mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset b774250f04d3 - the landed patch for bug 424558 has regressed.

This commit is contained in:
Igor Bukanov 2009-11-30 15:33:04 +03:00
Родитель 023de075d7
Коммит c2ecdc1cf6
1 изменённых файлов: 86 добавлений и 152 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

234
js/src/jsopcode.cpp
Просмотреть файл

@ -526,7 +526,6 @@ typedef struct Sprinter {
#define STR2OFF(sp,str) ((str) - (sp)->base)
#define RETRACT(sp,str) ((sp)->offset = STR2OFF(sp, str))
/* Ensure room for len chars plus the '\0' at the end. */
static JSBool
SprintEnsureBuffer(Sprinter *sp, size_t len)
{
@ -538,10 +537,8 @@ SprintEnsureBuffer(Sprinter *sp, size_t len)
return JS_TRUE;
base = sp->base;
if (!base) {
JS_ASSERT(sp->size == 0);
JS_ARENA_ALLOCATE_CAST(base, char *, sp->pool, nb);
} else {
JS_ASSERT(sp->size != 0);
JS_ARENA_GROW_CAST(base, char *, sp->pool, sp->size, nb);
}
if (!base) {
@ -559,19 +556,7 @@ SprintPut(Sprinter *sp, const char *s, size_t len)
ptrdiff_t offset;
char *bp;
/*
* Check s + len does not overflow. Note that s != 0 implies s - 1 < s
* using unsigned arithmetic.
*/
JS_STATIC_ASSERT(reinterpret_cast<jsuword>((void *) 0) == jsuword(0));
JS_ASSERT(reinterpret_cast<jsuword>(s) - 1 <= jsuword(-1) - len);
/*
* Check that s does not point into sp->base that can be reallocated in
* SprintEnsureBuffer.
*/
JS_ASSERT(s + len <= sp->base || sp->base + sp->size <= s);
/* Allocate space for s, including the '\0' at the end. */
if (!SprintEnsureBuffer(sp, len))
return -1;
@ -579,39 +564,7 @@ SprintPut(Sprinter *sp, const char *s, size_t len)
offset = sp->offset;
sp->offset += len;
bp = sp->base + offset;
memcpy(bp, s, len);
bp[len] = 0;
return offset;
}
static ptrdiff_t
SprintOffset(Sprinter *sp, ptrdiff_t offset)
{
size_t len;
const char *chars;
char *bp;
JS_ASSERT(offset >= 0);
JS_ASSERT((size_t) offset < sp->size);
len = strlen(OFF2STR(sp, offset));
/*
* Check that the 0 terminating the string starting at off is inside the
* allocated buffer.
*/
JS_ASSERT(len < sp->size - offset);
if (!SprintEnsureBuffer(sp, len))
return -1;
/*
* We call OFF2STR here again as SprintEnsureBuffer may reallocate the
* buffer.
*/
chars = OFF2STR(sp, offset);
bp = sp->base + sp->offset;
offset = sp->offset;
sp->offset += len;
memmove(bp, chars, len);
memmove(bp, s, len);
bp[len] = 0;
return offset;
}
@ -680,8 +633,8 @@ const char js_EscapeMap[] = {
#define DONT_ESCAPE 0x10000
static ptrdiff_t
QuoteStringOffset(Sprinter *sp, JSString *str, uint32 quote)
static char *
QuoteString(Sprinter *sp, JSString *str, uint32 quote)
{
JSBool dontEscape, ok;
jschar qc, c;
@ -695,7 +648,7 @@ QuoteStringOffset(Sprinter *sp, JSString *str, uint32 quote)
qc = (jschar) quote;
off = sp->offset;
if (qc && Sprint(sp, "%c", (char)qc) < 0)
return -1;
return NULL;
/* Loop control variables: z points at end of string sentinel. */
str->getCharsAndEnd(s, z);
@ -712,7 +665,7 @@ QuoteStringOffset(Sprinter *sp, JSString *str, uint32 quote)
/* Allocate space for s, including the '\0' at the end. */
if (!SprintEnsureBuffer(sp, len))
return -1;
return NULL;
/* Advance sp->offset and copy s into sp's buffer. */
bp = sp->base + sp->offset;
@ -733,27 +686,18 @@ QuoteStringOffset(Sprinter *sp, JSString *str, uint32 quote)
ok = Sprint(sp, (c >> 8) ? "\\u%04X" : "\\x%02X", c) >= 0;
}
if (!ok)
return -1;
return NULL;
}
/* Sprint the closing quote and return the quoted string. */
if (qc && Sprint(sp, "%c", (char)qc) < 0)
return -1;
return NULL;
/*
* If we haven't Sprint'd anything yet, Sprint an empty string so ensure
* that we have \0-terminated string in the buffer.
* If we haven't Sprint'd anything yet, Sprint an empty string so that
* the OFF2STR below gives a valid result.
*/
if (off == sp->offset && Sprint(sp, "") < 0)
return -1;
return off;
}
static char *
QuoteString(Sprinter *sp, JSString *str, uint32 quote)
{
ptrdiff_t off = QuoteStringOffset(sp, str, quote);
if (off < 0)
return NULL;
return OFF2STR(sp, off);
}
@ -1326,7 +1270,7 @@ GetArgOrVarAtom(JSPrinter *jp, uintN slot)
return name;
}
ptrdiff_t
const char *
GetLocal(SprintStack *ss, jsint i)
{
ptrdiff_t off;
@ -1337,13 +1281,13 @@ GetLocal(SprintStack *ss, jsint i)
JSObject *obj;
jsint depth, count;
JSScopeProperty *sprop;
ptrdiff_t roff;
const char *rval;
#define LOCAL_ASSERT(expr) LOCAL_ASSERT_RV(expr, -1)
#define LOCAL_ASSERT(expr) LOCAL_ASSERT_RV(expr, "")
off = ss->offsets[i];
if (off >= 0)
return off;
return OFF2STR(&ss->sprinter, off);
/*
* We must be called from js_DecompileValueGenerator (via Decompile) when
@ -1358,10 +1302,10 @@ GetLocal(SprintStack *ss, jsint i)
cx = ss->sprinter.context;
script = ss->printer->script;
if (script->objectsOffset == 0)
return GetOff(ss, i);
return GetStr(ss, i);
for (j = 0, n = script->objects()->length; ; j++) {
if (j == n)
return GetOff(ss, i);
return GetStr(ss, i);
obj = script->getObject(j);
if (OBJ_GET_CLASS(cx, obj) == &js_BlockClass) {
depth = OBJ_BLOCK_DEPTH(cx, obj);
@ -1379,11 +1323,11 @@ GetLocal(SprintStack *ss, jsint i)
LOCAL_ASSERT(sprop && JSID_IS_ATOM(sprop->id));
atom = JSID_TO_ATOM(sprop->id);
roff = QuoteStringOffset(&ss->sprinter, ATOM_TO_STRING(atom), 0);
if (roff < 0)
return -1;
ss->sprinter.offset -= roff;
return roff;
rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
if (!rval)
return NULL;
RETRACT(&ss->sprinter, rval);
return rval;
#undef LOCAL_ASSERT
}
@ -1428,7 +1372,8 @@ DecompileDestructuringLHS(SprintStack *ss, jsbytecode *pc, jsbytecode *endpc,
const JSCodeSpec *cs;
uintN oplen;
jsint i;
ptrdiff_t todo, loff, xoff;
const char *lval, *xval;
ptrdiff_t todo;
JSAtom *atom;
*hole = JS_FALSE;
@ -1449,8 +1394,8 @@ DecompileDestructuringLHS(SprintStack *ss, jsbytecode *pc, jsbytecode *endpc,
if (pc == endpc)
return pc;
LOAD_OP_DATA(pc);
loff = PopOff(ss, JSOP_NOP);
todo = SprintOffset(&ss->sprinter, loff);
lval = PopStr(ss, JSOP_NOP);
todo = SprintCString(&ss->sprinter, lval);
if (op == JSOP_POPN)
return pc;
LOCAL_ASSERT(*pc == JSOP_POP);
@ -1464,6 +1409,7 @@ DecompileDestructuringLHS(SprintStack *ss, jsbytecode *pc, jsbytecode *endpc,
case JSOP_SETLOCALPOP:
atom = NULL;
lval = NULL;
if (op == JSOP_SETARG) {
atom = GetArgOrVarAtom(jp, GET_SLOTNO(pc));
LOCAL_ASSERT(atom);
@ -1472,15 +1418,13 @@ DecompileDestructuringLHS(SprintStack *ss, jsbytecode *pc, jsbytecode *endpc,
} else if (IsVarSlot(jp, pc, &i)) {
atom = GetArgOrVarAtom(jp, i);
LOCAL_ASSERT(atom);
} else {
lval = GetLocal(ss, i);
}
if (atom) {
const char *lval = js_AtomToPrintableString(cx, atom);
if (atom)
lval = js_AtomToPrintableString(cx, atom);
LOCAL_ASSERT(lval);
todo = SprintCString(&ss->sprinter, lval);
} else {
loff = GetLocal(ss, i);
todo = SprintOffset(&ss->sprinter, loff);
}
if (op != JSOP_SETLOCALPOP) {
pc += oplen;
if (pc == endpc)
@ -1509,22 +1453,21 @@ DecompileDestructuringLHS(SprintStack *ss, jsbytecode *pc, jsbytecode *endpc,
return pc;
LOAD_OP_DATA(pc);
LOCAL_ASSERT(op == JSOP_ENUMELEM || op == JSOP_ENUMCONSTELEM);
xoff = PopOff(ss, JSOP_NOP);
loff = PopOff(ss, JSOP_GETPROP);
xval = PopStr(ss, JSOP_NOP);
lval = PopStr(ss, JSOP_GETPROP);
ss->sprinter.offset = todo;
if (*OFF2STR(&ss->sprinter, loff) == '\0') {
/* loff is from JSOP_BINDNAME, so just print xval. */
todo = SprintOffset(&ss->sprinter, xoff);
} else if (*OFF2STR(&ss->sprinter, xoff) == '\0') {
/* xoff is from JSOP_SETCALL or JSOP_BINDXMLNAME, print lval. */
todo = SprintOffset(&ss->sprinter, loff);
if (*lval == '\0') {
/* lval is from JSOP_BINDNAME, so just print xval. */
todo = SprintCString(&ss->sprinter, xval);
} else if (*xval == '\0') {
/* xval is from JSOP_SETCALL or JSOP_BINDXMLNAME, print lval. */
todo = SprintCString(&ss->sprinter, lval);
} else {
todo = Sprint(&ss->sprinter,
(JOF_OPMODE(ss->opcodes[ss->top+1]) == JOF_XMLNAME)
? "%s.%s"
: "%s[%s]",
OFF2STR(&ss->sprinter, loff),
OFF2STR(&ss->sprinter, xoff));
lval, xval);
}
break;
}
@ -1844,7 +1787,6 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
const JSCodeSpec *cs;
jssrcnote *sn, *sn2;
const char *lval, *rval, *xval, *fmt, *token;
ptrdiff_t loff, roff, xoff;
uintN nuses;
jsint i, argc;
char **argv;
@ -1884,7 +1826,6 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
#define DECOMPILE_CODE(pc,nb) if (!Decompile(ss, pc, nb, JSOP_NOP)) return NULL
#define NEXT_OP(pc) (((pc) + (len) == endpc) ? nextop : pc[len])
#define TOP_STR() GetStr(ss, ss->top - 1)
#define POP_OFF() PopOff(ss, op)
#define POP_STR() PopStr(ss, op)
#define POP_STR_PREC(prec) PopStrPrec(ss, prec)
@ -2153,10 +2094,10 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
* problem).
*/
op = (JSOp) pc[oplen];
roff = POP_OFF();
POP_OFF();
rval = POP_STR();
lval = POP_STR();
/* Print only the right operand of the assignment-op. */
todo = SprintOffset(&ss->sprinter, roff);
todo = SprintCString(&ss->sprinter, rval);
op = saveop;
} else if (!inXML) {
rval = POP_STR_PREC(cs->prec + !!(cs->format & JOF_LEFTASSOC));
@ -2462,9 +2403,9 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
* NB: todo at this point indexes space in ss->sprinter
* that is liable to be overwritten. The code below knows
* exactly how long rval lives, or else copies it down via
* SprintOffset.
* SprintCString.
*/
roff = todo;
rval = OFF2STR(&ss->sprinter, todo);
todo = -2;
pc2 = pc + oplen;
if (*pc2 == JSOP_NOP) {
@ -2473,7 +2414,6 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
if (SN_TYPE(sn) == SRC_FOR) {
op = JSOP_NOP;
pc = pc2;
rval = OFF2STR(&ss->sprinter, roff);
goto do_forloop;
}
@ -2487,12 +2427,11 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
pc = pc2 + JSOP_NOP_LENGTH;
len = js_GetSrcNoteOffset(sn, 0);
LOCAL_ASSERT(pc[len] == JSOP_LEAVEBLOCK);
js_printf(jp, "\tlet (%s) {\n",
OFF2STR(&ss->sprinter, roff));
js_printf(jp, "\tlet (%s) {\n", rval);
js_printf(jp, "\t}\n");
break;
}
todo = SprintOffset(&ss->sprinter, roff);
todo = SprintCString(&ss->sprinter, rval);
if (todo < 0 || !PushOff(ss, todo, JSOP_NOP))
return NULL;
op = JSOP_POP;
@ -2510,17 +2449,17 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
*/
if (GET_UINT16(pc) == 0)
break;
todo = SprintOffset(&ss->sprinter, roff);
todo = SprintCString(&ss->sprinter, rval);
saveop = JSOP_NOP;
}
}
/*
* If control flow reaches this point with todo still -2,
* just print an expression statement.
* just print rval as an expression statement.
*/
if (todo == -2)
js_printf(jp, "\t%s;\n", OFF2STR(&ss->sprinter, roff));
js_printf(jp, "\t%s;\n", rval);
break;
}
#endif
@ -2704,9 +2643,10 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
}
ok = JS_TRUE;
for (i = 0; i < argc; i++) {
JSString *str = ATOM_TO_STRING(atomv[i]);
roff = QuoteStringOffset(&ss->sprinter, str, 0);
if (roff < 0 || !PushOff(ss, roff, op)) {
atom = atomv[i];
rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
if (!rval ||
!PushOff(ss, STR2OFF(&ss->sprinter, rval), op)) {
ok = JS_FALSE;
goto enterblock_out;
}
@ -2836,7 +2776,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
todo = -2;
if (op == JSOP_LEAVEBLOCKEXPR) {
LOCAL_ASSERT(SN_TYPE(sn) == SRC_PCBASE);
roff = POP_OFF();
rval = POP_STR();
} else if (sn) {
LOCAL_ASSERT(op == JSOP_LEAVEBLOCK);
if (SN_TYPE(sn) == SRC_HIDDEN)
@ -2853,9 +2793,8 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
if ((uintN)js_GetSrcNoteOffset(sn, 0) != ss->top) {
LOCAL_ASSERT((uintN)js_GetSrcNoteOffset(sn, 0)
== ss->top - 1);
roff = POP_OFF();
LOCAL_ASSERT(strcmp(OFF2STR(&ss->sprinter, roff),
exception_cookie) == 0);
rval = POP_STR();
LOCAL_ASSERT(strcmp(rval, exception_cookie) == 0);
}
}
top = ss->top;
@ -2865,7 +2804,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
ss->top = top;
ss->sprinter.offset = GetOff(ss, top);
if (op == JSOP_LEAVEBLOCKEXPR)
todo = SprintOffset(&ss->sprinter, roff);
todo = SprintCString(&ss->sprinter, rval);
break;
}
@ -2949,9 +2888,8 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
}
#endif
roff = GetLocal(ss, i);
todo = Sprint(&ss->sprinter, ss_format, VarPrefix(sn),
OFF2STR(&ss->sprinter, roff));
rval = GetLocal(ss, i);
todo = Sprint(&ss->sprinter, ss_format, VarPrefix(sn), rval);
break;
case JSOP_SETLOCAL:
@ -2961,7 +2899,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
LOCAL_ASSERT(atom);
goto do_setname;
}
lval = OFF2STR(&ss->sprinter, GetLocal(ss, i));
lval = GetLocal(ss, i);
rval = POP_STR();
goto do_setlval;
@ -2972,7 +2910,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
LOCAL_ASSERT(atom);
goto do_incatom;
}
lval = OFF2STR(&ss->sprinter, GetLocal(ss, i));
lval = GetLocal(ss, i);
goto do_inclval;
case JSOP_LOCALINC:
@ -2982,7 +2920,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
LOCAL_ASSERT(atom);
goto do_atominc;
}
lval = OFF2STR(&ss->sprinter, GetLocal(ss, i));
lval = GetLocal(ss, i);
goto do_lvalinc;
case JSOP_RETRVAL:
@ -3481,22 +3419,20 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
*/
atom = NULL;
op = JSOP_NOP; /* turn off parens around xval */
xoff = POP_OFF();
xval = POP_STR();
op = JSOP_GETELEM; /* lval must have high precedence */
loff = POP_OFF();
lval = POP_STR();
op = saveop;
roff = POP_OFF();
LOCAL_ASSERT(strcmp(OFF2STR(&ss->sprinter, roff),
forelem_cookie) == 0);
if (*OFF2STR(&ss->sprinter, xoff) == '\0') {
todo = SprintOffset(&ss->sprinter, loff);
rval = POP_STR();
LOCAL_ASSERT(strcmp(rval, forelem_cookie) == 0);
if (*xval == '\0') {
todo = SprintCString(&ss->sprinter, lval);
} else {
todo = Sprint(&ss->sprinter,
(JOF_OPMODE(lastop) == JOF_XMLNAME)
? dot_format
: index_format,
OFF2STR(&ss->sprinter, loff),
OFF2STR(&ss->sprinter, xoff));
lval, xval);
}
break;
@ -3508,8 +3444,8 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
#endif
case JSOP_DUP2:
roff = GetOff(ss, ss->top-2);
todo = SprintOffset(&ss->sprinter, roff);
rval = GetStr(ss, ss->top-2);
todo = SprintCString(&ss->sprinter, rval);
if (todo < 0 || !PushOff(ss, todo,
(JSOp) ss->opcodes[ss->top-2])) {
return NULL;
@ -3544,9 +3480,9 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
}
#endif
roff = GetOff(ss, ss->top-1);
rval = GetStr(ss, ss->top-1);
saveop = (JSOp) ss->opcodes[ss->top-1];
todo = SprintOffset(&ss->sprinter, roff);
todo = SprintCString(&ss->sprinter, rval);
break;
case JSOP_SETARG:
@ -3912,9 +3848,8 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
atom = GetArgOrVarAtom(ss->printer, i);
LOCAL_ASSERT(atom);
LOCAL_ASSERT(ATOM_IS_STRING(atom));
loff = QuoteStringOffset(&ss->sprinter, ATOM_TO_STRING(atom),
0);
if (loff < 0 || !PushOff(ss, loff, op))
lval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0);
if (!lval || !PushOff(ss, STR2OFF(&ss->sprinter, lval), op))
return NULL;
/* Get the name of the property. */
@ -3925,10 +3860,10 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
if (IsVarSlot(jp, pc, &i))
goto do_getarg_prop;
LOCAL_ASSERT((uintN)i < ss->top);
loff = GetLocal(ss, i);
if (loff < 0)
lval = GetLocal(ss, i);
if (!lval)
return NULL;
todo = SprintOffset(&ss->sprinter, loff);
todo = SprintCString(&ss->sprinter, lval);
if (todo < 0 || !PushOff(ss, todo, op))
return NULL;
LOAD_ATOM(2);
@ -4080,10 +4015,11 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
case JSOP_STRING:
LOAD_ATOM(0);
todo = QuoteStringOffset(&ss->sprinter, ATOM_TO_STRING(atom),
rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom),
inXML ? DONT_ESCAPE : '"');
if (todo < 0)
if (!rval)
return NULL;
todo = STR2OFF(&ss->sprinter, rval);
break;
case JSOP_LAMBDA:
@ -4890,7 +4826,6 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
#undef DECOMPILE_CODE
#undef NEXT_OP
#undef TOP_STR
#undef POP_OFF
#undef POP_STR
#undef POP_STR_PREC
#undef LOCAL_ASSERT
@ -5104,7 +5039,7 @@ js_DecompileFunction(JSPrinter *jp)
if (!param) {
ptrdiff_t todo;
ptrdiff_t loff;
const char *lval;
LOCAL_ASSERT(*pc == JSOP_GETARG);
pc += JSOP_GETARG_LENGTH;
@ -5121,9 +5056,8 @@ js_DecompileFunction(JSPrinter *jp)
}
LOCAL_ASSERT(*pc == JSOP_POP);
pc += JSOP_POP_LENGTH;
loff = PopOff(&ss, JSOP_NOP);
todo = SprintCString(&jp->sprinter,
OFF2STR(&ss.sprinter, loff));
lval = PopStr(&ss, JSOP_NOP);
todo = SprintCString(&jp->sprinter, lval);
if (todo < 0) {
ok = JS_FALSE;
break;