X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fcode.c;h=6ef68a33e95c27fe49b452dc5f160332a3d8d6e5;hb=6d87a7d85f89d5b6a22fe6f1e8891ec73ed682f6;hp=4f7e2550802ea9ea888b7ffb5560fcb2f2b65a09;hpb=acd4d2f4ebdd984129651a6f449e008549985022;p=swftools.git

diff --git a/lib/as3/code.c b/lib/as3/code.c
index 4f7e255..6ef68a3 100644
--- a/lib/as3/code.c
+++ b/lib/as3/code.c
@@ -201,25 +201,25 @@ opcode_t opcodes[]={
 {0x53, "applytype", "n",       -1, 1, 0, OP_STACK_ARGS},
 
 /* 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},
+{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},
 {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)
@@ -291,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;
         }
 
@@ -845,7 +846,17 @@ 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)
+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)
 {
     abc_exception_list_t*e = exceptions;
     c = code_start(c);
@@ -905,11 +916,11 @@ 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;
-                    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);
-                    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;
@@ -924,8 +935,8 @@ int code_dump(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*p
                     int n = (ptroff_t)data;
                     fprintf(fo, "r%d", n);
                 } else if(*p == 'b') {
-                    int b = (ptroff_t)data;
-                    fprintf(fo, "%02x", b);
+                    int b = (signed char)(ptroff_t)data;
+                    fprintf(fo, "%d", b);
                 } else if(*p == 'j') {
                     if(c->branch)
                         fprintf(fo, "->%d", c->branch->pos);
@@ -943,7 +954,7 @@ int code_dump(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*p
                     if(l->def)
                         fprintf(fo, "default->%d", l->def->pos);
                     else
-                        fprintf(fo, "default->00000000", l->def->pos);
+                        fprintf(fo, "default->00000000");
                     code_list_t*t = l->targets;
                     while(t) {
                         if(t->code)
@@ -1006,13 +1017,15 @@ code_t* add_opcode(code_t*atag, U8 op)
 {
     code_t*tmp = (code_t*)rfx_calloc(sizeof(code_t));
     tmp->opcode = op;
-    tmp->next = 0;
     if(atag) {
 	tmp->prev = atag;
         tmp->next = atag->next;
+        if(tmp->next)
+            tmp->next->prev = tmp;
 	atag->next = tmp;
     } else {
 	tmp->prev = 0;
+        tmp->next = 0;
     }
     return tmp;
 }
@@ -1124,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;
 }
@@ -1138,6 +1151,7 @@ code_t*code_cutlast(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);