translate: some 64bit math stuff, arg-reuse tailcall

[ia32rtools.git] / tools / asmproc.c

diff --git a/tools/asmproc.c b/tools/asmproc.c
index e152669..6f1e3d5 100644 (file)
--- a/tools/asmproc.c
+++ b/tools/asmproc.c
@@ -9,6 +9,7 @@ struct sl_item {
        char *name;
        unsigned int callsites:1;
        unsigned int found:1;
+       unsigned int ignore_missing:1;
 };
 
 static int cmp_sym(const void *p1_, const void *p2_)
@@ -50,7 +51,7 @@ static int cmp_sym_sort(const void *p1_, const void *p2_)
 }
 
 void read_list(struct sl_item **sl_in, int *cnt, int *alloc,
-       FILE *f, int callsites)
+       FILE *f, int callsites, int ignore_missing)
 {
        struct sl_item *sl = *sl_in;
        int c = *cnt;
@@ -64,6 +65,7 @@ void read_list(struct sl_item **sl_in, int *cnt, int *alloc,
 
                sl[c].name = strdup(word);
                sl[c].callsites = callsites;
+               sl[c].ignore_missing = ignore_missing;
                sl[c].found = 0;
                c++;
 
@@ -101,6 +103,7 @@ int main(int argc, char *argv[])
 {
        struct sl_item *symlist, *sym, ssym = { NULL, };
        int patch_callsites = 0;
+       int ignore_missing = 0;
        FILE *fout, *fin, *f;
        int symlist_alloc;
        int symlist_cnt;
@@ -116,9 +119,10 @@ int main(int argc, char *argv[])
        int i;
 
        if (argc < 4) {
-               // -c - patch callsites
-               printf("usage:\n%s <asmf_out> <asmf_in> [[-c] <listf>]*>\n",
+               printf("usage:\n%s <asmf_out> <asmf_in> [[-c][-i] <listf>]*>\n",
                        argv[0]);
+               printf("  -c - patch callsites\n"
+                                        "  -i - ignore missing syms\n");
                return 1;
        }
 
@@ -132,14 +136,19 @@ int main(int argc, char *argv[])
                        patch_callsites = 1;
                        continue;
                }
+               if (strcmp(argv[i], "-i") == 0) {
+                       ignore_missing = 1;
+                       continue;
+               }
 
                f = fopen(argv[i], "r");
                my_assert_not(f, NULL);
                read_list(&symlist, &symlist_cnt, &symlist_alloc,
-                       f, patch_callsites);
+                       f, patch_callsites, ignore_missing);
                fclose(f);
 
                patch_callsites = 0;
+               ignore_missing = 0;
        }
 
        qsort(symlist, symlist_cnt, sizeof(symlist[0]), cmp_sym_sort);
@@ -184,7 +193,7 @@ int main(int argc, char *argv[])
                        }
                }
 
-               if (IS_OR3(word, "call", "jmp", "public")) {
+               if (IS_OR2(word, "call", "jmp")) {
                        ssym.name = word2;
                        sym = bsearch(&ssym, symlist, symlist_cnt,
                                sizeof(symlist[0]), cmp_sym);
@@ -197,6 +206,16 @@ int main(int argc, char *argv[])
                        }
                }
 
+               if (IS(word, "public")) {
+                       ssym.name = word2;
+                       sym = bsearch(&ssym, symlist, symlist_cnt,
+                               sizeof(symlist[0]), cmp_sym);
+                       if (sym != NULL) {
+                               fprintf(fout, "\t\tpublic %s%s", sym_use(sym), p);
+                               continue;
+                       }
+               }
+
                p = sskip(p);
                if (*p == 0 || *p == ';')
                        goto pass; // need at least 3 words
@@ -220,9 +239,11 @@ int main(int argc, char *argv[])
                }
 
                // dd offset <sym>
-               if (IS(word, "dd") && IS(word2, "offset")) {
+               if (IS(word, "dd")
+                       && (IS(word2, "offset") || strstr(p, "offset")))
+               {
                        fprintf(fout, "\t\tdd");
-                       strcpy(word, word3);
+                       p = next_word(word, sizeof(word), line);
                        goto offset_loop;
                }
 
@@ -233,9 +254,12 @@ int main(int argc, char *argv[])
                p = next_word(word4, sizeof(word4), p);
 
                // <name> dd offset <sym>
-               if (IS(word2, "dd") && IS(word3, "offset")) {
+               if (IS(word2, "dd")
+                       && (IS(word3, "offset") || strstr(p, "offset")))
+               {
                        fprintf(fout, "%s\tdd", word);
-                       strcpy(word, word4);
+                       p = next_word(word, sizeof(word), line);
+                       p = next_word(word, sizeof(word), p);
                        goto offset_loop;
                }
 
@@ -285,6 +309,19 @@ pass:
 
 offset_loop:
                while (1) {
+                       p2 = next_word(word, sizeof(word), p);
+                       if (word[0] == 0 || word[0] == ';') {
+                               break;
+                       }
+                       if (!IS(word, "offset")) {
+                               // pass through
+                               p2 = strstr(p, "offset");
+                               if (p2 == NULL)
+                                       break;
+                               fwrite(p, 1, p2 - p, fout);
+                               p2 = next_word(word, sizeof(word), p2);
+                       }
+                       p = next_word(word, sizeof(word), p2);
                        p2 = strchr(word, ',');
                        if (p2)
                                *p2 = 0;
@@ -295,23 +332,13 @@ offset_loop:
                        fprintf(fout, " offset %s%s",
                                (sym != NULL && sym->callsites) ? sym_use(sym) : word,
                                p2 ? "," : "");
-
-                       p2 = next_word(word, sizeof(word), p);
-                       if (word[0] == 0 || word[0] == ';') {
-                               break;
-                       }
-                       if (!IS(word, "offset")) {
-                               printf("could not handle offset array\n");
-                               break;
-                       }
-                       p = next_word(word, sizeof(word), p2);
                }
                fprintf(fout, "%s", p);
                continue;
        }
 
        for (i = 0; i < symlist_cnt; i++) {
-               if (!symlist[i].found)
+               if (!symlist[i].found && !symlist[i].ignore_missing)
                        printf("warning: sym '%s' not found\n", symlist[i].name);
        }