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

runtime/vm/instructions_arm_test.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"
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/assembler.h"
 #include "vm/cpu.h"
 #include "vm/instructions.h"
@@ skipping 11 matching lines @@
   __ Ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Call, test) {
   // The return address, which must be the address of an instruction contained
   // in the code, points to the Ret instruction above, i.e. one instruction
   // before the end of the code buffer.
   CallPattern call(test->entry() + test->code().Size() - Instr::kInstrSize,
                    test->code());
-  EXPECT_EQ(StubCode::InvokeDartCode_entry()->code(), call.TargetCode());
+  EXPECT_EQ(StubCode::InvokeDartCode_entry()->label().address(),
+            call.TargetAddress());
 }
 
+
+ASSEMBLER_TEST_GENERATE(Jump, assembler) {
+  __ BranchPatchable(*StubCode::InvokeDartCode_entry());
+  __ BranchPatchable(*StubCode::AllocateArray_entry());
+}
+
+
+ASSEMBLER_TEST_RUN(Jump, test) {
+  const Code& code = test->code();
+  const Instructions& instrs = Instructions::Handle(code.instructions());
+  bool status =
+      VirtualMemory::Protect(reinterpret_cast<void*>(instrs.EntryPoint()),
+                             instrs.size(),
+                             VirtualMemory::kReadWrite);
+  EXPECT(status);
+  JumpPattern jump1(test->entry(), test->code());
+  EXPECT_EQ(StubCode::InvokeDartCode_entry()->label().address(),
+            jump1.TargetAddress());
+  JumpPattern jump2(test->entry() + jump1.pattern_length_in_bytes(),
+                    test->code());
+  const Code& array_stub =
+      Code::Handle(StubCode::AllocateArray_entry()->code());
+  EXPECT_EQ(array_stub.EntryPoint(), jump2.TargetAddress());
+  uword target1 = jump1.TargetAddress();
+  uword target2 = jump2.TargetAddress();
+  jump1.SetTargetAddress(target2);
+  jump2.SetTargetAddress(target1);
+  EXPECT_EQ(array_stub.EntryPoint(), jump1.TargetAddress());
+  EXPECT_EQ(StubCode::InvokeDartCode_entry()->label().address(),
+            jump2.TargetAddress());
+}
+
+
+#if defined(USING_SIMULATOR)
+ASSEMBLER_TEST_GENERATE(JumpARMv6, assembler) {
+  // ARMv7 is the default.
+  HostCPUFeatures::set_arm_version(ARMv6);
+  __ BranchPatchable(*StubCode::InvokeDartCode_entry());
+  __ BranchPatchable(*StubCode::AllocateArray_entry());
+  HostCPUFeatures::set_arm_version(ARMv7);
+}
+
+
+ASSEMBLER_TEST_RUN(JumpARMv6, test) {
+  HostCPUFeatures::set_arm_version(ARMv6);
+  const Code& code = test->code();
+  const Instructions& instrs = Instructions::Handle(code.instructions());
+  bool status =
+      VirtualMemory::Protect(reinterpret_cast<void*>(instrs.EntryPoint()),
+                             instrs.size(),
+                             VirtualMemory::kReadWrite);
+  EXPECT(status);
+  JumpPattern jump1(test->entry(), test->code());
+  EXPECT_EQ(StubCode::InvokeDartCode_entry()->label().address(),
+            jump1.TargetAddress());
+  JumpPattern jump2(test->entry() + jump1.pattern_length_in_bytes(),
+                    test->code());
+  const Code& array_stub =
+      Code::Handle(StubCode::AllocateArray_entry()->code());
+  EXPECT_EQ(array_stub.EntryPoint(), jump2.TargetAddress());
+  uword target1 = jump1.TargetAddress();
+  uword target2 = jump2.TargetAddress();
+  jump1.SetTargetAddress(target2);
+  jump2.SetTargetAddress(target1);
+  EXPECT_EQ(array_stub.EntryPoint(), jump1.TargetAddress());
+  EXPECT_EQ(StubCode::InvokeDartCode_entry()->label().address(),
+            jump2.TargetAddress());
+  HostCPUFeatures::set_arm_version(ARMv7);
+}
+#endif
+
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM