X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fabc.c;h=91a70e64c92ea22d7c8aaff0480f9e93c413244e;hb=0263ce360bed1a321157bb8d9d1f67a3b33b816d;hp=5b2f91cea7a8da9a6c8cc3c29828ac8567a28926;hpb=f674f67572814639b77ef5337590d719bda36c3e;p=swftools.git diff --git a/lib/as3/abc.c b/lib/as3/abc.c index 5b2f91c..91a70e6 100644 --- a/lib/as3/abc.c +++ b/lib/as3/abc.c @@ -40,7 +40,7 @@ int abc_RegisterPrivateNameSpace(abc_file_t*file, const char*name); /* TODO: switch to a datastructure with just values */ #define NO_KEY "" -static char* params_to_string(multiname_list_t*list) +static char* params_tostring(multiname_list_t*list) { multiname_list_t*l; int n = list_length(list); @@ -50,7 +50,7 @@ static char* params_to_string(multiname_list_t*list) n = 0; int size = 0; while(l) { - names[n] = multiname_to_string(l->multiname); + names[n] = multiname_tostring(l->multiname); size += strlen(names[n]) + 2; n++;l=l->next; } @@ -124,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; } @@ -174,7 +175,7 @@ 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*file, 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 */ NEW(abc_method_body_t,c); @@ -187,11 +188,8 @@ abc_method_body_t* add_method(abc_file_t*file, abc_class_t*cls, char*returntype, NEW(abc_method_t,m); array_append(file->methods, NO_KEY, m); - if(returntype && strcmp(returntype, "void")) { - m->return_type = multiname_fromstring(returntype); - } else { - m->return_type = 0; - } + m->return_type = returntype; + int t; for(t=0;tfile; va_list va; @@ -303,7 +301,7 @@ int abc_initscript_addClassTrait(abc_script_t*script, multiname_t*multiname, abc return slotid; } -abc_script_t* abc_initscript(abc_file_t*file, 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); @@ -323,10 +321,10 @@ static void dump_method(FILE*fo, const char*prefix, const char*type, const char* { char*return_type = 0; if(m->return_type) - return_type = multiname_to_string(m->return_type); + return_type = multiname_tostring(m->return_type); else return_type = strdup("void"); - char*paramstr = params_to_string(m->parameters); + 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; @@ -336,7 +334,7 @@ static void dump_method(FILE*fo, const char*prefix, const char*type, const char* return; } - fprintf(fo, "%s[stack:%d locals:%d scope:%d-%d flags:%02x]\n", prefix, c->max_stack, c->local_count, c->init_scope_depth, c->max_scope_depth, c->method->flags); + 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); @@ -365,6 +363,12 @@ static void traits_free(trait_list_t*traits) } 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) { @@ -382,7 +386,7 @@ static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file) 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); + DEBUG name = multiname_tostring(trait->name); U8 kind = swf_GetU8(tag); U8 attributes = kind&0xf0; kind&=0x0f; @@ -412,7 +416,7 @@ static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file) int vkind = swf_GetU8(tag); trait->value = constant_fromindex(pool, vindex, vkind); } - DEBUG printf(" slot %s %d %s (%s)\n", name, trait->slot_id, trait->type_name->name, constant_to_string(trait->value)); + 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); } @@ -503,7 +507,7 @@ static void traits_dump(FILE*fo, const char*prefix, trait_list_t*traits, abc_fil 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) { @@ -527,8 +531,8 @@ static void traits_dump(FILE*fo, const char*prefix, trait_list_t*traits, abc_fil } } 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); - char*value = constant_to_string(trait->value); + 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); @@ -574,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; @@ -605,7 +609,7 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix) dump_method(fo, prefix2,"staticconstructor", "", cls->static_constructor, 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); @@ -670,7 +674,7 @@ 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) { /* TODO optional parameters */ @@ -751,10 +755,12 @@ 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; @@ -833,10 +839,6 @@ void* swf_ReadABC(TAG*tag) s->method = m; s->traits = traits_parse(tag, pool, file); array_append(file->scripts, NO_KEY, s); - if(!s->traits) { - fprintf(stderr, "Can't parse script traits\n"); - return 0; - } } pool_destroy(pool); @@ -863,12 +865,25 @@ void swf_WriteABC(TAG*abctag, void*code) abc_method_t*nullmethod = 0; if(need_null_method) { - nullmethod = malloc(sizeof(abc_method_t)); - memset(nullmethod, 0, sizeof(abc_method_t)); + 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++) { @@ -890,6 +905,41 @@ void swf_WriteABC(TAG*abctag, void*code) 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; @@ -999,10 +1049,10 @@ void swf_WriteABC(TAG*abctag, void*code) 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->init_scope_depth); - //swf_SetU30(tag, c->max_scope_depth); + //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) @@ -1042,7 +1092,7 @@ void swf_WriteABC(TAG*abctag, void*code) tag = abctag; if(tag->id == ST_DOABC) { - swf_SetU32(tag, 1); // flags + swf_SetU32(tag, file->flags); // flags swf_SetString(tag, file->name); } @@ -1190,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"); @@ -1236,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); @@ -1263,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); @@ -1345,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);