Index: src/arm/code-stubs-arm.h |
diff --git a/src/arm/code-stubs-arm.h b/src/arm/code-stubs-arm.h |
index 0443cf799cc08e5d83e8ebe88f6de929dc8b5d12..ed6561cb5583aba558887887e6719529aaa35439 100644 |
--- a/src/arm/code-stubs-arm.h |
+++ b/src/arm/code-stubs-arm.h |
@@ -472,9 +472,10 @@ class RecordWriteStub: public CodeStub { |
CpuFeatures::Scope scope(VFP2); |
masm->sub(sp, |
sp, |
- Operand(kDoubleSize * (DwVfpRegister::kNumRegisters - 1))); |
+ Operand(kDoubleSize * (DwVfpRegister::NumAvailableRegisters() - 1))); |
// Save all VFP registers except d0. |
- for (int i = DwVfpRegister::kNumRegisters - 1; i > 0; i--) { |
+ // XXX: Why is d0 special? It's not the scratch register.. |
Rodolph Perfetta
2012/12/05 21:39:34
To reply to your previous question, yes only d0-d7
hans
2012/12/11 17:08:04
I'll do a fix in a separate patch.
|
+ for (int i = DwVfpRegister::NumAvailableRegisters() - 1; i > 0; i--) { |
DwVfpRegister reg = DwVfpRegister::from_code(i); |
masm->vstr(reg, MemOperand(sp, (i - 1) * kDoubleSize)); |
} |
@@ -486,13 +487,14 @@ class RecordWriteStub: public CodeStub { |
if (mode == kSaveFPRegs) { |
CpuFeatures::Scope scope(VFP2); |
// Restore all VFP registers except d0. |
- for (int i = DwVfpRegister::kNumRegisters - 1; i > 0; i--) { |
+ // XXX: Why is d0 special? It's not the scratch register.. |
+ for (int i = DwVfpRegister::NumAvailableRegisters() - 1; i > 0; i--) { |
DwVfpRegister reg = DwVfpRegister::from_code(i); |
masm->vldr(reg, MemOperand(sp, (i - 1) * kDoubleSize)); |
} |
masm->add(sp, |
sp, |
- Operand(kDoubleSize * (DwVfpRegister::kNumRegisters - 1))); |
+ Operand(kDoubleSize * (DwVfpRegister::NumAvailableRegisters() - 1))); |
} |
masm->ldm(ia_w, sp, (kCallerSaved | lr.bit()) & ~scratch1_.bit()); |
} |