corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JAEGER] Merge.

Browse Source
This commit is contained in:
David Anderson
2010-06-30 12:00:36 -07:00
parent ca0cdc0aff 9dab43c1ef
commit 6151eec068
14 changed files with 316 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/methodjit/Compiler.cpp
View File

@@ -445,7 +445,13 @@ mjit::Compiler::generateMethod()
frame.forgetEverything();
masm.fixScriptStack(frame.frameDepth());
masm.setupVMFrame();
#if defined(JS_NO_FASTCALL) && defined(JS_CPU_X86)
masm.push(Registers::ArgReg0);
#endif
masm.call(JS_FUNC_TO_DATA_PTR(void *, stubs::ValueToBoolean));
#if defined(JS_NO_FASTCALL) && defined(JS_CPU_X86)
masm.pop();
#endif
Assembler::Condition cond = (op == JSOP_IFEQ)
? Assembler::Zero
: Assembler::NonZero;
@@ -825,7 +831,13 @@ mjit::Compiler::generateMethod()
frame.forgetEverything();
masm.fixScriptStack(frame.frameDepth());
masm.setupVMFrame();
#if defined(JS_NO_FASTCALL) && defined(JS_CPU_X86)
masm.push(Registers::ArgReg0);
#endif
masm.call(JS_FUNC_TO_DATA_PTR(void *, stubs::ValueToBoolean));
#if defined(JS_NO_FASTCALL) && defined(JS_CPU_X86)
masm.pop();
#endif
Assembler::Condition cond = (op == JSOP_OR)
? Assembler::NonZero
: Assembler::Zero;