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

Bug 910782 - SpiderMonkey: Reorder top-level contents of js::Interpret for readability. r=luke

Browse Source
This commit is contained in:
Dan Gohman 2013-10-28 10:32:50 -07:00
parent 2421133503
commit 599cc0e771
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/src/vm/Interpreter.cpp
View File

@ -1191,15 +1191,6 @@ SetObjectElementOperation(JSContext *cx, Handle<JSObject*> obj, HandleId id, con
static JS_NEVER_INLINE bool
Interpret(JSContext *cx, RunState &state)
{
JSAutoResolveFlags rf(cx, RESOLVE_INFER);
gc::MaybeVerifyBarriers(cx, true);
JS_ASSERT(!cx->compartment()->activeAnalysis);
#define CHECK_PCCOUNT_INTERRUPTS() \
JS_ASSERT_IF(script->hasScriptCounts, activation.opMask() == EnableInterruptsPseudoOpcode)
/*
* Define macros for an interpreter loop. Opcode dispatch may be either by a
* switch statement or by indirect goto (aka a threaded interpreter), depending
@ -1249,11 +1240,6 @@ Interpret(JSContext *cx, RunState &state)
jsbytecode switchOp;
#endif
/*
* Shorthand for the common sequence at the end of a fixed-size opcode.
*/
#define END_CASE(OP) ADVANCE_AND_DISPATCH(OP##_LENGTH);
/*
* Increment REGS.pc by N, load the opcode at that position,
* and jump to the code to execute it.
@ -1277,6 +1263,11 @@ Interpret(JSContext *cx, RunState &state)
DISPATCH_TO(*REGS.pc | activation.opMask()); \
JS_END_MACRO
/*
* Shorthand for the common sequence at the end of a fixed-size opcode.
*/
#define END_CASE(OP) ADVANCE_AND_DISPATCH(OP##_LENGTH);
/*
* Prepare to call a user-supplied branch handler, and abort the script
* if it returns false.
@ -1313,9 +1304,15 @@ Interpret(JSContext *cx, RunState &state)
#define SANITY_CHECKS() \
JS_BEGIN_MACRO \
js::gc::MaybeVerifyBarriers(cx); \
CHECK_PCCOUNT_INTERRUPTS(); \
JS_ASSERT_IF(script->hasScriptCounts, \
activation.opMask() == EnableInterruptsPseudoOpcode); \
JS_END_MACRO
JSAutoResolveFlags rf(cx, RESOLVE_INFER);
gc::MaybeVerifyBarriers(cx, true);
JS_ASSERT(!cx->compartment()->activeAnalysis);
StackFrame *entryFrame = state.pushInterpreterFrame(cx);
if (!entryFrame)
return false;