X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fcode.c;h=5e196def59a9428bd6673223775a742b8ae35fe7;hb=328c4aaa49aafc44551f72cb30fa5979542fa635;hp=e2a2f4382769487f72e6263179372a557d2c2aed;hpb=1df35f9584f6bd020e10de0d99a43e9168f2dbaa;p=swftools.git

diff --git a/lib/as3/code.c b/lib/as3/code.c
index e2a2f43..5e196de 100644
--- a/lib/as3/code.c
+++ b/lib/as3/code.c
@@ -201,26 +201,25 @@ opcode_t opcodes[]={
 {0x53, "applytype", "n",       -1, 1, 0, OP_STACK_ARGS},
 
 /* dummy instructions. Warning: these are not actually supported by flash */
+{0xfb, "__pushpackage__", "s",      0, 1, 0, OP_INTERNAL},
 {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},
+{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},
 };
 
-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;
-    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++) {
-            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)
@@ -292,6 +291,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;
+            c->prev = code;
             code = c;
         }
 
@@ -848,6 +848,12 @@ void stats_free(currentstats_t*stats)
 
 int code_dump(code_t*c)
 {
+    code_t*cc = code_start(c);
+    while(cc) {
+        assert(!cc->next || cc->next->prev == cc);
+        cc = cc->next;
+    }
+
     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)
@@ -1131,7 +1137,7 @@ code_t*code_cut(code_t*c)
     if(prev) prev->next=next;
     if(next) next->prev=prev;
     code_free(c);
-    
+
     if(next) return code_end(next);
     else     return prev;
 }
@@ -1173,11 +1179,11 @@ code_t* cut_last_push(code_t*c)
         } else if(c->opcode == OPCODE_CALLSUPER) {
             c->opcode = OPCODE_CALLSUPERVOID;
             return c;
-        } else if(c->opcode == OPCODE_NEWOBJECT ||
-                  c->opcode == OPCODE_NEWARRAY) {
+        } else if((c->opcode == OPCODE_NEWOBJECT ||
+                   c->opcode == OPCODE_NEWARRAY) &&
+                   !c->data[0]) {
             // we can discard these if they're not eating up stack parameters
-            if(!c->data[0])
-                return code_cutlast(c);
+            return code_cutlast(c);
         } 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