const double*v2=_v2;
if(!v1 || !v2)
return v1==v2;
- return *v1==*v2;
+
+ if(*v1==*v2) return 1;
+ if(*v1!=*v1 && *v2!=*v2) return 1; //both values are NaN
+ return 0;
}
type_t float_type = {
return newstr;
}
-char* namespace_to_string(namespace_t*ns)
+char* namespace_tostring(namespace_t*ns)
{
if(!ns)
return strdup("NULL");
U8 type = ns->access;
access = access2str(type);
char*s = escape_string(ns->name);
- char*string = (char*)malloc(strlen(access)+strlen(s)+3);
- int l = sprintf(string, "[%s]%s", access, s);
+ char*string = (char*)malloc(strlen(access)+strlen(s)+7);
+ if(!s)
+ sprintf(string, "[%s]NULL", access, s);
+ else if(!*s)
+ sprintf(string, "[%s]\"\"", access, s);
+ else
+ sprintf(string, "[%s]", access, s);
+
free(s);
return string;
}
if(!strcmp(a, "")) access=0x16;
else if(!strcmp(a, "undefined")) access=0x08; // public??
else if(!strcmp(a, "package")) access=0x16;
+ else if(!strcmp(a, "public")) access=0x16;
else if(!strcmp(a, "packageinternal")) access=0x17;
else if(!strcmp(a, "protected")) access=0x18;
else if(!strcmp(a, "explicit")) access=0x19;
set->namespaces = list_new();
return set;
}
-char* namespace_set_to_string(namespace_set_t*set)
+char* namespace_set_tostring(namespace_set_t*set)
{
if(!set)
return strdup("NULL");
int l = 0;
namespace_list_t*lns = set->namespaces;
while(lns) {
- char*s = namespace_to_string(lns->namespace);
+ char*s = namespace_tostring(lns->namespace);
l += strlen(s)+1;
free(s);
lns = lns->next;
strcpy(desc, "{");
lns = set->namespaces;
while(lns) {
- char*s = namespace_to_string(lns->namespace);
+ char*s = namespace_tostring(lns->namespace);
strcat(desc, s);
free(s);
lns = lns->next;
{
NEW(multiname_t,m);
m->type = QNAME;
- m->ns = namespace_clone(ns);
+ if(!ns) {
+ m->ns = namespace_new_packageinternal("");
+ } else {
+ m->ns = namespace_clone(ns);
+ }
m->name = strdup(name);
return m;
}
char* access2str(int type)
{
- if(type==0x08) return "access08";
- else if(type==0x16) return "package";
+ if(type==0x08) return "namespace";
+ else if(type==0x16) return "public";
else if(type==0x17) return "packageinternal";
else if(type==0x18) return "protected";
else if(type==0x19) return "explicit";
m->type==MULTINAMEL || m->type==MULTINAMELA;
}
-char* multiname_to_string(multiname_t*m)
+char* multiname_tostring(multiname_t*m)
{
char*mname = 0;
if(!m)
} else if(m->type==RTQNAMELA) {
mname = strdup("<rt,l,attr>");
} else if(m->type==MULTINAME || m->type==MULTINAMEA) {
- char*s = namespace_set_to_string(m->namespace_set);
+ char*s = namespace_set_tostring(m->namespace_set);
mname = malloc(strlen(s)+namelen+16);
if(m->type == MULTINAME)
strcpy(mname,"<multi>");
strcat(mname, name);
free(s);
} else if(m->type==MULTINAMEL || m->type==MULTINAMELA) {
- char*s = namespace_set_to_string(m->namespace_set);
+ char*s = namespace_set_tostring(m->namespace_set);
mname = malloc(strlen(s)+16);
if(m->type == MULTINAMEL)
strcpy(mname,"<l,multi>");
if(m->namespace_set) {
namespace_set_destroy(m->namespace_set);m->namespace_set = 0;
}
+ m->type=0;
free(m);
}
}
constant_t* constant_new_string(char*s)
{
NEW(constant_t,c);
- c->s = strdup(s);
+ c->s = string_new4(s);
+ c->type = CONSTANT_STRING;
+ return c;
+}
+constant_t* constant_new_string2(const char*s, int len)
+{
+ NEW(constant_t,c);
+ c->s = string_new3(s, len);
c->type = CONSTANT_STRING;
return c;
}
} else if(c->type == CONSTANT_FLOAT) {
c->f = pool_lookup_float(pool, index);
} else if(c->type == CONSTANT_STRING) {
- c->s = strdup(pool_lookup_string(pool, index));
+ string_t s = pool_lookup_string2(pool, index);
+ c->s = string_dup3(&s);
} else if(UNIQUE_CONSTANT(c->type)) {
// ok
} else {
}
return c;
}
-char* constant_to_string(constant_t*c)
+char* constant_tostring(constant_t*c)
{
if(!c)
- return 0;
- char buf[30];
+ return strdup("NULL");
+ char buf[32];
if(NS_TYPE(c->type)) {
- return namespace_to_string(c->ns);
+ return namespace_tostring(c->ns);
} else if(c->type == CONSTANT_INT) {
sprintf(buf, "%d", c->i);
return strdup(buf);
sprintf(buf, "%u", c->u);
return strdup(buf);
} else if(c->type == CONSTANT_FLOAT) {
+ char buf[1024];
sprintf(buf, "%f", c->f);
return strdup(buf);
} else if(c->type == CONSTANT_STRING) {
- return strdup(c->s);
+ /* should we escape the string? \0 bytes won't be printed */
+ return strdup_n(c->s->str,c->s->len);
} else if(c->type == CONSTANT_TRUE) {
return strdup("true");
} else if(c->type == CONSTANT_FALSE) {
} else if(c->type == CONSTANT_FLOAT) {
return pool_register_float(pool, c->f);
} else if(c->type == CONSTANT_STRING) {
- return pool_register_string(pool, c->s);
+ return pool_register_string2(pool, c->s);
} else if(!constant_has_index(c)) {
return 1;
} else {
if(!c)
return;
if(c->type == CONSTANT_STRING) {
- free(c->s);c->s=0;
+ string_free(c->s);
} else if (NS_TYPE(c->type)) {
namespace_destroy(c->ns);c->ns=0;
}
assert(pos!=0);
return pos;
}
-int pool_register_string(pool_t*pool, const char*s)
+int pool_register_string(pool_t*pool, const char*str)
{
- if(!s) return 0;
+ if(!str) return 0;
+ string_t s = string_new2(str);
+ int pos = array_append_if_new(pool->x_strings, &s, 0);
+ assert(pos!=0);
+ return pos;
+}
+int pool_register_string2(pool_t*pool, string_t*s)
+{
+ if(!s || !s->str) return 0;
int pos = array_append_if_new(pool->x_strings, s, 0);
assert(pos!=0);
return pos;
{
if(!n) return 0;
int pos = array_append_if_new(pool->x_multinames, n, 0);
- if(pos==0) {
- *(int*)0=0xdead;
- }
assert(pos!=0);
return pos;
}
return 0;
int i = array_find(pool->x_namespaces, ns);
if(i<=0) {
- char*s = namespace_to_string(ns);
+ char*s = namespace_tostring(ns);
fprintf(stderr, "Couldn't find namespace \"%s\" %08x in constant pool\n", s, ns);
free(s);
return 0;
return 0;
int i = array_find(pool->x_namespace_sets, set);
if(i<=0) {
- char*s = namespace_set_to_string(set);
+ char*s = namespace_set_tostring(set);
fprintf(stderr, "Couldn't find namespace_set \"%s\" in constant pool\n", s);
free(s);
return 0;
}
return i;
}
-int pool_find_string(pool_t*pool, const char*s)
+int pool_find_string(pool_t*pool, const char*str)
{
- if(!s)
+ if(!str)
return 0;
- int i = array_find(pool->x_strings, s);
+ string_t s = string_new2(str);
+ int i = array_find(pool->x_strings, &s);
if(i<=0) {
fprintf(stderr, "Couldn't find string \"%s\" in constant pool\n", s);
return 0;
return 0;
int i = array_find(pool->x_multinames, name);
if(i<=0) {
- char*s = multiname_to_string(name);
+ char*s = multiname_tostring(name);
fprintf(stderr, "Couldn't find multiname \"%s\" in constant pool\n", s);
free(s);
return 0;
if(!i) return __builtin_nan("");
return *(double*)array_getkey(pool->x_floats, i);
}
-char*pool_lookup_string(pool_t*pool, int i)
+const char*pool_lookup_string(pool_t*pool, int i)
+{
+ string_t*s = array_getkey(pool->x_strings, i);
+ if(!s) return 0;
+ return s->str;
+}
+string_t pool_lookup_string2(pool_t*pool, int i)
{
- return (char*)array_getkey(pool->x_strings, i);
+ string_t*s = array_getkey(pool->x_strings, i);
+ return *s;
}
namespace_t*pool_lookup_namespace(pool_t*pool, int i)
{
p->x_ints = array_new2(&uint_type);
p->x_uints = array_new2(&uint_type);
p->x_floats = array_new2(&float_type);
- p->x_strings = array_new2(&charptr_type);
+ p->x_strings = array_new2(&stringstruct_type);
p->x_namespaces = array_new2(&namespace_type);
p->x_namespace_sets = array_new2(&namespace_set_type);
p->x_multinames = array_new2(&multiname_type);
DEBUG printf("%d ints\n", num_ints);
int t;
for(t=1;t<num_ints;t++) {
- S32 v = swf_GetS30(tag);
+ S32 v = swf_GetABCS32(tag);
DEBUG printf("int %d) %d\n", t, v);
array_append(pool->x_ints, &v, 0);
}
int num_uints = swf_GetU30(tag);
DEBUG printf("%d uints\n", num_uints);
for(t=1;t<num_uints;t++) {
- U32 v = swf_GetU30(tag);
+ U32 v = swf_GetABCU32(tag);
DEBUG printf("uint %d) %d\n", t, v);
array_append(pool->x_uints, &v, 0);
}
DEBUG printf("%d strings\n", num_strings);
for(t=1;t<num_strings;t++) {
int len = swf_GetU30(tag);
- char*s = malloc(len+1);
- swf_GetBlock(tag, s, len);
- s[len] = 0;
- array_append(pool->x_strings, s, 0);
- free(s);
- DEBUG printf("%d) \"%s\"\n", t, pool->x_strings->d[t].name);
+ string_t s = string_new(&tag->data[tag->pos], len);
+ swf_GetBlock(tag, 0, len);
+ array_append(pool->x_strings, &s, 0);
+ DEBUG printf("%d) \"%s\"\n", t, ((string_t*)array_getkey(pool->x_strings, t))->str);
}
int num_namespaces = swf_GetU30(tag);
DEBUG printf("%d namespaces\n", num_namespaces);
int namenr = swf_GetU30(tag);
const char*name = 0;
if(namenr)
- name = array_getkey(pool->x_strings, namenr);
+ name = pool_lookup_string(pool, namenr);
namespace_t*ns = namespace_new(type, name);
array_append(pool->x_namespaces, ns, 0);
- DEBUG printf("%d) %02x \"%s\"\n", t, type, namespace_to_string(ns));
+ DEBUG printf("%d) %02x \"%s\"\n", t, type, namespace_tostring(ns));
namespace_destroy(ns);
}
int num_sets = swf_GetU30(tag);
list_append(nsset->namespaces, namespace_clone(ns));
}
array_append(pool->x_namespace_sets, nsset, 0);
- DEBUG printf("set %d) %s\n", t, namespace_set_to_string(nsset));
+ DEBUG printf("set %d) %s\n", t, namespace_set_tostring(nsset));
namespace_set_destroy(nsset);
}
m.ns = (namespace_t*)array_getkey(pool->x_namespaces, namespace_index);
int name_index = swf_GetU30(tag);
if(name_index) // 0 = '*' (any)
- m.name = array_getkey(pool->x_strings, name_index);
+ m.name = pool_lookup_string(pool, name_index);
} else if(m.type==0x0f || m.type==0x10) {
int name_index = swf_GetU30(tag);
if(name_index) // 0 = '*' (any name)
- m.name = array_getkey(pool->x_strings, name_index);
+ m.name = pool_lookup_string(pool, name_index);
} else if(m.type==0x11 || m.type==0x12) {
} else if(m.type==0x09 || m.type==0x0e) {
int name_index = swf_GetU30(tag);
int namespace_set_index = swf_GetU30(tag);
if(name_index)
- m.name = array_getkey(pool->x_strings, name_index);
+ m.name = pool_lookup_string(pool, name_index);
m.namespace_set = (namespace_set_t*)array_getkey(pool->x_namespace_sets, namespace_set_index);
} else if(m.type==0x1b || m.type==0x1c) {
int namespace_set_index = swf_GetU30(tag);
} else {
printf("can't parse type %d multinames yet\n", m.type);
}
- DEBUG printf("multiname %d) %s\n", t, multiname_to_string(&m));
+ DEBUG printf("multiname %d) %s\n", t, multiname_tostring(&m));
array_append(pool->x_multinames, &m, 0);
}
}
+void pool_dump(pool_t*pool, FILE*fo, char flags)
+{
+ int t;
+ fprintf(fo, "%d integers:\n", pool->x_ints->num);
+ for(t=1;t<pool->x_ints->num;t++) {
+ S32 val = *(int*)array_getkey(pool->x_ints, t);
+ if(flags&1) fprintf(fo, "%d) %d\n", t, val);
+ }
+ fprintf(fo, "%d unsigned integers:\n", pool->x_uints->num);
+ for(t=1;t<pool->x_uints->num;t++) {
+ U32 val = *(unsigned int*)array_getkey(pool->x_uints, t);
+ if(flags&1) fprintf(fo, "%d) %d\n", t, val);
+ }
+ fprintf(fo, "%d floats:\n", pool->x_floats->num);
+ for(t=1;t<pool->x_floats->num;t++) {
+ double d = pool_lookup_float(pool, t);
+ if(flags&2) fprintf(fo, "%d) %f\n", t, d);
+ }
+ fprintf(fo, "%d strings:\n", pool->x_strings->num);
+ for(t=1;t<pool->x_strings->num;t++) {
+ string_t str = pool_lookup_string2(pool, t);
+ if(flags&1) fprintf(fo, "%d) ", t);
+ if(flags&1) fwrite(str.str, str.len, 1, fo);
+ if(flags&1) fprintf(fo, "\n", t);
+ }
+ fprintf(fo, "%d namespaces:\n", pool->x_namespaces->num);
+ for(t=1;t<pool->x_namespaces->num;t++) {
+ namespace_t*ns= (namespace_t*)array_getkey(pool->x_namespaces, t);
+ char*s = namespace_tostring(ns);
+ if(flags&1) fprintf(fo, "%d) %s\n", t, s);
+ free(s);
+ }
+ fprintf(fo, "%d namespace sets:\n", pool->x_namespace_sets->num);
+ for(t=1;t<pool->x_namespace_sets->num;t++) {
+ namespace_set_t*set = (namespace_set_t*)array_getkey(pool->x_namespace_sets, t);
+ char*s = namespace_set_tostring(set);
+ if(flags&1) fprintf(fo, "%d) %s\n", t, s);
+ free(s);
+ }
+
+ fprintf(fo, "%d multinames:\n", pool->x_multinames->num);
+ for(t=1;t<pool->x_multinames->num;t++) {
+ multiname_t*m = (multiname_t*)array_getkey(pool->x_multinames, t);
+ char*s = multiname_tostring(m);
+ if(flags&1) fprintf(fo, "%d) %s\n", t, s);
+ free(s);
+ }
+}
+
void pool_write(pool_t*pool, TAG*tag)
{
int t;
However when actually using zero strings as empty namespaces, the
flash player breaks.*/
//if(ns->name && ns->name[0])
- array_append_if_new(pool->x_strings, ns->name, 0);
+ pool_register_string(pool, ns->name);
}
//pool_register_int(pool, 15);
swf_SetU30(tag, pool->x_ints->num>1?pool->x_ints->num:0);
for(t=1;t<pool->x_ints->num;t++) {
S32 val = *(int*)array_getkey(pool->x_ints, t);
- swf_SetS30(tag, val);
+ swf_SetABCS32(tag, val);
}
swf_SetU30(tag, pool->x_uints->num>1?pool->x_uints->num:0);
for(t=1;t<pool->x_uints->num;t++) {
- swf_SetU30(tag, *(unsigned int*)array_getkey(pool->x_uints, t));
+ swf_SetABCU32(tag, *(unsigned int*)array_getkey(pool->x_uints, t));
}
swf_SetU30(tag, pool->x_floats->num>1?pool->x_floats->num:0);
for(t=1;t<pool->x_floats->num;t++) {
}
swf_SetU30(tag, pool->x_strings->num>1?pool->x_strings->num:0);
for(t=1;t<pool->x_strings->num;t++) {
- swf_SetU30String(tag, array_getkey(pool->x_strings, t));
+ string_t str = pool_lookup_string2(pool, t);
+ swf_SetU30String(tag, str.str, str.len);
}
swf_SetU30(tag, pool->x_namespaces->num>1?pool->x_namespaces->num:0);
for(t=1;t<pool->x_namespaces->num;t++) {
git.asbjorn.biz / swftools.git / blobdiff