n = u30 number of params
i = u30 index into method info
b = byte
- s = short
c = u30 index into class
s = string (u30 index into strings)
S = switch
u = u30
r = register
*/
-
+
opcode_t opcodes[]={
{0xa0, "add", "", -2, 1, 0, 0},
{0xc5, "add_i", "", -2, 1, 0, 0},
{0x57, "newactivation", "", 0, 1, 0, OP_NEED_ACTIVATION},
{0x56, "newarray", "n", 0, 1, 0, OP_STACK_ARGS},
{0x5a, "newcatch", "u", 0, 1, 0, 0}, //u = index into exception_info
+#define OP_NEWCLASS 0x58
{0x58, "newclass", "c", -1, 1, 0, 0}, //c = index into class_info
+#define OP_NEWFUNCTION 0x40
{0x40, "newfunction", "m", 0, 1, 0, 0}, //i = index into method_info
{0x55, "newobject", "n", 0, 1, 0, OP_STACK_ARGS2},
{0x1e, "nextname", "", -2, 1, 0, 0},
{0x29, "pop", "", -1, 0, 0, 0},
{0x1d, "popscope", "", 0, 0,-1, 0},
{0x24, "pushbyte", "b", 0, 1, 0, 0},
-{0x2f, "pushdouble", "u", 0, 1, 0, 0}, //index into floats
+{0x2f, "pushdouble", "f", 0, 1, 0, 0}, //index into floats
{0x27, "pushfalse", "", 0, 1, 0, 0},
-{0x2d, "pushint", "u", 0, 1, 0, 0}, //index into ints
-{0x31, "pushnamespace", "u", 0, 1, 0, 0}, //index into namespace
+{0x2d, "pushint", "I", 0, 1, 0, 0}, //index into ints
+{0x31, "pushnamespace", "u", 0, 1, 0, 0}, //index into namespace TODO
{0x28, "pushnan", "", 0, 1, 0, 0},
{0x20, "pushnull", "", 0, 1, 0, 0},
{0x30, "pushscope", "", -1, 0, 1, 0},
{0x25, "pushshort", "u", 0, 1, 0, 0},
{0x2c, "pushstring", "s", 0, 1, 0, 0},
{0x26, "pushtrue", "", 0, 1, 0, 0},
-{0x2e, "pushuint", "u", 0, 1, 0, 0}, //index into uints
+{0x2e, "pushuint", "U", 0, 1, 0, 0}, //index into uints
{0x21, "pushundefined", "", 0, 1, 0, 0},
{0x1c, "pushwith", "", -1, 0, 1, 0},
{0x48, "returnvalue", "", -1, 0, 0, OP_RETURN},
{0xd7, "setlocal_3", "", -1, 0, 0, OP_REGISTER},
{0x6f, "setglobalslot", "u", -1, 0, 0, 0},
{0x61, "setproperty", "2", -2, 0, 0, OP_STACK_NS},
-{0x6d, "setslot", "2", -2, 0, 0, 0},
+{0x6d, "setslot", "u", -2, 0, 0, 0},
{0x05, "setsuper", "2", -2, 0, 0, OP_STACK_NS},
{0xac, "strictequals", "", -2, 1, 0, 0},
{0xa1, "subtract", "", -2, 1, 0, 0},
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 == 'U') { //uint
+ data = (void*)(ptroff_t)pool_lookup_uint(pool, swf_GetU30(tag));
+ } else if(*p == 'I') { //int
+ data = (void*)(ptroff_t)pool_lookup_int(pool, swf_GetU30(tag));
+ } else if(*p == 'f') { //int
+ double*fp = malloc(sizeof(double));
+ *fp = pool_lookup_float(pool, swf_GetU30(tag));
+ data = fp;
} else if(*p == 'm') { //method
data = array_getvalue(file->methods, swf_GetU30(tag));
} else if(*p == 'c') { //classinfo
code_t*code_find_start(code_t*c)
{
- while(c->prev)
+ while(c && c->prev)
c=c->prev;
return c;
}
void*data = c->data[pos];
if(*p == '2') { //multiname
multiname_destroy(data);
- } else if(strchr("sD", *p)) {
+ } else if(strchr("sDf", *p)) {
free(data);
} else if(strchr("S", *p)) {
lookupswitch_t*l = (lookupswitch_t*)data;
char*p = op->params;
int pos = 0;
int len = 0;
-
+
if(tag)
swf_SetU8(tag, c->opcode);
len++;
} 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
printf(" 00000000\n");
}
if(op->params[0]=='2') {
- printf(" %s", multiname_to_string(c->data[0]));
+ printf(" %s", multiname_tostring(c->data[0]));
}
printf("\n");
}
if(stats->stack[pos].seen) {
if(stats->stack[pos].stackpos != stack ||
stats->stack[pos].scopepos != scope) {
- dumpstack(stats);
+ //dumpstack(stats);
fprintf(stderr, "Stack mismatch at pos %d\n", pos);
fprintf(stderr, "Should be: %d:%d, is: %d:%d\n", stack, scope,
stats->stack[pos].stackpos, stats->stack[pos].scopepos);
- return 0;
+
+ /* return error here if we do verification */
+ //return 0;
}
return 1;
}
if(stack<0) {
fprintf(stderr, "error: stack underflow at %d (%s)\n", pos, op->name);
- printf("error: stack underflow at %d (%s)\n", pos, op->name);exit(0);
- return 0;
+
+ /* if we would do true verification (if we would be a vm), this is
+ where we would return the error
+ return 0;
+ */
}
stack += op->stack_plus;
stats->flags |= FLAGS_SET_DXNS;
if(op->flags & OP_NEED_ACTIVATION)
stats->flags |= FLAGS_ACTIVATION;
+
+ if(c->opcode == OP_NEWCLASS) {
+ abc_class_t*cls = (abc_class_t*)(c->data[0]);
+ if(scope > cls->init_scope_depth)
+ cls->init_scope_depth = scope;
+ }
+ if(c->opcode == OP_NEWFUNCTION) {
+ abc_method_t*m = (abc_method_t*)(c->data[0]);
+ if(m->body && scope > m->body->init_scope_depth)
+ m->body->init_scope_depth = scope;
+ }
if(op->flags & OP_REGISTER) {
char*p = op->params;
if(op->flags & (OP_JUMP|OP_BRANCH)) {
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_to_string(c->data[0]));
+ printf("%5d) %s %s\n", t, op->name, multiname_tostring(c->data[0]));
} else {
printf("%5d) %s\n", t, op->name);
}
void stats_free(currentstats_t*stats)
{
- free(stats->stack);stats->stack=0;
- free(stats);
+ if(stats) {
+ free(stats->stack);stats->stack=0;
+ free(stats);
+ }
}
int code_dump(code_t*c, exception_list_t*exceptions, abc_file_t*file, char*prefix, FILE*fo)
if(c==e->exception->from)
fprintf(fo, "%s TRY {\n", prefix);
if(c==e->exception->target) {
- char*s1 = multiname_to_string(e->exception->exc_type);
- char*s2 = multiname_to_string(e->exception->var_name);
+ char*s1 = multiname_tostring(e->exception->exc_type);
+ char*s2 = multiname_tostring(e->exception->var_name);
fprintf(fo, "%s CATCH(%s %s)\n", prefix, s1, s2);
free(s1);
free(s2);
char first = 1;
int i=0;
- fprintf(fo, "%s%5d) %c %d:%d %s ", prefix, c->pos, stats->stack[c->pos].seen?'x':'|',
- stats->stack[c->pos].stackpos,
- stats->stack[c->pos].scopepos,
- op->name);
+ if(stats) {
+ fprintf(fo, "%s%5d) %c %d:%d %s ", prefix, c->pos, stats->stack[c->pos].seen?'x':'|',
+ stats->stack[c->pos].stackpos,
+ stats->stack[c->pos].scopepos,
+ op->name);
+ } else {
+ fprintf(fo, "%s%5d) ? ?:? %s ", prefix, c->pos, op->name);
+ }
while(*p) {
void*data = c->data[i];
fprintf(fo, "%d params", n);
} else if(*p == '2') {
multiname_t*n = (multiname_t*)data;
- char* m = multiname_to_string(n);
+ char* m = multiname_tostring(n);
fprintf(fo, "%s", m);
free(m);
} else if(*p == 'm') {
fprintf(fo, "[method %s]", m->name);
} else if(*p == 'c') {
abc_class_t*cls = (abc_class_t*)data;
- char*classname = multiname_to_string(cls->classname);
+ char*classname = multiname_tostring(cls->classname);
fprintf(fo, "[classinfo %s]", classname);
free(classname);
} else if(*p == 'i') {
abc_method_body_t*b = (abc_method_body_t*)data;
fprintf(fo, "[methodbody]");
- } else if(*p == 'u') {
+ } else if(*p == 'u' || *p == 'I' || *p == 'U') {
int n = (ptroff_t)data;
fprintf(fo, "%d", n);
+ } else if(*p == 'f') {
+ double f = *(double*)data;
+ fprintf(fo, "%f", f);
} else if(*p == 'r') {
int n = (ptroff_t)data;
fprintf(fo, "r%d", n);
codestats_t*stats = rfx_calloc(sizeof(codestats_t));
stats->local_count = current->maxlocal;
stats->max_stack = current->maxstack;
- stats->init_scope_depth = 0;
stats->max_scope_depth = current->maxscope;
stats->flags = current->flags;
tmp->next = 0;
if(atag) {
tmp->prev = atag;
+ tmp->next = atag->next;
atag->next = tmp;
} else {
tmp->prev = 0;
{
printf("max_stack: %d\n", stats->max_stack);
printf("local_count: %d\n", stats->local_count);
- printf("init_scope_depth: %d\n", stats->init_scope_depth);
- printf("max_scope_depth: %d\n", stats->max_scope_depth);
+ printf("scope_depth: %d\n", stats->max_scope_depth);
+}
+
+code_t* code_append(code_t*code, code_t*toappend)
+{
+ if(!code)
+ return toappend;
+ if(!toappend)
+ return code;
+ //find end of first list
+ while(code->next) {
+ code = code->next;
+ }
+ code_t*start=toappend;
+ //and start of second list
+ while(start->prev) {
+ start = start->prev;
+ }
+ code->next = start;
+ start->prev = code;
+ return toappend;
}
git.asbjorn.biz / swftools.git / blobdiff