Skip to content

Commit 69e4ded

Browse files
author
Dragan Mladjenovic
committed
Bug 1418990 - [MIPS32] Reset MacroAssembler::framePushed when doing stack realignment in JitRuntime::generateVMWrapper. r=jandem
--HG-- extra : source : 2b6b5af4a1f22a7862facee78d7b982ed2726b0f
1 parent 96f9c8a commit 69e4ded

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

js/src/jit/mips32/Trampoline-mips32.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,8 +693,9 @@ JitRuntime::generateVMWrapper(JSContext* cx, MacroAssembler& masm, const VMFunct
693693
regs.take(argsBase);
694694
masm.ma_addu(argsBase, StackPointer, Imm32(ExitFrameLayout::SizeWithFooter()));
695695
}
696-
696+
uint32_t framePushedBeforeAlignStack = masm.framePushed();
697697
masm.alignStackPointer();
698+
masm.setFramePushed(0);
698699

699700
// Reserve space for the outparameter. Reserve sizeof(Value) for every
700701
// case so that stack stays aligned.
@@ -853,6 +854,7 @@ JitRuntime::generateVMWrapper(JSContext* cx, MacroAssembler& masm, const VMFunct
853854
}
854855

855856
masm.restoreStackPointer();
857+
masm.setFramePushed(framePushedBeforeAlignStack);
856858

857859
masm.leaveExitFrame();
858860
masm.retn(Imm32(sizeof(ExitFrameLayout) +

0 commit comments

Comments
 (0)