X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fabc.c;h=a4f174d955ea3817a517aa6314c1f5423a5b6055;hb=cdc086dfc22111a34d2f40308e8f066b89fc2398;hp=f1243d9c22ca7886678eddfb0289b6425c433ff6;hpb=398fa92330471e3e133c504b20b6197504fc45ce;p=swftools.git

diff --git a/lib/as3/abc.c b/lib/as3/abc.c
index f1243d9..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;s<num;s++) {
             int i1 = swf_GetU30(tag);
             int i2 = swf_GetU30(tag);
-            char*key = i1?pool_lookup_string(pool, i1):"";
-            char*value = i2?pool_lookup_string(pool, i2):"";
+            const char*key = i1?pool_lookup_string(pool, i1):"";
+            const char*value = i2?pool_lookup_string(pool, i2):"";
             DEBUG printf("    %s=%s\n", key, value);
             array_append(items, key, strdup(value));
         }
@@ -129,19 +129,14 @@ abc_file_t*abc_file_new()
     return f;
 }
 
-#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*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->classname = multiname_clone(classname);
+    c->superclass = multiname_clone(superclass);
     c->flags = 0;
     c->constructor = 0;
     c->static_constructor = 0;
@@ -172,55 +167,52 @@ void abc_class_protectedNS(abc_class_t*c, char*namespace)
 }
 void abc_class_add_interface(abc_class_t*c, multiname_t*interface)
 {
-    list_append(c->interfaces, interface);
+    list_append(c->interfaces, 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->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;t<num_params;t++) {
-	const char*param = va_arg(va, const char*);
-	list_append(m->parameters, 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)
@@ -235,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));
@@ -244,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));
@@ -255,28 +250,59 @@ 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);
-    list_append(cls->traits, trait_new_method(multiname_fromstring(name), c->method));
-    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;
 }
 
-void abc_AddSlot(abc_class_t*cls, char*name, int slot, char*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_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);
+    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_find_slotid(abc_class_t*cls, int slotid)
+{
+    trait_list_t*l;
+    trait_t*t=0;
+    for(l=cls->traits;l;l=l->next) {
+        if(l->trait->slot_id==slotid) {
+            t=l->trait; 
+            break;
+        }
+    }
+    return t;
 }
 
 void abc_method_body_addClassTrait(abc_method_body_t*code, char*multiname, int slotid, abc_class_t*cls)
@@ -301,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;
 
@@ -347,13 +380,18 @@ static void dump_method(FILE*fo, const char*prefix, const char*type, const char*
     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");
+    fprintf(fo, "]");
+
+    if(m->trait) {
+        fprintf(fo, " slot:%d", m->trait->slot_id);
+    }
+    fprintf(fo, "\n");
 
 
     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);
@@ -410,10 +448,12 @@ static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file)
 	if(kind == TRAIT_METHOD || kind == TRAIT_GETTER || kind == TRAIT_SETTER) { // method / getter / setter
 	    trait->disp_id = swf_GetU30(tag);
 	    trait->method = (abc_method_t*)array_getvalue(file->methods, swf_GetU30(tag));
+            trait->method->trait = trait;
 	    DEBUG printf("  method/getter/setter\n");
 	} else if(kind == TRAIT_FUNCTION) { // function
 	    trait->slot_id =  swf_GetU30(tag);
 	    trait->method = (abc_method_t*)array_getvalue(file->methods, swf_GetU30(tag));
+            trait->method->trait = trait;
 	} else if(kind == TRAIT_CLASS) { // class
 	    trait->slot_id = swf_GetU30(tag);
 	    trait->cls = (abc_class_t*)array_getvalue(file->classes, swf_GetU30(tag));
@@ -516,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) {
@@ -524,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, "<metadata>");
+
 	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) {
@@ -582,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;t<file->classes->num;t++) {
         abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t);
         char prefix2[80];
@@ -619,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;t<file->scripts->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;t<file->methods->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;
 }
 
@@ -689,10 +763,9 @@ void* swf_ReadABC(TAG*tag)
 
 	m->flags = swf_GetU8(tag);
 	
-        DEBUG printf("method %d) %s flags=%02x\n", t, params_tostring(m->parameters), m->flags);
+        DEBUG printf("method %d) %s %s flags=%02x\n", t, m->name, params_tostring(m->parameters), m->flags);
 
         if(m->flags&0x08) {
-            /* TODO optional parameters */
             m->optional_parameters = list_new();
             int num = swf_GetU30(tag);
             int s;
@@ -707,10 +780,11 @@ 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;
             }
 	}
+        m->index = array_length(file->methods);
 	array_append(file->methods, NO_KEY, m);
     }
             
@@ -724,13 +798,13 @@ void* swf_ReadABC(TAG*tag)
 	abc_class_t*cls = malloc(sizeof(abc_class_t));
 	memset(cls, 0, sizeof(abc_class_t));
 	
-        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);
+        DEBUG printf("class %d %02x\n", t, cls->flags);
 	if(cls->flags&8) 
 	    swf_GetU30(tag); //protectedNS
         int s;
@@ -743,12 +817,14 @@ void* swf_ReadABC(TAG*tag)
             DEBUG printf("  class %d interface: %s\n", t, m->name);
         }
 
-	swf_GetU30(tag); //iinit
+	int iinit = swf_GetU30(tag); //iinit
+        DEBUG printf("--iinit-->%d\n", iinit);
 	traits_skip(tag);
     }
     for(t=0;t<num_classes;t++) {
         abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t);
 	int cinit = swf_GetU30(tag);
+        DEBUG printf("--cinit(%d)-->%d\n", t, cinit);
         cls->static_constructor = (abc_method_t*)array_getvalue(file->methods, cinit);
         traits_skip(tag);
     }
@@ -805,7 +881,7 @@ void* swf_ReadABC(TAG*tag)
         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);
+	DEBUG printf("method_body %d) (method %d), %d bytes of code\n", t, methodnr, code_length);
 
 	array_append(file->method_bodies, NO_KEY, c);
     }
@@ -832,7 +908,7 @@ void* swf_ReadABC(TAG*tag)
         int num_interfaces = swf_GetU30(tag); //interface count
         int s;
         for(s=0;s<num_interfaces;s++) {
-            swf_GetU30(tag); // multiname index TODO
+            swf_GetU30(tag);
         }
 	int iinit = swf_GetU30(tag);
         cls->constructor = (abc_method_t*)array_getvalue(file->methods, iinit);
@@ -868,15 +944,22 @@ void swf_WriteABC(TAG*abctag, void*code)
     TAG*tmp = swf_InsertTag(0,0);
     TAG*tag = tmp;
     int t;
-   
+  
+    /* add method bodies where needed */
     for(t=0;t<file->classes->num;t++) {
 	abc_class_t*c = (abc_class_t*)array_getvalue(file->classes, t);
         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->flags&CLASS_INTERFACE)) {
+                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);
+                // don't bother to set m->index
+                body->method = m; m->body = body;
+                __ returnvoid(body);
+                c->constructor = m;
+            } else {
+                NEW(abc_method_t,m);array_append(file->methods, NO_KEY, m);
+                c->constructor = m;
+            }
         }
         if(!c->static_constructor) {
             NEW(abc_method_t,m);array_append(file->methods, NO_KEY, m);
@@ -926,11 +1009,11 @@ void swf_WriteABC(TAG*abctag, void*code)
     for(t=0;t<file->classes->num;t++) {
 	abc_class_t*c = (abc_class_t*)array_getvalue(file->classes, t);
         trait_list_t*traits = c->traits;
-        if(c->constructor &&
+        if(c->constructor && c->constructor->body &&
            c->constructor->body->init_scope_depth < c->init_scope_depth) {
            c->constructor->body->init_scope_depth = c->init_scope_depth;
         }
-        if(c->static_constructor &&
+        if(c->static_constructor && c->static_constructor->body &&
            c->static_constructor->body->init_scope_depth < c->init_scope_depth) {
            c->static_constructor->body->init_scope_depth = c->init_scope_depth;
         }
@@ -1057,10 +1140,15 @@ void swf_WriteABC(TAG*abctag, void*code)
 	//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)
+
+        int param_num = list_length(c->method->parameters)+1;
+        if(c->method->flags&METHOD_NEED_REST)
+            param_num++;
+        if(param_num <= c->stats->local_count)
 	    swf_SetU30(tag, c->stats->local_count);
         else
-	    swf_SetU30(tag, list_length(c->method->parameters)+1);
+	    swf_SetU30(tag, param_num);
+
 	swf_SetU30(tag, c->init_scope_depth);
 	swf_SetU30(tag, c->stats->max_scope_depth+
                         c->init_scope_depth);
@@ -1243,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;
@@ -1253,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;
@@ -1289,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;
@@ -1298,6 +1386,10 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events)
                 __ debugline(f, 1);
                 __ getlocal_0(f);
                 __ pushscope(f);
+                if(stop_each_frame) {
+                    __ findpropstrict(f, "[package]::stop");
+                    __ callpropvoid(f, "[package]::stop", 0);
+                }
             }
 
             if(tag->id == ST_DEFINEBUTTON || tag->id == ST_DEFINEBUTTON2) {
@@ -1310,14 +1402,12 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events)
                 __ getlex(f,functionname);
                 __ callpropvoid(f, "::addEventListener" ,2);
 
-                if(stop_each_frame) {
-                    __ findpropstrict(f, "[package]::stop");
-                    __ callpropvoid(f, "[package]::stop", 0);
-                }
                 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;
@@ -1391,13 +1481,14 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events)
         if(tag->id == ST_DEFINEBUTTON || tag->id == ST_DEFINEBUTTON2) {
             char buttonname[80];
             sprintf(buttonname, "::button%d", swf_GetDefineID(tag));
-            abc_AddSlot(cls, buttonname, 0, "flash.display::SimpleButton");
+            multiname_t*s = multiname_fromstring(buttonname);
+            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;