X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fabc.c;h=a4f174d955ea3817a517aa6314c1f5423a5b6055;hb=cdc086dfc22111a34d2f40308e8f066b89fc2398;hp=04ce6990ce0cd347478fc6b56396ff6be2a0dd30;hpb=d39393539c367410d6e5c6b996f563d43b9a4260;p=swftools.git diff --git a/lib/as3/abc.c b/lib/as3/abc.c index 04ce699..a4f174d 100644 --- a/lib/as3/abc.c +++ b/lib/as3/abc.c @@ -97,8 +97,8 @@ static void parse_metadata(TAG*tag, abc_file_t*file, pool_t*pool) for(s=0;sinterfaces, multiname_clone(interface)); } -abc_method_body_t* add_method(abc_file_t*file, abc_class_t*cls, multiname_t*returntype, int num_params, va_list va) +abc_method_t* abc_method_new(abc_file_t*file, multiname_t*returntype, char body) { - /* construct code (method body) object */ - NEW(abc_method_body_t,c); - array_append(file->method_bodies, NO_KEY, c); - c->index = array_length(file->method_bodies); - c->file = file; - c->traits = list_new(); - c->code = 0; - /* construct method object */ NEW(abc_method_t,m); m->index = array_length(file->methods); array_append(file->methods, NO_KEY, m); - m->return_type = returntype; - int t; - for(t=0;tparameters, multiname_fromstring(param)); + if(body) { + /* construct code (method body) object */ + NEW(abc_method_body_t,c); + array_append(file->method_bodies, NO_KEY, c); + c->index = array_length(file->method_bodies); + c->file = file; + c->traits = list_new(); + c->code = 0; + + /* crosslink the two objects */ + m->body = c; + c->method = m; } - /* crosslink the two objects */ - m->body = c; - c->method = m; - - return c; + return m; } -abc_method_body_t* abc_class_constructor(abc_class_t*cls, multiname_t*returntype, int num_params, ...) +abc_method_t* abc_class_getconstructor(abc_class_t*cls, multiname_t*returntype) { - va_list va; - va_start(va, num_params); - abc_method_body_t* c = add_method(cls->file, cls, returntype, num_params, va); - va_end(va); - cls->constructor = c->method; - return c; + if(cls->constructor) { + return cls->constructor; + } + abc_method_t* m = abc_method_new(cls->file, returntype, 1); + cls->constructor = m; + return m; } -abc_method_body_t* abc_class_staticconstructor(abc_class_t*cls, multiname_t*returntype, int num_params, ...) +abc_method_t* abc_class_getstaticconstructor(abc_class_t*cls, multiname_t*returntype) { - va_list va; - va_start(va, num_params); - abc_method_body_t* c = add_method(cls->file, cls, returntype, num_params, va); - va_end(va); - cls->static_constructor = c->method; - return c; + if(cls->static_constructor) { + return cls->static_constructor; + } + abc_method_t* m = abc_method_new(cls->file, returntype, 1); + cls->static_constructor = m; + return m; } trait_t*trait_new(int type, multiname_t*name, int data1, int data2, constant_t*v) @@ -232,7 +227,7 @@ trait_t*trait_new(int type, multiname_t*name, int data1, int data2, constant_t*v trait->value = v; return trait; } -trait_t*trait_new_member(multiname_t*type, multiname_t*name,constant_t*v) +trait_t*trait_new_member(trait_list_t**traits, multiname_t*type, multiname_t*name,constant_t*v) { int kind = TRAIT_SLOT; trait_t*trait = malloc(sizeof(trait_t)); @@ -241,9 +236,12 @@ trait_t*trait_new_member(multiname_t*type, multiname_t*name,constant_t*v) trait->attributes = kind&0xf0; trait->name = name; trait->type_name = type; + + trait->slot_id = list_length_(traits)+1; + list_append_(traits, trait); return trait; } -trait_t*trait_new_method(multiname_t*name, abc_method_t*m) +trait_t*trait_new_method(trait_list_t**traits, multiname_t*name, abc_method_t*m) { int type = TRAIT_METHOD; trait_t*trait = malloc(sizeof(trait_t)); @@ -252,37 +250,48 @@ trait_t*trait_new_method(multiname_t*name, abc_method_t*m) trait->attributes = type&0xf0; trait->name = name; trait->method = m; + + /* start assigning traits at position #1. + Weird things happen when assigning slot 0- slot 0 and 1 seem + to be identical */ + trait->slot_id = list_length_(traits)+1; + list_append_(traits, trait); return trait; } -abc_method_body_t* abc_class_method(abc_class_t*cls, multiname_t*returntype, char*name, int num_params, ...) +abc_method_t* abc_class_method(abc_class_t*cls, multiname_t*returntype, multiname_t*name) { abc_file_t*file = cls->file; - va_list va; - va_start(va, num_params); - abc_method_body_t* c = add_method(cls->file, cls, returntype, num_params, va); - va_end(va); - trait_t*t = trait_new_method(multiname_fromstring(name), c->method); - c->method->trait = t; - /* start assigning traits at position #1. - Weird things happen when assigning slot 0- slot 0 and 1 seem - to be identical */ - t->slot_id = list_length(cls->traits)+1; - list_append(cls->traits, t); - return c; + abc_method_t* m = abc_method_new(cls->file, returntype, !(cls->flags&CLASS_INTERFACE)); + m->trait = trait_new_method(&cls->traits, multiname_clone(name), m); + return m; +} +abc_method_t* abc_class_staticmethod(abc_class_t*cls, multiname_t*returntype, multiname_t*name) +{ + abc_file_t*file = cls->file; + abc_method_t* m = abc_method_new(cls->file, returntype, !(cls->flags&CLASS_INTERFACE)); + m->trait = trait_new_method(&cls->static_traits, multiname_clone(name), m); + return m; } -trait_t* abc_class_slot(abc_class_t*cls, char*name, multiname_t*type) +trait_t* abc_class_slot(abc_class_t*cls, multiname_t*name, multiname_t*type) +{ + abc_file_t*file = cls->file; + multiname_t*m_name = multiname_clone(name); + multiname_t*m_type = multiname_clone(type); + trait_t*t = trait_new_member(&cls->traits, m_type, m_name, 0); + return t; +} +trait_t* abc_class_staticslot(abc_class_t*cls, multiname_t*name, multiname_t*type) { abc_file_t*file = cls->file; - multiname_t*m_name = multiname_fromstring(name); + multiname_t*m_name = multiname_clone(name); multiname_t*m_type = multiname_clone(type); - trait_t*t = trait_new_member(m_type, m_name, 0); - t->slot_id = list_length(cls->traits)+1; - list_append(cls->traits, t); + trait_t*t = trait_new_member(&cls->traits, m_type, m_name, 0); return t; } + trait_t* abc_class_find_slotid(abc_class_t*cls, int slotid) { trait_list_t*l; @@ -318,31 +327,38 @@ int abc_initscript_addClassTrait(abc_script_t*script, multiname_t*multiname, abc return slotid; } -abc_script_t* abc_initscript(abc_file_t*file, multiname_t*returntype, int num_params, ...) +abc_script_t* abc_initscript(abc_file_t*file, multiname_t*returntype) { - va_list va; - va_start(va, num_params); - abc_method_body_t* c = add_method(file, 0, returntype, num_params, va); + abc_method_t*m = abc_method_new(file, returntype, 1); abc_script_t* s = malloc(sizeof(abc_script_t)); - s->method = c->method; + s->method = m; s->traits = list_new(); s->file = file; array_append(file->scripts, NO_KEY, s); - va_end(va); return s; } -static void traits_dump(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, dict_t*methods_seen); -static void dump_method(FILE*fo, const char*prefix, const char*type, const char*name, abc_method_t*m, abc_file_t*file) +static void dump_method(FILE*fo, const char*prefix, + const char*attr, + const char*type, + const char*name, + abc_method_t*m, abc_file_t*file, dict_t*methods_seen) { + if(methods_seen) + dict_put(methods_seen, m, 0); + char*return_type = 0; if(m->return_type) 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)); + fprintf(fo, "%s%s%s %s %s=%s %s (%d params, %d optional)\n", prefix, attr, type, return_type, name, m->name, paramstr, + list_length(m->parameters), + list_length(m->optional_parameters) + ); free(paramstr);paramstr=0; free(return_type);return_type=0; @@ -375,7 +391,7 @@ static void dump_method(FILE*fo, const char*prefix, const char*type, const char* char prefix2[80]; sprintf(prefix2, "%s ", prefix); if(c->traits) - traits_dump(fo, prefix, c->traits, file); + traits_dump(fo, prefix, c->traits, file, methods_seen); fprintf(fo, "%s{\n", prefix); code_dump(c->code, c->exceptions, file, prefix2, fo); fprintf(fo, "%s}\n\n", prefix); @@ -540,7 +556,7 @@ static void traits_write(pool_t*pool, TAG*tag, trait_list_t*traits) } -static void traits_dump(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, dict_t*methods_seen) { int t; while(traits) { @@ -548,18 +564,31 @@ static void traits_dump(FILE*fo, const char*prefix, trait_list_t*traits, abc_fil char*name = multiname_tostring(trait->name); U8 kind = trait->kind; U8 attributes = trait->attributes; + + char a = attributes & (TRAIT_ATTR_OVERRIDE|TRAIT_ATTR_FINAL); + char* type = ""; + if(a==TRAIT_ATTR_FINAL) + type = "final "; + else if(a==TRAIT_ATTR_OVERRIDE) + type = "override "; + else if(a==(TRAIT_ATTR_OVERRIDE|TRAIT_ATTR_FINAL)) + type = "final override "; + + if(attributes&TRAIT_ATTR_METADATA) + fprintf(fo, ""); + if(kind == TRAIT_METHOD) { abc_method_t*m = trait->method; - dump_method(fo, prefix, "method", name, m, file); + dump_method(fo, prefix, type, "method", name, m, file, methods_seen); } else if(kind == TRAIT_GETTER) { abc_method_t*m = trait->method; - dump_method(fo, prefix, "getter", name, m, file); + dump_method(fo, prefix, type, "getter", name, m, file, methods_seen); } else if(kind == TRAIT_SETTER) { abc_method_t*m = trait->method; - dump_method(fo, prefix, "setter", name, m, file); + dump_method(fo, prefix, type, "setter", name, m, file, methods_seen); } else if(kind == TRAIT_FUNCTION) { // function abc_method_t*m = trait->method; - dump_method(fo, prefix, "function", name, m, file); + dump_method(fo, prefix, type, "function", name, m, file, methods_seen); } else if(kind == TRAIT_CLASS) { // class abc_class_t*cls = trait->cls; if(!cls) { @@ -606,6 +635,7 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix) fprintf(fo, "%s#\n", prefix); } + dict_t*methods_seen = dict_new2(&ptr_type); for(t=0;tclasses->num;t++) { abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t); char prefix2[80]; @@ -643,25 +673,45 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix) fprintf(fo, "extra flags=%02x\n", cls->flags&0xf0); fprintf(fo, "%s{\n", prefix); - if(cls->static_constructor) - dump_method(fo, prefix2,"staticconstructor", "", cls->static_constructor, file); - traits_dump(fo, prefix2, cls->static_traits, file); + dict_put(methods_seen, cls->static_constructor, 0); + dict_put(methods_seen, cls->constructor, 0); + + if(cls->static_constructor) { + dump_method(fo, prefix2, "", "staticconstructor", "", cls->static_constructor, file, methods_seen); + } + traits_dump(fo, prefix2, cls->static_traits, file, methods_seen); char*n = multiname_tostring(cls->classname); if(cls->constructor) - dump_method(fo, prefix2, "constructor", n, cls->constructor, file); + dump_method(fo, prefix2, "", "constructor", n, cls->constructor, file, methods_seen); free(n); - traits_dump(fo, prefix2,cls->traits, file); + traits_dump(fo, prefix2,cls->traits, file, methods_seen); fprintf(fo, "%s}\n", prefix); - } fprintf(fo, "%s\n", 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); - traits_dump(fo, prefix, s->traits, file); + dump_method(fo, prefix, "", "initmethod", "init", s->method, file, methods_seen); + traits_dump(fo, prefix, s->traits, file, methods_seen); } + + char extra=0; + for(t=0;tmethods->num;t++) { + abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, t); + if(!dict_contains(methods_seen, m)) { + if(!extra) { + extra=1; + fprintf(fo, "\n"); + fprintf(fo, "%s//internal (non-class non-script) methods:\n", prefix); + } + char name[18]; + sprintf(name, "%08x ", m); + dump_method(fo, prefix, "", "internalmethod", name, m, file, methods_seen); + } + } + dict_destroy(methods_seen); + return file; } @@ -730,7 +780,7 @@ void* swf_ReadABC(TAG*tag) /* debug information- not used by avm2 */ multiname_list_t*l = m->parameters; while(l) { - char*name = pool_lookup_string(pool, swf_GetU30(tag)); + const char*name = pool_lookup_string(pool, swf_GetU30(tag)); l = l->next; } } @@ -1281,7 +1331,7 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) swf_SetU16(tag, 0); swf_SetString(tag, "rfx.MainTimeline"); - c = abc_class_staticconstructor(cls, 0, 0); + c = abc_class_getstaticconstructor(cls, 0)->body; c->old.max_stack = 1; c->old.local_count = 1; c->old.init_scope_depth = 9; @@ -1291,7 +1341,7 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) __ pushscope(c); __ returnvoid(c); - c = abc_class_constructor(cls, 0, 0); + c = abc_class_getconstructor(cls, 0)->body; c->old.max_stack = 3; c->old.local_count = 1; c->old.init_scope_depth = 10; @@ -1327,7 +1377,7 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) __ getlex(c,framename); __ callpropvoid(c,"[package]::addFrameScript",2); - f = abc_class_method(cls, 0, framename, 0); + f = abc_class_method(cls, 0, multiname_fromstring(framename))->body; f->old.max_stack = 3; f->old.local_count = 1; f->old.init_scope_depth = 10; @@ -1355,7 +1405,9 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) needs_framescript = 1; abc_method_body_t*h = - abc_class_method(cls, 0, functionname, 1, "flash.events::MouseEvent"); + abc_class_method(cls, 0, multiname_fromstring(functionname))->body; + list_append(h->method->parameters, multiname_fromstring("flash.events::MouseEvent")); + h->old.max_stack = 6; h->old.local_count = 2; h->old.init_scope_depth = 10; @@ -1430,13 +1482,13 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events) char buttonname[80]; sprintf(buttonname, "::button%d", swf_GetDefineID(tag)); multiname_t*s = multiname_fromstring(buttonname); - abc_class_slot(cls, buttonname, s); + abc_class_slot(cls, multiname_fromstring(buttonname), s); } tag = tag->next; } - abc_script_t*s = abc_initscript(file, 0, 0); + abc_script_t*s = abc_initscript(file, 0); c = s->method->body; c->old.max_stack = 2; c->old.local_count = 1;