Put live register bits in stackmaps.

runtime/vm/flow_graph_compiler_ia32.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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "lib/error.h"
@@ skipping 780 matching lines @@
     // EBP : points to previous frame pointer.
     // EBP + 4 : points to return address.
     // EBP + 8 : address of last argument (arg n-1).
     // ESP + 8 + 4*(n-1) : address of first argument (arg 0).
     // ECX : ic-data.
     // EDX : arguments descriptor array.
     __ call(&StubCode::CallNoSuchMethodFunctionLabel());
   }
   if (is_optimizing()) {
     stackmap_table_builder_->AddEntry(assembler()->CodeSize(),
-                                      empty_stack_bitmap);
+                                      empty_stack_bitmap,
+                                      0);  // No registers.
   }
 
 
   if (FLAG_trace_functions) {
     __ pushl(EAX);  // Preserve result.
     __ PushObject(Function::ZoneHandle(function.raw()));
     // We do not use GenerateCallRuntime because of the non-standard (empty)
     // stackmap used here.
     __ CallRuntime(kTraceFunctionExitRuntimeEntry);
     AddCurrentDescriptor(PcDescriptors::kOther,
                          Isolate::kNoDeoptId,
                          0,  // No token position.
                          CatchClauseNode::kInvalidTryIndex);
     if (is_optimizing()) {
       stackmap_table_builder_->AddEntry(assembler()->CodeSize(),
-                                        empty_stack_bitmap);
+                                        empty_stack_bitmap,
+                                        0);  // No registers.
     }
     __ popl(EAX);  // Remove argument.
     __ popl(EAX);  // Restore result.
   }
   __ LeaveFrame();
   __ ret();
 
   __ Bind(&all_arguments_processed);
   // Nullify originally passed arguments only after they have been copied and
   // checked, otherwise noSuchMethod would not see their original values.
@@ skipping 281 matching lines @@
   __ SmiUntag(temp);
   __ cvtsi2sd(result, temp);
   __ Bind(&done);
 }
 
 
 void FlowGraphCompiler::SaveLiveRegisters(LocationSummary* locs) {
   // TODO(vegorov): consider saving only caller save (volatile) registers.
   const intptr_t xmm_regs_count = locs->live_registers()->xmm_regs_count();
   if (xmm_regs_count > 0) {
-    intptr_t stack_offs = (StackSize() + 1) * kWordSize;
+    __ subl(ESP, Immediate(xmm_regs_count * kDoubleSize));
+    intptr_t offset = 0;
     for (intptr_t reg_idx = 0; reg_idx < kNumberOfXmmRegisters; ++reg_idx) {
       XmmRegister xmm_reg = static_cast<XmmRegister>(reg_idx);
       if (locs->live_registers()->ContainsXmmRegister(xmm_reg)) {
-        __ movsd(Address(EBP, -stack_offs), xmm_reg);
-        stack_offs += kDoubleSize;
+        __ movsd(Address(ESP, offset), xmm_reg);
+        offset += kDoubleSize;
       }
     }
+    ASSERT(offset == (xmm_regs_count * kDoubleSize));
   }
 
   for (intptr_t reg_idx = 0; reg_idx < kNumberOfCpuRegisters; ++reg_idx) {
     Register reg = static_cast<Register>(reg_idx);
     if (locs->live_registers()->ContainsRegister(reg)) {
       __ pushl(reg);
     }
   }
 }
 
 
 void FlowGraphCompiler::RestoreLiveRegisters(LocationSummary* locs) {
   for (intptr_t reg_idx = kNumberOfCpuRegisters - 1; reg_idx >= 0; --reg_idx) {
     Register reg = static_cast<Register>(reg_idx);
     if (locs->live_registers()->ContainsRegister(reg)) {
       __ popl(reg);
     }
   }
 
   const intptr_t xmm_regs_count = locs->live_registers()->xmm_regs_count();
   if (xmm_regs_count > 0) {
-    intptr_t stack_offs = (StackSize() + 1) * kWordSize;
+    intptr_t offset = 0;
     for (intptr_t reg_idx = 0; reg_idx < kNumberOfXmmRegisters; ++reg_idx) {
       XmmRegister xmm_reg = static_cast<XmmRegister>(reg_idx);
       if (locs->live_registers()->ContainsXmmRegister(xmm_reg)) {
-        __ movsd(xmm_reg, Address(EBP, -stack_offs));
-        stack_offs += kDoubleSize;
+        __ movsd(xmm_reg, Address(ESP, offset));
+        offset += kDoubleSize;
       }
     }
+    ASSERT(offset == (xmm_regs_count * kDoubleSize));
+    __ addl(ESP, Immediate(offset));
   }
 }
 
 
 #undef __
 #define __ compiler_->assembler()->
 
 
 static Address ToStackSlotAddress(Location loc) {
   const intptr_t index = loc.stack_index();
@@ skipping 149 matching lines @@
   __ popl(ECX);
   __ popl(EAX);
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32