Oops, backed out the wrong patch last time

This commit is contained in:
Jeff Walden 2009-01-14 11:35:08 -08:00
Родитель fc20999689 a13543934e
Коммит 70193c9e1b
2 изменённых файлов: 18 добавлений и 20 удалений

Просмотреть файл

@ -229,28 +229,27 @@ static struct {
}, },
}; };
static struct { static struct {
jsbytecode sign[37]; jsbytecode sign[34];
} unary_imacros = { } unary_imacros = {
{ {
/* 0*/ JSOP_DUP, /* 0*/ JSOP_DUP,
/* 1*/ JSOP_DUP, /* 1*/ JSOP_DUP,
/* 2*/ JSOP_GETPROP, 0, COMMON_ATOM_INDEX(valueOf), /* 2*/ JSOP_GETPROP, 0, COMMON_ATOM_INDEX(valueOf),
/* 5*/ JSOP_IFPRIMTOP, 0, 21, /* 5*/ JSOP_IFPRIMTOP, 0, 18,
/* 8*/ JSOP_SWAP, /* 8*/ JSOP_SWAP,
/* 9*/ JSOP_STRING, 0, COMMON_TYPE_ATOM_INDEX(JSTYPE_NUMBER), /* 9*/ JSOP_CALL, 0, 0,
/*12*/ JSOP_CALL, 0, 1, /*12*/ JSOP_IFPRIMTOP, 0, 6,
/*15*/ JSOP_IFPRIMTOP, 0, 6, /*15*/ JSOP_GOTO, 0, 9,
/*18*/ JSOP_GOTO, 0, 9, /*18*/ JSOP_SWAP,
/*21*/ JSOP_SWAP, /*19*/ JSOP_POP,
/*22*/ JSOP_POP, /*20*/ JSOP_GOTO, 0, 12,
/*23*/ JSOP_GOTO, 0, 12, /*23*/ JSOP_POP,
/*26*/ JSOP_POP, /*24*/ JSOP_POP,
/*27*/ JSOP_POP, /*25*/ JSOP_CALLPROP, 0, COMMON_ATOM_INDEX(toString),
/*28*/ JSOP_CALLPROP, 0, COMMON_ATOM_INDEX(toString), /*28*/ JSOP_CALL, 0, 0,
/*31*/ JSOP_CALL, 0, 0, /*31*/ JSOP_PRIMTOP,
/*34*/ JSOP_PRIMTOP, /*32*/ JSOP_IMACOP,
/*35*/ JSOP_IMACOP, /*33*/ JSOP_STOP,
/*36*/ JSOP_STOP,
}, },
}; };
static struct { static struct {
@ -571,8 +570,8 @@ uint8 js_opcode2extra[JSOP_LIMIT] = {
3, /* JSOP_MOD */ 3, /* JSOP_MOD */
0, /* JSOP_NOT */ 0, /* JSOP_NOT */
0, /* JSOP_BITNOT */ 0, /* JSOP_BITNOT */
3, /* JSOP_NEG */ 2, /* JSOP_NEG */
3, /* JSOP_POS */ 2, /* JSOP_POS */
0, /* JSOP_DELNAME */ 0, /* JSOP_DELNAME */
0, /* JSOP_DELPROP */ 0, /* JSOP_DELPROP */
0, /* JSOP_DELELEM */ 0, /* JSOP_DELELEM */

Просмотреть файл

@ -275,8 +275,7 @@
getprop valueOf # obj obj valueOf getprop valueOf # obj obj valueOf
ifprimtop 2 # obj obj valueOf ifprimtop 2 # obj obj valueOf
swap # obj valueOf obj swap # obj valueOf obj
string number # obj valueOf obj "number" call 0 # obj lval
call 1 # obj lval
ifprimtop 1 # obj lval ifprimtop 1 # obj lval
goto 3 # obj lval goto 3 # obj lval
1: swap # lval obj 1: swap # lval obj