/* TODO: switch to a datastructure with just values */
#define NO_KEY ""
-static char* params_tostring(multiname_list_t*list)
+static void params_dump(FILE*fo, multiname_list_t*l, constant_list_t*o)
{
- multiname_list_t*l;
- int n = list_length(list);
- char**names = (char**)malloc(sizeof(char*)*n);
-
- l = list;
- n = 0;
- int size = 0;
- while(l) {
- names[n] = multiname_tostring(l->multiname);
- size += strlen(names[n]) + 2;
- n++;l=l->next;
- }
+ int n = list_length(l);
+ int no = list_length(o);
+ int i = 0;
- char* params = malloc(size+15);
- params[0]='(';
- params[1]=0;
- l = list;
- int s=0;
- n = 0;
+ fprintf(fo, "(");
while(l) {
- if(s)
- strcat(params, ", ");
- strcat(params, names[n]);
- free(names[n]);
- l = l->next;
- n++;
- s=1;
+ char*s = multiname_tostring(l->multiname);
+ fprintf(fo, s);
+ free(s);
+ if(i>=n-no) {
+ s = constant_tostring(o->constant);
+ fprintf(fo, " = ");
+ fprintf(fo, s);
+ free(s);
+ o = o->next;
+ }
+
+ if(l->next)
+ fprintf(fo, ", ");
+ l = l->next;i++;
}
- free(names);
- /*char num[20];
- sprintf(num, "[%d params]", n);
- strcat(params, num);*/
- strcat(params, ")");
- int t;
- return params;
+ fprintf(fo, ")");
}
//#define DEBUG
list_append(c->interfaces, multiname_clone(interface));
}
-static abc_method_t* add_method(abc_file_t*file, abc_class_t*cls, multiname_t*returntype, char body)
+abc_method_t* abc_method_new(abc_file_t*file, multiname_t*returntype, char body)
{
/* construct method object */
NEW(abc_method_t,m);
if(cls->constructor) {
return cls->constructor;
}
- abc_method_t* m = add_method(cls->file, cls, returntype, 1);
+ abc_method_t* m = abc_method_new(cls->file, returntype, 1);
cls->constructor = m;
return m;
}
if(cls->static_constructor) {
return cls->static_constructor;
}
- abc_method_t* m = add_method(cls->file, cls, returntype, 1);
+ abc_method_t* m = abc_method_new(cls->file, returntype, 1);
cls->static_constructor = m;
return m;
}
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));
trait->attributes = kind&0xf0;
trait->name = name;
trait->type_name = type;
+
+ trait->slot_id = list_length(*traits)+1;
+ trait_list_t*l = *traits;
+ 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));
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_t* abc_class_method(abc_class_t*cls, multiname_t*returntype, multiname_t*name)
{
abc_file_t*file = cls->file;
- abc_method_t* m = add_method(cls->file, cls, returntype, !(cls->flags&CLASS_INTERFACE));
- m->trait = trait_new_method(multiname_clone(name), m);
- /* start assigning traits at position #1.
- Weird things happen when assigning slot 0- slot 0 and 1 seem
- to be identical */
- m->trait->slot_id = list_length(cls->traits)+1;
- list_append(cls->traits, m->trait);
+ 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 = add_method(cls->file, cls, returntype, !(cls->flags&CLASS_INTERFACE));
- m->trait = trait_new_method(multiname_clone(name), m);
- m->trait->slot_id = list_length(cls->static_traits)+1;
- list_append(cls->static_traits, m->trait);
+ 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;
}
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(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_staticslot(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(m_type, m_name, 0);
- t->slot_id = list_length(cls->static_traits)+1;
- list_append(cls->static_traits, t);
+ trait_t*t = trait_new_member(&cls->static_traits, m_type, m_name, 0);
return t;
}
return slotid;
}
-abc_script_t* abc_initscript(abc_file_t*file, multiname_t*returntype)
+abc_script_t* abc_initscript(abc_file_t*file)
{
- abc_method_t*m = add_method(file, 0, returntype, 1);
+ abc_method_t*m = abc_method_new(file, 0, 1);
abc_script_t* s = malloc(sizeof(abc_script_t));
s->method = m;
s->traits = list_new();
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 %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;
+
+ fprintf(fo, "%s", prefix);
+ fprintf(fo, "%s %s", attr, type);
+ fprintf(fo, "%s %s=%s", return_type, name, m->name);
+ params_dump(fo, m->parameters, m->optional_parameters);
+ fprintf(fo, "(%d params, %d optional)\n", list_length(m->parameters), list_length(m->optional_parameters));
+
free(return_type);return_type=0;
abc_method_body_t*c = m->body;
if(c->traits)
traits_dump(fo, prefix, c->traits, file, methods_seen);
fprintf(fo, "%s{\n", prefix);
- code_dump(c->code, c->exceptions, file, prefix2, fo);
+ code_dump2(c->code, c->exceptions, file, prefix2, fo);
fprintf(fo, "%s}\n\n", prefix);
}
trait->cls = (abc_class_t*)array_getvalue(file->classes, swf_GetU30(tag));
DEBUG printf(" class %s %d %d\n", name, trait->slot_id, trait->cls);
} else if(kind == TRAIT_SLOT || kind == TRAIT_CONST) { // slot, const
- /* a slot is a variable in a class that is shared amonst all instances
- of the same type, but which has a unique location in each object
- (in other words, slots are non-static, traits are static)
- */
trait->slot_id = swf_GetU30(tag);
trait->type_name = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag)));
int vindex = swf_GetU30(tag);
int slot_id = trait->slot_id;
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);
+ fprintf(fo, "%sslot %d: %s %s:%s %s %s\n", prefix, trait->slot_id,
+ kind==TRAIT_CONST?"const":"var", name, type_name,
+ value?"=":"", value?value:"");
if(value) free(value);
free(type_name);
} else {
void* swf_DumpABC(FILE*fo, void*code, char*prefix)
{
abc_file_t* file = (abc_file_t*)code;
-
+
if(file->name) {
fprintf(fo, "%s#\n", prefix);
fprintf(fo, "%s#name: %s\n", prefix, file->name);
fprintf(fo, "%s//internal (non-class non-script) methods:\n", prefix);
}
char name[18];
- sprintf(name, "%08x ", m);
+ sprintf(name, "%08x ", m->index);
dump_method(fo, prefix, "", "internalmethod", name, m, file, methods_seen);
}
}
}
pool_read(pool, tag);
+ pool_dump(pool, stdout, 2);
+ printf("pool is %d bytes\n", tag->pos);
int num_methods = swf_GetU30(tag);
DEBUG printf("%d methods\n", num_methods);
for(s=0;s<param_count;s++) {
int type_index = swf_GetU30(tag);
- /* type_index might be 0, which probably means "..." (varargs) */
+ /* type_index might be 0 ("*") */
multiname_t*param = type_index?multiname_clone(pool_lookup_multiname(pool, type_index)):0;
list_append(m->parameters, param);
}
m->flags = swf_GetU8(tag);
- DEBUG printf("method %d) %s %s flags=%02x\n", t, m->name, params_tostring(m->parameters), m->flags);
+ DEBUG printf("method %d) %s ", m->name);
+ DEBUG params_dump(stdout, m->parameters, m->optional_parameters);
+ DEBUG printf("flags=%02x\n", t, m->flags);
if(m->flags&0x08) {
m->optional_parameters = list_new();
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) {
return file;
}
-void swf_WriteABC(TAG*abctag, void*code)
+static pool_t*writeABC(TAG*abctag, void*code, pool_t*pool)
{
abc_file_t*file = (abc_file_t*)code;
- pool_t*pool = pool_new();
+ if(!pool)
+ pool = pool_new();
TAG*tmp = swf_InsertTag(0,0);
TAG*tag = tmp;
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);
+ int i = constant_get_index(pool, l->constant);
+ swf_SetU30(tag, i);
+ if(!i) {
+ swf_SetU8(tag, CONSTANT_NULL);
+ } else {
+ swf_SetU8(tag, l->constant->type);
+ }
l = l->next;
}
}
//swf_SetU30(tag, c->old.max_scope_depth);
swf_SetU30(tag, c->stats->max_stack);
-
int param_num = list_length(c->method->parameters)+1;
if(c->method->flags&METHOD_NEED_REST)
param_num++;
swf_SetBlock(tag, tmp->data, tmp->len);
swf_DeleteTag(0, tmp);
+ return pool;
+}
+
+void swf_WriteABC(TAG*abctag, void*code)
+{
+ pool_t*pool = writeABC(abctag, code, 0);
+ pool_optimize(pool);
+ writeABC(abctag, code, pool);
pool_destroy(pool);
}
char buttonname[80];
sprintf(buttonname, "::button%d", swf_GetDefineID(tag));
multiname_t*s = multiname_fromstring(buttonname);
- abc_class_slot(cls, multiname_fromstring(buttonname), s);
+ //abc_class_slot(cls, multiname_fromstring(buttonname), s);
+ abc_class_slot(cls, multiname_fromstring(buttonname),
+ multiname_fromstring("flash.display::SimpleButton"));
}
tag = tag->next;
}
- abc_script_t*s = abc_initscript(file, 0);
+ abc_script_t*s = abc_initscript(file);
c = s->method->body;
c->old.max_stack = 2;
c->old.local_count = 1;
swf_WriteABC(abctag, file);
}
+TAG*swf_AddAS3FontDefine(TAG*tag, U16 id, char*fontname)
+{
+ tag = swf_InsertTag(tag, ST_DOABC);
+ abc_file_t*file = abc_file_new();
+
+ //abc_class_t*cls = abc_class_new2(file, fontname, "flash.display::MovieClip");
+ //abc_class_slot(cls, multiname_fromstring(fontname), multiname_fromstring("flash.text::Font"));
+
+ abc_class_t*cls = abc_class_new2(file, fontname, "flash.text::Font");
+
+ abc_script_t*s = abc_initscript(file);
+ code_t*c = s->method->body->code;
+ c = abc_getlocal_0(c);
+ c = abc_pushscope(c);
+ c = abc_getscopeobject(c, 0);
+ c = abc_getlex(c,"flash.text::Font");
+ c = abc_pushscope(c);
+ c = abc_getlex(c,"flash.text::Font");
+ c = abc_newclass(c,cls);
+ c = abc_popscope(c);
+ c = abc_initproperty(c, fontname);
+ c = abc_returnvoid(c);
+ s->method->body->code = c;
+
+ abc_initscript_addClassTrait(s, multiname_fromstring(fontname), cls);
+ swf_WriteABC(tag, file);
+
+ tag = swf_InsertTag(tag, ST_SYMBOLCLASS);
+ swf_SetU16(tag, 1);
+ swf_SetU16(tag, id);
+ swf_SetString(tag, fontname);
+
+ return tag;
+}
+
+
git.asbjorn.biz / swftools.git / blobdiff