{0x53, "applytype", "n", -1, 1, 0, OP_STACK_ARGS},
/* dummy instructions. Warning: these are not actually supported by flash */
+{0xfb, "__pushpackage__", "s", 0, 1, 0, OP_INTERNAL},
{0xfc, "__rethrow__", "", 0, 0, 0, OP_THROW|OP_INTERNAL},
-{0xfd, "__fallthrough__", "s", 0, 0, 0, OP_INTERNAL},
-{0xfe, "__continue__", "s", 0, 0, 0, OP_RETURN|OP_INTERNAL},
+{0xfd, "__fallthrough__", "s", 0, 0, 0, OP_INTERNAL},
+{0xfe, "__continue__", "s", 0, 0, 0, OP_RETURN|OP_INTERNAL},
{0xff, "__break__", "s", 0, 0, 0, OP_RETURN|OP_INTERNAL},
};
-static U8 op2index[256] = {254};
+static opcode_t* op2op[256] = {0,0,0};
-opcode_t* opcode_get(U8 op)
+static inline opcode_t* opcode_get(U8 op)
{
int t;
- if(op2index[0]==254) {
- memset(op2index, 255, sizeof(op2index));
+ if(!op2op[0x02]) {
+ memset(op2op, 0, sizeof(op2op));
for(t=0;t<sizeof(opcodes)/sizeof(opcodes[0]);t++) {
- op2index[opcodes[t].opcode] = t;
+ op2op[opcodes[t].opcode] = &opcodes[t];
}
}
- if(op2index[op]!=255)
- return &opcodes[op2index[op]];
- return 0;
+ return op2op[op];
}
static code_t*pos2code(code_t**bytepos, code_t*c, int pos, int len)
head = code = c;
} else {
code->next = c;
+ c->prev = code;
code = c;
}
int code_dump(code_t*c)
{
+ code_t*cc = code_start(c);
+ while(cc) {
+ assert(!cc->next || cc->next->prev == cc);
+ cc = cc->next;
+ }
+
return code_dump2(c, 0, 0, "", stdout);
}
int code_dump2(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*prefix, FILE*fo)
free(m);
} else if(*p == 'm') {
abc_method_t*m = (abc_method_t*)data;
- fprintf(fo, "[method %08x %s]", m, m->name);
+ fprintf(fo, "[method %08x %s]", m->index, m->name);
} else if(*p == 'c') {
abc_class_t*cls = (abc_class_t*)data;
char*classname = multiname_tostring(cls->classname);
- fprintf(fo, "[classinfo %s]", classname);
+ fprintf(fo, "[classinfo %08x %s]", cls->index, classname);
free(classname);
} else if(*p == 'i') {
abc_method_body_t*b = (abc_method_body_t*)data;
if(prev) prev->next=next;
if(next) next->prev=prev;
code_free(c);
-
+
if(next) return code_end(next);
else return prev;
}
} else if(c->opcode == OPCODE_CALLSUPER) {
c->opcode = OPCODE_CALLSUPERVOID;
return c;
- } else if(c->opcode == OPCODE_NEWOBJECT ||
- c->opcode == OPCODE_NEWARRAY) {
+ } else if((c->opcode == OPCODE_NEWOBJECT ||
+ c->opcode == OPCODE_NEWARRAY) &&
+ !c->data[0]) {
// we can discard these if they're not eating up stack parameters
- if(!c->data[0])
- return code_cutlast(c);
+ return code_cutlast(c);
} else if(op->stack_minus ==0 && op->stack_plus == 0 &&
!(op->flags&~(OP_REGISTER|OP_SET_DXNS)) && c->prev) {
// trim code *before* the kill, inclocal, declocal, dxns