Stick jsops.cpp into jsinterp.cpp, where it belongs

This commit is contained in:
Luke Wagner 2010-07-05 18:28:41 -07:00
parent 29555a0cb9
commit 8c317f0f93
7 changed files with 4380 additions and 4426 deletions

View File

@ -6291,7 +6291,7 @@ js_EmitTree(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
* For operator new applied to other expressions than E4X ones, we emit * For operator new applied to other expressions than E4X ones, we emit
* JSOP_GETPROP instead of JSOP_CALLPROP, etc. This is necessary to * JSOP_GETPROP instead of JSOP_CALLPROP, etc. This is necessary to
* interpose the lambda-initialized method read barrier -- see the code * interpose the lambda-initialized method read barrier -- see the code
* in jsops.cpp for JSOP_LAMBDA followed by JSOP_{SET,INIT}PROP. * in jsinterp.cpp for JSOP_LAMBDA followed by JSOP_{SET,INIT}PROP.
* *
* Then (or in a call case that has no explicit reference-base object) * Then (or in a call case that has no explicit reference-base object)
* we emit JSOP_NULL as a placeholder local GC root to hold the |this| * we emit JSOP_NULL as a placeholder local GC root to hold the |this|

File diff suppressed because it is too large Load Diff

View File

@ -2697,7 +2697,7 @@ js_NonEmptyObject(JSContext* cx, JSObject* proto)
} }
/* /*
* See comments in the JSOP_NEWINIT case of jsops.cpp why we cannot * See comments in the JSOP_NEWINIT case of jsinterp.cpp why we cannot
* assume that cx owns the scope and skip the unlock call. * assume that cx owns the scope and skip the unlock call.
*/ */
JS_UNLOCK_SCOPE(cx, scope); JS_UNLOCK_SCOPE(cx, scope);

View File

@ -336,7 +336,7 @@ js_GetIndexFromBytecode(JSContext *cx, JSScript *script, jsbytecode *pc,
* Unfortunately some bytecodes such as JSOP_LOOKUPSWITCH have immediates that * Unfortunately some bytecodes such as JSOP_LOOKUPSWITCH have immediates that
* might be string or double atoms. Those opcodes cannot be used from imacros. * might be string or double atoms. Those opcodes cannot be used from imacros.
* See the assertions in the JSOP_DOUBLE and JSOP_LOOKUPSWTICH* opcode cases in * See the assertions in the JSOP_DOUBLE and JSOP_LOOKUPSWTICH* opcode cases in
* jsops.cpp. * jsinterp.cpp.
*/ */
#define GET_DOUBLE_FROM_BYTECODE(script, pc, pcoff, dbl) \ #define GET_DOUBLE_FROM_BYTECODE(script, pc, pcoff, dbl) \
JS_BEGIN_MACRO \ JS_BEGIN_MACRO \

File diff suppressed because it is too large Load Diff

View File

@ -320,7 +320,7 @@ JSScope::initRuntimeState(JSContext *cx)
* is less than freeslot to succeed. As the shared emptyArgumentsScope is * is less than freeslot to succeed. As the shared emptyArgumentsScope is
* never mutated, it's safe to pretend to have all the slots possible. * never mutated, it's safe to pretend to have all the slots possible.
* *
* Note how the fast paths in jsops.cpp for JSOP_LENGTH and JSOP_GETELEM * Note how the fast paths in jsinterp.cpp for JSOP_LENGTH and JSOP_GETELEM
* bypass resolution of scope properties for length and element indices on * bypass resolution of scope properties for length and element indices on
* arguments objects. This helps ensure that any arguments object needing * arguments objects. This helps ensure that any arguments object needing
* its own mutable scope (with unique shape) is a rare event. * its own mutable scope (with unique shape) is a rare event.

View File

@ -14771,7 +14771,7 @@ JS_REQUIRES_STACK AbortableRecordingStatus
TraceRecorder::record_JSOP_ENUMELEM() TraceRecorder::record_JSOP_ENUMELEM()
{ {
/* /*
* To quote from jsops.cpp's JSOP_ENUMELEM case: * To quote from jsinterp.cpp's JSOP_ENUMELEM case:
* Funky: the value to set is under the [obj, id] pair. * Funky: the value to set is under the [obj, id] pair.
*/ */
return setElem(-2, -1, -3); return setElem(-2, -1, -3);
@ -14834,7 +14834,7 @@ TraceRecorder::record_JSOP_LAMBDA()
* JSOP_SETMETHOD or JSOP_INITMETHOD, since we optimize away the clone for * JSOP_SETMETHOD or JSOP_INITMETHOD, since we optimize away the clone for
* these combinations and clone only if the "method value" escapes. * these combinations and clone only if the "method value" escapes.
* *
* See jsops.cpp, the JSOP_LAMBDA null closure case. The JSOP_SETMETHOD and * See jsinterp.cpp, the JSOP_LAMBDA null closure case. The JSOP_SETMETHOD and
* JSOP_INITMETHOD logic governing the early ARECORD_CONTINUE returns below * JSOP_INITMETHOD logic governing the early ARECORD_CONTINUE returns below
* must agree with the corresponding break-from-do-while(0) logic there. * must agree with the corresponding break-from-do-while(0) logic there.
*/ */