X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fabc.c;h=f1243d9c22ca7886678eddfb0289b6425c433ff6;hb=17d95f2f55f38f9a4c52e4f5850ff2913e4a4261;hp=32352ee61fc2acddce1f6b19fa0e7c3adc2cb7ba;hpb=9bd08484bd337a7e89750ad3080db8491eff69e3;p=swftools.git diff --git a/lib/as3/abc.c b/lib/as3/abc.c index 32352ee..f1243d9 100644 --- a/lib/as3/abc.c +++ b/lib/as3/abc.c @@ -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; } @@ -333,7 +334,21 @@ 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:", + prefix, c->old.max_stack, c->old.local_count, c->old.init_scope_depth, + c->old.max_scope_depth); + + + int flags = c->method->flags; + if(flags&METHOD_NEED_ARGUMENTS) {fprintf(fo, " need_arguments");flags&=~METHOD_NEED_ARGUMENTS;} + if(flags&METHOD_NEED_ACTIVATION) {fprintf(fo, " need_activation");flags&=~METHOD_NEED_ACTIVATION;} + if(flags&METHOD_NEED_REST) {fprintf(fo, " need_rest");flags&=~METHOD_NEED_REST;} + if(flags&METHOD_HAS_OPTIONAL) {fprintf(fo, " has_optional");flags&=~METHOD_HAS_OPTIONAL;} + if(flags&METHOD_SET_DXNS) {fprintf(fo, " set_dxns");flags&=~METHOD_SET_DXNS;} + if(flags&METHOD_HAS_PARAM_NAMES) {fprintf(fo, " has_param_names");flags&=~METHOD_HAS_PARAM_NAMES;} + if(flags) fprintf(fo, " %02x", flags); + fprintf(fo, "]\n"); + char prefix2[80]; sprintf(prefix2, "%s ", prefix); @@ -362,6 +377,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) { @@ -600,7 +621,7 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix) if(cls->static_constructor) dump_method(fo, prefix2,"staticconstructor", "", cls->static_constructor, file); - traits_dump(fo, prefix2, cls->static_constructor_traits, file); + traits_dump(fo, prefix2, cls->static_traits, file); char*n = multiname_tostring(cls->classname); if(cls->constructor) @@ -608,6 +629,7 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix) free(n); traits_dump(fo, prefix2,cls->traits, file); fprintf(fo, "%s}\n", prefix); + } fprintf(fo, "%s\n", prefix); @@ -748,10 +770,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; @@ -766,7 +790,7 @@ void* swf_ReadABC(TAG*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)); @@ -818,7 +842,7 @@ void* swf_ReadABC(TAG*tag) abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t); /* SKIP */ swf_GetU30(tag); // cindex - cls->static_constructor_traits = traits_parse(tag, pool, file); + cls->static_traits = traits_parse(tag, pool, file); } int num_scripts2 = swf_GetU30(tag); for(t=0;tmethod = 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); @@ -849,23 +869,25 @@ void swf_WriteABC(TAG*abctag, void*code) 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; + if(!c->constructor) { + NEW(abc_method_t,m);array_append(file->methods, NO_KEY, m); + NEW(abc_method_body_t,body);array_append(file->method_bodies, NO_KEY, body); + body->method = m; m->body = body; + __ returnvoid(body); + c->constructor = m; + } + if(!c->static_constructor) { + NEW(abc_method_t,m);array_append(file->methods, NO_KEY, m); + NEW(abc_method_body_t,body);array_append(file->method_bodies, NO_KEY, body); + body->method = m; m->body = body; + __ returnvoid(body); + c->static_constructor = m; } } - 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++) { @@ -887,6 +909,43 @@ 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. + EDIT: flashplayer doesn't allow this anyway- a method can only + be used once + + 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; @@ -966,21 +1025,17 @@ void swf_WriteABC(TAG*abctag, void*code) interface = interface->next; } - if(!c->constructor) { - swf_SetU30(tag, nullmethod->index); - } else { - swf_SetU30(tag, c->constructor->index); - } + assert(c->constructor); + 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) { - swf_SetU30(tag, nullmethod->index); - } else { - swf_SetU30(tag, c->static_constructor->index); - } - traits_write(pool, tag, c->static_constructor_traits); + assert(c->static_constructor); + swf_SetU30(tag, c->static_constructor->index); + + traits_write(pool, tag, c->static_traits); } swf_SetU30(tag, file->scripts->num); @@ -996,10 +1051,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) @@ -1013,14 +1068,14 @@ void swf_WriteABC(TAG*abctag, void*code) code_write(tag, c->code, pool, file); swf_SetU30(tag, list_length(c->exceptions)); - exception_list_t*l = c->exceptions; + abc_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)); + swf_SetU30(tag, l->abc_exception->from->pos); + swf_SetU30(tag, l->abc_exception->to->pos); + swf_SetU30(tag, l->abc_exception->target->pos); + swf_SetU30(tag, pool_register_multiname(pool, l->abc_exception->exc_type)); + swf_SetU30(tag, pool_register_multiname(pool, l->abc_exception->var_name)); l = l->next; } @@ -1039,7 +1094,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); } @@ -1057,15 +1112,17 @@ void swf_WriteABC(TAG*abctag, void*code) void abc_file_free(abc_file_t*file) { 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)); + if(file->metadata) { + 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(items); + array_free(file->metadata);file->metadata=0; } - array_free(file->metadata); for(t=0;tmethods->num;t++) { abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, t); @@ -1092,12 +1149,12 @@ void abc_file_free(abc_file_t*file) } free(m); } - array_free(file->methods); + array_free(file->methods);file->methods=0; for(t=0;tclasses->num;t++) { abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t); traits_free(cls->traits);cls->traits=0; - traits_free(cls->static_constructor_traits);cls->static_constructor_traits=0; + traits_free(cls->static_traits);cls->static_traits=0; if(cls->classname) { multiname_destroy(cls->classname); @@ -1118,23 +1175,23 @@ void abc_file_free(abc_file_t*file) } free(cls); } - array_free(file->classes); + array_free(file->classes);file->classes=0; for(t=0;tscripts->num;t++) { abc_script_t*s = (abc_script_t*)array_getvalue(file->scripts, t); traits_free(s->traits);s->traits=0; free(s); } - array_free(file->scripts); + array_free(file->scripts);file->scripts=0; for(t=0;tmethod_bodies->num;t++) { 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; + abc_exception_list_t*ee = body->exceptions; while(ee) { - exception_t*e=ee->exception;ee->exception=0; + abc_exception_t*e=ee->abc_exception;ee->abc_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; @@ -1145,7 +1202,7 @@ void abc_file_free(abc_file_t*file) free(body); } - array_free(file->method_bodies); + array_free(file->method_bodies);file->method_bodies=0; if(file->name) { free((void*)file->name);file->name=0; @@ -1187,20 +1244,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"); @@ -1233,10 +1290,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); @@ -1261,10 +1318,10 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) abc_method_body_t*h = abc_class_method(cls, 0, functionname, 1, "flash.events::MouseEvent"); - h->max_stack = 6; - h->local_count = 2; - h->init_scope_depth = 10; - h->max_scope_depth = 11; + 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); @@ -1342,10 +1399,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);