git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed innerfunction this.Class
[swftools.git]
/
lib
/
as3
/
code.c
diff --git
a/lib/as3/code.c
b/lib/as3/code.c
index
67c0d4e
..
233b996
100644
(file)
--- a/
lib/as3/code.c
+++ b/
lib/as3/code.c
@@
-207,20
+207,18
@@
opcode_t opcodes[]={
{0xff, "__break__", "s", 0, 0, 0, OP_RETURN|OP_INTERNAL},
};
{0xff, "__break__", "s", 0, 0, 0, OP_RETURN|OP_INTERNAL},
};
-static U8 op2index[256] = {254};
+static opcode_t* op2op[256] = {0,0,0};
-opcode_t* opcode_get(U8 op)
+static inline opcode_t* opcode_get(U8 op)
{
int t;
{
int t;
- if(op2index[0]==254) {
- memset(op2index, 255, sizeof(op2index));
+ if(!op2op[0x02]) {
+ memset(op2op, 0, sizeof(op2op));
for(t=0;t<sizeof(opcodes)/sizeof(opcodes[0]);t++) {
for(t=0;t<sizeof(opcodes)/sizeof(opcodes[0]);t++) {
- op2index[opcodes[t].opcode] = t;
+ op2op[opcodes[t].opcode] = &opcodes[t];
}
}
}
}
- if(op2index[op]!=255)
- return &opcodes[op2index[op]];
- return 0;
+ return op2op[op];
}
static code_t*pos2code(code_t**bytepos, code_t*c, int pos, int len)
}
static code_t*pos2code(code_t**bytepos, code_t*c, int pos, int len)
@@
-292,6
+290,7
@@
code_t*code_parse(TAG*tag, int len, abc_file_t*file, pool_t*pool, codelookup_t**
head = code = c;
} else {
code->next = c;
head = code = c;
} else {
code->next = c;
+ c->prev = code;
code = c;
}
code = c;
}
@@
-910,11
+909,11
@@
int code_dump2(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*
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;