Fix computations in LeaveCallRuntimeFrame to use kDoubleSize for saved XMM registers.

runtime/vm/assembler_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"
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/assembler.h"
 #include "vm/heap.h"
 #include "vm/memory_region.h"
@@ skipping 1528 matching lines @@
     EAX, ECX, EDX
 };
 
 
 // XMM0 is used only as a scratch register in the optimized code. No need to
 // save it.
 static const intptr_t kNumberOfVolatileXmmRegisters =
     kNumberOfXmmRegisters - 1;
 
 
-static const intptr_t kNumberOfVolatileRegisters =
-    kNumberOfVolatileCpuRegisters + kNumberOfVolatileXmmRegisters;
-
-
 void Assembler::EnterCallRuntimeFrame(intptr_t frame_space) {
   enter(Immediate(0));
 
   // Preserve volatile CPU registers.
   for (intptr_t i = 0; i < kNumberOfVolatileCpuRegisters; i++) {
     pushl(volatile_cpu_registers[i]);
   }
 
   // Preserve all XMM registers except XMM0
   subl(ESP, Immediate((kNumberOfXmmRegisters - 1) * kDoubleSize));
   // Store XMM registers with the lowest register number at the lowest
   // address.
   intptr_t offset = 0;
   for (intptr_t reg_idx = 1; reg_idx < kNumberOfXmmRegisters; ++reg_idx) {
     XmmRegister xmm_reg = static_cast<XmmRegister>(reg_idx);
     movsd(Address(ESP, offset), xmm_reg);
     offset += kDoubleSize;
   }
 
   ReserveAlignedFrameSpace(frame_space);
 }
 
 
 void Assembler::LeaveCallRuntimeFrame() {
   // ESP might have been modified to reserve space for arguments
   // and ensure proper alignment of the stack frame.
   // We need to restore it before restoring registers.
-  leal(ESP, Address(EBP, -kNumberOfVolatileRegisters * kWordSize));
+  const intptr_t kPushedRegistersSize =
+      kNumberOfVolatileCpuRegisters * kWordSize +
+      kNumberOfVolatileXmmRegisters * kDoubleSize;
+  leal(ESP, Address(EBP, -kPushedRegistersSize));
 
   // Restore all XMM registers except XMM0
   // XMM registers have the lowest register number at the lowest address.
   intptr_t offset = 0;
   for (intptr_t reg_idx = 1; reg_idx < kNumberOfXmmRegisters; ++reg_idx) {
     XmmRegister xmm_reg = static_cast<XmmRegister>(reg_idx);
     movsd(xmm_reg, Address(ESP, offset));
     offset += kDoubleSize;
   }
   addl(ESP, Immediate(offset));
@@ skipping 244 matching lines @@
 
 const char* Assembler::XmmRegisterName(XmmRegister reg) {
   ASSERT((0 <= reg) && (reg < kNumberOfXmmRegisters));
   return xmm_reg_names[reg];
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32