Track prologue offset of Code and use for more precise return addresses

runtime/vm/assembler_ia32.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"  // NOLINT
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/cpu.h"
 #include "vm/heap.h"
+#include "vm/instructions.h"
 #include "vm/memory_region.h"
 #include "vm/runtime_entry.h"
 #include "vm/stack_frame.h"
 #include "vm/stub_code.h"
 #include "vm/verified_memory.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, print_stop_message, true, "Print stop message.");
 DECLARE_FLAG(bool, inline_alloc);
@@ skipping 2460 matching lines @@
     uint64_t a;
     uint64_t b;
   } double_abs_constant =
       {0x7FFFFFFFFFFFFFFFLL, 0x7FFFFFFFFFFFFFFFLL};
   andpd(reg, Address::Absolute(reinterpret_cast<uword>(&double_abs_constant)));
 }
 
 
 void Assembler::EnterFrame(intptr_t frame_size) {
   if (prologue_offset_ == -1) {
+    Comment("PrologueOffset = %" Pd "", CodeSize());
     prologue_offset_ = CodeSize();
   }
+#ifdef DEBUG
+  intptr_t check_offset = CodeSize();
+#endif
   pushl(EBP);
   movl(EBP, ESP);
+#ifdef DEBUG
+  ProloguePattern pp(CodeAddress(check_offset));
+  ASSERT(pp.IsValid());
+#endif
   if (frame_size != 0) {
     Immediate frame_space(frame_size);
     subl(ESP, frame_space);
   }
 }
 
 
 void Assembler::LeaveFrame() {
   movl(ESP, EBP);
   popl(EBP);
@@ skipping 279 matching lines @@
 }
 
 
 // On entry to a function compiled for OSR, the caller's frame pointer, the
 // stack locals, and any copied parameters are already in place.  The frame
 // pointer is already set up.  The PC marker is not correct for the
 // optimized function and there may be extra space for spill slots to
 // allocate.
 void Assembler::EnterOsrFrame(intptr_t extra_size) {
   Comment("EnterOsrFrame");
+  if (prologue_offset_ == -1) {
+    Comment("PrologueOffset = %" Pd "", CodeSize());
+    prologue_offset_ = CodeSize();
+  }
   Label dart_entry;
   call(&dart_entry);
   Bind(&dart_entry);
   // The runtime system assumes that the code marker address is
   // kEntryPointToPcMarkerOffset bytes from the entry.  Since there is no
   // code to set up the frame pointer, the address needs to be adjusted.
   const intptr_t offset = EntryPointToPcMarkerOffset() - CodeSize();
   if (offset != 0) {
     addl(Address(ESP, 0), Immediate(offset));
   }
@@ skipping 300 matching lines @@
 
 const char* Assembler::FpuRegisterName(FpuRegister reg) {
   ASSERT((0 <= reg) && (reg < kNumberOfXmmRegisters));
   return xmm_reg_names[reg];
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32