Add AddImmediate(reg, int) to ARM64 assembler

runtime/vm/intrinsifier_arm.cc

 // Copyright (c) 2013, 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_ARM.
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/intrinsifier.h"
 
 #include "vm/assembler.h"
@@ skipping 1764 matching lines @@
   // if (start < 0) return false;
   __ cmp(R1, Operand(0));
   __ b(return_false, LT);
 
   // if (start + other.length > this.length) return false;
   __ add(R3, R1, Operand(R9));
   __ cmp(R3, Operand(R8));
   __ b(return_false, GT);
 
   if (receiver_cid == kOneByteStringCid) {
-    __ AddImmediate(R0, R0, OneByteString::data_offset() - kHeapObjectTag);
+    __ AddImmediate(R0, OneByteString::data_offset() - kHeapObjectTag);
     __ add(R0, R0, Operand(R1));
   } else {
     ASSERT(receiver_cid == kTwoByteStringCid);
-    __ AddImmediate(R0, R0, TwoByteString::data_offset() - kHeapObjectTag);
+    __ AddImmediate(R0, TwoByteString::data_offset() - kHeapObjectTag);
     __ add(R0, R0, Operand(R1));
     __ add(R0, R0, Operand(R1));
   }
   if (other_cid == kOneByteStringCid) {
-    __ AddImmediate(R2, R2, OneByteString::data_offset() - kHeapObjectTag);
+    __ AddImmediate(R2, OneByteString::data_offset() - kHeapObjectTag);
   } else {
     ASSERT(other_cid == kTwoByteStringCid);
-    __ AddImmediate(R2, R2, TwoByteString::data_offset() - kHeapObjectTag);
+    __ AddImmediate(R2, TwoByteString::data_offset() - kHeapObjectTag);
   }
 
   // i = 0
   __ LoadImmediate(R3, 0);
 
   // do
   Label loop;
   __ Bind(&loop);
 
   if (receiver_cid == kOneByteStringCid) {
     __ ldrb(R4, Address(R0, 0));  // this.codeUnitAt(i + start)
   } else {
     __ ldrh(R4, Address(R0, 0));  // this.codeUnitAt(i + start)
   }
   if (other_cid == kOneByteStringCid) {
     __ ldrb(NOTFP, Address(R2, 0));  // other.codeUnitAt(i)
   } else {
     __ ldrh(NOTFP, Address(R2, 0));  // other.codeUnitAt(i)
   }
   __ cmp(R4, Operand(NOTFP));
   __ b(return_false, NE);
 
   // i++, while (i < len)
-  __ AddImmediate(R3, R3, 1);
-  __ AddImmediate(R0, R0, receiver_cid == kOneByteStringCid ? 1 : 2);
-  __ AddImmediate(R2, R2, other_cid == kOneByteStringCid ? 1 : 2);
+  __ AddImmediate(R3, 1);
+  __ AddImmediate(R0, receiver_cid == kOneByteStringCid ? 1 : 2);
+  __ AddImmediate(R2, other_cid == kOneByteStringCid ? 1 : 2);
   __ cmp(R3, Operand(R9));
   __ b(&loop, LT);
 
   __ b(return_true);
 }
 
 
 // bool _substringMatches(int start, String other)
 // This intrinsic handles a OneByteString or TwoByteString receiver with a
 // OneByteString other.
@@ skipping 395 matching lines @@
   // Incoming registers:
   // R0: Function. (Will be reloaded with the specialized matcher function.)
   // R4: Arguments descriptor. (Will be preserved.)
   // R9: Unknown. (Must be GC safe on tail call.)
 
   // Load the specialized function pointer into R0. Leverage the fact the
   // string CIDs as well as stored function pointers are in sequence.
   __ ldr(R2, Address(SP, kRegExpParamOffset));
   __ ldr(R1, Address(SP, kStringParamOffset));
   __ LoadClassId(R1, R1);
-  __ AddImmediate(R1, R1, -kOneByteStringCid);
+  __ AddImmediate(R1, -kOneByteStringCid);
   __ add(R1, R2, Operand(R1, LSL, kWordSizeLog2));
   __ ldr(R0,
          FieldAddress(R1, RegExp::function_offset(kOneByteStringCid, sticky)));
 
   // Registers are now set up for the lazy compile stub. It expects the function
   // in R0, the argument descriptor in R4, and IC-Data in R9.
   __ eor(R9, R9, Operand(R9));
 
   // Tail-call the function.
   __ ldr(CODE_REG, FieldAddress(R0, Function::code_offset()));
@@ skipping 60 matching lines @@
 
 void Intrinsifier::SetAsyncThreadStackTrace(Assembler* assembler) {
   __ ldr(R0, Address(THR, Thread::async_stack_trace_offset()));
   __ LoadObject(R0, Object::null_object());
   __ Ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM