wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
David Anderson 2012-05-10 18:01:53 -07:00
commit bb9ee25a0b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/ion/arm/Trampoline-arm.cpp
View File

@ -282,8 +282,13 @@ generateBailoutTail(MacroAssembler &masm)
// Test for an exception
masm.as_cmp(r0, Imm8(0));
masm.ma_b(&exception, Assembler::Zero);
masm.freeStack(sizeof(IonCode*));
masm.ma_pop(pc);
masm.bind(&exception);
#ifdef DEBUG
masm.ma_add(Imm32(sizeof(IonCode*)), sp);
#endif
masm.handleException();
}
@ -574,7 +579,7 @@ IonCompartment::generateVMWrapper(JSContext *cx, const VMFunction &f)
if (f.explicitArgs) {
argsBase = r5;
regs.take(argsBase);
masm.ma_add(sp, Imm32(IonExitFrameLayout::SizeWithFooter()), argsBase);
masm.ma_add(sp, Imm32(IonExitFrameLayout::SizeWithFooter() + argumentPadding), argsBase);
}
// Reserve space for the outparameter.