Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 777474 - Use the expression decompiler for opcode text when possible. r=bhackket

Browse Source
This commit is contained in:
Benjamin Peterson 2013-02-01 00:10:17 -05:00
parent f9d88b583b
commit 3934f5a9ef
1 changed files with 11 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
js/src/jsopcode.cpp
View File

@ -6810,29 +6810,7 @@ GetPCCountJSON(JSContext *cx, const ScriptAndCounts &sac, StringBuffer &buf)
buf.append('{');
AppendJSONProperty(buf, "text", NO_COMMA);
Vector<DecompiledOpcode> decompiledOpcodes(cx);
if (!decompiledOpcodes.reserve(script->length))
return false;
for (unsigned i = 0; i < script->length; i++)
decompiledOpcodes.infallibleAppend(DecompiledOpcode());
JSFunction *fun = script->function();
JSPrinter *jp = js_NewPrinter(cx, "", fun, 4, true, false, false);
if (!jp)
return false;
AutoDestroyPrinter destroy(jp);
jp->decompiledOpcodes = &decompiledOpcodes;
if (fun) {
if (!DecompileFunction(jp))
return false;
} else {
if (!DecompileScript(jp, script))
return false;
}
JSString *str = js_GetPrinterOutput(jp);
JSString *str = JS_DecompileScript(cx, script, NULL, 0);
if (!str || !(str = ValueToSource(cx, StringValue(str))))
return false;
@ -6874,28 +6852,18 @@ GetPCCountJSON(JSContext *cx, const ScriptAndCounts &sac, StringBuffer &buf)
buf.append('\"');
}
DecompiledOpcode *search = &decompiledOpcodes[offset];
size_t textBias = 0;
while (search->parent) {
textBias += search->parentOffset;
if (search->parenthesized)
textBias++;
search = &decompiledOpcodes[search->parent - script->code];
}
int32_t printedOffset = search->parentOffset;
if (printedOffset != -1) {
printedOffset += textBias;
if (search->parenthesized)
printedOffset++;
AppendJSONProperty(buf, "textOffset");
NumberValueToStringBuffer(cx, Int32Value(printedOffset), buf);
}
const char *text = decompiledOpcodes[offset].text;
if (text && *text != 0) {
{
ExpressionDecompiler ed(cx, script, script->function());
if (!ed.init())
return false;
if (!ed.decompilePC(pc))
return false;
char *text;
if (!ed.getOutput(&text))
return false;
AppendJSONProperty(buf, "text");
JSString *str = JS_NewStringCopyZ(cx, text);
js_free(text);
if (!str || !(str = ValueToSource(cx, StringValue(str))))
return false;
buf.append(str);