X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fcode.c;h=bdf6daab49f82550b2bc7c7f91a130b4cf4e3132;hb=f2f63d449efb4dc54cceb8ff221f4a75c672370c;hp=8a729d4464ef74e617ad92ad2d14055958e05b84;hpb=719f26744e38f9abbcadfc132b214dfd950a79fd;p=swftools.git

diff --git a/lib/as3/code.c b/lib/as3/code.c
index 8a729d4..bdf6daa 100644
--- 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},
 
-/* 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},
 };
@@ -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 {
-            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;
-                    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);
@@ -1038,6 +1039,14 @@ code_t* code_end(code_t*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)
 {
@@ -1112,16 +1121,26 @@ code_t*code_dup(code_t*c)
     return last;
 }
 
-code_t*code_cutlast(code_t*c)
+code_t*code_cut(code_t*c)
 {
     if(!c) return c;
-    assert(!c->next);
     code_t*prev = c->prev;
+    code_t*next = c->next;
     c->prev = 0;
-    if(prev)
-        prev->next=0;
+    c->next = 0;
+    if(prev) prev->next=next;
+    if(next) next->prev=prev;
     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)
@@ -1153,8 +1172,19 @@ code_t* cut_last_push(code_t*c)
         } else if(c->opcode == OPCODE_CALLSUPER) {
             c->opcode = OPCODE_CALLSUPERVOID;
             return c;
-        }
-        else
+        } else if(c->opcode == OPCODE_NEWOBJECT ||
+                  c->opcode == OPCODE_NEWARRAY) {
+            // we can discard these if they're not eating up stack parameters
+            if(!c->data[0])
+                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
+            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);