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 (from parent 1:
6b8893f
)
added code_append()
author
kramm
<kramm>
Tue, 2 Dec 2008 17:02:38 +0000
(17:02 +0000)
committer
kramm
<kramm>
Tue, 2 Dec 2008 17:02:38 +0000
(17:02 +0000)
lib/as3/code.c
patch
|
blob
|
history
lib/as3/code.h
patch
|
blob
|
history
diff --git
a/lib/as3/code.c
b/lib/as3/code.c
index
7273900
..
0b22b28
100644
(file)
--- a/
lib/as3/code.c
+++ b/
lib/as3/code.c
@@
-27,7
+27,7
@@
u = u30
r = register
*/
u = u30
r = register
*/
-
+
opcode_t opcodes[]={
{0xa0, "add", "", -2, 1, 0, 0},
{0xc5, "add_i", "", -2, 1, 0, 0},
opcode_t opcodes[]={
{0xa0, "add", "", -2, 1, 0, 0},
{0xc5, "add_i", "", -2, 1, 0, 0},
@@
-130,7
+130,9
@@
opcode_t opcodes[]={
{0x57, "newactivation", "", 0, 1, 0, OP_NEED_ACTIVATION},
{0x56, "newarray", "n", 0, 1, 0, OP_STACK_ARGS},
{0x5a, "newcatch", "u", 0, 1, 0, 0}, //u = index into exception_info
{0x57, "newactivation", "", 0, 1, 0, OP_NEED_ACTIVATION},
{0x56, "newarray", "n", 0, 1, 0, OP_STACK_ARGS},
{0x5a, "newcatch", "u", 0, 1, 0, 0}, //u = index into exception_info
+#define OP_NEWCLASS 0x58
{0x58, "newclass", "c", -1, 1, 0, 0}, //c = index into class_info
{0x58, "newclass", "c", -1, 1, 0, 0}, //c = index into class_info
+#define OP_NEWFUNCTION 0x40
{0x40, "newfunction", "m", 0, 1, 0, 0}, //i = index into method_info
{0x55, "newobject", "n", 0, 1, 0, OP_STACK_ARGS2},
{0x1e, "nextname", "", -2, 1, 0, 0},
{0x40, "newfunction", "m", 0, 1, 0, 0}, //i = index into method_info
{0x55, "newobject", "n", 0, 1, 0, OP_STACK_ARGS2},
{0x1e, "nextname", "", -2, 1, 0, 0},
@@
-645,6
+647,17
@@
static char callcode(currentstats_t*stats, int pos, int stack, int scope)
stats->flags |= FLAGS_SET_DXNS;
if(op->flags & OP_NEED_ACTIVATION)
stats->flags |= FLAGS_ACTIVATION;
stats->flags |= FLAGS_SET_DXNS;
if(op->flags & OP_NEED_ACTIVATION)
stats->flags |= FLAGS_ACTIVATION;
+
+ if(c->opcode == OP_NEWCLASS) {
+ abc_class_t*cls = (abc_class_t*)(c->data[0]);
+ if(scope > cls->init_scope_depth)
+ cls->init_scope_depth = scope;
+ }
+ if(c->opcode == OP_NEWFUNCTION) {
+ abc_method_t*m = (abc_method_t*)(c->data[0]);
+ if(m->body && scope > m->body->init_scope_depth)
+ m->body->init_scope_depth = scope;
+ }
if(op->flags & OP_REGISTER) {
char*p = op->params;
if(op->flags & OP_REGISTER) {
char*p = op->params;
@@
-945,6
+958,7
@@
code_t* add_opcode(code_t*atag, U8 op)
tmp->next = 0;
if(atag) {
tmp->prev = atag;
tmp->next = 0;
if(atag) {
tmp->prev = atag;
+ tmp->next = atag->next;
atag->next = tmp;
} else {
tmp->prev = 0;
atag->next = tmp;
} else {
tmp->prev = 0;
@@
-959,3
+973,23
@@
void codestats_print(codestats_t*stats)
printf("scope_depth: %d\n", stats->max_scope_depth);
}
printf("scope_depth: %d\n", stats->max_scope_depth);
}
+code_t* code_append(code_t*code, code_t*toappend)
+{
+ if(!code)
+ return toappend;
+ if(!toappend)
+ return code;
+ //find end of first list
+ while(code->next) {
+ code = code->next;
+ }
+ code_t*start=toappend;
+ //and start of second list
+ while(start->prev) {
+ start = start->prev;
+ }
+ code->next = start;
+ start->prev = code;
+ return toappend;
+}
+
diff --git
a/lib/as3/code.h
b/lib/as3/code.h
index
48adaf7
..
5acc8d1
100644
(file)
--- a/
lib/as3/code.h
+++ b/
lib/as3/code.h
@@
-1,5
+1,5
@@
-#ifndef __code_h__
-#define __code_h__
+#ifndef __abc_code_h__
+#define __abc_code_h__
#include "../q.h"
#include "../q.h"
@@
-68,5
+68,8
@@
codestats_t* code_get_statistics(code_t*code, exception_list_t*exceptions);
void codestats_print(codestats_t*s);
void codestats_free(codestats_t*s);
void codestats_print(codestats_t*s);
void codestats_free(codestats_t*s);
+code_t* code_append(code_t*code, code_t*toappend);
+
+#define code_new() (0)
#endif
#endif