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 */
+{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)
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
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)) {
} else if(*p == '2') { //multiname
multiname_t*m = (multiname_t*)data;
len += swf_SetU30(tag, pool_register_multiname(pool, m));
+ } else if(*p == 'N') { //namespace
+ namespace_t*ns = (namespace_t*)data;
+ len += swf_SetU30(tag, pool_register_namespace(pool, ns));
} else if(*p == 'm') { //method
abc_method_t*m = (abc_method_t*)data;
len += swf_SetU30(tag, m->index);
}
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");
}
printf("%5d) %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]));
+ } else if(op->params[0]=='N') {
+ printf("%5d) %s %s\n", t, op->name, namespace_tostring(c->data[0]));
} else {
printf("%5d) %s\n", t, op->name);
}
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)
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->index, m->name);
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') {
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