Expands the use of Immediate and Operand wrappers.

runtime/vm/intrinsifier_arm64.cc

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_ARM64.
 #if defined(TARGET_ARCH_ARM64)
 
 #include "vm/intrinsifier.h"
 
 #include "vm/assembler.h"
@@ skipping 48 matching lines @@
     __ CompareObject(R1, Object::null_object(), PP);
     __ b(&checked_ok, EQ);
 
     // Check if it's dynamic.
     // Get type at index 0.
     __ ldr(R0, FieldAddress(R1, TypeArguments::type_at_offset(0)));
     __ CompareObject(R0, Type::ZoneHandle(Type::DynamicType()), PP);
     __ b(&checked_ok, EQ);
 
     // Check for int and num.
-    __ tsti(R2, kSmiTagMask);  // Value is Smi?
+    __ tsti(R2, Immediate(Immediate(kSmiTagMask)));  // Value is Smi?
     __ b(&fall_through, NE);  // Non-smi value.
     __ CompareObject(R0, Type::ZoneHandle(Type::IntType()), PP);
     __ b(&checked_ok, EQ);
     __ CompareObject(R0, Type::ZoneHandle(Type::Number()), PP);
     __ b(&fall_through, NE);
     __ Bind(&checked_ok);
   }
   __ ldr(R1, Address(SP, 1 * kWordSize));  // Index.
-  __ tsti(R1, kSmiTagMask);
+  __ tsti(R1, Immediate(kSmiTagMask));
   // Index not Smi.
   __ b(&fall_through, NE);
   __ ldr(R0, Address(SP, 2 * kWordSize));  // Array.
 
   // Range check.
   __ ldr(R3, FieldAddress(R0, Array::length_offset()));  // Array length.
   __ cmp(R1, Operand(R3));
   // Runtime throws exception.
   __ b(&fall_through, CS);
 
@@ skipping 47 matching lines @@
   __ Bind(&fall_through);
 }
 
 
 void Intrinsifier::GrowableArrayGetIndexed(Assembler* assembler) {
   Label fall_through;
 
   __ ldr(R0, Address(SP, + 0 * kWordSize));  // Index
   __ ldr(R1, Address(SP, + 1 * kWordSize));  // Array
 
-  __ tsti(R0, kSmiTagMask);
+  __ tsti(R0, Immediate(kSmiTagMask));
   __ b(&fall_through, NE);  // Index is not an smi, fall through.
 
   // Range check.
   __ ldr(R6, FieldAddress(R1, GrowableObjectArray::length_offset()));
   __ cmp(R0, Operand(R6));
   __ b(&fall_through, CS);
 
   ASSERT(kSmiTagShift == 1);
   // array element at R6 + R0 * 4 + Array::data_offset - 1
   __ ldr(R6, FieldAddress(R1, GrowableObjectArray::data_offset()));  // Data
   __ add(R6, R6, Operand(R0, LSL, 2));
   __ ldr(R0, FieldAddress(R6, Array::data_offset()));
   __ ret();
   __ Bind(&fall_through);
 }
 
 
 // Set value into growable object array at specified index.
 // On stack: growable array (+2), index (+1), value (+0).
 void Intrinsifier::GrowableArraySetIndexed(Assembler* assembler) {
   if (FLAG_enable_type_checks) {
     return;
   }
   Label fall_through;
   __ ldr(R1, Address(SP, 1 * kWordSize));  // Index.
   __ ldr(R0, Address(SP, 2 * kWordSize));  // GrowableArray.
-  __ tsti(R1, kSmiTagMask);
+  __ tsti(R1, Immediate(kSmiTagMask));
   __ b(&fall_through, NE);  // Non-smi index.
   // Range check using _length field.
   __ ldr(R2, FieldAddress(R0, GrowableObjectArray::length_offset()));
   __ cmp(R1, Operand(R2));
   // Runtime throws exception.
   __ b(&fall_through, CS);
   __ ldr(R0, FieldAddress(R0, GrowableObjectArray::data_offset()));  // data.
   __ ldr(R2, Address(SP, 0 * kWordSize));  // Value.
   // Note that R1 is Smi, i.e, times 2.
   ASSERT(kSmiTagShift == 1);
   __ add(R1, R0, Operand(R1, LSL, 2));
   __ StoreIntoObject(R0,
                      FieldAddress(R1, Array::data_offset()),
                      R2);
   __ ret();
   __ Bind(&fall_through);
 }
 
 
 // Set length of growable object array. The length cannot
 // be greater than the length of the data container.
 // On stack: growable array (+1), length (+0).
 void Intrinsifier::GrowableArraySetLength(Assembler* assembler) {
   Label fall_through;
   __ ldr(R0, Address(SP, 1 * kWordSize));  // Growable array.
   __ ldr(R1, Address(SP, 0 * kWordSize));  // Length value.
-  __ tsti(R1, kSmiTagMask);  // Check for Smi.
+  __ tsti(R1, Immediate(kSmiTagMask));  // Check for Smi.
   __ b(&fall_through, NE);
   __ str(R1, FieldAddress(R0, GrowableObjectArray::length_offset()));
   __ ret();
   __ Bind(&fall_through);
   // Fall through on non-Smi.
 }
 
 
 // Set data of growable object array.
 // On stack: growable array (+1), data (+0).
 void Intrinsifier::GrowableArraySetData(Assembler* assembler) {
   if (FLAG_enable_type_checks) {
     return;
   }
   Label fall_through;
   __ ldr(R1, Address(SP, 0 * kWordSize));  // Data.
   // Check that data is an ObjectArray.
-  __ tsti(R1, kSmiTagMask);
+  __ tsti(R1, Immediate(kSmiTagMask));
   __ b(&fall_through, EQ);  // Data is Smi.
   __ CompareClassId(R1, kArrayCid, kNoPP);
   __ b(&fall_through, NE);
   __ ldr(R0, Address(SP, 1 * kWordSize));  // Growable array.
   __ StoreIntoObject(R0,
                      FieldAddress(R0, GrowableObjectArray::data_offset()),
                      R1);
   __ ret();
   __ Bind(&fall_through);
 }
@@ skipping 47 matching lines @@
   return -1;
 }
 
 
 #define TYPED_ARRAY_ALLOCATION(type_name, cid, max_len, scale_shift)           \
   Label fall_through;                                                          \
   const intptr_t kArrayLengthStackOffset = 0 * kWordSize;                      \
   __ ldr(R2, Address(SP, kArrayLengthStackOffset));  /* Array length. */       \
   /* Check that length is a positive Smi. */                                   \
   /* R2: requested array length argument. */                                   \
-  __ tsti(R2, kSmiTagMask);                                                    \
+  __ tsti(R2, Immediate(kSmiTagMask));                                         \
   __ b(&fall_through, NE);                                                     \
   __ CompareRegisters(R2, ZR);                                                 \
   __ b(&fall_through, LT);                                                     \
   __ SmiUntag(R2);                                                             \
   /* Check for maximum allowed length. */                                      \
   /* R2: untagged array length. */                                             \
   __ CompareImmediate(R2, max_len, kNoPP);                                     \
   __ b(&fall_through, GT);                                                     \
   __ LslImmediate(R2, R2, scale_shift);                                        \
   const intptr_t fixed_size = sizeof(Raw##type_name) + kObjectAlignment - 1;   \
   __ AddImmediate(R2, R2, fixed_size, kNoPP);                                  \
-  __ andi(R2, R2, ~(kObjectAlignment - 1));                                    \
+  __ andi(R2, R2, Immediate(~(kObjectAlignment - 1)));                         \
   Heap* heap = Isolate::Current()->heap();                                     \
   Heap::Space space = heap->SpaceForAllocation(cid);                           \
   __ LoadImmediate(R0, heap->TopAddress(space), kNoPP);                        \
   __ ldr(R0, Address(R0, 0));                                                  \
                                                                                \
   /* R2: allocation size. */                                                   \
   __ add(R1, R0, Operand(R2));                                                 \
   __ b(&fall_through, VS);                                                     \
                                                                                \
   /* Check if the allocation fits into the remaining space. */                 \
@@ skipping 69 matching lines @@
 CLASS_LIST_TYPED_DATA(TYPED_DATA_ALLOCATOR)
 #undef TYPED_DATA_ALLOCATOR
 
 
 // Loads args from stack into R0 and R1
 // Tests if they are smis, jumps to label not_smi if not.
 static void TestBothArgumentsSmis(Assembler* assembler, Label* not_smi) {
   __ ldr(R0, Address(SP, + 0 * kWordSize));
   __ ldr(R1, Address(SP, + 1 * kWordSize));
   __ orr(TMP, R0, Operand(R1));
-  __ tsti(TMP, kSmiTagMask);
+  __ tsti(TMP, Immediate(kSmiTagMask));
   __ b(not_smi, NE);
 }
 
 
 void Intrinsifier::Integer_addFromInteger(Assembler* assembler) {
   Label fall_through;
   TestBothArgumentsSmis(assembler, &fall_through);  // Checks two smis.
   __ adds(R0, R0, Operand(R1));  // Adds.
   __ b(&fall_through, VS);  // Fall-through on overflow.
   __ ret();
@@ skipping 104 matching lines @@
 //    } else {
 //      res = res + right;
 //    }
 //  }
 void Intrinsifier::Integer_moduloFromInteger(Assembler* assembler) {
   // Check to see if we have integer division
   Label neg_remainder, fall_through;
   __ ldr(R1, Address(SP, + 0 * kWordSize));
   __ ldr(R0, Address(SP, + 1 * kWordSize));
   __ orr(TMP, R0, Operand(R1));
-  __ tsti(TMP, kSmiTagMask);
+  __ tsti(TMP, Immediate(kSmiTagMask));
   __ b(&fall_through, NE);
   // R1: Tagged left (dividend).
   // R0: Tagged right (divisor).
   // Check if modulo by zero -> exception thrown in main function.
   __ CompareRegisters(R0, ZR);
   __ b(&fall_through, EQ);
   EmitRemainderOperation(assembler);
   // Untagged right in R0. Untagged remainder result in R1.
 
   __ CompareRegisters(R1, ZR);
@@ skipping 33 matching lines @@
   __ b(&fall_through, EQ);
   __ SmiTag(R0);  // Not equal. Okay to tag and return.
   __ ret();  // Return.
   __ Bind(&fall_through);
 }
 
 
 void Intrinsifier::Integer_negate(Assembler* assembler) {
   Label fall_through;
   __ ldr(R0, Address(SP, + 0 * kWordSize));  // Grab first argument.
-  __ tsti(R0, kSmiTagMask);  // Test for Smi.
+  __ tsti(R0, Immediate(kSmiTagMask));  // Test for Smi.
   __ b(&fall_through, NE);
   __ negs(R0, R0);
   __ b(&fall_through, VS);
   __ ret();
   __ Bind(&fall_through);
 }
 
 
 void Intrinsifier::Integer_bitAndFromInteger(Assembler* assembler) {
   Label fall_through;
@@ skipping 109 matching lines @@
 // can be Smi, Mint, Bigint or double.
 void Intrinsifier::Integer_equalToInteger(Assembler* assembler) {
   Label fall_through, true_label, check_for_mint;
   // For integer receiver '===' check first.
   __ ldr(R0, Address(SP, 0 * kWordSize));
   __ ldr(R1, Address(SP, 1 * kWordSize));
   __ cmp(R0, Operand(R1));
   __ b(&true_label, EQ);
 
   __ orr(R2, R0, Operand(R1));
-  __ tsti(R2, kSmiTagMask);
+  __ tsti(R2, Immediate(kSmiTagMask));
   __ b(&check_for_mint, NE);  // If R0 or R1 is not a smi do Mint checks.
 
   // Both arguments are smi, '===' is good enough.
   __ LoadObject(R0, Bool::False(), PP);
   __ ret();
   __ Bind(&true_label);
   __ LoadObject(R0, Bool::True(), PP);
   __ ret();
 
   // At least one of the arguments was not Smi.
   Label receiver_not_smi;
   __ Bind(&check_for_mint);
 
-  __ tsti(R1, kSmiTagMask);  // Check receiver.
+  __ tsti(R1, Immediate(kSmiTagMask));  // Check receiver.
   __ b(&receiver_not_smi, NE);
 
   // Left (receiver) is Smi, return false if right is not Double.
   // Note that an instance of Mint or Bigint never contains a value that can be
   // represented by Smi.
 
   __ CompareClassId(R0, kDoubleCid, kNoPP);
   __ b(&fall_through, EQ);
   __ LoadObject(R0, Bool::False(), PP);  // Smi == Mint -> false.
   __ ret();
 
   __ Bind(&receiver_not_smi);
   // R1: receiver.
 
   __ CompareClassId(R1, kMintCid, kNoPP);
   __ b(&fall_through, NE);
   // Receiver is Mint, return false if right is Smi.
-  __ tsti(R0, kSmiTagMask);
+  __ tsti(R0, Immediate(kSmiTagMask));
   __ b(&fall_through, NE);
   __ LoadObject(R0, Bool::False(), PP);
   __ ret();
   // TODO(srdjan): Implement Mint == Mint comparison.
 
   __ Bind(&fall_through);
 }
 
 
 void Intrinsifier::Integer_equal(Assembler* assembler) {
@@ skipping 20 matching lines @@
   __ asrv(R0, R1, R0);
   __ SmiTag(R0);
   __ ret();
   __ Bind(&fall_through);
 }
 
 
 void Intrinsifier::Smi_bitNegate(Assembler* assembler) {
   __ ldr(R0, Address(SP, 0 * kWordSize));
   __ mvn(R0, R0);
-  __ andi(R0, R0, ~kSmiTagMask);  // Remove inverted smi-tag.
+  __ andi(R0, R0, Immediate(~kSmiTagMask));  // Remove inverted smi-tag.
   __ ret();
 }
 
 
 void Intrinsifier::Smi_bitLength(Assembler* assembler) {
   // TODO(sra): Implement as word-length - CLZ.
 }
 
 
 void Intrinsifier::Bigint_setNeg(Assembler* assembler) {
@@ skipping 30 matching lines @@
 }
 
 
 // Check if the last argument is a double, jump to label 'is_smi' if smi
 // (easy to convert to double), otherwise jump to label 'not_double_smi',
 // Returns the last argument in R0.
 static void TestLastArgumentIsDouble(Assembler* assembler,
                                      Label* is_smi,
                                      Label* not_double_smi) {
   __ ldr(R0, Address(SP, 0 * kWordSize));
-  __ tsti(R0, kSmiTagMask);
+  __ tsti(R0, Immediate(kSmiTagMask));
   __ b(is_smi, EQ);
   __ CompareClassId(R0, kDoubleCid, kNoPP);
   __ b(not_double_smi, NE);
   // Fall through with Double in R0.
 }
 
 
 // Both arguments on stack, arg0 (left) is a double, arg1 (right) is of unknown
 // type. Return true or false object in the register R0. Any NaN argument
 // returns false. Any non-double arg1 causes control flow to fall through to the
@@ skipping 96 matching lines @@
 void Intrinsifier::Double_div(Assembler* assembler) {
   DoubleArithmeticOperations(assembler, Token::kDIV);
 }
 
 
 // Left is double right is integer (Bigint, Mint or Smi)
 void Intrinsifier::Double_mulFromInteger(Assembler* assembler) {
   Label fall_through;
   // Only smis allowed.
   __ ldr(R0, Address(SP, 0 * kWordSize));
-  __ tsti(R0, kSmiTagMask);
+  __ tsti(R0, Immediate(kSmiTagMask));
   __ b(&fall_through, NE);
   // Is Smi.
   __ SmiUntag(R0);
   __ scvtfd(V1, R0);
   __ ldr(R0, Address(SP, 1 * kWordSize));
   __ LoadDFieldFromOffset(V0, R0, Double::value_offset(), kNoPP);
   __ fmuld(V0, V0, V1);
   const Class& double_class = Class::Handle(
       Isolate::Current()->object_store()->double_class());
   __ TryAllocate(double_class, &fall_through, R0, R1, kNoPP);
   __ StoreDFieldToOffset(V0, R0, Double::value_offset(), kNoPP);
   __ ret();
   __ Bind(&fall_through);
 }
 
 
 void Intrinsifier::DoubleFromInteger(Assembler* assembler) {
   Label fall_through;
 
   __ ldr(R0, Address(SP, 0 * kWordSize));
-  __ tsti(R0, kSmiTagMask);
+  __ tsti(R0, Immediate(kSmiTagMask));
   __ b(&fall_through, NE);
   // Is Smi.
   __ SmiUntag(R0);
   __ scvtfd(V0, R0);
   const Class& double_class = Class::Handle(
       Isolate::Current()->object_store()->double_class());
   __ TryAllocate(double_class, &fall_through, R0, R1, kNoPP);
   __ StoreDFieldToOffset(V0, R0, Double::value_offset(), kNoPP);
   __ ret();
   __ Bind(&fall_through);
@@ skipping 29 matching lines @@
   __ Bind(&is_true);
   __ mov(R0, true_reg);
 
   __ Bind(&is_false);
   __ ret();
 
   __ Bind(&is_zero);
   // Check for negative zero by looking at the sign bit.
   __ fmovrd(R1, V0);
   __ LsrImmediate(R1, R1, 63);
-  __ tsti(R1, 1);
+  __ tsti(R1, Immediate(1));
   __ csel(R0, true_reg, false_reg, NE);  // Sign bit set.
   __ ret();
 }
 
 
 void Intrinsifier::DoubleToInteger(Assembler* assembler) {
   Label fall_through;
 
   __ ldr(R0, Address(SP, 0 * kWordSize));
   __ LoadDFieldFromOffset(V0, R0, Double::value_offset(), kNoPP);
@@ skipping 56 matching lines @@
   __ ldr(R0, Address(SP, 0 * kWordSize));  // Receiver.
   __ ldr(R1, FieldAddress(R0, state_field.Offset()));  // Field '_state'.
 
   // Addresses of _state[0].
   const int64_t disp =
       Instance::DataOffsetFor(kTypedDataUint32ArrayCid) - kHeapObjectTag;
 
   __ LoadImmediate(R0, a_int_value, kNoPP);
   __ LoadFromOffset(R2, R1, disp, kNoPP);
   __ LsrImmediate(R3, R2, 32);
-  __ andi(R2, R2, 0xffffffff);
+  __ andi(R2, R2, Immediate(0xffffffff));
   __ mul(R2, R0, R2);
   __ add(R2, R2, Operand(R3));
   __ StoreToOffset(R2, R1, disp, kNoPP);
   __ ret();
 }
 
 
 void Intrinsifier::ObjectEquals(Assembler* assembler) {
   __ ldr(R0, Address(SP, 0 * kWordSize));
   __ ldr(R1, Address(SP, 1 * kWordSize));
@@ skipping 15 matching lines @@
   // Hash not yet computed.
   __ Bind(&fall_through);
 }
 
 
 void Intrinsifier::StringBaseCodeUnitAt(Assembler* assembler) {
   Label fall_through, try_two_byte_string;
 
   __ ldr(R1, Address(SP, 0 * kWordSize));  // Index.
   __ ldr(R0, Address(SP, 1 * kWordSize));  // String.
-  __ tsti(R1, kSmiTagMask);
+  __ tsti(R1, Immediate(kSmiTagMask));
   __ b(&fall_through, NE);  // Index is not a Smi.
   // Range check.
   __ ldr(R2, FieldAddress(R0, String::length_offset()));
   __ cmp(R1, Operand(R2));
   __ b(&fall_through, CS);  // Runtime throws exception.
   __ CompareClassId(R0, kOneByteStringCid, kNoPP);
   __ b(&try_two_byte_string, NE);
   __ SmiUntag(R1);
   __ AddImmediate(R0, R0, OneByteString::data_offset() - kHeapObjectTag, kNoPP);
   __ ldr(R0, Address(R0, R1), kUnsignedByte);
@@ skipping 11 matching lines @@
 
   __ Bind(&fall_through);
 }
 
 
 void Intrinsifier::StringBaseCharAt(Assembler* assembler) {
   Label fall_through, try_two_byte_string;
 
   __ ldr(R1, Address(SP, 0 * kWordSize));  // Index.
   __ ldr(R0, Address(SP, 1 * kWordSize));  // String.
-  __ tsti(R1, kSmiTagMask);
+  __ tsti(R1, Immediate(kSmiTagMask));
   __ b(&fall_through, NE);  // Index is not a Smi.
   // Range check.
   __ ldr(R2, FieldAddress(R0, String::length_offset()));
   __ cmp(R1, Operand(R2));
   __ b(&fall_through, CS);  // Runtime throws exception.
 
   __ CompareClassId(R0, kOneByteStringCid, kNoPP);
   __ b(&try_two_byte_string, NE);
   __ SmiUntag(R1);
   __ AddImmediate(R0, R0, OneByteString::data_offset() - kHeapObjectTag, kNoPP);
@@ skipping 105 matching lines @@
 static void TryAllocateOnebyteString(Assembler* assembler,
                                      Label* ok,
                                      Label* failure) {
   const Register length_reg = R2;
   Label fail;
 
   __ mov(R6, length_reg);  // Save the length register.
   __ SmiUntag(length_reg);
   const intptr_t fixed_size = sizeof(RawString) + kObjectAlignment - 1;
   __ AddImmediate(length_reg, length_reg, fixed_size, kNoPP);
-  __ andi(length_reg, length_reg, ~(kObjectAlignment - 1));
+  __ andi(length_reg, length_reg, Immediate(~(kObjectAlignment - 1)));
 
   Isolate* isolate = Isolate::Current();
   Heap* heap = isolate->heap();
   const intptr_t cid = kOneByteStringCid;
   Heap::Space space = heap->SpaceForAllocation(cid);
   __ LoadImmediate(R3, heap->TopAddress(space), kNoPP);
   __ ldr(R0, Address(R3));
 
   // length_reg: allocation size.
   __ adds(R1, R0, Operand(length_reg));
@@ skipping 53 matching lines @@
 // The indexes must be valid.
 void Intrinsifier::OneByteString_substringUnchecked(Assembler* assembler) {
   const intptr_t kStringOffset = 2 * kWordSize;
   const intptr_t kStartIndexOffset = 1 * kWordSize;
   const intptr_t kEndIndexOffset = 0 * kWordSize;
   Label fall_through, ok;
 
   __ ldr(R2, Address(SP, kEndIndexOffset));
   __ ldr(TMP, Address(SP, kStartIndexOffset));
   __ orr(R3, R2,  Operand(TMP));
-  __ tsti(R3, kSmiTagMask);
+  __ tsti(R3, Immediate(kSmiTagMask));
   __ b(&fall_through, NE);  // 'start', 'end' not Smi.
 
   __ sub(R2, R2, Operand(TMP));
   TryAllocateOnebyteString(assembler, &ok, &fall_through);
   __ Bind(&ok);
   // R0: new string as tagged pointer.
   // Copy string.
   __ ldr(R3, Address(SP, kStringOffset));
   __ ldr(R1, Address(SP, kStartIndexOffset));
   __ SmiUntag(R1);
@@ skipping 62 matching lines @@
 void StringEquality(Assembler* assembler, intptr_t string_cid) {
   Label fall_through, is_true, is_false, loop;
   __ ldr(R0, Address(SP, 1 * kWordSize));  // This.
   __ ldr(R1, Address(SP, 0 * kWordSize));  // Other.
 
   // Are identical?
   __ cmp(R0, Operand(R1));
   __ b(&is_true, EQ);
 
   // Is other OneByteString?
-  __ tsti(R1, kSmiTagMask);
+  __ tsti(R1, Immediate(kSmiTagMask));
   __ b(&fall_through, EQ);
   __ CompareClassId(R1, string_cid, kNoPP);
   __ b(&fall_through, NE);
 
   // Have same length?
   __ ldr(R2, FieldAddress(R0, String::length_offset()));
   __ ldr(R3, FieldAddress(R1, String::length_offset()));
   __ cmp(R2, Operand(R3));
   __ b(&is_false, NE);
 
@@ skipping 84 matching lines @@
   Isolate* isolate = Isolate::Current();
   __ LoadImmediate(R1, reinterpret_cast<uword>(isolate), kNoPP);
   // Set return value to Isolate::current_tag_.
   __ ldr(R0, Address(R1, Isolate::current_tag_offset()));
   __ ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM64