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

runtime/vm/assembler_x64.h

 // 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.
 
 #ifndef VM_ASSEMBLER_X64_H_
 #define VM_ASSEMBLER_X64_H_
 
 #ifndef VM_ASSEMBLER_H_
 #error Do not include assembler_x64.h directly; use assembler.h instead.
 #endif
@@ skipping 348 matching lines @@
   static const bool kFarJump = false;
 
   /*
    * Emit Machine Instructions.
    */
   void call(Register reg);
   void call(const Address& address);
   void call(Label* label);
   void call(const ExternalLabel* label);
 
-  static const intptr_t kCallExternalLabelSize = 15;
+  static const intptr_t kCallExternalLabelSize = 7;
 
   void pushq(Register reg);
   void pushq(const Address& address);
   void pushq(const Immediate& imm);
   void PushImmediate(const Immediate& imm);
 
   void popq(Register reg);
   void popq(const Address& address);
 
   void setcc(Condition condition, ByteRegister dst);
@@ skipping 383 matching lines @@
   void LoadExternalLabel(Register dst,
                          const ExternalLabel* label,
                          Patchability patchable);
   void LoadNativeEntry(Register dst,
                        const ExternalLabel* label,
                        Patchability patchable);
   void LoadFunctionFromCalleePool(Register dst,
                                   const Function& function,
                                   Register new_pp);
   void JmpPatchable(const StubEntry& stub_entry, Register pp);
-  void Jmp(const StubEntry& stub_entry, Register pp = PP);
+  void Jmp(const StubEntry& stub_entry, Register pp);
   void J(Condition condition, const StubEntry& stub_entry, Register pp);
   void CallPatchable(const StubEntry& stub_entry);
   void Call(const StubEntry& stub_entry);
   // Unaware of write barrier (use StoreInto* methods for storing to objects).
   // TODO(koda): Add StackAddress/HeapAddress types to prevent misuse.
   void StoreObject(const Address& dst, const Object& obj);
   void PushObject(const Object& object);
   void CompareObject(Register reg, const Object& object);
 
   // When storing into a heap object field, knowledge of the previous content
@@ skipping 41 matching lines @@
   void DoubleAbs(XmmRegister reg);
 
   void LockCmpxchgq(const Address& address, Register reg) {
     lock();
     cmpxchgq(address, reg);
   }
 
   void PushRegisters(intptr_t cpu_register_set, intptr_t xmm_register_set);
   void PopRegisters(intptr_t cpu_register_set, intptr_t xmm_register_set);
 
-  void CheckCodePointer();
-
   void EnterFrame(intptr_t frame_space);
   void LeaveFrame();
   void ReserveAlignedFrameSpace(intptr_t frame_space);
 
   // Create a frame for calling into runtime that preserves all volatile
   // registers.  Frame's RSP is guaranteed to be correctly aligned and
   // frame_space bytes are reserved under it.
   void EnterCallRuntimeFrame(intptr_t frame_space);
   void LeaveCallRuntimeFrame();
 
@@ skipping 70 matching lines @@
   ObjectPoolWrapper& object_pool_wrapper() { return object_pool_wrapper_; }
 
   RawObjectPool* MakeObjectPool() {
     return object_pool_wrapper_.MakeObjectPool();
   }
 
   void FinalizeInstructions(const MemoryRegion& region) {
     buffer_.FinalizeInstructions(region);
   }
 
-  void RestoreCodePointer();
   void LoadPoolPointer(Register pp = PP);
 
   // Set up a Dart frame on entry with a frame pointer and PC information to
   // enable easy access to the RawInstruction object of code corresponding
   // to this frame.
   // The dart frame layout is as follows:
   //   ....
   //   locals space  <=== RSP
   //   saved PP
   //   pc (used to derive the RawInstruction Object of the dart code)
   //   saved RBP     <=== RBP
   //   ret PC
   //   .....
   // This code sets this up with the sequence:
   //   pushq rbp
   //   movq rbp, rsp
   //   call L
   //   L: <code to adjust saved pc if there is any intrinsification code>
   //   ...
   //   pushq r15
   //   .....
-  void EnterDartFrame(intptr_t frame_size, Register new_pp);
-  void LeaveDartFrame(RestorePP restore_pp = kRestoreCallerPP);
+  void EnterDartFrame(intptr_t frame_size,
+                      Register new_pp,
+                      Register pc_marker_override);
+  void LeaveDartFrame();
 
   // Set up a Dart frame for a function compiled for on-stack replacement.
   // The frame layout is a normal Dart frame, but the frame is partially set
   // up on entry (it is the frame of the unoptimized code).
-  void EnterOsrFrame(intptr_t extra_size);
+  void EnterOsrFrame(intptr_t extra_size,
+                     Register new_pp, Register pc_marker_override);
 
   // Set up a stub frame so that the stack traversal code can easily identify
   // a stub frame.
   // The stub frame layout is as follows:
   //   ....       <=== RSP
   //   pc (used to derive the RawInstruction Object of the stub)
   //   saved RBP  <=== RBP
   //   ret PC
   //   .....
   // This code sets this up with the sequence:
   //   pushq rbp
   //   movq rbp, rsp
   //   pushq immediate(0)
   //   .....
   void EnterStubFrame();
   void LeaveStubFrame();
 
+  // Instruction pattern from entrypoint is used in dart frame prologues
+  // to set up the frame and save a PC which can be used to figure out the
+  // RawInstruction object corresponding to the code running in the frame.
+  // entrypoint:
+  //   pushq rbp          (size is 1 byte)
+  //   movq rbp, rsp      (size is 3 bytes)
+  //   call L             (size is 5 bytes)
+  //   L:
+  static const intptr_t kEntryPointToPcMarkerOffset = 0;
+  static intptr_t EntryPointToPcMarkerOffset() {
+    return kEntryPointToPcMarkerOffset;
+  }
+
   void UpdateAllocationStats(intptr_t cid,
                              Heap::Space space,
                              bool inline_isolate = true);
 
   void UpdateAllocationStatsWithSize(intptr_t cid,
                                      Register size_reg,
                                      Heap::Space space,
                                      bool inline_isolate = true);
   void UpdateAllocationStatsWithSize(intptr_t cid,
                                      intptr_t instance_size,
@@ skipping 214 matching lines @@
 }
 
 
 inline void Assembler::EmitOperandSizeOverride() {
   EmitUint8(0x66);
 }
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_X64_H_