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

Backed out changeset 99ce8bcb547c

Browse Source
This commit is contained in:
David Anderson
2010-06-22 23:21:09 -07:00
parent dae8906b47
commit 5afbc172a7
4 changed files with 12 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1160,8 +1160,7 @@ mjit::Compiler::generateMethod()
END_CASE(JSOP_REGEXP)
BEGIN_CASE(JSOP_CALLPROP)
if (!jsop_callprop(script->getAtom(fullAtomIndex(PC))))
return Compile_Error;
jsop_callprop(script->getAtom(fullAtomIndex(PC)));
END_CASE(JSOP_CALLPROP)
BEGIN_CASE(JSOP_GETUPVAR)
@@ -1837,7 +1836,7 @@ mjit::Compiler::jsop_getprop_slow()
frame.pushSynced();
}
bool
void
mjit::Compiler::jsop_callprop_slow(JSAtom *atom)
{
prepareStubCall();
@@ -1846,7 +1845,6 @@ mjit::Compiler::jsop_callprop_slow(JSAtom *atom)
frame.pop();
frame.pushSynced();
frame.pushSynced();
return true;
}
void
@@ -1974,59 +1972,7 @@ mjit::Compiler::jsop_getprop(JSAtom *atom, bool doTypeCheck)
pics.append(pic);
}
bool
mjit::Compiler::jsop_callprop_str(JSAtom *atom)
{
if (!script->compileAndGo) {
jsop_callprop_slow(atom);
return true;
}
/* Bake in String.prototype. Is this safe? */
JSObject *obj;
if (!js_GetClassPrototype(cx, NULL, JSProto_String, &obj))
return false;
/* Force into a register because getprop won't expect a constant. */
RegisterID reg = frame.allocReg();
masm.move(ImmPtr(obj), reg);
frame.pushTypedPayload(JSVAL_MASK32_NONFUNOBJ, reg);
/* Get the property. */
jsop_getprop(atom);
/* Perform a swap. */
frame.dup2();
frame.shift(-3);
frame.shift(-1);
/* 4) Test if the function can take a primitive. */
FrameEntry *funFe = frame.peek(-2);
JS_ASSERT(!funFe->isTypeKnown());
RegisterID temp = frame.allocReg();
Jump notFun = frame.testFunObj(Assembler::NotEqual, funFe);
Address fslot(frame.tempRegForData(funFe),
offsetof(JSObject, fslots) + JSSLOT_PRIVATE * sizeof(Value));
masm.loadData32(fslot, temp);
masm.load16(Address(temp, offsetof(JSFunction, flags)), temp);
masm.and32(Imm32(JSFUN_THISP_STRING), temp);
Jump noPrim = masm.branchTest32(Assembler::Zero, temp, temp);
{
stubcc.linkExit(noPrim);
stubcc.leave();
stubcc.call(stubs::WrapPrimitiveThis);
}
frame.freeReg(temp);
notFun.linkTo(masm.label(), &masm);
stubcc.rejoin(1);
return true;
}
bool
void
mjit::Compiler::jsop_callprop_obj(JSAtom *atom)
{
FrameEntry *top = frame.peek(-1);
@@ -2087,11 +2033,9 @@ mjit::Compiler::jsop_callprop_obj(JSAtom *atom)
stubcc.rejoin(1);
pics.append(pic);
return true;
}
bool
void
mjit::Compiler::jsop_callprop(JSAtom *atom)
{
FrameEntry *top = frame.peek(-1);
@@ -2101,14 +2045,14 @@ mjit::Compiler::jsop_callprop(JSAtom *atom)
(top->getTypeTag() != JSVAL_MASK32_FUNOBJ &&
top->getTypeTag() != JSVAL_MASK32_NONFUNOBJ))
{
if (top->getTypeTag() == JSVAL_MASK32_STRING)
return jsop_callprop_str(atom);
return jsop_callprop_slow(atom);
jsop_callprop_slow(atom);
return;
}
if (top->isTypeKnown())
return jsop_callprop_obj(atom);
return jsop_callprop_slow(atom);
jsop_callprop_obj(atom);
else
jsop_callprop_slow(atom);
}
void