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 globalvarassign test case
[swftools.git]
/
lib
/
as3
/
code.c
diff --git
a/lib/as3/code.c
b/lib/as3/code.c
index
9fce3a8
..
d5c3acf
100644
(file)
--- a/
lib/as3/code.c
+++ b/
lib/as3/code.c
@@
-200,7
+200,8
@@
opcode_t opcodes[]={
//0x53: seen in builtin.abc
{0x53, "applytype", "n", -1, 1, 0, OP_STACK_ARGS},
//0x53: seen in builtin.abc
{0x53, "applytype", "n", -1, 1, 0, OP_STACK_ARGS},
-/* dummy instruction. Warning: this one is not actually supported by flash */
+/* dummy instructions. Warning: these are not actually supported by flash */
+{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},
};
{0xfe, "__continue__", "s", 0, 0, 0, OP_RETURN|OP_INTERNAL},
{0xff, "__break__", "s", 0, 0, 0, OP_RETURN|OP_INTERNAL},
};
@@
-414,16
+415,9
@@
void codelookup_free(codelookup_t*codelookup)
free(codelookup);
}
free(codelookup);
}
-code_t*code_find_start(code_t*c)
-{
- while(c && c->prev)
- c=c->prev;
- return c;
-}
-
void code_free(code_t*c)
{
void code_free(code_t*c)
{
- c = code_find_start(c);
+ c = code_start(c);
while(c) {
code_t*next = c->next;
opcode_t*op = opcode_get(c->opcode);
while(c) {
code_t*next = c->next;
opcode_t*op = opcode_get(c->opcode);
@@
-465,7
+459,7
@@
static int opcode_write(TAG*tag, code_t*c, pool_t*pool, abc_file_t*file, int len
c->opcode == OPCODE___CONTINUE__) {
fprintf(stderr, "Unresolved %s\n", op->name);
} else {
c->opcode == OPCODE___CONTINUE__) {
fprintf(stderr, "Unresolved %s\n", op->name);
} else {
- fprintf(stderr, "Error: writing undefined internal opcode %s", op->name);
+ fprintf(stderr, "Error: writing undefined internal opcode %s\n", op->name);
}
}
}
}
@@
-543,7
+537,7
@@
static int opcode_write(TAG*tag, code_t*c, pool_t*pool, abc_file_t*file, int len
void code_write(TAG*tag, code_t*code, pool_t*pool, abc_file_t*file)
{
void code_write(TAG*tag, code_t*code, pool_t*pool, abc_file_t*file)
{
- code = code_find_start(code);
+ code = code_start(code);
int pos = 0;
int length = 0;
code_t*c = code;
int pos = 0;
int length = 0;
code_t*c = code;
@@
-786,7
+780,7
@@
static char callcode(currentstats_t*stats, int pos, int stack, int scope)
static currentstats_t* code_get_stats(code_t*code, abc_exception_list_t*exceptions)
{
static currentstats_t* code_get_stats(code_t*code, abc_exception_list_t*exceptions)
{
- code = code_find_start(code);
+ code = code_start(code);
int num = 0;
code_t*c = code;
while(c) {
int num = 0;
code_t*c = code;
while(c) {
@@
-854,7
+848,7
@@
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)
{
abc_exception_list_t*e = exceptions;
int code_dump(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*prefix, FILE*fo)
{
abc_exception_list_t*e = exceptions;
- c = code_find_start(c);
+ c = code_start(c);
currentstats_t*stats = code_get_stats(c, exceptions);
int pos = 0;
currentstats_t*stats = code_get_stats(c, exceptions);
int pos = 0;
@@
-1038,6
+1032,14
@@
code_t* code_end(code_t*code)
code = code->next;
return code;
}
code = code->next;
return code;
}
+code_t* code_start(code_t*code)
+{
+ if(!code)
+ return 0;
+ while(code->prev)
+ code = code->prev;
+ return code;
+}
code_t* code_append(code_t*code, code_t*toappend)
{
code_t* code_append(code_t*code, code_t*toappend)
{
@@
-1079,7
+1081,7
@@
code_t*code_dup(code_t*c)
memcpy(n, c, sizeof(code_t));
opcode_t*op = opcode_get(c->opcode);
memcpy(n, c, sizeof(code_t));
opcode_t*op = opcode_get(c->opcode);
- if(c->branch) {
+ if(c->branch || c->opcode == OPCODE_LABEL) {
fprintf(stderr, "Error: Can't duplicate branching code\n");
return 0;
}
fprintf(stderr, "Error: Can't duplicate branching code\n");
return 0;
}
@@
-1112,20
+1114,31
@@
code_t*code_dup(code_t*c)
return last;
}
return last;
}
-code_t*code_cutlast(code_t*c)
+code_t*code_cut(code_t*c)
{
if(!c) return c;
{
if(!c) return c;
- assert(!c->next);
code_t*prev = c->prev;
code_t*prev = c->prev;
+ code_t*next = c->next;
c->prev = 0;
c->prev = 0;
- if(prev)
- prev->next=0;
+ c->next = 0;
+ if(prev) prev->next=next;
+ if(next) next->prev=prev;
code_free(c);
code_free(c);
- return prev;
+
+ if(next) return code_end(next);
+ else return prev;
+}
+
+code_t*code_cutlast(code_t*c)
+{
+ if(!c) return c;
+ assert(!c->next);
+ return code_cut(c);
}
code_t* cut_last_push(code_t*c)
{
}
code_t* cut_last_push(code_t*c)
{
+ assert(!c->next);
while(c) {
if(!c) break;
opcode_t*op = opcode_get(c->opcode);
while(c) {
if(!c) break;
opcode_t*op = opcode_get(c->opcode);
@@
-1158,8
+1171,14
@@
code_t* cut_last_push(code_t*c)
// we can discard these if they're not eating up stack parameters
if(!c->data[0])
return code_cutlast(c);
// we can discard these if they're not eating up stack parameters
if(!c->data[0])
return code_cutlast(c);
- }
- else
+ } else if(op->stack_minus ==0 && op->stack_plus == 0 &&
+ !(op->flags&~(OP_REGISTER|OP_SET_DXNS)) && c->prev) {
+ // trim code *before* the kill, inclocal, declocal, dxns
+ code_t*p = c->prev;
+ p->next = 0;
+ c->prev = 0;
+ return code_append(cut_last_push(p), c);
+ } else
break;
}
c = abc_pop(c);
break;
}
c = abc_pop(c);