X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fabc.c;h=91a70e64c92ea22d7c8aaff0480f9e93c413244e;hb=3f9b43eec2a339e1c60a4139556b6153f8b3cc65;hp=e3a9858a412b6d9533eb3c2ae2a6bd364cf0dd58;hpb=bed6026d6c3be366a8f3d7f3c884d7758a6694b8;p=swftools.git diff --git a/lib/as3/abc.c b/lib/as3/abc.c index e3a9858..91a70e6 100644 --- a/lib/as3/abc.c +++ b/lib/as3/abc.c @@ -29,24 +29,6 @@ char stringbuffer[2048]; -typedef struct _opcode -{ - unsigned char opcode; - char*name; - char*params; -} opcode_t; - -/* 2 = multiname - m = method - n = number of params - i = method info - b = byte - s = short - c = class - s = string - S = switch -*/ - int abc_RegisterNameSpace(abc_file_t*file, const char*name); int abc_RegisterPackageNameSpace(abc_file_t*file, const char*name); int abc_RegisterPackageInternalNameSpace(abc_file_t*file, const char*name); @@ -55,438 +37,43 @@ int abc_RegisterExplicitNameSpace(abc_file_t*file, const char*name); int abc_RegisterStaticProtectedNameSpace(abc_file_t*file, const char*name); int abc_RegisterPrivateNameSpace(abc_file_t*file, const char*name); +/* TODO: switch to a datastructure with just values */ +#define NO_KEY "" -opcode_t opcodes[]={ -{0xa0, "add", ""}, -{0xc5, "add_i", ""}, -{0x86, "atype", "2"}, -{0x87, "astypelate", ""}, -{0xA8, "bitand", ""}, -{0x97, "bitnot", ""}, -{0xa9, "bitor", ""}, -{0xaa, "bitxor", ""}, -{0x41, "call", "n"}, -{0x43, "callmethod", "mn"}, -{0x4c, "callproplex", "2n"}, -{0x46, "callproperty", "2n"}, -{0x4f, "callpropvoid", "2n"}, -{0x44, "callstatic", "in"}, -{0x45, "callsuper", "2n"}, -{0x4e, "callsupervoid", "2n"}, -{0x78, "checkfilter", ""}, -{0x80, "coerce", "2"}, -{0x82, "coerce_a", ""}, -{0x85, "coerce_s", ""}, -{0x42, "construct", "n"}, -{0x4a, "constructprop", "2n"}, -{0x49, "constructsuper", "n"}, -{0x76, "convert_b", ""}, -{0x73, "convert_i", ""}, -{0x75, "convert_d", ""}, -{0x77, "convert_o", ""}, -{0x74, "convert_u", ""}, -{0x70, "convert_s", ""}, -{0xef, "debug", "D"}, -{0xf1, "debugfile", "s"}, -{0xf0, "debugline", "u"}, -{0x94, "declocal", "u"}, -{0xc3, "declocal_i", "u"}, -{0x93, "decrement", ""}, -{0xc1, "decrement_i", ""}, -{0x6a, "deleteproperty", "2"}, -{0xa3, "divide", ""}, -{0x2a, "dup", ""}, -{0x06, "dxns", "s"}, -{0x07, "dxnslate", ""}, -{0xab, "equals", ""}, -{0x72, "esc_xattr", ""}, -{0x71, "esc_xelem", ""}, -{0x5e, "findproperty", "2"}, -{0x5d, "findpropstrict", "2"}, -{0x59, "getdescendants", "2"}, -{0x64, "getglobalscope", ""}, -{0x6e, "getglobalslot", "u"}, -{0x60, "getlex", "2"}, -{0x62, "getlocal", "u"}, -{0xd0, "getlocal_0", ""}, -{0xd1, "getlocal_1", ""}, -{0xd2, "getlocal_2", ""}, -{0xd3, "getlocal_3", ""}, -{0x66, "getproperty", "2"}, -{0x65, "getscopeobject", "u"}, -{0x6c, "getslot", "u"}, -{0x04, "getsuper", "2"}, -{0xaf, "greaterequals", ""}, -{0x1f, "hasnext", ""}, -{0x32, "hasnext2", "uu"}, -{0x13, "ifeq", "j"}, -{0x12, "iffalse", "j"}, -{0x18, "ifge", "j"}, -{0x17, "ifgt", "j"}, -{0x16, "ifle", "j"}, -{0x15, "iflt", "j"}, -{0x0f, "ifnge", "j"}, -{0x0e, "ifngt", "j"}, -{0x0d, "ifnle", "j"}, -{0x0c, "ifnlt", "j"}, -{0x14, "ifne", "j"}, -{0x19, "ifstricteq", "j"}, -{0x1a, "ifstrictne", "j"}, -{0x11, "iftrue", "j"}, -{0xb4, "in", ""}, -{0x92, "inclocal", "u"}, -{0xc2, "inclocal_i", "u"}, -{0x91, "increment", ""}, -{0xc0, "increment_i", ""}, -{0x68, "initproperty", "2"}, -{0xb1, "instanceof", ""}, -{0xb2, "istype", "2"}, -{0xb3, "istypelate", ""}, -{0x10, "jump", "j"}, -{0x08, "kill", "u"}, -{0x09, "label", ""}, -{0xae, "lessequals", ""}, -{0xad, "lessthan", ""}, -{0x1b, "lookupswitch", "S"}, -{0xa5, "lshift", ""}, -{0xa4, "modulo", ""}, -{0xa2, "multiply", ""}, -{0xc7, "multiply_i", ""}, -{0x90, "negate", ""}, -{0xc4, "negate_i", ""}, -{0x57, "newactivation", ""}, -{0x56, "newarray", "u"}, -{0x5a, "newcatch", "u"}, //index into exception_info -{0x58, "newclass", "c"}, //index into class_info -{0x40, "newfunction", "u"}, //index into method_info -{0x55, "newobject", "u"}, -{0x1e, "nextname", ""}, -{0x23, "nextvalue", ""}, -{0x02, "nop", ""}, -{0x96, "not", ""}, -{0x29, "pop", ""}, -{0x1d, "popscope", ""}, -{0x24, "pushbyte", "b"}, -{0x2f, "pushdouble", "u"}, //index into floats -{0x27, "pushfalse", ""}, -{0x2d, "pushint", "u"}, //index into ints -{0x31, "pushnamespace", "u"}, //index into namespace -{0x28, "pushnan", ""}, -{0x20, "pushnull", ""}, -{0x30, "pushscope", ""}, -{0x25, "pushshort", "u"}, -{0x2c, "pushstring", "s"}, -{0x26, "pushtrue", ""}, -{0x2e, "pushuint", "u"}, //index into uints -{0x21, "pushundefined", ""}, -{0x1c, "pushwith", ""}, -{0x48, "returnvalue", ""}, -{0x47, "returnvoid", ""}, -{0xa6, "rshift", ""}, -{0x63, "setlocal", "u"}, -{0xd4, "setlocal_0", ""}, -{0xd5, "setlocal_1", ""}, -{0xd6, "setlocal_2", ""}, -{0xd7, "setlocal_3", ""}, -{0x6f, "setglobalshot", "u"}, -{0x61, "setproperty", "2"}, -{0x6d, "setslot", "u"}, -{0x05, "setsuper", "2"}, -{0xac, "strictequals", ""}, -{0xa1, "subtract", ""}, -{0xc6, "subtract_i", ""}, -{0x2b, "swap", ""}, -{0x03, "throw", ""}, -{0x95, "typeof", ""}, -{0xa7, "urshift", ""}, -{0xb0, "xxx", ""}, -}; - -static U8 op2index[256] = {254}; - -opcode_t* opcode_get(U8 op) -{ - int t; - if(op2index[0]==254) { - memset(op2index, 255, sizeof(op2index)); - for(t=0;tpos+len; - //printf("-->\n");fflush(stdout); - while(tag->posname);fflush(stdout); - NEW(abc_code_t,c); - if(!head) { - head = code = c; - } else { - code->next = c; - code = c; - } - - c->opcode = opcode; - - char*p = op->params; - int pos = 0; - while(*p) { - void*data = 0; - if(*p == 'n') { // number - 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 == 'm') { //method - data = array_getvalue(file->methods, swf_GetU30(tag)); - } else if(*p == 'c') { //classinfo - data = array_getvalue(file->classes, swf_GetU30(tag)); - } else if(*p == 'i') { //methodbody TODO - data = array_getvalue(file->method_bodies, swf_GetU30(tag)); - } else if(*p == 'u') { // lookoup TODO - data = (void*)(ptroff_t)swf_GetU30(tag); - } else if(*p == 'b') { // byte - data = (void*)(ptroff_t)swf_GetU8(tag); - } else if(*p == 'j') { // jump TODO - data = (void*)(ptroff_t)swf_GetS24(tag); - } else if(*p == 's') { // string - data = strdup((char*)pool_lookup_string(pool, swf_GetU30(tag))); - } else if(*p == 'D') { // debug - /*type, usually 1*/ - U8 type = swf_GetU8(tag); - if(type!=1) - fprintf(stderr, "Unknown debug type: %02x\n", type); - /*register name*/ - code->params[0] = strdup((char*)pool_lookup_string(pool, swf_GetU30(tag))); - /*register index*/ - code->params[1] = (void*)(ptroff_t)swf_GetU8(tag); - /*unused*/ - swf_GetU30(tag); - } else if(*p == 'S') { // switch statement TODO - /* I hate these things */ - swf_GetU24(tag); //default - int num = swf_GetU30(tag)+1; - int t; - for(t=0;tparams[pos++] = data; - p++; - } - } - return head; -} - -static void code_free(abc_code_t*c) -{ - while(c) { - abc_code_t*next = c->next; - opcode_t*op = opcode_get(c->opcode); - char*p = op?op->params:""; - int pos=0; - while(*p) { - void*data = c->params[pos]; - if(*p == '2') { //multiname - multiname_destroy(data); - } else if(strchr("sD", *p)) { - free(data); - } - c->params[pos]=0; - p++;pos++; - } - memset(c, 0, sizeof(c)); - free(c); - c = next; - } -} - -static int code_dump(abc_code_t*c, abc_file_t*file, char*prefix, FILE*fo) -{ - pool_t*pool = pool_new(); - - while(c) { - U8 opcode = c->opcode; - int t; - char found = 0; - opcode_t*op = opcode_get(opcode); - if(!op) { - fprintf(stderr, "Can't parse opcode %02x.\n", opcode); - return 0; - } else { - fprintf(fo, "%s%s ", prefix, op->name); - char*p = op->params; - char first = 1; - int pos=0; - while(*p) { - void*data = c->params[pos]; - if(pos>0) - printf(", "); - - if(*p == 'n') { - int n = (ptroff_t)data; - fprintf(fo, "%d params", n); - } else if(*p == '2') { - multiname_t*n = (multiname_t*)data; - char* m = multiname_to_string(n); - fprintf(fo, "%s", m); - free(m); - } else if(*p == 'm') { - abc_method_t*m = (abc_method_t*)data; - 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); - 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') { - int n = (ptroff_t)data; - fprintf(fo, "%d", n); - } else if(*p == 'b') { - int b = (ptroff_t)data; - fprintf(fo, "%02x", b); - } else if(*p == 'j') { - int n = (ptroff_t)data; - fprintf(fo, "%d", n); - } else if(*p == 's') { - fprintf(fo, "\"%s\"", data); - } else if(*p == 'D') { - fprintf(fo, "[register %02x=%s]", (ptroff_t)c->params[1], (char*)c->params[0]); - } else if(*p == 'S') { - fprintf(fo, "[switch data]"); - } else { - fprintf(stderr, "Can't parse opcode param type \"%c\"\n", *p); - return 0; - } - p++; - pos++; - first = 0; - } - fprintf(fo, "\n"); - } - c = c->next; - } - return 1; -} - -static int opcode_write(TAG*tag, abc_code_t*code, pool_t*pool, abc_file_t*file) -{ - opcode_t*c = opcode_get(code->opcode); - char*p = c->params; - int pos = 0; - int len = 0; - - if(tag) - swf_SetU8(tag, code->opcode); - len++; - - while(*p) { - void*data = code->params[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 == 'u') { // 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 - len += swf_SetS24(tag, (ptroff_t)data); - } else if(*p == 's') { // string - int index = pool_register_string(pool, 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,code->params[0])); - if(tag) - swf_SetU8(tag, (ptroff_t)code->params[1]); - len++; - len+=swf_SetU30(tag, 0); - } else if(*p == 'S') { // switch statement - len+=swf_SetU24(tag, 0); //default - len+=swf_SetU30(tag, 0); //nr-1 - len+=swf_SetU24(tag, 0); //first - } else { - printf("Can't parse opcode param type \"%c\"\n", *p); - } - p++; - } - return len; -} - - -static char* params_to_string(multiname_list_t*list) +static char* params_tostring(multiname_list_t*list) { multiname_list_t*l; - int n; - - l = list; - n = 0; - while(list) { - n++;list=list->next; - } - + int n = list_length(list); char**names = (char**)malloc(sizeof(char*)*n); l = list; n = 0; int size = 0; - while(list) { - names[n] = multiname_to_string(list->multiname); + while(l) { + names[n] = multiname_tostring(l->multiname); size += strlen(names[n]) + 2; - n++;list=list->next; + n++;l=l->next; } - char* params = malloc(size+5); + char* params = malloc(size+15); params[0]='('; params[1]=0; l = list; int s=0; n = 0; - while(list) { + while(l) { if(s) strcat(params, ", "); strcat(params, names[n]); free(names[n]); + l = l->next; n++; s=1; } free(names); + /*char num[20]; + sprintf(num, "[%d params]", n); + strcat(params, num);*/ strcat(params, ")"); int t; return params; @@ -537,6 +124,7 @@ abc_file_t*abc_file_new() f->classes = array_new(); f->scripts = array_new(); f->method_bodies = array_new(); + f->flags = ABCFILE_LAZY; return f; } @@ -546,11 +134,12 @@ abc_file_t*abc_file_new() #define CLASS_INTERFACE 4 #define CLASS_PROTECTED_NS 8 -abc_class_t* abc_class_new(abc_file_t*pool, multiname_t*classname, multiname_t*superclass) { - abc_class_t* c = malloc(sizeof(abc_class_t)); - memset(c, 0, sizeof(abc_class_t)); - c->index = array_append(pool->classes, classname->name, c); - c->pool = pool; +abc_class_t* abc_class_new(abc_file_t*file, multiname_t*classname, multiname_t*superclass) { + + NEW(abc_class_t,c); + array_append(file->classes, NO_KEY, c); + + c->file = file; c->classname = classname; c->superclass = superclass; c->flags = 0; @@ -586,24 +175,21 @@ void abc_class_add_interface(abc_class_t*c, multiname_t*interface) list_append(c->interfaces, interface); } -abc_method_body_t* add_method(abc_file_t*pool, abc_class_t*cls, char*returntype, int num_params, va_list va) +abc_method_body_t* add_method(abc_file_t*file, abc_class_t*cls, multiname_t*returntype, int num_params, va_list va) { /* construct code (method body) object */ - abc_method_body_t* c = malloc(sizeof(abc_method_body_t)); - memset(c, 0, sizeof(abc_method_body_t)); - c->index = array_append(pool->method_bodies, 0, c); - c->pool = pool; + NEW(abc_method_body_t,c); + array_append(file->method_bodies, NO_KEY, c); + c->file = file; c->traits = list_new(); c->code = 0; /* construct method object */ NEW(abc_method_t,m); - m->index = array_append(pool->methods, 0, m); - if(returntype && strcmp(returntype, "void")) { - m->return_type = multiname_fromstring(returntype); - } else { - m->return_type = 0; - } + array_append(file->methods, NO_KEY, m); + + m->return_type = returntype; + int t; for(t=0;tpool, cls, returntype, num_params, va); + abc_method_body_t* c = add_method(cls->file, cls, returntype, num_params, va); va_end(va); cls->constructor = c->method; return c; } -abc_method_body_t* abc_class_staticconstructor(abc_class_t*cls, char*returntype, int num_params, ...) +abc_method_body_t* abc_class_staticconstructor(abc_class_t*cls, multiname_t*returntype, int num_params, ...) { va_list va; va_start(va, num_params); - abc_method_body_t* c = add_method(cls->pool, cls, returntype, num_params, va); + abc_method_body_t* c = add_method(cls->file, cls, returntype, num_params, va); va_end(va); cls->static_constructor = c->method; return c; } -trait_t*trait_new(int type, multiname_t*name, int data1, int data2, int vindex, int vkind) +trait_t*trait_new(int type, multiname_t*name, int data1, int data2, constant_t*v) { trait_t*trait = malloc(sizeof(trait_t)); memset(trait, 0, sizeof(trait_t)); @@ -646,88 +232,116 @@ trait_t*trait_new(int type, multiname_t*name, int data1, int data2, int vindex, trait->name = name; trait->data1 = data1; trait->data2 = data2; - trait->vindex = vindex; - trait->vkind = vkind; + trait->value = v; + return trait; +} +trait_t*trait_new_member(multiname_t*type, multiname_t*name,constant_t*v) +{ + int kind = TRAIT_SLOT; + trait_t*trait = malloc(sizeof(trait_t)); + memset(trait, 0, sizeof(trait_t)); + trait->kind = kind&0x0f; + trait->attributes = kind&0xf0; + trait->name = name; + trait->type_name = type; + return trait; +} +trait_t*trait_new_method(multiname_t*name, abc_method_t*m) +{ + int type = TRAIT_METHOD; + trait_t*trait = malloc(sizeof(trait_t)); + memset(trait, 0, sizeof(trait_t)); + trait->kind = type&0x0f; + trait->attributes = type&0xf0; + trait->name = name; + trait->method = m; return trait; } -abc_method_body_t* abc_class_method(abc_class_t*cls, char*returntype, char*name, int num_params, ...) +abc_method_body_t* abc_class_method(abc_class_t*cls, multiname_t*returntype, char*name, int num_params, ...) { - abc_file_t*pool = cls->pool; + abc_file_t*file = cls->file; va_list va; va_start(va, num_params); - abc_method_body_t* c = add_method(cls->pool, cls, returntype, num_params, va); + abc_method_body_t* c = add_method(cls->file, cls, returntype, num_params, va); va_end(va); - list_append(cls->traits, trait_new(TRAIT_METHOD, multiname_fromstring(name), 0, c->method->index, 0, 0)); + list_append(cls->traits, trait_new_method(multiname_fromstring(name), c->method)); return c; } -void abc_AddSlot(abc_class_t*cls, char*name, int slot, char*multiname) +void abc_AddSlot(abc_class_t*cls, char*name, int slot, char*type) { - abc_file_t*pool = cls->pool; - multiname_t*m = multiname_fromstring(multiname); - list_append(cls->traits, trait_new(TRAIT_SLOT, m, slot, 0, 0, 0)); + abc_file_t*file = cls->file; + multiname_t*m_name = multiname_fromstring(name); + multiname_t*m_type = multiname_fromstring(type); + trait_t*t = trait_new_member(m_type, m_name, 0); + t->slot_id = list_length(cls->traits); + list_append(cls->traits, t); } void abc_method_body_addClassTrait(abc_method_body_t*code, char*multiname, int slotid, abc_class_t*cls) { - abc_file_t*pool = code->pool; + abc_file_t*file = code->file; multiname_t*m = multiname_fromstring(multiname); - trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0, 0); + trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0); trait->cls = cls; list_append(code->traits, trait); } /* notice: traits of a method (body) belonging to an init script and traits of the init script are *not* the same thing */ -void abc_initscript_addClassTrait(abc_script_t*script, char*multiname, int slotid, abc_class_t*cls) +int abc_initscript_addClassTrait(abc_script_t*script, multiname_t*multiname, abc_class_t*cls) { - abc_file_t*pool = script->pool; - multiname_t*m = multiname_fromstring(multiname); - trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0, 0); + abc_file_t*file = script->file; + multiname_t*m = multiname_clone(multiname); + int slotid = list_length(script->traits)+1; + trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0); trait->cls = cls; list_append(script->traits, trait); + return slotid; } -abc_script_t* abc_initscript(abc_file_t*pool, char*returntype, int num_params, ...) +abc_script_t* abc_initscript(abc_file_t*file, multiname_t*returntype, int num_params, ...) { va_list va; va_start(va, num_params); - abc_method_body_t* c = add_method(pool, 0, returntype, num_params, va); + abc_method_body_t* c = add_method(file, 0, returntype, num_params, va); abc_script_t* s = malloc(sizeof(abc_script_t)); s->method = c->method; s->traits = list_new(); - s->pool = pool; - array_append(pool->scripts, 0, s); + s->file = file; + array_append(file->scripts, NO_KEY, s); va_end(va); return s; } -static void dump_traits(FILE*fo, const char*prefix, trait_list_t*traits, abc_file_t*file); +static void traits_dump(FILE*fo, const char*prefix, trait_list_t*traits, abc_file_t*file); static void dump_method(FILE*fo, const char*prefix, const char*type, const char*name, abc_method_t*m, abc_file_t*file) { - const char*return_type = ""; + char*return_type = 0; if(m->return_type) - return_type = multiname_to_string(m->return_type); - - char*paramstr = params_to_string(m->parameters); - - fprintf(fo, "%s%s %s %s=%s %s\n", prefix, type, return_type, name, m->name, paramstr); + return_type = multiname_tostring(m->return_type); + else + return_type = strdup("void"); + char*paramstr = params_tostring(m->parameters); + fprintf(fo, "%s%s %s %s=%s %s (%d params)\n", prefix, type, return_type, name, m->name, paramstr, list_length(m->parameters)); + free(paramstr);paramstr=0; + free(return_type);return_type=0; abc_method_body_t*c = m->body; if(!c) { return; } - fprintf(fo, "%s[%d %d %d %d %d]\n", prefix, c->max_stack, c->local_count, c->init_scope_depth, c->max_scope_depth, c->exception_count); + fprintf(fo, "%s[stack:%d locals:%d scope:%d-%d flags:%02x]\n", prefix, c->old.max_stack, c->old.local_count, c->old.init_scope_depth, c->old.max_scope_depth, c->method->flags); char prefix2[80]; sprintf(prefix2, "%s ", prefix); if(c->traits) - dump_traits(fo, prefix, c->traits, file); + traits_dump(fo, prefix, c->traits, file); fprintf(fo, "%s{\n", prefix); - code_dump(c->code, file, prefix2, fo); + code_dump(c->code, c->exceptions, file, prefix2, fo); fprintf(fo, "%s}\n\n", prefix); } @@ -741,11 +355,20 @@ static void traits_free(trait_list_t*traits) if(t->trait->kind == TRAIT_SLOT || t->trait->kind == TRAIT_CONST) { multiname_destroy(t->trait->type_name); } + if(t->trait->value) { + constant_free(t->trait->value);t->trait->value = 0; + } free(t->trait);t->trait = 0; t = t->next; } list_free(traits); } + +static char trait_is_method(trait_t*trait) +{ + return (trait->kind == TRAIT_METHOD || trait->kind == TRAIT_GETTER || + trait->kind == TRAIT_SETTER || trait->kind == TRAIT_FUNCTION); +} static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file) { @@ -757,14 +380,13 @@ static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file) } for(t=0;tname = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag))); // always a QName (ns,name) const char*name = 0; - DEBUG name = multiname_to_string(trait->name); + DEBUG name = multiname_tostring(trait->name); U8 kind = swf_GetU8(tag); U8 attributes = kind&0xf0; kind&=0x0f; @@ -789,11 +411,12 @@ static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file) */ trait->slot_id = swf_GetU30(tag); trait->type_name = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag))); - trait->vindex = swf_GetU30(tag); - if(trait->vindex) { - trait->vkind = swf_GetU8(tag); + int vindex = swf_GetU30(tag); + if(vindex) { + int vkind = swf_GetU8(tag); + trait->value = constant_fromindex(pool, vindex, vkind); } - DEBUG printf(" slot %s %d %s (vindex=%d)\n", name, trait->slot_id, trait->type_name->name, trait->vindex); + DEBUG printf(" slot %s %d %s (%s)\n", name, trait->slot_id, trait->type_name->name, constant_tostring(trait->value)); } else { fprintf(stderr, "Can't parse trait type %d\n", kind); } @@ -864,9 +487,10 @@ static void traits_write(pool_t*pool, TAG*tag, trait_list_t*traits) } if(trait->kind == TRAIT_SLOT || trait->kind == TRAIT_CONST) { - swf_SetU30(tag, trait->vindex); - if(trait->vindex) { - swf_SetU8(tag, trait->vkind); + int vindex = constant_get_index(pool, trait->value); + swf_SetU30(tag, vindex); + if(vindex) { + swf_SetU8(tag, trait->value->type); } } if(trait->attributes&0x40) { @@ -878,12 +502,12 @@ static void traits_write(pool_t*pool, TAG*tag, trait_list_t*traits) } -static void dump_traits(FILE*fo, const char*prefix, trait_list_t*traits, abc_file_t*file) +static void traits_dump(FILE*fo, const char*prefix, trait_list_t*traits, abc_file_t*file) { int t; while(traits) { trait_t*trait = traits->trait; - char*name = multiname_to_string(trait->name); + char*name = multiname_tostring(trait->name); U8 kind = trait->kind; U8 attributes = trait->attributes; if(kind == TRAIT_METHOD) { @@ -901,14 +525,18 @@ static void dump_traits(FILE*fo, const char*prefix, trait_list_t*traits, abc_fil } else if(kind == TRAIT_CLASS) { // class abc_class_t*cls = trait->cls; if(!cls) { - fprintf(fo, "%sslot %d: class %s=class%d\n", prefix, trait->slot_id, name); + fprintf(fo, "%sslot %d: class %s=00000000\n", prefix, trait->slot_id, name); } else { fprintf(fo, "%sslot %d: class %s=%s\n", prefix, trait->slot_id, name, cls->classname->name); } } else if(kind == TRAIT_SLOT || kind == TRAIT_CONST) { // slot, const int slot_id = trait->slot_id; - char*type_name = multiname_to_string(trait->type_name); - fprintf(fo, "%sslot %s %d %s (vindex=%d)\n", prefix, name, trait->slot_id, type_name, trait->vindex); + char*type_name = multiname_tostring(trait->type_name); + char*value = constant_tostring(trait->value); + fprintf(fo, "%sslot %d: %s%s %s %s %s\n", prefix, trait->slot_id, + kind==TRAIT_CONST?"const ":"", type_name, name, + value?"=":"", value); + if(value) free(value); free(type_name); } else { fprintf(fo, "%s can't dump trait type %d\n", prefix, kind); @@ -922,10 +550,11 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix) { abc_file_t* file = (abc_file_t*)code; - if(file->name) + if(file->name) { fprintf(fo, "%s#\n", prefix); fprintf(fo, "%s#name: %s\n", prefix, file->name); fprintf(fo, "%s#\n", prefix); + } int t; for(t=0;tmetadata->num;t++) { @@ -949,23 +578,23 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix) if(cls->flags&2) fprintf(fo, "final "); if(cls->flags&4) fprintf(fo, "interface "); if(cls->flags&8) { - char*s = namespace_to_string(cls->protectedNS); + char*s = namespace_tostring(cls->protectedNS); fprintf(fo, "protectedNS(%s) ", s); free(s); } - char*classname = multiname_to_string(cls->classname); + char*classname = multiname_tostring(cls->classname); fprintf(fo, "class %s", classname); free(classname); if(cls->superclass) { - char*supername = multiname_to_string(cls->superclass); + char*supername = multiname_tostring(cls->superclass); fprintf(fo, " extends %s", supername); free(supername); multiname_list_t*ilist = cls->interfaces; if(ilist) fprintf(fo, " implements"); while(ilist) { - char*s = multiname_to_string(ilist->multiname); + char*s = multiname_tostring(ilist->multiname); fprintf(fo, " %s", s); free(s); ilist = ilist->next; @@ -978,13 +607,13 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix) if(cls->static_constructor) dump_method(fo, prefix2,"staticconstructor", "", cls->static_constructor, file); - dump_traits(fo, prefix2, cls->static_constructor_traits, file); + traits_dump(fo, prefix2, cls->static_constructor_traits, file); - char*n = multiname_to_string(cls->classname); + char*n = multiname_tostring(cls->classname); if(cls->constructor) dump_method(fo, prefix2, "constructor", n, cls->constructor, file); free(n); - dump_traits(fo, prefix2,cls->traits, file); + traits_dump(fo, prefix2,cls->traits, file); fprintf(fo, "%s}\n", prefix); } fprintf(fo, "%s\n", prefix); @@ -992,7 +621,7 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix) for(t=0;tscripts->num;t++) { abc_script_t*s = (abc_script_t*)array_getvalue(file->scripts, t); dump_method(fo, prefix,"initmethod", "init", s->method, file); - dump_traits(fo, prefix, s->traits, file); + traits_dump(fo, prefix, s->traits, file); } return file; } @@ -1008,7 +637,7 @@ void* swf_ReadABC(TAG*tag) U32 abcflags = swf_GetU32(tag); DEBUG printf("flags=%08x\n", abcflags); char*name= swf_GetString(tag); - file->name = name?strdup(name):0; + file->name = (name&&name[0])?strdup(name):0; } U32 version = swf_GetU32(tag); if(version!=0x002e0010) { @@ -1023,13 +652,17 @@ void* swf_ReadABC(TAG*tag) NEW(abc_method_t,m); int param_count = swf_GetU30(tag); int return_type_index = swf_GetU30(tag); - m->return_type = multiname_clone(pool_lookup_multiname(pool, return_type_index)); + if(return_type_index) + m->return_type = multiname_clone(pool_lookup_multiname(pool, return_type_index)); + else + m->return_type = 0; int s; for(s=0;sparameters, param); } @@ -1041,15 +674,18 @@ void* swf_ReadABC(TAG*tag) m->flags = swf_GetU8(tag); - DEBUG printf("method %d) %s flags=%02x\n", t, params_to_string(m->parameters), m->flags); + DEBUG printf("method %d) %s flags=%02x\n", t, params_tostring(m->parameters), m->flags); if(m->flags&0x08) { - /* optional parameters */ + /* TODO optional parameters */ + m->optional_parameters = list_new(); int num = swf_GetU30(tag); int s; for(s=0;soptional_parameters, c); } } if(m->flags&0x80) { @@ -1060,7 +696,7 @@ void* swf_ReadABC(TAG*tag) l = l->next; } } - array_append(file->methods, m->name, m); + array_append(file->methods, NO_KEY, m); } parse_metadata(tag, file, pool); @@ -1074,12 +710,11 @@ void* swf_ReadABC(TAG*tag) memset(cls, 0, sizeof(abc_class_t)); DEBUG printf("class %d\n", t); - int name_index = swf_GetU30(tag); //classname - char*name = pool_lookup_string(pool, name_index); - - array_append(file->classes, name, cls); - + swf_GetU30(tag); //classname swf_GetU30(tag); //supername + + array_append(file->classes, NO_KEY, cls); + cls->flags = swf_GetU8(tag); if(cls->flags&8) swf_GetU30(tag); //protectedNS @@ -1120,33 +755,44 @@ void* swf_ReadABC(TAG*tag) abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, methodnr); abc_method_body_t*c = malloc(sizeof(abc_method_body_t)); memset(c, 0, sizeof(abc_method_body_t)); - c->max_stack = swf_GetU30(tag); - c->local_count = swf_GetU30(tag); - c->init_scope_depth = swf_GetU30(tag); - c->max_scope_depth = swf_GetU30(tag); + c->old.max_stack = swf_GetU30(tag); + c->old.local_count = swf_GetU30(tag); + c->old.init_scope_depth = swf_GetU30(tag); + c->old.max_scope_depth = swf_GetU30(tag); + + c->init_scope_depth = c->old.init_scope_depth; int code_length = swf_GetU30(tag); c->method = m; m->body = c; int pos = tag->pos + code_length; - c->code = code_parse(tag, code_length, file, pool); + codelookup_t*codelookup = 0; + c->code = code_parse(tag, code_length, file, pool, &codelookup); tag->pos = pos; int exception_count = swf_GetU30(tag); int s; + c->exceptions = list_new(); for(s=0;sfrom = code_atposition(codelookup, swf_GetU30(tag)); + e->to = code_atposition(codelookup, swf_GetU30(tag)); + e->target = code_atposition(codelookup, swf_GetU30(tag)); + + e->exc_type = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag))); + e->var_name = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag))); + //e->var_name = pool_lookup_string(pool, swf_GetU30(tag)); + //if(e->var_name) e->var_name = strdup(e->var_name); + list_append(c->exceptions, e); } + codelookup_free(codelookup); c->traits = traits_parse(tag, pool, file); DEBUG printf("method_body %d) (method %d), %d bytes of code", t, methodnr, code_length); - array_append(file->method_bodies, m->name, c); + array_append(file->method_bodies, NO_KEY, c); } if(tag->len - tag->pos) { fprintf(stderr, "%d unparsed bytes remaining in ABC block\n", tag->len - tag->pos); @@ -1192,35 +838,13 @@ void* swf_ReadABC(TAG*tag) memset(s, 0, sizeof(abc_script_t)); s->method = m; s->traits = traits_parse(tag, pool, file); - array_append(file->scripts, "script", s); - if(!s->traits) { - fprintf(stderr, "Can't parse script traits\n"); - return 0; - } + array_append(file->scripts, NO_KEY, s); } pool_destroy(pool); return file; } -static void code_write(TAG*tag, abc_code_t*code, pool_t*pool, abc_file_t*file) -{ - int len = 0; - abc_code_t*c = code; - while(c) { - len += opcode_write(0, c, pool, file); - c = c->next; - } - swf_SetU30(tag, len); - int pos = tag->len; - c = code; - while(c) { - opcode_write(tag, c, pool, file); - c = c->next; - } - assert(tag->len - pos == len); -} - void swf_WriteABC(TAG*abctag, void*code) { abc_file_t*file = (abc_file_t*)code; @@ -1229,9 +853,38 @@ void swf_WriteABC(TAG*abctag, void*code) TAG*tmp = swf_InsertTag(0,0); TAG*tag = tmp; int t; + + char need_null_method=0; + for(t=0;tclasses->num;t++) { + abc_class_t*c = (abc_class_t*)array_getvalue(file->classes, t); + if(!c->constructor || !c->static_constructor) { + need_null_method=1; + break; + } + } + + abc_method_t*nullmethod = 0; + if(need_null_method) { + NEW(abc_method_t,m); + nullmethod = m; + /*TODO: might be more efficient to have this at the beginning */ + array_append(file->methods, NO_KEY, nullmethod); + + NEW(abc_method_body_t,body); + body->method = m; + m->body = body; + __ returnvoid(body); + array_append(file->method_bodies, NO_KEY, body); + } + for(t=0;tclasses->num;t++) { + abc_class_t*c = (abc_class_t*)array_getvalue(file->classes, t); + if(!c->constructor) + c->constructor = nullmethod; + if(!c->static_constructor) + c->static_constructor = nullmethod; + } swf_SetU30(tag, file->methods->num); - /* enumerate classes, methods and method bodies */ for(t=0;tmethods->num;t++) { abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, t); @@ -1245,7 +898,48 @@ void swf_WriteABC(TAG*abctag, void*code) abc_method_body_t*m = (abc_method_body_t*)array_getvalue(file->method_bodies, t); m->index = t; } - + + /* generate code statistics */ + for(t=0;tmethod_bodies->num;t++) { + abc_method_body_t*m = (abc_method_body_t*)array_getvalue(file->method_bodies, t); + m->stats = code_get_statistics(m->code, m->exceptions); + } + + /* level init scope depths: The init scope depth of a method is + always as least as high as the init scope depth of it's surrounding + class. + A method has it's own init_scope_depth if it's an init method + (then its init scope depth is zero), or if it's used as a closure. + + Not sure yet what to do with methods which are used at different + locations- e.g. the nullmethod is used all over the place. + + Also, I have the strong suspicion that flash player uses only + the difference between max_scope_stack and init_scope_stack, anyway. + */ + for(t=0;tclasses->num;t++) { + abc_class_t*c = (abc_class_t*)array_getvalue(file->classes, t); + trait_list_t*traits = c->traits; + if(c->constructor && + c->constructor->body->init_scope_depth < c->init_scope_depth) { + c->constructor->body->init_scope_depth = c->init_scope_depth; + } + if(c->static_constructor && + c->static_constructor->body->init_scope_depth < c->init_scope_depth) { + c->static_constructor->body->init_scope_depth = c->init_scope_depth; + } + while(traits) { + trait_t*trait = traits->trait; + if(trait_is_method(trait) && trait->method->body) { + abc_method_body_t*body = trait->method->body; + if(body->init_scope_depth < c->init_scope_depth) { + body->init_scope_depth = c->init_scope_depth; + } + } + traits = traits->next; + } + } + for(t=0;tmethods->num;t++) { abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, t); int n = 0; @@ -1267,7 +961,23 @@ void swf_WriteABC(TAG*abctag, void*code) swf_SetU30(tag, 0); } - swf_SetU8(tag, 0); //flags + U8 flags = m->flags&(METHOD_NEED_REST|METHOD_NEED_ARGUMENTS); + if(m->optional_parameters) + flags |= METHOD_HAS_OPTIONAL; + if(m->body) { + flags |= m->body->stats->flags; + } + + swf_SetU8(tag, flags); + if(flags&METHOD_HAS_OPTIONAL) { + swf_SetU30(tag, list_length(m->optional_parameters)); + constant_list_t*l = m->optional_parameters; + while(l) { + swf_SetU30(tag, constant_get_index(pool, l->constant)); + swf_SetU8(tag, l->constant->type); + l = l->next; + } + } } /* write metadata */ @@ -1310,19 +1020,19 @@ void swf_WriteABC(TAG*abctag, void*code) } if(!c->constructor) { - fprintf(stderr, "Error: Class %s has no constructor\n", c->classname); - return; - } - swf_SetU30(tag, c->constructor->index); + swf_SetU30(tag, nullmethod->index); + } else { + swf_SetU30(tag, c->constructor->index); + } traits_write(pool, tag, c->traits); } for(t=0;tclasses->num;t++) { abc_class_t*c = (abc_class_t*)array_getvalue(file->classes, t); if(!c->static_constructor) { - fprintf(stderr, "Error: Class %s has no static constructor\n", c->classname); - return; - } - swf_SetU30(tag, c->static_constructor->index); + swf_SetU30(tag, nullmethod->index); + } else { + swf_SetU30(tag, c->static_constructor->index); + } traits_write(pool, tag, c->static_constructor_traits); } @@ -1338,23 +1048,51 @@ void swf_WriteABC(TAG*abctag, void*code) abc_method_body_t*c = (abc_method_body_t*)array_getvalue(file->method_bodies, t); abc_method_t*m = c->method; swf_SetU30(tag, m->index); - swf_SetU30(tag, c->max_stack); - swf_SetU30(tag, c->local_count); + + //swf_SetU30(tag, c->old.max_stack); + //swf_SetU30(tag, c->old.local_count); + //swf_SetU30(tag, c->old.init_scope_depth); + //swf_SetU30(tag, c->old.max_scope_depth); + + swf_SetU30(tag, c->stats->max_stack); + if(list_length(c->method->parameters)+1 <= c->stats->local_count) + swf_SetU30(tag, c->stats->local_count); + else + swf_SetU30(tag, list_length(c->method->parameters)+1); swf_SetU30(tag, c->init_scope_depth); - swf_SetU30(tag, c->max_scope_depth); + swf_SetU30(tag, c->stats->max_scope_depth+ + c->init_scope_depth); code_write(tag, c->code, pool, file); - swf_SetU30(tag, c->exception_count); + swf_SetU30(tag, list_length(c->exceptions)); + exception_list_t*l = c->exceptions; + while(l) { + // warning: assumes "pos" in each code_t is up-to-date + swf_SetU30(tag, l->exception->from->pos); + swf_SetU30(tag, l->exception->to->pos); + swf_SetU30(tag, l->exception->target->pos); + swf_SetU30(tag, pool_register_multiname(pool, l->exception->exc_type)); + swf_SetU30(tag, pool_register_multiname(pool, l->exception->var_name)); + l = l->next; + } + traits_write(pool, tag, c->traits); } + + /* free temporary codestat data again. Notice: If we were to write this + file multiple times, this can also be shifted to abc_file_free() */ + for(t=0;tmethod_bodies->num;t++) { + abc_method_body_t*m = (abc_method_body_t*)array_getvalue(file->method_bodies, t); + codestats_free(m->stats);m->stats=0; + } // --- start to write real tag -- tag = abctag; if(tag->id == ST_DOABC) { - swf_SetU32(tag, 1); // flags + swf_SetU32(tag, file->flags); // flags swf_SetString(tag, file->name); } @@ -1369,10 +1107,8 @@ void swf_WriteABC(TAG*abctag, void*code) pool_destroy(pool); } -void swf_FreeABC(void*code) +void abc_file_free(abc_file_t*file) { - abc_file_t*file= (abc_file_t*)code; - int t; for(t=0;tmetadata->num;t++) { array_t*items = (array_t*)array_getvalue(file->metadata, t); @@ -1393,6 +1129,13 @@ void swf_FreeABC(void*code) param = param->next; } list_free(m->parameters);m->parameters=0; + + constant_list_t*opt = m->optional_parameters; + while(opt) { + constant_free(opt->constant);opt->constant=0; + opt = opt->next; + } + list_free(m->optional_parameters);m->optional_parameters=0; if(m->name) { free((void*)m->name);m->name=0; @@ -1441,6 +1184,18 @@ void swf_FreeABC(void*code) abc_method_body_t*body = (abc_method_body_t*)array_getvalue(file->method_bodies, t); code_free(body->code);body->code=0; traits_free(body->traits);body->traits=0; + + exception_list_t*ee = body->exceptions; + while(ee) { + exception_t*e=ee->exception;ee->exception=0; + e->from = e->to = e->target = 0; + multiname_destroy(e->exc_type);e->exc_type=0; + multiname_destroy(e->var_name);e->var_name=0; + free(e); + ee=ee->next; + } + list_free(body->exceptions);body->exceptions=0; + free(body); } array_free(file->method_bodies); @@ -1452,24 +1207,12 @@ void swf_FreeABC(void*code) free(file); } -abc_code_t* add_opcode(abc_code_t*atag, U8 op) +void swf_FreeABC(void*code) { - abc_code_t*tmp = (abc_code_t*)malloc(sizeof(abc_code_t)); - tmp->opcode = op; - tmp->next = 0; - if(atag) { - tmp->prev = atag; - atag->next = tmp; - tmp->parent = atag->parent; - } else { - tmp->prev = 0; - tmp->parent = tmp; - } - return tmp; + abc_file_t*file= (abc_file_t*)code; + abc_file_free(file); } -#include "abc_ops.c" - void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) { int num_frames = 0; @@ -1497,20 +1240,20 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) swf_SetString(tag, "rfx.MainTimeline"); c = abc_class_staticconstructor(cls, 0, 0); - c->max_stack = 1; - c->local_count = 1; - c->init_scope_depth = 9; - c->max_scope_depth = 10; + c->old.max_stack = 1; + c->old.local_count = 1; + c->old.init_scope_depth = 9; + c->old.max_scope_depth = 10; __ getlocal_0(c); __ pushscope(c); __ returnvoid(c); c = abc_class_constructor(cls, 0, 0); - c->max_stack = 3; - c->local_count = 1; - c->init_scope_depth = 10; - c->max_scope_depth = 11; + c->old.max_stack = 3; + c->old.local_count = 1; + c->old.init_scope_depth = 10; + c->old.max_scope_depth = 11; debugfile(c, "constructor.as"); @@ -1543,10 +1286,10 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) __ callpropvoid(c,"[package]::addFrameScript",2); f = abc_class_method(cls, 0, framename, 0); - f->max_stack = 3; - f->local_count = 1; - f->init_scope_depth = 10; - f->max_scope_depth = 11; + f->old.max_stack = 3; + f->old.local_count = 1; + f->old.init_scope_depth = 10; + f->old.max_scope_depth = 11; __ debugfile(f, "framescript.as"); __ debugline(f, 1); __ getlocal_0(f); @@ -1570,11 +1313,11 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) needs_framescript = 1; abc_method_body_t*h = - abc_class_method(cls, "::void", functionname, 1, "flash.events::MouseEvent"); - h->max_stack = 6; - h->local_count = 2; - h->init_scope_depth = 10; - h->max_scope_depth = 11; + abc_class_method(cls, 0, functionname, 1, "flash.events::MouseEvent"); + h->old.max_stack = 6; + h->old.local_count = 2; + h->old.init_scope_depth = 10; + h->old.max_scope_depth = 11; __ getlocal_0(h); __ pushscope(h); @@ -1652,10 +1395,10 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) abc_script_t*s = abc_initscript(file, 0, 0); c = s->method->body; - c->max_stack = 2; - c->local_count = 1; - c->init_scope_depth = 1; - c->max_scope_depth = 9; + c->old.max_stack = 2; + c->old.local_count = 1; + c->old.init_scope_depth = 1; + c->old.max_scope_depth = 9; __ getlocal_0(c); __ pushscope(c); @@ -1687,7 +1430,9 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) __ returnvoid(c); //abc_method_body_addClassTrait(c, "rfx:MainTimeline", 1, cls); - abc_initscript_addClassTrait(s, "rfx::MainTimeline", 1, cls); + multiname_t*classname = multiname_fromstring("rfx::MainTimeline"); + abc_initscript_addClassTrait(s, classname, cls); + multiname_destroy(classname); swf_WriteABC(abctag, file); }