fixed reconcile bug, moved local var initialization to the top of code blocks

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

diff --git a/lib/as3/code.c b/lib/as3/code.c
index e1ccba8..d5c3acf 100644 (file)
--- a/lib/as3/code.c
+++ b/lib/as3/code.c
@@ -415,16 +415,9 @@ void codelookup_free(codelookup_t*codelookup)
     free(codelookup);
 }
 
-code_t*code_find_start(code_t*c)
-{
-    while(c && c->prev) 
-        c=c->prev;
-    return c;
-}
-
 void code_free(code_t*c)
 {
-    c = code_find_start(c);
+    c = code_start(c);
     while(c) {
         code_t*next = c->next;
         opcode_t*op = opcode_get(c->opcode);
@@ -544,7 +537,7 @@ static int opcode_write(TAG*tag, code_t*c, pool_t*pool, abc_file_t*file, int len
 
 void code_write(TAG*tag, code_t*code, pool_t*pool, abc_file_t*file)
 {
-    code = code_find_start(code);
+    code = code_start(code);
     int pos = 0;
     int length = 0;
     code_t*c = code;
@@ -787,7 +780,7 @@ static char callcode(currentstats_t*stats, int pos, int stack, int scope)
 
 static currentstats_t* code_get_stats(code_t*code, abc_exception_list_t*exceptions) 
 {
-    code = code_find_start(code);
+    code = code_start(code);
     int num = 0;
     code_t*c = code;
     while(c) {
@@ -855,7 +848,7 @@ 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)
 {
     abc_exception_list_t*e = exceptions;
-    c = code_find_start(c);
+    c = code_start(c);
     currentstats_t*stats =  code_get_stats(c, exceptions);
 
     int pos = 0;
@@ -1039,6 +1032,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)
 {
@@ -1080,7 +1081,7 @@ code_t*code_dup(code_t*c)
         memcpy(n, c, sizeof(code_t));
 
         opcode_t*op = opcode_get(c->opcode);
-        if(c->branch) {
+        if(c->branch || c->opcode == OPCODE_LABEL) {
             fprintf(stderr, "Error: Can't duplicate branching code\n");
             return 0;
         }
@@ -1137,6 +1138,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);