Revert "VM: New calling convention for generated code."

runtime/vm/intermediate_language_arm.cc

Index: runtime/vm/intermediate_language_arm.cc
diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc
index 049969979a9f26854ceff08a209de581b799b521..45ec0271a6238b4586599f4380890875895891d0 100644
--- a/runtime/vm/intermediate_language_arm.cc
+++ b/runtime/vm/intermediate_language_arm.cc
@@ -223,7 +223,6 @@ void ClosureCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   // R4: Arguments descriptor.
   // R0: Function.
   ASSERT(locs()->in(0).reg() == R0);
-  __ ldr(CODE_REG, FieldAddress(R0, Function::code_offset()));
   __ ldr(R2, FieldAddress(R0, Function::entry_point_offset()));
 
   // R2: instructions entry point.
@@ -2330,7 +2329,7 @@ static void InlineArrayAllocation(FlowGraphCompiler* compiler,
                       R0,  // instance
                       R3,  // end address
                       R6,
-                      R10);
+                      R9);
   // R0: new object start as a tagged pointer.
   // R3: new object end address.
 
@@ -2347,7 +2346,7 @@ static void InlineArrayAllocation(FlowGraphCompiler* compiler,
   // Initialize all array elements to raw_null.
   // R0: new object start as a tagged pointer.
   // R3: new object end address.
-  // R10: iterator which initially points to the start of the variable
+  // R9: iterator which initially points to the start of the variable
   // data area to be initialized.
   // R6: null
   if (num_elements > 0) {
@@ -2361,12 +2360,12 @@ static void InlineArrayAllocation(FlowGraphCompiler* compiler,
       __ LoadImmediate(R7, 0x1);
 #endif  // DEBUG
     }
-    __ AddImmediate(R10, R0, sizeof(RawArray) - kHeapObjectTag);
+    __ AddImmediate(R9, R0, sizeof(RawArray) - kHeapObjectTag);
     if (array_size < (kInlineArraySize * kWordSize)) {
-      __ InitializeFieldsNoBarrierUnrolled(R0, R10, 0, num_elements * kWordSize,
+      __ InitializeFieldsNoBarrierUnrolled(R0, R9, 0, num_elements * kWordSize,
                                            R6, R7);
     } else {
-      __ InitializeFieldsNoBarrier(R0, R10, R3, R6, R7);
+      __ InitializeFieldsNoBarrier(R0, R9, R3, R6, R7);
     }
   }
   __ b(done);
@@ -2838,8 +2837,8 @@ void CatchBlockEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
                                 compiler->assembler()->CodeSize(),
                                 catch_handler_types_,
                                 needs_stacktrace());
+
   // Restore the pool pointer.
-  __ RestoreCodePointer();
   __ LoadPoolPointer();
 
   if (HasParallelMove()) {
@@ -6687,10 +6686,9 @@ LocationSummary* IndirectGotoInstr::MakeLocationSummary(Zone* zone,
 void IndirectGotoInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register target_address_reg = locs()->temp_slot(0)->reg();
 
-  // Offset is relative to entry pc.
-  const intptr_t entry_to_pc_offset = __ CodeSize() + Instr::kPCReadOffset;
-  __ mov(target_address_reg, Operand(PC));
-  __ AddImmediate(target_address_reg, target_address_reg, -entry_to_pc_offset);
+  // Load from [current frame pointer] + kPcMarkerSlotFromFp.
+  __ ldr(target_address_reg, Address(FP, kPcMarkerSlotFromFp * kWordSize));
+
   // Add the offset.
   Register offset_reg = locs()->in(0).reg();
   Operand offset_opr =