Index: src/mips/code-stubs-mips.cc |
diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc |
index 6f7922526fe4521c4cc228d61a4565e70ac36eb7..c35ba7a17b9f62b51be4fb70aca0292885eaeb20 100644 |
--- a/src/mips/code-stubs-mips.cc |
+++ b/src/mips/code-stubs-mips.cc |
@@ -4083,6 +4083,7 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
offset_to_argv += kNumCalleeSavedFPU * kDoubleSize; |
} |
+ __ InitializeRootRegister(); |
__ lw(s0, MemOperand(sp, offset_to_argv + kCArgsSlotsSize)); |
// We build an EntryFrame. |
@@ -7051,7 +7052,7 @@ void DirectCEntryStub::GenerateCall(MacroAssembler* masm, |
// This spot for ra was reserved in EnterExitFrame. |
masm->sw(ra, MemOperand(sp, kCArgsSlotsSize)); |
masm->li(ra, Operand(reinterpret_cast<intptr_t>(GetCode().location()), |
- RelocInfo::CODE_TARGET), true); |
+ RelocInfo::CODE_TARGET), CONSTANT_SIZE); |
Erik Corry
2012/02/29 14:38:13
This line is incorrectly indented.
kalmard
2012/03/12 12:40:00
Done.
|
// Call the function. |
masm->Jump(t9); |
// Make sure the stored 'ra' points to this position. |