small fixes

[swftools.git] / lib / as3 / code.c

diff --git a/lib/as3/code.c b/lib/as3/code.c
index acccb6a..5e196de 100644 (file)
--- a/lib/as3/code.c
+++ b/lib/as3/code.c
@@ -201,9 +201,10 @@ 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},
 };
 
@@ -1178,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