//0x53: seen in builtin.abc
{0x53, "applytype", "n", -1, 1, 0, OP_STACK_ARGS},
-/* dummy instruction. Warning: this one is not actually supported by flash */
+/* dummy instructions. Warning: these are not actually supported by flash */
+{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},
{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;
}
free(codelookup);
}
-code_t*code_find_start(code_t*c)
-{
- while(c && c->prev)
- c=c->prev;
- return c;
-}
-
void code_free(code_t*c)
{
- c = code_find_start(c);
+ c = code_start(c);
while(c) {
code_t*next = c->next;
opcode_t*op = opcode_get(c->opcode);
c->opcode == OPCODE___CONTINUE__) {
fprintf(stderr, "Unresolved %s\n", op->name);
} else {
- fprintf(stderr, "Error: writing undefined internal opcode %s", op->name);
+ fprintf(stderr, "Error: writing undefined internal opcode %s\n", op->name);
}
}
void code_write(TAG*tag, code_t*code, pool_t*pool, abc_file_t*file)
{
- code = code_find_start(code);
+ code = code_start(code);
int pos = 0;
int length = 0;
code_t*c = code;
static currentstats_t* code_get_stats(code_t*code, abc_exception_list_t*exceptions)
{
- code = code_find_start(code);
+ code = code_start(code);
int num = 0;
code_t*c = code;
while(c) {
}
}
-int code_dump(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*prefix, FILE*fo)
+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)
{
abc_exception_list_t*e = exceptions;
- c = code_find_start(c);
+ c = code_start(c);
currentstats_t*stats = code_get_stats(c, exceptions);
int pos = 0;
free(m);
} else if(*p == 'm') {
abc_method_t*m = (abc_method_t*)data;
- fprintf(fo, "[method %s]", 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;
int n = (ptroff_t)data;
fprintf(fo, "r%d", n);
} else if(*p == 'b') {
- int b = (ptroff_t)data;
- fprintf(fo, "%02x", b);
+ int b = (signed char)(ptroff_t)data;
+ fprintf(fo, "%d", b);
} else if(*p == 'j') {
if(c->branch)
fprintf(fo, "->%d", c->branch->pos);
if(l->def)
fprintf(fo, "default->%d", l->def->pos);
else
- fprintf(fo, "default->00000000", l->def->pos);
+ fprintf(fo, "default->00000000");
code_list_t*t = l->targets;
while(t) {
if(t->code)
{
code_t*tmp = (code_t*)rfx_calloc(sizeof(code_t));
tmp->opcode = op;
- tmp->next = 0;
if(atag) {
tmp->prev = atag;
tmp->next = atag->next;
+ if(tmp->next)
+ tmp->next->prev = tmp;
atag->next = tmp;
} else {
tmp->prev = 0;
+ tmp->next = 0;
}
return tmp;
}
code = code->next;
return code;
}
+code_t* code_start(code_t*code)
+{
+ if(!code)
+ return 0;
+ while(code->prev)
+ code = code->prev;
+ return code;
+}
code_t* code_append(code_t*code, code_t*toappend)
{
memcpy(n, c, sizeof(code_t));
opcode_t*op = opcode_get(c->opcode);
- if(c->branch) {
+ if(c->branch || c->opcode == OPCODE_LABEL) {
fprintf(stderr, "Error: Can't duplicate branching code\n");
return 0;
}
return last;
}
-code_t*code_cutlast(code_t*c)
+code_t*code_cut(code_t*c)
{
if(!c) return c;
- assert(!c->next);
code_t*prev = c->prev;
+ code_t*next = c->next;
c->prev = 0;
- if(prev)
- prev->next=0;
+ c->next = 0;
+ if(prev) prev->next=next;
+ if(next) next->prev=prev;
code_free(c);
- return prev;
+
+ if(next) return code_end(next);
+ else return prev;
+}
+
+code_t*code_cutlast(code_t*c)
+{
+ if(!c) return c;
+ assert(!c->next);
+ return code_cut(c);
}
code_t* cut_last_push(code_t*c)
{
+ assert(!c->next);
while(c) {
if(!c) break;
opcode_t*op = opcode_get(c->opcode);
} else if(c->opcode == OPCODE_CALLSUPER) {
c->opcode = OPCODE_CALLSUPERVOID;
return c;
- }
- else
+ } else if(c->opcode == OPCODE_NEWOBJECT ||
+ c->opcode == OPCODE_NEWARRAY) {
+ // we can discard these if they're not eating up stack parameters
+ if(!c->data[0])
+ 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
+ code_t*p = c->prev;
+ p->next = 0;
+ c->prev = 0;
+ return code_append(cut_last_push(p), c);
+ } else
break;
}
c = abc_pop(c);