- On store buffer block overflow call a VM leaf function to

vm/stub_code_ia32.cc

Index: vm/stub_code_ia32.cc
===================================================================
--- vm/stub_code_ia32.cc	(revision 9468)
+++ vm/stub_code_ia32.cc	(working copy)
@@ -89,9 +89,10 @@
 
 
 // Print the stop message.
-static void PrintStopMessage(const char* message) {
+DEFINE_LEAF_RUNTIME_ENTRY(void, PrintStopMessage, const char* message) {
   OS::Print("Stop message: %s\n", message);
 }
+END_LEAF_RUNTIME_ENTRY
 
 
 // Input parameters:
@@ -99,33 +100,16 @@
 //   EAX : stop message (const char*).
 // Must preserve all registers, except EAX.
 void StubCode::GeneratePrintStopMessageStub(Assembler* assembler) {
-  // Preserve caller-saved registers.
-  __ pushl(ECX);
-  __ pushl(EDX);
+  __ enter(Immediate(0));
+  __ PreserveCallerSavedRegisters();
 
-  // Create a stub frame as we are pushing some objects on the stack before
-  // calling into the runtime.
-  AssemblerMacros::EnterStubFrame(assembler);
-
-  // Reserve space for the native argument and align frame before entering
-  // the C++ world.
-  __ AddImmediate(ESP, Immediate(-sizeof(kWordSize)));
-  if (OS::ActivationFrameAlignment() > 0) {
-    __ andl(ESP, Immediate(~(OS::ActivationFrameAlignment() - 1)));
-  }
-
-  // Pass argument and call native function.
+  // Call the runtime leaf function.
+  __ ReserveAlignedFrameSpace(kWordSize);

[siva, 2012/07/09 22:51:07]

1 * kWordSize to be uniform with similar code below.

[Ivan Posva, 2012/07/09 22:59:35]

Done.

   __ movl(Address(ESP, 0), EAX);
-  __ movl(EAX, Immediate(reinterpret_cast<uword>(&PrintStopMessage)));
-  __ call(EAX);
-  __ popl(EAX);
+  __ CallRuntime(kPrintStopMessageRuntimeEntry);
 
-  __ LeaveFrame();
-
-  // Restore caller-saved registers.
-  __ popl(EDX);
-  __ popl(ECX);
-
+  __ RestoreCallerSavedRegisters();
+  __ leave();
   __ ret();
 }
 
@@ -1079,49 +1063,61 @@
   __ ret();
 }
 
+DECLARE_LEAF_RUNTIME_ENTRY(void, StoreBufferBlockProcess, Isolate* isolate);
 
 // Helper stub to implement Assembler::StoreIntoObject.
 // Input parameters:
 //   EAX: Address being stored
 void StubCode::GenerateUpdateStoreBufferStub(Assembler* assembler) {
   // Save values being destroyed.
-  __ pushl(CTX);
-  __ pushl(EBX);
+  __ pushl(EDX);
+  __ pushl(ECX);
 
   // Load the isolate out of the context.
+  // Spilled: EDX, ECX
   // EAX: Address being stored
-  __ movl(CTX, FieldAddress(CTX, Context::isolate_offset()));
+  __ movl(EDX, FieldAddress(CTX, Context::isolate_offset()));
 
   // Load top_ out of the StoreBufferBlock and add the address to the pointers_.
+  // Spilled: EDX, ECX
   // EAX: Address being stored
-  // CTX: Isolate
+  // EDX: Isolate
   intptr_t store_buffer_offset = Isolate::store_buffer_block_offset();
-  __ movl(EBX,
-          Address(CTX, store_buffer_offset + StoreBufferBlock::top_offset()));
-  __ movl(Address(CTX,
-                  EBX, TIMES_4,
+  __ movl(ECX,
+          Address(EDX, store_buffer_offset + StoreBufferBlock::top_offset()));
+  __ movl(Address(EDX,
+                  ECX, TIMES_4,
                   store_buffer_offset + StoreBufferBlock::pointers_offset()),
           EAX);
 
   // Increment top_ and check for overflow.
-  // EBX: top_
-  // CTX: Isolate
+  // Spilled: EDX, ECX
+  // ECX: top_
+  // EDX: Isolate
   Label L;
-  __ incl(EBX);
-  __ movl(Address(CTX, store_buffer_offset + StoreBufferBlock::top_offset()),
-          EBX);
-  __ cmpl(EBX, Immediate(StoreBufferBlock::kSize));
-  __ j(NOT_EQUAL, &L, Assembler::kNearJump);
+  __ incl(ECX);
+  __ movl(Address(EDX, store_buffer_offset + StoreBufferBlock::top_offset()),
+          ECX);
+  __ cmpl(ECX, Immediate(StoreBufferBlock::kSize));
+  // Restore values.
+  // Spilled: EDX, ECX
+  __ popl(ECX);
+  __ popl(EDX);
+  __ j(EQUAL, &L, Assembler::kNearJump);
+  __ ret();
 
-  // Handle overflow: Reset the top_ pointer.
-  // CTX: Isolate
-  __ movl(Address(CTX, store_buffer_offset + StoreBufferBlock::top_offset()),
-          Immediate(0));
-
+  // Handle overflow: Call the runtime leaf function.
   __ Bind(&L);
-  // Restore values.
-  __ popl(EBX);
-  __ popl(CTX);
+  // Setup frame, push callee-saved registers.
+  __ enter(Immediate(0));
+  __ PreserveCallerSavedRegisters();
+  __ movl(EAX, FieldAddress(CTX, Context::isolate_offset()));
+  __ ReserveAlignedFrameSpace(1 * kWordSize);
+  __ movl(Address(ESP, 0), EAX);  // Push the isolate as the only argument.
+  __ CallRuntime(kStoreBufferBlockProcessRuntimeEntry);
+  // Restore callee-saved registers, tear down frame.
+  __ RestoreCallerSavedRegisters();
+  __ leave();
   __ ret();
 }