X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fabc.c;h=abdc2585bc05b86f6104fc7d34f11f708233ea9e;hb=b3344fdaf6b8e8c4e40b951b8180c7d57677be5c;hp=2fb0cbb083ddae475e194e66b6999526510e5875;hpb=9357273f55ebb7fd2e8bb265ab38ae607d8bf91f;p=swftools.git diff --git a/lib/as3/abc.c b/lib/as3/abc.c index 2fb0cbb..abdc258 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,385 +37,8 @@ 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); - -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;tnext; - memset(code, 0, sizeof(code)); - free(code); - code = next; - } -} - -abc_code_t*parse_code(TAG*tag, int len, abc_file_t*file, pool_t*pool) -{ - abc_code_t*head=0; - abc_code_t*code=0; - int end=tag->pos+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 = array_getvalue(pool->multinames, 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 = (void*)array_getkey(pool->strings, 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] = (void*)array_getkey(pool->strings, 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 int dump_code(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; - fprintf(fo, "[classinfo %s]", cls->classname->name); - } 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; -} - +/* TODO: switch to a datastructure with just values */ +#define NO_KEY "" static char* params_to_string(multiname_list_t*list) { @@ -487,7 +92,7 @@ static void parse_metadata(TAG*tag, abc_file_t*file, pool_t*pool) DEBUG printf("%d metadata\n"); for(t=0;tstrings, swf_GetU30(tag)); + const char*entry_name = pool_lookup_string(pool, swf_GetU30(tag)); int num = swf_GetU30(tag); int s; DEBUG printf(" %s\n", entry_name); @@ -495,10 +100,10 @@ static void parse_metadata(TAG*tag, abc_file_t*file, pool_t*pool) for(s=0;sstrings, i1):""; - const char*value = i2?array_getkey(pool->strings, i2):""; + char*key = i1?pool_lookup_string(pool, i1):""; + char*value = i2?pool_lookup_string(pool, i2):""; DEBUG printf(" %s=%s\n", key, value); - array_append(items, key, value); + array_append(items, key, strdup(value)); } array_append(file->metadata, entry_name, items); } @@ -517,6 +122,7 @@ abc_file_t*abc_file_new() abc_file_t*f = malloc(sizeof(abc_file_t)); memset(f, 0, sizeof(abc_file_t)); f->metadata = array_new(); + f->methods = array_new(); f->classes = array_new(); f->scripts = array_new(); @@ -525,80 +131,29 @@ abc_file_t*abc_file_new() return f; } -static namespace_t* namespace_new(U8 access, const char*name) -{ - namespace_t*ns = malloc(sizeof(namespace_t)); - memset(ns, 0, sizeof(namespace_t)); - - if(access==0) { // autodetect access - char*n = strdup(name); - if(n[0] == '[') { - char*bracket = strchr(n, ']'); - if(bracket) { - *bracket = 0; - char*a = n+1; - name += (bracket-n)+1; - if(!strcmp(a, "")) access=0x16; - else if(!strcmp(a, "package")) access=0x16; - else if(!strcmp(a, "packageinternal")) access=0x17; - else if(!strcmp(a, "protected")) access=0x18; - else if(!strcmp(a, "explicit")) access=0x19; - else if(!strcmp(a, "staticprotected")) access=0x1a; - else if(!strcmp(a, "private")) access=0x05; - else { - fprintf(stderr, "Undefined access level: [%s]\n", a); - return 0; - } - } - } else { - access = 0x16; - } - free(n); - } - ns->access = access; - ns->name = strdup(name); - return ns; -} -namespace_t* namespace(abc_file_t*file, const char*name) { - return namespace_new(0x08, name); -} -namespace_t* abc_packagenamespace(abc_file_t*file, const char*name) { - return namespace_new(0x16 , name); -} -namespace_t* abc_packageinternalnamespace(abc_file_t*file, const char*name) { - return namespace_new(0x17, name); -} -namespace_t* abc_protectednamespace(abc_file_t*file, const char*name) { - return namespace_new(0x18, name); -} -namespace_t* abc_explicitnamespace(abc_file_t*file, const char*name) { - return namespace_new(0x19, name); -} -namespace_t* abc_staticprotectednamespace(abc_file_t*file, const char*name) { - return namespace_new(0x1a, name); -} -namespace_t* abc_privatenamespace(abc_file_t*file, const char*name) { - return namespace_new(0x05, name); -} - #define CLASS_SEALED 1 #define CLASS_FINAL 2 #define CLASS_INTERFACE 4 #define CLASS_PROTECTED_NS 8 -abc_class_t* abc_class_new(abc_file_t*pool, char*classname, char*superclass) { - abc_class_t* c = malloc(sizeof(abc_class_t)); - memset(c, 0, sizeof(abc_class_t)); - c->index = array_append(pool->classes, classname, c); +abc_class_t* abc_class_new(abc_file_t*pool, multiname_t*classname, multiname_t*superclass) { + + NEW(abc_class_t,c); + array_append(pool->classes, NO_KEY, c); + c->pool = pool; - c->classname = multiname_fromstring(classname); - c->superclass = superclass?multiname_fromstring(superclass):0; + c->classname = classname; + c->superclass = superclass; c->flags = 0; c->constructor = 0; c->static_constructor = 0; c->traits = list_new(); return c; } +abc_class_t* abc_class_new2(abc_file_t*pool, char*classname, char*superclass) +{ + return abc_class_new(pool, multiname_fromstring(classname), multiname_fromstring(superclass)); +} void abc_class_sealed(abc_class_t*c) { @@ -614,23 +169,27 @@ void abc_class_interface(abc_class_t*c) } void abc_class_protectedNS(abc_class_t*c, char*namespace) { - c->protectedNS = namespace; + c->protectedNS = namespace_new_protected(namespace); c->flags |= CLASS_PROTECTED_NS; } +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) { /* 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); + NEW(abc_method_body_t,c); + array_append(pool->method_bodies, NO_KEY, c); c->pool = pool; c->traits = list_new(); c->code = 0; /* construct method object */ NEW(abc_method_t,m); - m->index = array_append(pool->methods, 0, m); + array_append(pool->methods, NO_KEY, m); + if(returntype && strcmp(returntype, "void")) { m->return_type = multiname_fromstring(returntype); } else { @@ -682,6 +241,17 @@ trait_t*trait_new(int type, multiname_t*name, int data1, int data2, int vindex, trait->vkind = vkind; 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, ...) { @@ -690,7 +260,7 @@ abc_method_body_t* abc_class_method(abc_class_t*cls, char*returntype, char*name, va_start(va, num_params); abc_method_body_t* c = add_method(cls->pool, 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; } @@ -730,7 +300,7 @@ abc_script_t* abc_initscript(abc_file_t*pool, char*returntype, int num_params, . s->method = c->method; s->traits = list_new(); s->pool = pool; - array_append(pool->scripts, 0, s); + array_append(pool->scripts, NO_KEY, s); va_end(va); return s; } @@ -739,7 +309,7 @@ static void dump_traits(FILE*fo, const char*prefix, trait_list_t*traits, abc_fil 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 = ""; + const char*return_type = "void"; if(m->return_type) return_type = multiname_to_string(m->return_type); @@ -759,7 +329,7 @@ static void dump_method(FILE*fo, const char*prefix, const char*type, const char* if(c->traits) dump_traits(fo, prefix, c->traits, file); fprintf(fo, "%s{\n", prefix); - dump_code(c->code, file, prefix2, fo); + code_dump(c->code, file, prefix2, fo); fprintf(fo, "%s}\n\n", prefix); } @@ -767,6 +337,12 @@ static void traits_free(trait_list_t*traits) { trait_list_t*t = traits; while(t) { + if(t->trait->name) { + multiname_destroy(t->trait->name);t->trait->name = 0; + } + if(t->trait->kind == TRAIT_SLOT || t->trait->kind == TRAIT_CONST) { + multiname_destroy(t->trait->type_name); + } free(t->trait);t->trait = 0; t = t->next; } @@ -787,7 +363,7 @@ static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file) memset(trait, 0, sizeof(trait_t)); list_append(traits, trait); - trait->name = pool_lookup_multiname(pool, swf_GetU30(tag)); // always a QName (ns,name) + trait->name = 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); @@ -814,7 +390,7 @@ static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file) (in other words, slots are non-static, traits are static) */ trait->slot_id = swf_GetU30(tag); - trait->type_name = (multiname_t*)array_getvalue(pool->multinames, 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); @@ -948,10 +524,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++) { @@ -975,12 +552,18 @@ 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) { - fprintf(fo, "protectedNS<%s> ", cls->protectedNS); + char*s = namespace_to_string(cls->protectedNS); + fprintf(fo, "protectedNS(%s) ", s); + free(s); } - fprintf(fo, "class %s", cls->classname->name); + char*classname = multiname_to_string(cls->classname); + fprintf(fo, "class %s", classname); + free(classname); if(cls->superclass) { - fprintf(fo, " extends %s", cls->superclass->name); + char*supername = multiname_to_string(cls->superclass); + fprintf(fo, " extends %s", supername); + free(supername); multiname_list_t*ilist = cls->interfaces; if(ilist) fprintf(fo, " implements"); @@ -1043,20 +626,24 @@ 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 = 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); } int namenr = swf_GetU30(tag); - m->name = ""; if(namenr) - m->name = array_getkey(pool->strings, namenr); + m->name = strdup(pool_lookup_string(pool, namenr)); + else + m->name = strdup(""); m->flags = swf_GetU8(tag); @@ -1075,11 +662,11 @@ void* swf_ReadABC(TAG*tag) /* debug information- not used by avm2 */ multiname_list_t*l = m->parameters; while(l) { - char*name = (char*)array_getkey(pool->strings, swf_GetU30(tag)); + char*name = pool_lookup_string(pool, swf_GetU30(tag)); l = l->next; } } - array_append(file->methods, m->name, m); + array_append(file->methods, NO_KEY, m); } parse_metadata(tag, file, pool); @@ -1091,11 +678,13 @@ void* swf_ReadABC(TAG*tag) for(t=0;tclasses, 0, cls); DEBUG printf("class %d\n", t); 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 @@ -1104,7 +693,7 @@ void* swf_ReadABC(TAG*tag) cls->interfaces = 0; for(s=0;smultinames, interface_index); + multiname_t* m = multiname_clone(pool_lookup_multiname(pool, interface_index)); list_append(cls->interfaces, m); DEBUG printf(" class %d interface: %s\n", t, m->name); } @@ -1146,7 +735,7 @@ void* swf_ReadABC(TAG*tag) m->body = c; int pos = tag->pos + code_length; - c->code = parse_code(tag, code_length, file, pool); + c->code = code_parse(tag, code_length, file, pool); tag->pos = pos; int exception_count = swf_GetU30(tag); @@ -1162,7 +751,7 @@ void* swf_ReadABC(TAG*tag) DEBUG printf("method_body %d) (method %d), %d bytes of code", t, methodnr, code_length); - array_append(file->method_bodies, 0, 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); @@ -1175,13 +764,13 @@ void* swf_ReadABC(TAG*tag) int classname_index = swf_GetU30(tag); int superclass_index = swf_GetU30(tag); - cls->classname = (multiname_t*)array_getvalue(pool->multinames, classname_index); - cls->superclass = (multiname_t*)array_getvalue(pool->multinames, superclass_index); + cls->classname = multiname_clone(pool_lookup_multiname(pool, classname_index)); + cls->superclass = multiname_clone(pool_lookup_multiname(pool, superclass_index)); cls->flags = swf_GetU8(tag); const char*ns = ""; if(cls->flags&8) { int ns_index = swf_GetU30(tag); - cls->protectedNS = array_getkey(pool->namespaces, ns_index); + cls->protectedNS = namespace_clone(pool_lookup_namespace(pool, ns_index)); } int num_interfaces = swf_GetU30(tag); //interface count @@ -1208,35 +797,17 @@ 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, 0, s); + array_append(file->scripts, NO_KEY, s); if(!s->traits) { fprintf(stderr, "Can't parse script traits\n"); return 0; } } - //pool_destroy(pool); + 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; @@ -1245,9 +816,25 @@ 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; + } + } - swf_SetU30(tag, file->methods->num); + abc_method_t*nullmethod = 0; + if(need_null_method) { + nullmethod = malloc(sizeof(abc_method_t)); + memset(nullmethod, 0, sizeof(abc_method_t)); + /*TODO: might be more efficient to have this at the beginning */ + array_append(file->methods, NO_KEY, 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); @@ -1314,8 +901,7 @@ void swf_WriteABC(TAG*abctag, void*code) swf_SetU8(tag, c->flags); // flags if(c->flags&0x08) { - namespace_t*ns = abc_protectednamespace(file, c->protectedNS); - int ns_index = pool_register_namespace(pool, ns); + int ns_index = pool_register_namespace(pool, c->protectedNS); swf_SetU30(tag, ns_index); } @@ -1327,19 +913,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); } @@ -1366,32 +952,6 @@ void swf_WriteABC(TAG*abctag, void*code) traits_write(pool, tag, c->traits); } - - for(t=1;tmultinames->num;t++) { - multiname_t*m = (multiname_t*)array_getvalue(pool->multinames, t); - if(m->ns) { - pool_register_namespace(pool, m->ns); - } - if(m->namespace_set) { - pool_register_namespace_set(pool, m->namespace_set); - } - if(m->name) { - pool_register_string(pool, m->name); - } - } - for(t=1;tnamespace_sets->num;t++) { - namespace_set_t*set = (namespace_set_t*)array_getvalue(pool->namespace_sets, t); - namespace_list_t*i = set->namespaces; - while(i) { - pool_register_namespace(pool, i->namespace); - i = i->next; - } - } - for(t=1;tnamespaces->num;t++) { - namespace_t*ns= (namespace_t*)array_getvalue(pool->namespaces, t); - array_append_if_new(pool->strings, ns->name, 0); - } - // --- start to write real tag -- tag = abctag; @@ -1403,78 +963,9 @@ void swf_WriteABC(TAG*abctag, void*code) swf_SetU16(tag, 0x10); //version swf_SetU16(tag, 0x2e); - - swf_SetU30(tag, pool->ints->num>1?pool->ints->num:0); - for(t=1;tints->num;t++) { - S32 val = (ptroff_t)array_getvalue(pool->ints, t); - swf_SetS30(tag, val); - } - swf_SetU30(tag, pool->uints->num>1?pool->uints->num:0); - for(t=1;tuints->num;t++) { - swf_SetU30(tag, (ptroff_t)array_getvalue(pool->uints, t)); - } - swf_SetU30(tag, pool->floats->num>1?pool->floats->num:0); - for(t=1;tfloats->num;t++) { - array_getvalue(pool->floats, t); - swf_SetD64(tag, 0.0); // fixme - } - swf_SetU30(tag, pool->strings->num>1?pool->strings->num:0); - for(t=1;tstrings->num;t++) { - swf_SetU30String(tag, array_getkey(pool->strings, t)); - } - swf_SetU30(tag, pool->namespaces->num>1?pool->namespaces->num:0); - for(t=1;tnamespaces->num;t++) { - namespace_t*ns= (namespace_t*)array_getvalue(pool->namespaces, t); - const char*name = ns->name; - int i = pool_find_string(pool, name); - swf_SetU8(tag, ns->access); - swf_SetU30(tag, i); - } - swf_SetU30(tag, pool->namespace_sets->num>1?pool->namespace_sets->num:0); - for(t=1;tnamespace_sets->num;t++) { - namespace_set_t*set = (namespace_set_t*)array_getvalue(pool->namespace_sets, t); - namespace_list_t*i = set->namespaces; - int len = list_length(i); - swf_SetU30(tag, len); - while(i) { - int index = pool_find_namespace(pool, i->namespace); - swf_SetU30(tag, index); - i = i->next; - } - } - - swf_SetU30(tag, pool->multinames->num>1?pool->multinames->num:0); - for(t=1;tmultinames->num;t++) { - multiname_t*m = (multiname_t*)array_getvalue(pool->multinames, t); - swf_SetU8(tag, m->type); - - if(m->ns) { - assert(m->type==0x07 || m->type==0x0d); - int i = pool_find_namespace(pool, m->ns); - if(i<0) fprintf(stderr, "internal error: unregistered namespace %02x %s %s\n", m->ns->access, access2str(m->ns->access), m->ns->name); - swf_SetU30(tag, i); - } else { - assert(m->type!=0x07 && m->type!=0x0d); - } - if(m->name) { - assert(m->type==0x09 || m->type==0x0e || m->type==0x07 || m->type==0x0d || m->type==0x0f || m->type==0x10); - int i = pool_find_string(pool, m->name); - if(i<0) fprintf(stderr, "internal error: unregistered name\n"); - swf_SetU30(tag, i); - } else { - assert(m->type!=0x09 && m->type!=0x0e && m->type!=0x07 && m->type!=0x0d && m->type!=0x0f && m->type!=0x10); - } - if(m->namespace_set) { - assert(m->type==0x09 || m->type==0x0e || m->type==0x1c || m->type==0x1b); - int i = pool_find_namespace_set(pool, m->namespace_set); - if(i<0) fprintf(stderr, "internal error: unregistered namespace set\n"); - swf_SetU30(tag, i); - } else { - assert(m->type!=0x09 && m->type!=0x0e && m->type!=0x1c && m->type!=0x1b); - } - - } - + + pool_write(pool, tag); + swf_SetBlock(tag, tmp->data, tmp->len); swf_DeleteTag(0, tmp); @@ -1488,22 +979,56 @@ void swf_FreeABC(void*code) int t; for(t=0;tmetadata->num;t++) { array_t*items = (array_t*)array_getvalue(file->metadata, t); + int s; + for(s=0;snum;s++) { + free(array_getvalue(items, s)); + } array_free(items); } array_free(file->metadata); for(t=0;tmethods->num;t++) { abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, t); + + multiname_list_t*param = m->parameters; + while(param) { + multiname_destroy(param->multiname);param->multiname=0; + param = param->next; + } list_free(m->parameters);m->parameters=0; + + if(m->name) { + free((void*)m->name);m->name=0; + } + if(m->return_type) { + multiname_destroy(m->return_type); + } free(m); } array_free(file->methods); for(t=0;tclasses->num;t++) { abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t); - list_free(cls->interfaces);cls->interfaces=0; traits_free(cls->traits);cls->traits=0; traits_free(cls->static_constructor_traits);cls->static_constructor_traits=0; + + if(cls->classname) { + multiname_destroy(cls->classname); + } + if(cls->superclass) { + multiname_destroy(cls->superclass); + } + + multiname_list_t*i = cls->interfaces; + while(i) { + multiname_destroy(i->multiname);i->multiname=0; + i = i->next; + } + list_free(cls->interfaces);cls->interfaces=0; + + if(cls->protectedNS) { + namespace_destroy(cls->protectedNS); + } free(cls); } array_free(file->classes); @@ -1523,26 +1048,12 @@ void swf_FreeABC(void*code) } array_free(file->method_bodies); - free(file); -} - -abc_code_t* add_opcode(abc_code_t*atag, U8 op) -{ - 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; + if(file->name) { + free((void*)file->name);file->name=0; } - return tmp; -} -#include "abc_ops.c" + free(file); +} void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) { @@ -1560,7 +1071,7 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) abc_file_t*file = abc_file_new(); abc_method_body_t*c = 0; - abc_class_t*cls = abc_class_new(file, "rfx::MainTimeline", "flash.display::MovieClip"); + abc_class_t*cls = abc_class_new2(file, "rfx::MainTimeline", "flash.display::MovieClip"); abc_class_protectedNS(cls, "rfx:MainTimeline"); TAG*abctag = swf_InsertTagBefore(swf, swf->firstTag, ST_DOABC);