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);
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;t<sizeof(opcodes)/sizeof(opcodes[0]);t++) {
- op2index[opcodes[t].opcode] = t;
- }
- }
- if(op2index[op]!=255)
- return &opcodes[op2index[op]];
- return 0;
-}
-
-abc_code_t*code_parse(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->pos<end) {
- U8 opcode = swf_GetU8(tag);
- opcode_t*op = opcode_get(opcode);
- if(!op) {
- fprintf(stderr, "Can't parse opcode %02x\n", opcode);
- return head;
- }
- //printf("%s\n", op->name);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 = multiname_clone(pool_lookup_multiname(pool, 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 = strdup((char*)pool_lookup_string(pool, 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] = strdup((char*)pool_lookup_string(pool, 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;t<num;t++)
- swf_GetU24(tag);
- data = 0;
- } else {
- printf("Can't parse opcode param type \"%c\"\n", *p);
- return 0;
- }
- if(data)
- code->params[pos++] = data;
- p++;
- }
- }
- return head;
-}
-
-static void code_free(abc_code_t*c)
-{
- while(c) {
- abc_code_t*next = c->next;
- opcode_t*op = opcode_get(c->opcode);
- char*p = op?op->params:"";
- int pos=0;
- while(*p) {
- void*data = c->params[pos];
- if(*p == '2') { //multiname
- multiname_destroy(data);
- } else if(strchr("sD", *p)) {
- free(data);
- }
- c->params[pos]=0;
- p++;pos++;
- }
- memset(c, 0, sizeof(c));
- free(c);
- c = next;
- }
-}
-
-static int code_dump(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;
- char*classname = multiname_to_string(cls->classname);
- fprintf(fo, "[classinfo %s]", classname);
- free(classname);
- } 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)
{
multiname_list_t*l;
- int n;
-
- l = list;
- n = 0;
- while(list) {
- n++;list=list->next;
- }
-
+ int n = list_length(list);
char**names = (char**)malloc(sizeof(char*)*n);
l = list;
n = 0;
int size = 0;
- while(list) {
- names[n] = multiname_to_string(list->multiname);
+ while(l) {
+ names[n] = multiname_to_string(l->multiname);
size += strlen(names[n]) + 2;
- n++;list=list->next;
+ n++;l=l->next;
}
- char* params = malloc(size+5);
+ char* params = malloc(size+15);
params[0]='(';
params[1]=0;
l = list;
int s=0;
n = 0;
- while(list) {
+ while(l) {
if(s)
strcat(params, ", ");
strcat(params, names[n]);
free(names[n]);
+ l = l->next;
n++;
s=1;
}
free(names);
+ /*char num[20];
+ sprintf(num, "[%d params]", n);
+ strcat(params, num);*/
strcat(params, ")");
int t;
return params;
#define CLASS_INTERFACE 4
#define CLASS_PROTECTED_NS 8
-abc_class_t* abc_class_new(abc_file_t*pool, multiname_t*classname, multiname_t*superclass) {
- abc_class_t* c = malloc(sizeof(abc_class_t));
- memset(c, 0, sizeof(abc_class_t));
- c->index = array_append(pool->classes, classname->name, c);
- c->pool = pool;
+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->flags = 0;
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)
+abc_method_body_t* add_method(abc_file_t*file, 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);
- c->pool = pool;
+ 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_append(pool->methods, 0, m);
+ array_append(file->methods, NO_KEY, m);
+
if(returntype && strcmp(returntype, "void")) {
m->return_type = multiname_fromstring(returntype);
} else {
{
va_list va;
va_start(va, num_params);
- abc_method_body_t* c = add_method(cls->pool, cls, returntype, num_params, va);
+ abc_method_body_t* c = add_method(cls->file, cls, returntype, num_params, va);
va_end(va);
cls->constructor = c->method;
return c;
{
va_list va;
va_start(va, num_params);
- abc_method_body_t* c = add_method(cls->pool, cls, returntype, num_params, va);
+ abc_method_body_t* c = add_method(cls->file, cls, returntype, num_params, va);
va_end(va);
cls->static_constructor = c->method;
return c;
}
-trait_t*trait_new(int type, multiname_t*name, int data1, int data2, int vindex, int vkind)
+trait_t*trait_new(int type, multiname_t*name, int data1, int data2, constant_t*v)
{
trait_t*trait = malloc(sizeof(trait_t));
memset(trait, 0, sizeof(trait_t));
trait->name = name;
trait->data1 = data1;
trait->data2 = data2;
- trait->vindex = vindex;
- trait->vkind = vkind;
+ trait->value = v;
+ return trait;
+}
+trait_t*trait_new_member(multiname_t*type, multiname_t*name,constant_t*v)
+{
+ int kind = TRAIT_SLOT;
+ trait_t*trait = malloc(sizeof(trait_t));
+ memset(trait, 0, sizeof(trait_t));
+ trait->kind = kind&0x0f;
+ trait->attributes = kind&0xf0;
+ trait->name = name;
+ trait->type_name = type;
+ 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, ...)
{
- abc_file_t*pool = cls->pool;
+ abc_file_t*file = cls->file;
va_list va;
va_start(va, num_params);
- abc_method_body_t* c = add_method(cls->pool, cls, returntype, num_params, va);
+ abc_method_body_t* c = add_method(cls->file, 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;
}
-void abc_AddSlot(abc_class_t*cls, char*name, int slot, char*multiname)
+void abc_AddSlot(abc_class_t*cls, char*name, int slot, char*type)
{
- abc_file_t*pool = cls->pool;
- multiname_t*m = multiname_fromstring(multiname);
- list_append(cls->traits, trait_new(TRAIT_SLOT, m, slot, 0, 0, 0));
+ 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);
}
void abc_method_body_addClassTrait(abc_method_body_t*code, char*multiname, int slotid, abc_class_t*cls)
{
- abc_file_t*pool = code->pool;
+ abc_file_t*file = code->file;
multiname_t*m = multiname_fromstring(multiname);
- trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0, 0);
+ trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0);
trait->cls = cls;
list_append(code->traits, trait);
}
/* notice: traits of a method (body) belonging to an init script
and traits of the init script are *not* the same thing */
-void abc_initscript_addClassTrait(abc_script_t*script, char*multiname, int slotid, abc_class_t*cls)
+int abc_initscript_addClassTrait(abc_script_t*script, multiname_t*multiname, abc_class_t*cls)
{
- abc_file_t*pool = script->pool;
- multiname_t*m = multiname_fromstring(multiname);
- trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0, 0);
+ abc_file_t*file = script->file;
+ multiname_t*m = multiname_clone(multiname);
+ int slotid = list_length(script->traits)+1;
+ trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0);
trait->cls = cls;
list_append(script->traits, trait);
+ return slotid;
}
-abc_script_t* abc_initscript(abc_file_t*pool, char*returntype, int num_params, ...)
+abc_script_t* abc_initscript(abc_file_t*file, char*returntype, int num_params, ...)
{
va_list va;
va_start(va, num_params);
- abc_method_body_t* c = add_method(pool, 0, returntype, num_params, va);
+ abc_method_body_t* c = add_method(file, 0, returntype, num_params, va);
abc_script_t* s = malloc(sizeof(abc_script_t));
s->method = c->method;
s->traits = list_new();
- s->pool = pool;
- array_append(pool->scripts, 0, s);
+ s->file = file;
+ array_append(file->scripts, NO_KEY, s);
va_end(va);
return s;
}
-static void dump_traits(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);
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 = "";
+ char*return_type = 0;
if(m->return_type)
return_type = multiname_to_string(m->return_type);
-
+ else
+ return_type = strdup("void");
char*paramstr = params_to_string(m->parameters);
-
- fprintf(fo, "%s%s %s %s=%s %s\n", prefix, type, return_type, name, m->name, paramstr);
+ 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;
abc_method_body_t*c = m->body;
if(!c) {
return;
}
- fprintf(fo, "%s[%d %d %d %d %d]\n", prefix, c->max_stack, c->local_count, c->init_scope_depth, c->max_scope_depth, c->exception_count);
+ 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);
char prefix2[80];
sprintf(prefix2, "%s ", prefix);
if(c->traits)
- dump_traits(fo, prefix, c->traits, file);
+ traits_dump(fo, prefix, c->traits, file);
fprintf(fo, "%s{\n", prefix);
- code_dump(c->code, file, prefix2, fo);
+ code_dump(c->code, c->exceptions, file, prefix2, fo);
fprintf(fo, "%s}\n\n", prefix);
}
if(t->trait->kind == TRAIT_SLOT || t->trait->kind == TRAIT_CONST) {
multiname_destroy(t->trait->type_name);
}
+ if(t->trait->value) {
+ constant_free(t->trait->value);t->trait->value = 0;
+ }
free(t->trait);t->trait = 0;
t = t->next;
}
}
for(t=0;t<num_traits;t++) {
- trait_t*trait = malloc(sizeof(trait_t));
- memset(trait, 0, sizeof(trait_t));
+ NEW(trait_t,trait);
list_append(traits, trait);
trait->name = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag))); // always a QName (ns,name)
*/
trait->slot_id = 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);
+ int vindex = swf_GetU30(tag);
+ if(vindex) {
+ int vkind = swf_GetU8(tag);
+ trait->value = constant_fromindex(pool, vindex, vkind);
}
- DEBUG printf(" slot %s %d %s (vindex=%d)\n", name, trait->slot_id, trait->type_name->name, trait->vindex);
+ DEBUG printf(" slot %s %d %s (%s)\n", name, trait->slot_id, trait->type_name->name, constant_to_string(trait->value));
} else {
fprintf(stderr, "Can't parse trait type %d\n", kind);
}
}
if(trait->kind == TRAIT_SLOT || trait->kind == TRAIT_CONST) {
- swf_SetU30(tag, trait->vindex);
- if(trait->vindex) {
- swf_SetU8(tag, trait->vkind);
+ int vindex = constant_get_index(pool, trait->value);
+ swf_SetU30(tag, vindex);
+ if(vindex) {
+ swf_SetU8(tag, trait->value->type);
}
}
if(trait->attributes&0x40) {
}
-static void dump_traits(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)
{
int t;
while(traits) {
} else if(kind == TRAIT_CLASS) { // class
abc_class_t*cls = trait->cls;
if(!cls) {
- fprintf(fo, "%sslot %d: class %s=class%d\n", prefix, trait->slot_id, name);
+ fprintf(fo, "%sslot %d: class %s=00000000\n", prefix, trait->slot_id, name);
} else {
fprintf(fo, "%sslot %d: class %s=%s\n", prefix, trait->slot_id, name, cls->classname->name);
}
} 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);
- fprintf(fo, "%sslot %s %d %s (vindex=%d)\n", prefix, name, trait->slot_id, type_name, trait->vindex);
+ char*value = constant_to_string(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);
+ if(value) free(value);
free(type_name);
} else {
fprintf(fo, "%s can't dump trait type %d\n", prefix, kind);
if(cls->static_constructor)
dump_method(fo, prefix2,"staticconstructor", "", cls->static_constructor, file);
- dump_traits(fo, prefix2, cls->static_constructor_traits, file);
+ traits_dump(fo, prefix2, cls->static_constructor_traits, file);
char*n = multiname_to_string(cls->classname);
if(cls->constructor)
dump_method(fo, prefix2, "constructor", n, cls->constructor, file);
free(n);
- dump_traits(fo, prefix2,cls->traits, file);
+ traits_dump(fo, prefix2,cls->traits, file);
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);
- dump_traits(fo, prefix, s->traits, file);
+ traits_dump(fo, prefix, s->traits, file);
}
return file;
}
U32 abcflags = swf_GetU32(tag);
DEBUG printf("flags=%08x\n", abcflags);
char*name= swf_GetString(tag);
- file->name = name?strdup(name):0;
+ file->name = (name&&name[0])?strdup(name):0;
}
U32 version = swf_GetU32(tag);
if(version!=0x002e0010) {
NEW(abc_method_t,m);
int param_count = swf_GetU30(tag);
int return_type_index = swf_GetU30(tag);
- m->return_type = multiname_clone(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;s<param_count;s++) {
int type_index = swf_GetU30(tag);
- multiname_t*param = multiname_clone(pool_lookup_multiname(pool, type_index));
+
/* type_index might be 0, which probably means "..." (varargs) */
+ multiname_t*param = type_index?multiname_clone(pool_lookup_multiname(pool, type_index)):0;
list_append(m->parameters, param);
}
DEBUG printf("method %d) %s flags=%02x\n", t, params_to_string(m->parameters), m->flags);
if(m->flags&0x08) {
- /* optional parameters */
+ /* TODO optional parameters */
+ m->optional_parameters = list_new();
int num = swf_GetU30(tag);
int s;
for(s=0;s<num;s++) {
- int val = swf_GetU30(tag);
- U8 kind = swf_GetU8(tag); // specifies index type for "val"
+ int vindex = swf_GetU30(tag);
+ U8 vkind = swf_GetU8(tag); // specifies index type for "val"
+ constant_t*c = constant_fromindex(pool, vindex, vkind);
+ list_append(m->optional_parameters, c);
}
}
if(m->flags&0x80) {
l = l->next;
}
}
- array_append(file->methods, m->name, m);
+ array_append(file->methods, NO_KEY, m);
}
parse_metadata(tag, file, pool);
memset(cls, 0, sizeof(abc_class_t));
DEBUG printf("class %d\n", t);
- int name_index = swf_GetU30(tag); //classname
- char*name = pool_lookup_string(pool, name_index);
-
- array_append(file->classes, name, cls);
-
+ 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
m->body = c;
int pos = tag->pos + code_length;
- c->code = code_parse(tag, code_length, file, pool);
+ codelookup_t*codelookup = 0;
+ c->code = code_parse(tag, code_length, file, pool, &codelookup);
tag->pos = pos;
int exception_count = swf_GetU30(tag);
int s;
+ c->exceptions = list_new();
for(s=0;s<exception_count;s++) {
- swf_GetU30(tag); //from
- swf_GetU30(tag); //to
- swf_GetU30(tag); //target
- swf_GetU30(tag); //exc_type
- swf_GetU30(tag); //var_name
+ exception_t*e = malloc(sizeof(exception_t));
+
+ e->from = code_atposition(codelookup, swf_GetU30(tag));
+ e->to = code_atposition(codelookup, swf_GetU30(tag));
+ e->target = code_atposition(codelookup, swf_GetU30(tag));
+
+ e->exc_type = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag)));
+ e->var_name = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag)));
+ //e->var_name = pool_lookup_string(pool, swf_GetU30(tag));
+ //if(e->var_name) e->var_name = strdup(e->var_name);
+ list_append(c->exceptions, e);
}
+ 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);
- array_append(file->method_bodies, m->name, 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);
memset(s, 0, sizeof(abc_script_t));
s->method = m;
s->traits = traits_parse(tag, pool, file);
- array_append(file->scripts, "script", s);
+ array_append(file->scripts, NO_KEY, s);
if(!s->traits) {
fprintf(stderr, "Can't parse script traits\n");
return 0;
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;
TAG*tmp = swf_InsertTag(0,0);
TAG*tag = tmp;
int t;
+
+ char need_null_method=0;
+ for(t=0;t<file->classes->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;t<file->methods->num;t++) {
abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, t);
abc_method_body_t*m = (abc_method_body_t*)array_getvalue(file->method_bodies, t);
m->index = t;
}
-
+
+ /* generate code statistics */
+ for(t=0;t<file->method_bodies->num;t++) {
+ abc_method_body_t*m = (abc_method_body_t*)array_getvalue(file->method_bodies, t);
+ m->stats = code_get_statistics(m->code, m->exceptions);
+ }
+
for(t=0;t<file->methods->num;t++) {
abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, t);
int n = 0;
swf_SetU30(tag, 0);
}
- swf_SetU8(tag, 0); //flags
+ U8 flags = m->flags&(METHOD_NEED_REST|METHOD_NEED_ARGUMENTS);
+ if(m->optional_parameters)
+ flags |= METHOD_HAS_OPTIONAL;
+ if(m->body) {
+ flags |= m->body->stats->flags;
+ }
+
+ swf_SetU8(tag, flags);
+ if(flags&METHOD_HAS_OPTIONAL) {
+ swf_SetU30(tag, list_length(m->optional_parameters));
+ constant_list_t*l = m->optional_parameters;
+ while(l) {
+ swf_SetU30(tag, constant_get_index(pool, l->constant));
+ swf_SetU8(tag, l->constant->type);
+ l = l->next;
+ }
+ }
}
/* write metadata */
}
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;t<file->classes->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);
}
abc_method_body_t*c = (abc_method_body_t*)array_getvalue(file->method_bodies, t);
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->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->stats->max_stack);
+ if(list_length(c->method->parameters)+1 <= c->stats->local_count)
+ swf_SetU30(tag, c->stats->local_count);
+ else
+ swf_SetU30(tag, list_length(c->method->parameters)+1);
swf_SetU30(tag, c->init_scope_depth);
- swf_SetU30(tag, c->max_scope_depth);
+ swf_SetU30(tag, c->stats->max_scope_depth+
+ c->init_scope_depth);
code_write(tag, c->code, pool, file);
- swf_SetU30(tag, c->exception_count);
+ swf_SetU30(tag, list_length(c->exceptions));
+ 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));
+ l = l->next;
+ }
+
traits_write(pool, tag, c->traits);
}
+
+ /* free temporary codestat data again. Notice: If we were to write this
+ file multiple times, this can also be shifted to abc_file_free() */
+ for(t=0;t<file->method_bodies->num;t++) {
+ abc_method_body_t*m = (abc_method_body_t*)array_getvalue(file->method_bodies, t);
+ codestats_free(m->stats);m->stats=0;
+ }
// --- start to write real tag --
pool_destroy(pool);
}
-void swf_FreeABC(void*code)
+void abc_file_free(abc_file_t*file)
{
- abc_file_t*file= (abc_file_t*)code;
-
int t;
for(t=0;t<file->metadata->num;t++) {
array_t*items = (array_t*)array_getvalue(file->metadata, t);
param = param->next;
}
list_free(m->parameters);m->parameters=0;
+
+ constant_list_t*opt = m->optional_parameters;
+ while(opt) {
+ constant_free(opt->constant);opt->constant=0;
+ opt = opt->next;
+ }
+ list_free(m->optional_parameters);m->optional_parameters=0;
if(m->name) {
free((void*)m->name);m->name=0;
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;
+ while(ee) {
+ exception_t*e=ee->exception;ee->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;
+ free(e);
+ ee=ee->next;
+ }
+ list_free(body->exceptions);body->exceptions=0;
+
free(body);
}
array_free(file->method_bodies);
free(file);
}
-abc_code_t* add_opcode(abc_code_t*atag, U8 op)
+void swf_FreeABC(void*code)
{
- 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;
- }
- return tmp;
+ abc_file_t*file= (abc_file_t*)code;
+ abc_file_free(file);
}
-#include "abc_ops.c"
-
void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events)
{
int num_frames = 0;
__ returnvoid(c);
//abc_method_body_addClassTrait(c, "rfx:MainTimeline", 1, cls);
- abc_initscript_addClassTrait(s, "rfx::MainTimeline", 1, cls);
+ multiname_t*classname = multiname_fromstring("rfx::MainTimeline");
+ abc_initscript_addClassTrait(s, classname, cls);
+ multiname_destroy(classname);
swf_WriteABC(abctag, file);
}
git.asbjorn.biz / swftools.git / blobdiff