X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fcode.c;h=6ef68a33e95c27fe49b452dc5f160332a3d8d6e5;hb=6d87a7d85f89d5b6a22fe6f1e8891ec73ed682f6;hp=8a729d4464ef74e617ad92ad2d14055958e05b84;hpb=719f26744e38f9abbcadfc132b214dfd950a79fd;p=swftools.git diff --git a/lib/as3/code.c b/lib/as3/code.c index 8a729d4..6ef68a3 100644 --- a/lib/as3/code.c +++ b/lib/as3/code.c @@ -200,25 +200,26 @@ opcode_t opcodes[]={ //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 */ -{0xfe, "__continue__", "s", 0, 0, 0, OP_RETURN|OP_INTERNAL}, +/* 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}, {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;tnext = c; + c->prev = code; code = c; } @@ -414,16 +416,9 @@ void codelookup_free(codelookup_t*codelookup) 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); @@ -465,7 +460,7 @@ static int opcode_write(TAG*tag, code_t*c, pool_t*pool, abc_file_t*file, int len 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); } } @@ -543,7 +538,7 @@ static int opcode_write(TAG*tag, code_t*c, pool_t*pool, abc_file_t*file, int len 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; @@ -786,7 +781,7 @@ static char callcode(currentstats_t*stats, int pos, int stack, int scope) 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) { @@ -851,10 +846,20 @@ void stats_free(currentstats_t*stats) } } -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; @@ -911,11 +916,11 @@ int code_dump(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*p 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; @@ -930,8 +935,8 @@ int code_dump(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*p 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); @@ -949,7 +954,7 @@ int code_dump(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*p 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) @@ -1012,13 +1017,15 @@ code_t* add_opcode(code_t*atag, U8 op) { 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; } @@ -1038,6 +1045,14 @@ code_t* code_end(code_t*code) 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) { @@ -1079,7 +1094,7 @@ code_t*code_dup(code_t*c) 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; } @@ -1112,20 +1127,31 @@ code_t*code_dup(code_t*c) 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); @@ -1153,8 +1179,19 @@ code_t* cut_last_push(code_t*c) } 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);