X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fcode.c;h=31c986f2fdaa66109f8536973c5581dc9a4e35be;hb=b8aa0577aae67db4da5221459102202febc5c103;hp=8f2033f2b92cb73cbc28b6c66eefabacf0d0c303;hpb=62a83d162b254d91da418cee25f5b87b067a3f92;p=swftools.git

diff --git a/lib/as3/code.c b/lib/as3/code.c
index 8f2033f..31c986f 100644
--- a/lib/as3/code.c
+++ b/lib/as3/code.c
@@ -371,15 +371,15 @@ code_t*code_parse(TAG*tag, int len, abc_file_t*file, pool_t*pool, codelookup_t**
         if(c) {
             opcode_t*op = opcode_get(c->opcode);
             if(op->flags & (OP_JUMP|OP_BRANCH)) {
-                printf("%5d) %02x %s %d\n", t, tag->data[start+t], op->name, c->data[0]);
+                printf("%50d) %02x %s %d\n", t, tag->data[start+t], op->name, c->data[0]);
             } else {
-                printf("%5d) %02x %s\n", t, tag->data[start+t], op->name);
+                printf("%50d) %02x %s\n", t, tag->data[start+t], op->name);
             }
         } else {
-            printf("%5d) %02x\n", t, tag->data[start+t]);
+            printf("%50d) %02x\n", t, tag->data[start+t]);
         }
     }
-    //printf("%5d) %02x\n", t, tag->data[start+t]);
+    //printf("%05d) %02x\n", t, tag->data[start+t]);
 #endif
 
     code_t*c = head;
@@ -471,72 +471,105 @@ static int opcode_write(TAG*tag, code_t*c, pool_t*pool, abc_file_t*file, int len
     while(*p) {
         void*data = c->data[pos++];
         assert(pos<=2);
-        if(*p == 'n') { // number
-            len += swf_SetU30(tag, (ptroff_t)data);
-        } else if(*p == '2') { //multiname
-            multiname_t*m = (multiname_t*)data;
-            len += swf_SetU30(tag, pool_register_multiname(pool, m));
-        } else if(*p == 'N') { //namespace
-            namespace_t*ns = (namespace_t*)data;
-            len += swf_SetU30(tag, pool_register_namespace(pool, ns));
-        } else if(*p == 'm') { //method
-            abc_method_t*m = (abc_method_t*)data;
-            len += swf_SetU30(tag, m->index);
-        } else if(*p == 'c') { //classinfo 
-            abc_class_t*cls = (abc_class_t*)data;
-            len += swf_SetU30(tag, cls->index);
-        } else if(*p == 'i') { //methodbody
-            abc_method_body_t*m = (abc_method_body_t*)data;
-            len += swf_SetU30(tag, m->index);
-        } else if(*p == 'I') { // int
-            len += swf_SetU30(tag, pool_register_int(pool, (ptroff_t)data));
-        } else if(*p == 'U') { // uint
-            len += swf_SetU30(tag, pool_register_uint(pool, (ptroff_t)data));
-        } else if(*p == 'f') { //  float
-            len += swf_SetU30(tag, pool_register_float(pool, *(double*)data));
-        } else if(*p == 'u') { // integer
-            len += swf_SetU30(tag, (ptroff_t)data);
-        } else if(*p == 'r') { // integer
-            len += swf_SetU30(tag, (ptroff_t)data);
-        } else if(*p == 'b') { // byte
-            if(tag)
-                swf_SetU8(tag, (ptroff_t)data);
-            len++;
-        } else if(*p == 'j') { // jump
-            int skip = length-c->pos-4;
-            if(c->branch) 
-                skip = (c->branch->pos) - c->pos - 4;
-            len += swf_SetS24(tag, skip);
-        } else if(*p == 's') { // string
-            int index = pool_register_string2(pool, (string_t*)data);
-            len += swf_SetU30(tag, index);
-        } else if(*p == 'D') { // debug statement
-            if(tag)
-                swf_SetU8(tag, 1);
-            len++;
-            len+=swf_SetU30(tag, pool_register_string(pool,c->data[0]));
-            if(tag)
-                swf_SetU8(tag, (ptroff_t)c->data[1]);
-            len++;
-            len+=swf_SetU30(tag, 0);
-        } else if(*p == 'S') { // switch statement
-            lookupswitch_t*l = (lookupswitch_t*)data;
-            int offset = 0;
-            len+=swf_SetS24(tag, l->def->pos-c->pos+offset); //default
-            code_list_t*t = l->targets;
-            if(list_length(t)) {
-                len+=swf_SetU30(tag, list_length(t)-1); //nr-1
+        switch(*p) {
+            case 'n': { // number
+                len += swf_SetU30(tag, (ptroff_t)data);
+                break;
+            }
+            case '2': { //multiname
+                multiname_t*m = (multiname_t*)data;
+                len += swf_SetU30(tag, pool_register_multiname(pool, m));
+                break;
+            }
+            case 'N': { //namespace
+                namespace_t*ns = (namespace_t*)data;
+                len += swf_SetU30(tag, pool_register_namespace(pool, ns));
+                break;
+            }
+            case 'm': { //method
+                abc_method_t*m = (abc_method_t*)data;
+                len += swf_SetU30(tag, m->index);
+                break;
+            }
+            case 'c': { //classinfo 
+                abc_class_t*cls = (abc_class_t*)data;
+                len += swf_SetU30(tag, cls->index);
+                break;
+            }
+            case 'i': { //methodbody
+                abc_method_body_t*m = (abc_method_body_t*)data;
+                len += swf_SetU30(tag, m->index);
+                break;
+            }
+            case 'I': { // int
+                len += swf_SetU30(tag, pool_register_int(pool, (ptroff_t)data));
+                break;
+            }
+            case 'U': { // uint
+                len += swf_SetU30(tag, pool_register_uint(pool, (ptroff_t)data));
+                break;
+            }
+            case 'f': { //  float
+                len += swf_SetU30(tag, pool_register_float(pool, *(double*)data));
+                break;
+            }
+            case 'u': { // integer
+                len += swf_SetU30(tag, (ptroff_t)data);
+                break;
+            }
+            case 'r': { // integer
+                len += swf_SetU30(tag, (ptroff_t)data);
+                break;
+            }
+            case 'b': { // byte
+                if(tag)
+                    swf_SetU8(tag, (ptroff_t)data);
+                len++;
+                break;
+            }
+            case 'j': { // jump
+                int skip = length-c->pos-4;
+                if(c->branch) 
+                    skip = (c->branch->pos) - c->pos - 4;
+                len += swf_SetS24(tag, skip);
+                break;
+            }
+            case 's': { // string
+                int index = pool_register_string2(pool, (string_t*)data);
+                len += swf_SetU30(tag, index);
+                break;
+            }
+            case 'D': { // debug statement
+                if(tag)
+                    swf_SetU8(tag, 1);
+                len++;
+                len+=swf_SetU30(tag, pool_register_string(pool,c->data[0]));
+                if(tag)
+                    swf_SetU8(tag, (ptroff_t)c->data[1]);
+                len++;
+                len+=swf_SetU30(tag, 0);
+                break;
+            }
+            case 'S': { // switch statement
+                lookupswitch_t*l = (lookupswitch_t*)data;
+                int offset = 0;
+                len+=swf_SetS24(tag, l->def->pos-c->pos+offset); //default
                 code_list_t*t = l->targets;
-                while(t) {
-                    len+=swf_SetS24(tag, t->code->pos - c->pos+offset);
-                    t = t->next;
+                if(list_length(t)) {
+                    len+=swf_SetU30(tag, list_length(t)-1); //nr-1
+                    code_list_t*t = l->targets;
+                    while(t) {
+                        len+=swf_SetS24(tag, t->code->pos - c->pos+offset);
+                        t = t->next;
+                    }
+                } else {
+                    len+=swf_SetU30(tag, 0); //nr-1
+                    len+=swf_SetS24(tag, l->def->pos-c->pos+offset);
                 }
-            } else {
-                len+=swf_SetU30(tag, 0); //nr-1
-                len+=swf_SetS24(tag, l->def->pos-c->pos+offset);
+                break;
             }
-        } else {
-            printf("Can't parse opcode param type \"%c\"\n", *p);
+            default:
+                printf("Can't parse opcode param type \"%c\"\n", *p);
         }
         p++;
     }
@@ -625,7 +658,7 @@ static void dumpstack(currentstats_t*stats)
     for(t=0;t<stats->num;t++) {
         code_t*c = stats->stack[t].code;
         opcode_t*op = opcode_get(c->opcode);
-        printf("%5d) %c %d:%d %s", t, (stats->stack[t].flags&FLAG_SEEN)?'x':'|', 
+        printf("%05d) %c %d:%d %s", t, (stats->stack[t].flags&FLAG_SEEN)?'x':'|', 
                                stats->stack[t].stackpos,
                                stats->stack[t].scopepos,
                                op->name);
@@ -812,17 +845,17 @@ static currentstats_t* code_get_stats(code_t*code, abc_exception_list_t*exceptio
     for(t=0;t<num;t++) {
         opcode_t*op = opcode_get(c->opcode);
         if(op->flags & (OP_JUMP|OP_BRANCH)) {
-            printf("%5d) %s %08x\n", t, op->name, c->branch);
+            printf("%05d) %s %08x\n", t, op->name, c->branch);
         } else if(op->params[0]=='2') {
-            printf("%5d) %s %s\n", t, op->name, multiname_tostring(c->data[0]));
+            printf("%05d) %s %s\n", t, op->name, multiname_tostring(c->data[0]));
         } else if(op->params[0]=='N') {
-            printf("%5d) %s %s\n", t, op->name, namespace_tostring(c->data[0]));
+            printf("%05d) %s %s\n", t, op->name, namespace_tostring(c->data[0]));
         } else {
-            printf("%5d) %s\n", t, op->name);
+            printf("%05d) %s\n", t, op->name);
         }
         c = c->next;
     }
-    //printf("%5d) %02x\n", t, tag->data[start+t]);
+    //printf("%05d) %02x\n", t, tag->data[start+t]);
 #endif
 
     num = 0;
@@ -903,13 +936,13 @@ int code_dump2(code_t*c, abc_exception_list_t*exceptions, abc_file_t*file, char*
 
             if(stats) {
                 int f = stats->stack[c->pos].flags;
-                fprintf(fo, "%s%5d) %c %d:%d %s ", prefix, c->pos, 
+                fprintf(fo, "%s%05d) %c %d:%d %s ", prefix, c->pos, 
                                        (f&FLAG_ERROR)?'E':((f&FLAG_SEEN)?'+':'|'),
                                        stats->stack[c->pos].stackpos,
                                        stats->stack[c->pos].scopepos,
                                        op->name);
             } else {
-                fprintf(fo, "%s%5d) ? ?:? %s ", prefix, c->pos, op->name);
+                fprintf(fo, "%s%05d) ? ?:? %s ", prefix, c->pos, op->name);
             }
 
             while(*p) {
@@ -1102,18 +1135,27 @@ code_t*code_dup(code_t*c)
 {
     if(!c) return 0;
 
-    while(c->prev) c = c->prev;
+    dict_t*pos2pos = dict_new2(&ptr_type);
 
     code_t*last = 0;
+    c = code_start(c);
+    code_t*start = 0;
+    char does_branch = 0;
     while(c) {
         NEW(code_t, n);
         memcpy(n, c, sizeof(code_t));
+        if(!start) 
+            start=n;
 
-        opcode_t*op = opcode_get(c->opcode);
-        if(c->branch || c->opcode == OPCODE_LABEL) {
-            fprintf(stderr, "Error: Can't duplicate branching code\n");
-            return 0;
+        if(c->opcode == OPCODE_LABEL || c->opcode == OPCODE_NOP) {
+            dict_put(pos2pos, c, n);
         }
+        if(c->branch) {
+            does_branch = 1;
+        }
+
+        opcode_t*op = opcode_get(c->opcode);
+        
         char*p = op?op->params:"";
         int pos=0;
         while(*p) {
@@ -1142,6 +1184,22 @@ code_t*code_dup(code_t*c)
         last = n;
         c = c->next;
     }
+   
+    if(does_branch) {
+        c = start;
+        while(c) {
+            if(c->branch) {
+                code_t*target = dict_lookup(pos2pos, c->branch);
+                if(!target) {
+                    fprintf(stderr, "Error: Can't find branch target in code_dup\n");
+                    return 0;
+                }
+                c->branch = target;
+            }
+            c = c->next;
+        }
+    }
+    dict_destroy(pos2pos);
     return last;
 }