Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 22:55:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Print exit names instead of numbers (bug 500522, r=gal).

Browse Source
This commit is contained in:
David Anderson 2009-06-25 15:32:50 -07:00
parent 01555189df
commit cf76f7bcd1
2 changed files with 61 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/src/jstracer.cpp
View File

@ -366,6 +366,21 @@ js_InitJITLogController ( void )
} }
#endif #endif
static const char*
js_ExitName(ExitType type)
{
static const char* exitNames[] =
{
#define MAKE_EXIT_STRING(x) #x,
JS_TM_EXITCODES(MAKE_EXIT_STRING)
#undef MAKE_EXIT_STRING
};
JS_ASSERT(unsigned(type) < JS_ARRAY_LENGTH(exitNames));
return exitNames[type];
}
/* The entire VM shares one oracle. Collisions and concurrent updates are tolerated and worst /* The entire VM shares one oracle. Collisions and concurrent updates are tolerated and worst
case cause performance regressions. */ case cause performance regressions. */
static Oracle oracle; static Oracle oracle;
@ -2949,8 +2964,8 @@ TraceRecorder::guard(bool expected, LIns* cond, VMSideExit* exit)
{ {
debug_only_printf(LC_TMRecorder, debug_only_printf(LC_TMRecorder,
" About to try emitting guard code for " " About to try emitting guard code for "
"SideExit=%p exitType=%d\n", "SideExit=%p exitType=%s\n",
(void*)exit, exit->exitType); (void*)exit, js_ExitName(exit->exitType));
LIns* guardRec = createGuardRecord(exit); LIns* guardRec = createGuardRecord(exit);
@ -4765,7 +4780,7 @@ js_RecordLoopEdge(JSContext* cx, TraceRecorder* r, uintN& inlineCallCount)
js_AbortRecording(cx, "Inner tree is trying to grow, abort outer recording"); js_AbortRecording(cx, "Inner tree is trying to grow, abort outer recording");
return js_AttemptToExtendTree(cx, lr, NULL, outer); return js_AttemptToExtendTree(cx, lr, NULL, outer);
default: default:
debug_only_printf(LC_TMTracer, "exit_type=%d\n", lr->exitType); debug_only_printf(LC_TMTracer, "exit_type=%s\n", js_ExitName(lr->exitType));
js_AbortRecording(cx, "Inner tree not suitable for calling"); js_AbortRecording(cx, "Inner tree not suitable for calling");
return false; return false;
} }
@ -5312,14 +5327,14 @@ LeaveTree(InterpState& state, VMSideExit* lr)
#endif #endif
debug_only_printf(LC_TMTracer, debug_only_printf(LC_TMTracer,
"leaving trace at %s:%u@%u, op=%s, lr=%p, exitType=%d, sp=%d, " "leaving trace at %s:%u@%u, op=%s, lr=%p, exitType=%s, sp=%d, "
"calldepth=%d, cycles=%llu\n", "calldepth=%d, cycles=%llu\n",
fp->script->filename, fp->script->filename,
js_FramePCToLineNumber(cx, fp), js_FramePCToLineNumber(cx, fp),
FramePCOffset(fp), FramePCOffset(fp),
js_CodeName[fp->imacpc ? *fp->imacpc : *fp->regs->pc], js_CodeName[fp->imacpc ? *fp->imacpc : *fp->regs->pc],
(void*)lr, (void*)lr,
lr->exitType, js_ExitName(lr->exitType),
fp->regs->sp - StackBase(fp), fp->regs->sp - StackBase(fp),
calldepth, calldepth,
cycles); cycles);

81
js/src/jstracer.h
View File

@ -228,47 +228,48 @@ public:
bool matches(TypeMap& other) const; bool matches(TypeMap& other) const;
}; };
#define JS_TM_EXITCODES(_) \
/* \
* An exit at a possible branch-point in the trace at which to attach a \
* future secondary trace. Therefore the recorder must generate different \
* code to handle the other outcome of the branch condition from the \
* primary trace's outcome. \
*/ \
_(BRANCH) \
/* \
* Exit at a tableswitch via a numbered case. \
*/ \
_(CASE) \
/* \
* Exit at a tableswitch via the default case. \
*/ \
_(DEFAULT) \
_(LOOP) \
_(NESTED) \
/* \
* An exit from a trace because a condition relied upon at recording time \
* no longer holds, where the alternate path of execution is so rare or \
* difficult to address in native code that it is not traced at all, e.g. \
* negative array index accesses, which differ from positive indexes in \
* that they require a string-based property lookup rather than a simple \
* memory access. \
*/ \
_(MISMATCH) \
/* \
* A specialization of MISMATCH_EXIT to handle allocation failures. \
*/ \
_(OOM) \
_(OVERFLOW) \
_(UNSTABLE_LOOP) \
_(TIMEOUT) \
_(DEEP_BAIL) \
_(STATUS)
enum ExitType { enum ExitType {
/* #define MAKE_EXIT_CODE(x) x##_EXIT,
* An exit at a possible branch-point in the trace at which to attach a JS_TM_EXITCODES(MAKE_EXIT_CODE)
* future secondary trace. Therefore the recorder must generate different #undef MAKE_EXIT_CODE
* code to handle the other outcome of the branch condition from the
* primary trace's outcome.
*/
BRANCH_EXIT,
/*
* Exit at a tableswitch via a numbered case.
*/
CASE_EXIT,
/*
* Exit at a tableswitch via the default case.
*/
DEFAULT_EXIT,
LOOP_EXIT,
NESTED_EXIT,
/*
* An exit from a trace because a condition relied upon at recording time
* no longer holds, where the alternate path of execution is so rare or
* difficult to address in native code that it is not traced at all, e.g.
* negative array index accesses, which differ from positive indexes in
* that they require a string-based property lookup rather than a simple
* memory access.
*/
MISMATCH_EXIT,
/*
* A specialization of MISMATCH_EXIT to handle allocation failures.
*/
OOM_EXIT,
OVERFLOW_EXIT,
UNSTABLE_LOOP_EXIT,
TIMEOUT_EXIT,
DEEP_BAIL_EXIT,
STATUS_EXIT
}; };
struct VMSideExit : public nanojit::SideExit struct VMSideExit : public nanojit::SideExit