git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test x|y|z
[swftools.git]
/
lib
/
as3
/
code.c
diff --git
a/lib/as3/code.c
b/lib/as3/code.c
index
2374392
..
bdf6daa
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},
};
@@
-465,7
+466,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);
}
}
}
}
@@
-911,7
+912,7
@@
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 %s]", m->name);
+ fprintf(fo, "[method %08x %s]", m, 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);
@@
-1038,6
+1039,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)
{
@@
-1112,16
+1121,26
@@
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)
@@
-1158,8
+1177,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);