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

runtime/vm/stub_code.cc

 // Copyright (c) 2012, 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/stub_code.h"
 
 #include "platform/assert.h"
 #include "platform/globals.h"
 #include "vm/assembler.h"
 #include "vm/disassembler.h"
@@ skipping 86 matching lines @@
   Isolate* isolate = Isolate::Current();
   const Error& error = Error::Handle(isolate, cls.EnsureIsFinalized(isolate));
   ASSERT(error.IsNull());
   if (cls.id() == kArrayCid) {
     return AllocateArray_entry()->code();
   }
   Code& stub = Code::Handle(isolate, cls.allocation_stub());
   if (stub.IsNull()) {
     Assembler assembler;
     const char* name = cls.ToCString();
-    StubCode::GenerateAllocationStubForClass(&assembler, cls);
+    uword patch_code_offset = 0;
+    uword entry_patch_offset = 0;
+    StubCode::GenerateAllocationStubForClass(
+        &assembler, cls, &entry_patch_offset, &patch_code_offset);
     stub ^= Code::FinalizeCode(name, &assembler);
     stub.set_owner(cls);
     cls.set_allocation_stub(stub);
     if (FLAG_disassemble_stubs) {
       LogBlock lb;
       THR_Print("Code for allocation stub '%s': {\n", name);
       DisassembleToStdout formatter;
       stub.Disassemble(&formatter);
       THR_Print("}\n");
-      const ObjectPool& object_pool = ObjectPool::Handle(stub.object_pool());
+      const ObjectPool& object_pool = ObjectPool::Handle(
+          Instructions::Handle(stub.instructions()).object_pool());
       object_pool.DebugPrint();
     }
+    stub.set_entry_patch_pc_offset(entry_patch_offset);
+    stub.set_patch_code_pc_offset(patch_code_offset);
   }
   return stub.raw();
 }
 
 
 const StubEntry* StubCode::UnoptimizedStaticCallEntry(
     intptr_t num_args_tested) {
   switch (num_args_tested) {
     case 0:
       return ZeroArgsUnoptimizedStaticCall_entry();
@@ skipping 12 matching lines @@
                             void (*GenerateStub)(Assembler* assembler)) {
   Assembler assembler;
   GenerateStub(&assembler);
   const Code& code = Code::Handle(Code::FinalizeCode(name, &assembler));
   if (FLAG_disassemble_stubs) {
     LogBlock lb;
     THR_Print("Code for stub '%s': {\n", name);
     DisassembleToStdout formatter;
     code.Disassemble(&formatter);
     THR_Print("}\n");
-    const ObjectPool& object_pool = ObjectPool::Handle(code.object_pool());
+    const ObjectPool& object_pool = ObjectPool::Handle(
+        Instructions::Handle(code.instructions()).object_pool());
     object_pool.DebugPrint();
   }
   return code.raw();
 }
 
 
 const char* StubCode::NameOfStub(uword entry_point) {
 #define VM_STUB_CODE_TESTER(name)                                              \
   if ((name##_entry() != NULL) &&                                              \
       (entry_point == name##_entry()->EntryPoint())) {                         \
     return ""#name;                                                            \
   }
   VM_STUB_CODE_LIST(VM_STUB_CODE_TESTER);
 #undef VM_STUB_CODE_TESTER
   return NULL;
 }
 
 }  // namespace dart