i = u30 index into method info
b = byte
c = u30 index into class
+ N = u30 index into namespaces
s = string (u30 index into strings)
S = switch
u = u30
{0x2f, "pushdouble", "f", 0, 1, 0, 0}, //index into floats
{0x27, "pushfalse", "", 0, 1, 0, 0},
{0x2d, "pushint", "I", 0, 1, 0, 0}, //index into ints
-{0x31, "pushnamespace", "u", 0, 1, 0, 0}, //index into namespace TODO
+{0x31, "pushnamespace", "N", 0, 1, 0, 0}, //index into namespace
{0x28, "pushnan", "", 0, 1, 0, 0},
{0x20, "pushnull", "", 0, 1, 0, 0},
{0x30, "pushscope", "", -1, 0, 1, 0},
{0xa7, "urshift", "", -2, 1, 0, 0},
/* opcodes not documented, but seen in the wild */
-//0x53: seen in builtin.abc
-{0x53, "applytype", "n", -1, 1, 0, OP_STACK_ARGS},
+{0x53, "applytype", "n", -1, 1, 0, OP_STACK_ARGS}, //seen in builtin.abc
/* dummy instructions. Warning: these are not actually supported by flash */
-{0xfd, "__fallthrough__", "s", 0, 0, 0, OP_INTERNAL},
-{0xfe, "__continue__", "s", 0, 0, 0, OP_RETURN|OP_INTERNAL},
+{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;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)
void lookupswitch_print(lookupswitch_t*l)
{
- printf("default: %08x\n", l->def);
+ printf("default: %08x\n", (int)l->def);
code_list_t*t = l->targets;
while(t) {
- printf("target: %08x\n", t->code);
+ printf("target: %08x\n", (int)t->code);
t = t->next;
}
}
head = code = c;
} else {
code->next = c;
+ c->prev = code;
code = c;
}
data = (void*)(ptroff_t)swf_GetU30(tag);
} else if(*p == '2') { //multiname
data = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag)));
+ } else if(*p == 'N') { //namespace
+ data = namespace_clone(pool_lookup_namespace(pool, swf_GetU30(tag)));
} else if(*p == 'U') { //uint
data = (void*)(ptroff_t)pool_lookup_uint(pool, swf_GetU30(tag));
} else if(*p == 'I') { //int
if(c) {
opcode_t*op = opcode_get(c->opcode);
if(op->flags & (OP_JUMP|OP_BRANCH)) {
- printf("%5d) %02x %s %d\n", t, tag->data[start+t], op->name, c->data[0]);
+ printf("%50d) %02x %s %d\n", t, tag->data[start+t], op->name, c->data[0]);
} else {
- printf("%5d) %02x %s\n", t, tag->data[start+t], op->name);
+ printf("%50d) %02x %s\n", t, tag->data[start+t], op->name);
}
} else {
- printf("%5d) %02x\n", t, tag->data[start+t]);
+ printf("%50d) %02x\n", t, tag->data[start+t]);
}
}
- //printf("%5d) %02x\n", t, tag->data[start+t]);
+ //printf("%05d) %02x\n", t, tag->data[start+t]);
#endif
code_t*c = head;
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);
void*data = c->data[pos];
if(*p == '2') { //multiname
multiname_destroy(data);
+ } else if(*p == 'N') { //namespace
+ namespace_destroy(data);
} else if(strchr("sDf", *p)) {
free(data);
} else if(strchr("S", *p)) {
while(*p) {
void*data = c->data[pos++];
assert(pos<=2);
- if(*p == 'n') { // number
- len += swf_SetU30(tag, (ptroff_t)data);
- } else if(*p == '2') { //multiname
- multiname_t*m = (multiname_t*)data;
- len += swf_SetU30(tag, pool_register_multiname(pool, m));
- } else if(*p == 'm') { //method
- abc_method_t*m = (abc_method_t*)data;
- len += swf_SetU30(tag, m->index);
- } else if(*p == 'c') { //classinfo
- abc_class_t*cls = (abc_class_t*)data;
- len += swf_SetU30(tag, cls->index);
- } else if(*p == 'i') { //methodbody
- abc_method_body_t*m = (abc_method_body_t*)data;
- len += swf_SetU30(tag, m->index);
- } else if(*p == 'I') { // int
- len += swf_SetU30(tag, pool_register_int(pool, (ptroff_t)data));
- } else if(*p == 'U') { // uint
- len += swf_SetU30(tag, pool_register_uint(pool, (ptroff_t)data));
- } else if(*p == 'f') { // float
- len += swf_SetU30(tag, pool_register_float(pool, *(double*)data));
- } else if(*p == 'u') { // integer
- len += swf_SetU30(tag, (ptroff_t)data);
- } else if(*p == 'r') { // integer
- len += swf_SetU30(tag, (ptroff_t)data);
- } else if(*p == 'b') { // byte
- if(tag)
- swf_SetU8(tag, (ptroff_t)data);
- len++;
- } else if(*p == 'j') { // jump
- int skip = length-c->pos-4;
- if(c->branch)
- skip = (c->branch->pos) - c->pos - 4;
- len += swf_SetS24(tag, skip);
- } else if(*p == 's') { // string
- int index = pool_register_string2(pool, (string_t*)data);
- len += swf_SetU30(tag, index);
- } else if(*p == 'D') { // debug statement
- if(tag)
- swf_SetU8(tag, 1);
- len++;
- len+=swf_SetU30(tag, pool_register_string(pool,c->data[0]));
- if(tag)
- swf_SetU8(tag, (ptroff_t)c->data[1]);
- len++;
- len+=swf_SetU30(tag, 0);
- } else if(*p == 'S') { // switch statement
- lookupswitch_t*l = (lookupswitch_t*)data;
- int offset = 0;
- len+=swf_SetS24(tag, l->def->pos-c->pos+offset); //default
- code_list_t*t = l->targets;
- if(list_length(t)) {
- len+=swf_SetU30(tag, list_length(t)-1); //nr-1
+ switch(*p) {
+ case 'n': { // number
+ len += swf_SetU30(tag, (ptroff_t)data);
+ break;
+ }
+ case '2': { //multiname
+ multiname_t*m = (multiname_t*)data;
+ len += swf_SetU30(tag, pool_register_multiname(pool, m));
+ break;
+ }
+ case 'N': { //namespace
+ namespace_t*ns = (namespace_t*)data;
+ len += swf_SetU30(tag, pool_register_namespace(pool, ns));
+ break;
+ }
+ case 'm': { //method
+ abc_method_t*m = (abc_method_t*)data;
+ len += swf_SetU30(tag, m->index);
+ break;
+ }
+ case 'c': { //classinfo
+ abc_class_t*cls = (abc_class_t*)data;
+ len += swf_SetU30(tag, cls->index);
+ break;
+ }
+ case 'i': { //methodbody
+ abc_method_body_t*m = (abc_method_body_t*)data;
+ len += swf_SetU30(tag, m->index);
+ break;
+ }
+ case 'I': { // int
+ len += swf_SetU30(tag, pool_register_int(pool, (ptroff_t)data));
+ break;
+ }
+ case 'U': { // uint
+ len += swf_SetU30(tag, pool_register_uint(pool, (ptroff_t)data));
+ break;
+ }
+ case 'f': { // float
+ len += swf_SetU30(tag, pool_register_float(pool, *(double*)data));
+ break;
+ }
+ case 'u': { // integer
+ len += swf_SetU30(tag, (ptroff_t)data);
+ break;
+ }
+ case 'r': { // integer
+ len += swf_SetU30(tag, (ptroff_t)data);
+ break;
+ }
+ case 'b': { // byte
+ if(tag)
+ swf_SetU8(tag, (ptroff_t)data);
+ len++;
+ break;
+ }
+ case 'j': { // jump
+ int skip = length-c->pos-4;
+ if(c->branch)
+ skip = (c->branch->pos) - c->pos - 4;
+ len += swf_SetS24(tag, skip);
+ break;
+ }
+ case 's': { // string
+ int index = pool_register_string2(pool, (string_t*)data);
+ len += swf_SetU30(tag, index);
+ break;
+ }
+ case 'D': { // debug statement
+ if(tag)
+ swf_SetU8(tag, 1);
+ len++;
+ len+=swf_SetU30(tag, pool_register_string(pool,c->data[0]));
+ if(tag)
+ swf_SetU8(tag, (ptroff_t)c->data[1]);
+ len++;
+ len+=swf_SetU30(tag, 0);
+ break;
+ }
+ case 'S': { // switch statement
+ lookupswitch_t*l = (lookupswitch_t*)data;
+ int offset = 0;
+ len+=swf_SetS24(tag, l->def->pos-c->pos+offset); //default
code_list_t*t = l->targets;
- while(t) {
- len+=swf_SetS24(tag, t->code->pos - c->pos+offset);
- t = t->next;
+ if(list_length(t)) {
+ len+=swf_SetU30(tag, list_length(t)-1); //nr-1
+ code_list_t*t = l->targets;
+ while(t) {
+ len+=swf_SetS24(tag, t->code->pos - c->pos+offset);
+ t = t->next;
+ }
+ } else {
+ len+=swf_SetU30(tag, 0); //nr-1
+ len+=swf_SetS24(tag, l->def->pos-c->pos+offset);
}
- } else {
- len+=swf_SetU30(tag, 0); //nr-1
- len+=swf_SetS24(tag, l->def->pos-c->pos+offset);
+ break;
}
- } else {
- printf("Can't parse opcode param type \"%c\"\n", *p);
+ default:
+ printf("Can't parse opcode param type \"%c\"\n", *p);
}
p++;
}
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;
for(t=0;t<stats->num;t++) {
code_t*c = stats->stack[t].code;
opcode_t*op = opcode_get(c->opcode);
- printf("%5d) %c %d:%d %s", t, (stats->stack[t].flags&FLAG_SEEN)?'x':'|',
+ printf("%05d) %c %d:%d %s", t, (stats->stack[t].flags&FLAG_SEEN)?'x':'|',
stats->stack[t].stackpos,
stats->stack[t].scopepos,
op->name);
}
if(op->params[0]=='2') {
printf(" %s", multiname_tostring(c->data[0]));
+ } else if(op->params[0]=='N') {
+ printf(" %s", namespace_tostring(c->data[0]));
}
printf("\n");
}
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) {
for(t=0;t<num;t++) {
opcode_t*op = opcode_get(c->opcode);
if(op->flags & (OP_JUMP|OP_BRANCH)) {
- printf("%5d) %s %08x\n", t, op->name, c->branch);
+ printf("%05d) %s %08x\n", t, op->name, c->branch);
} else if(op->params[0]=='2') {
- printf("%5d) %s %s\n", t, op->name, multiname_tostring(c->data[0]));
+ printf("%05d) %s %s\n", t, op->name, multiname_tostring(c->data[0]));
+ } else if(op->params[0]=='N') {
+ printf("%05d) %s %s\n", t, op->name, namespace_tostring(c->data[0]));
} else {
- printf("%5d) %s\n", t, op->name);
+ printf("%05d) %s\n", t, op->name);
}
c = c->next;
}
- //printf("%5d) %02x\n", t, tag->data[start+t]);
+ //printf("%05d) %02x\n", t, tag->data[start+t]);
#endif
num = 0;
}
}
-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;
if(stats) {
int f = stats->stack[c->pos].flags;
- fprintf(fo, "%s%5d) %c %d:%d %s ", prefix, c->pos,
+ fprintf(fo, "%s%05d) %c %d:%d %s ", prefix, c->pos,
(f&FLAG_ERROR)?'E':((f&FLAG_SEEN)?'+':'|'),
stats->stack[c->pos].stackpos,
stats->stack[c->pos].scopepos,
op->name);
} else {
- fprintf(fo, "%s%5d) ? ?:? %s ", prefix, c->pos, op->name);
+ fprintf(fo, "%s%05d) ? ?:? %s ", prefix, c->pos, op->name);
}
while(*p) {
char* m = multiname_tostring(n);
fprintf(fo, "%s", m);
free(m);
+ } else if(*p == 'N') {
+ namespace_t*ns = (namespace_t*)data;
+ char* m = namespace_tostring(ns);
+ fprintf(fo, "%s", m);
+ 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;
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);
else
- fprintf(fo, "%08x", c->branch);
+ fprintf(fo, "%08x", (unsigned int)c->branch);
} else if(*p == 's') {
char*s = string_escape((string_t*)data);
fprintf(fo, "\"%s\"", s);
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;
}
{
if(!c) return 0;
- while(c->prev) c = c->prev;
+ dict_t*pos2pos = dict_new2(&ptr_type);
code_t*last = 0;
+ c = code_start(c);
+ code_t*start = 0;
+ char does_branch = 0;
while(c) {
NEW(code_t, n);
memcpy(n, c, sizeof(code_t));
+ if(!start)
+ start=n;
- opcode_t*op = opcode_get(c->opcode);
+ if(c->opcode == OPCODE_LABEL || c->opcode == OPCODE_NOP) {
+ dict_put(pos2pos, c, n);
+ }
if(c->branch) {
- fprintf(stderr, "Error: Can't duplicate branching code\n");
- return 0;
+ does_branch = 1;
}
+
+ opcode_t*op = opcode_get(c->opcode);
+
char*p = op?op->params:"";
int pos=0;
while(*p) {
if(*p == '2') { //multiname
c->data[pos] = multiname_clone(c->data[pos]);
+ } else if(*p == 'N') { //multiname
+ c->data[pos] = namespace_clone(c->data[pos]);
} else if(*p == 's') {
c->data[pos] = string_dup3(c->data[pos]);
} else if(*p == 'D') {
last = n;
c = c->next;
}
+
+ if(does_branch) {
+ c = start;
+ while(c) {
+ if(c->branch) {
+ code_t*target = dict_lookup(pos2pos, c->branch);
+ if(!target) {
+ fprintf(stderr, "Error: Can't find branch target in code_dup\n");
+ return 0;
+ }
+ c->branch = target;
+ }
+ c = c->next;
+ }
+ }
+ dict_destroy(pos2pos);
return last;
}
if(prev) prev->next=next;
if(next) next->prev=prev;
code_free(c);
-
+
if(next) return code_end(next);
else return prev;
}
return code_cut(c);
}
+char is_getlocal(code_t*c)
+{
+ if(!c) return 0;
+ if(c->opcode == OPCODE_GETLOCAL ||
+ c->opcode == OPCODE_GETLOCAL_0 ||
+ c->opcode == OPCODE_GETLOCAL_1 ||
+ c->opcode == OPCODE_GETLOCAL_2 ||
+ c->opcode == OPCODE_GETLOCAL_3) {
+ return 1;
+ }
+ return 0;
+}
+
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 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