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 781343 - Part 2: common up some debug functions in shell/js.cpp. r=jimb.

Browse Source 
--HG--
extra : rebase_source : 83946e4ad299b5a1fa8a246156414ca92d76bf84
This commit is contained in:
Jason Orendorff 2012-09-12 11:03:15 -05:00
parent 8ab261f54a
commit 031d67828c
1 changed files with 26 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
js/src/shell/js.cpp
View File

@ -1813,38 +1813,45 @@ struct DisassembleOptionParser {
} /* anonymous namespace */
static JSBool
DisassembleToString(JSContext *cx, unsigned argc, jsval *vp)
static bool
DisassembleToSprinter(JSContext *cx, unsigned argc, jsval *vp, Sprinter *sprinter)
{
DisassembleOptionParser p(argc, JS_ARGV(cx, vp));
if (!p.parse(cx))
return false;
Sprinter sprinter(cx);
if (!sprinter.init())
return false;
bool ok = true;
if (p.argc == 0) {
/* Without arguments, disassemble the current script. */
RootedScript script(cx, GetTopScript(cx));
if (script) {
if (js_Disassemble(cx, script, p.lines, &sprinter)) {
SrcNotes(cx, script, &sprinter);
TryNotes(cx, script, &sprinter);
} else {
ok = false;
}
if (!js_Disassemble(cx, script, p.lines, sprinter))
return false;
SrcNotes(cx, script, sprinter);
TryNotes(cx, script, sprinter);
}
} else {
for (unsigned i = 0; i < p.argc; i++) {
JSFunction *fun;
JSScript *script = ValueToScript(cx, p.argv[i], &fun);
ok = ok && script && DisassembleScript(cx, script, fun, p.lines, p.recursive, &sprinter);
if (!script)
return false;
if (!DisassembleScript(cx, script, fun, p.lines, p.recursive, sprinter))
return false;
}
}
return true;
}
JSString *str = ok ? JS_NewStringCopyZ(cx, sprinter.string()) : NULL;
static JSBool
DisassembleToString(JSContext *cx, unsigned argc, jsval *vp)
{
Sprinter sprinter(cx);
if (!sprinter.init())
return false;
if (!DisassembleToSprinter(cx, argc, vp, &sprinter))
return false;
JSString *str = JS_NewStringCopyZ(cx, sprinter.string());
if (!str)
return false;
JS_SET_RVAL(cx, vp, STRING_TO_JSVAL(str));
@ -1854,38 +1861,15 @@ DisassembleToString(JSContext *cx, unsigned argc, jsval *vp)
static JSBool
Disassemble(JSContext *cx, unsigned argc, jsval *vp)
{
DisassembleOptionParser p(argc, JS_ARGV(cx, vp));
if (!p.parse(cx))
return false;
Sprinter sprinter(cx);
if (!sprinter.init())
return false;
if (!DisassembleToSprinter(cx, argc, vp, &sprinter))
return false;
bool ok = true;
if (p.argc == 0) {
/* Without arguments, disassemble the current script. */
RootedScript script(cx, GetTopScript(cx));
if (script) {
if (js_Disassemble(cx, script, p.lines, &sprinter)) {
SrcNotes(cx, script, &sprinter);
TryNotes(cx, script, &sprinter);
} else {
ok = false;
}
}
} else {
for (unsigned i = 0; i < p.argc; i++) {
JSFunction *fun;
JSScript *script = ValueToScript(cx, p.argv[i], &fun);
ok = ok && script && DisassembleScript(cx, script, fun, p.lines, p.recursive, &sprinter);
}
}
if (ok)
fprintf(stdout, "%s\n", sprinter.string());
fprintf(stdout, "%s\n", sprinter.string());
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return ok;
return true;
}
static JSBool