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

Improved debug output.

Browse Source
This commit is contained in:
Andreas Gal 2008-08-19 22:59:08 -07:00
parent bda3ded8af
commit c9feda7ac1
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/jstracer.cpp
View File

@ -686,6 +686,8 @@ TraceRecorder::TraceRecorder(JSContext* cx, GuardRecord* _anchor, Fragment* _fra
/* read into registers all values on the stack and all globals we know so far */
import(treeInfo, lirbuf->sp, ngslots, callDepth, globalTypeMap, stackTypeMap);
debug_only(printTypeMaps(ngslots, globalTypeMap, stackTypeMap);)
}
TraceRecorder::~TraceRecorder()
@ -1778,7 +1780,8 @@ js_ContinueRecording(JSContext* cx, TraceRecorder* r, jsbytecode* oldpc, uintN&
return false; /* we stay away from shared global objects */
}
#endif
Fragmento* fragmento = JS_TRACE_MONITOR(cx).fragmento;
JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx);
Fragmento* fragmento = tm->fragmento;
if (r->isLoopHeader(cx)) { /* did we hit the start point? */
if (fragmento->assm()->error()) {
/* error during recording, blacklist the fragment we were recording */
@ -1818,9 +1821,10 @@ js_ContinueRecording(JSContext* cx, TraceRecorder* r, jsbytecode* oldpc, uintN&
r->emitTreeCallStackSetup(f);
debug_only(printf("first fragment: %p\n", f));
GuardRecord* lr = js_ExecuteTree(cx, &f, inlineCallCount);
debug_only(printf("actual fragment: %p\n", f));
debug_only(printf("actual fragment: %p, lr=%p\n", f, lr));
if (!lr) {
js_AbortRecording(cx, oldpc, "Couldn't call inner tree");
js_AbortRecording(cx, oldpc, "Couldn't call inner tree, trying to record one.");
//return js_RecordTree(cx, tm, fragmento->newLoop(f->ip));
return false;
}
switch (lr->exit->exitType) {
@ -5428,11 +5432,11 @@ TraceRecorder::record_JSOP_HOLE()
#ifdef DEBUG
void
TraceRecorder::printTypeMap(uint8* globalTypeMap, uint8* stackTypeMap)
TraceRecorder::printTypeMaps(unsigned ngslots, uint8* globalTypeMap, uint8* stackTypeMap)
{
uint8* m = globalTypeMap;
const char* types[] = { "object", "int", "double", "int", "string", "int", "boolean", "int" };
FORALL_GLOBAL_SLOTS(cx, traceMonitor->globalSlots->length(), traceMonitor->globalSlots->data(),
FORALL_GLOBAL_SLOTS(cx, ngslots, traceMonitor->globalSlots->data(),
printf("%s%d type=%s value=%lx\n", vpname, vpnum, types[(unsigned)*m], *vp);
++m;
);

2
js/src/jstracer.h
View File

@ -303,7 +303,7 @@ class TraceRecorder {
bool forInLoop(jsval* vp);
#ifdef DEBUG
void printTypeMap(uint8* globalTypeMap, uint8* stackTypeMap);
void printTypeMaps(unsigned ngslots, uint8* globalTypeMap, uint8* stackTypeMap);
#endif
public: