git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9fe415e
)
write out index instead of memory address, for methods
author
kramm
<kramm>
Fri, 9 Jan 2009 11:49:20 +0000
(11:49 +0000)
committer
kramm
<kramm>
Fri, 9 Jan 2009 11:49:20 +0000
(11:49 +0000)
lib/as3/code.c
patch
|
blob
|
history
diff --git
a/lib/as3/code.c
b/lib/as3/code.c
index
d5c3acf
..
e2a2f43
100644
(file)
--- a/
lib/as3/code.c
+++ b/
lib/as3/code.c
@@
-201,6
+201,7
@@
opcode_t opcodes[]={
{0x53, "applytype", "n", -1, 1, 0, OP_STACK_ARGS},
/* dummy instructions. Warning: these are not actually supported by flash */
{0x53, "applytype", "n", -1, 1, 0, OP_STACK_ARGS},
/* dummy instructions. Warning: these are not actually supported by flash */
+{0xfc, "__rethrow__", "", 0, 0, 0, OP_THROW|OP_INTERNAL},
{0xfd, "__fallthrough__", "s", 0, 0, 0, OP_INTERNAL},
{0xfe, "__continue__", "s", 0, 0, 0, OP_RETURN|OP_INTERNAL},
{0xff, "__break__", "s", 0, 0, 0, OP_RETURN|OP_INTERNAL},
{0xfd, "__fallthrough__", "s", 0, 0, 0, OP_INTERNAL},
{0xfe, "__continue__", "s", 0, 0, 0, OP_RETURN|OP_INTERNAL},
{0xff, "__break__", "s", 0, 0, 0, OP_RETURN|OP_INTERNAL},
@@
-845,7
+846,11
@@
void stats_free(currentstats_t*stats)
}
}
}
}
-int code_dump(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*prefix, FILE*fo)
+int code_dump(code_t*c)
+{
+ return code_dump2(c, 0, 0, "", stdout);
+}
+int code_dump2(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*prefix, FILE*fo)
{
abc_exception_list_t*e = exceptions;
c = code_start(c);
{
abc_exception_list_t*e = exceptions;
c = code_start(c);
@@
-905,11
+910,11
@@
int code_dump(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*p
free(m);
} else if(*p == 'm') {
abc_method_t*m = (abc_method_t*)data;
free(m);
} else if(*p == 'm') {
abc_method_t*m = (abc_method_t*)data;
- fprintf(fo, "[method %08x %s]", m, m->name);
+ fprintf(fo, "[method %08x %s]", m->index, m->name);
} else if(*p == 'c') {
abc_class_t*cls = (abc_class_t*)data;
char*classname = multiname_tostring(cls->classname);
} else if(*p == 'c') {
abc_class_t*cls = (abc_class_t*)data;
char*classname = multiname_tostring(cls->classname);
- fprintf(fo, "[classinfo %s]", classname);
+ fprintf(fo, "[classinfo %08x %s]", cls->index, classname);
free(classname);
} else if(*p == 'i') {
abc_method_body_t*b = (abc_method_body_t*)data;
free(classname);
} else if(*p == 'i') {
abc_method_body_t*b = (abc_method_body_t*)data;
@@
-924,8
+929,8
@@
int code_dump(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*p
int n = (ptroff_t)data;
fprintf(fo, "r%d", n);
} else if(*p == 'b') {
int n = (ptroff_t)data;
fprintf(fo, "r%d", n);
} else if(*p == 'b') {
- int b = (ptroff_t)data;
- fprintf(fo, "%02x", b);
+ int b = (signed char)(ptroff_t)data;
+ fprintf(fo, "%d", b);
} else if(*p == 'j') {
if(c->branch)
fprintf(fo, "->%d", c->branch->pos);
} else if(*p == 'j') {
if(c->branch)
fprintf(fo, "->%d", c->branch->pos);
@@
-943,7
+948,7
@@
int code_dump(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*p
if(l->def)
fprintf(fo, "default->%d", l->def->pos);
else
if(l->def)
fprintf(fo, "default->%d", l->def->pos);
else
- fprintf(fo, "default->00000000", l->def->pos);
+ fprintf(fo, "default->00000000");
code_list_t*t = l->targets;
while(t) {
if(t->code)
code_list_t*t = l->targets;
while(t) {
if(t->code)
@@
-1006,13
+1011,15
@@
code_t* add_opcode(code_t*atag, U8 op)
{
code_t*tmp = (code_t*)rfx_calloc(sizeof(code_t));
tmp->opcode = op;
{
code_t*tmp = (code_t*)rfx_calloc(sizeof(code_t));
tmp->opcode = op;
- tmp->next = 0;
if(atag) {
tmp->prev = atag;
tmp->next = atag->next;
if(atag) {
tmp->prev = atag;
tmp->next = atag->next;
+ if(tmp->next)
+ tmp->next->prev = tmp;
atag->next = tmp;
} else {
tmp->prev = 0;
atag->next = tmp;
} else {
tmp->prev = 0;
+ tmp->next = 0;
}
return tmp;
}
}
return tmp;
}