flag/cond handling improvements

[ia32rtools.git] / tools / asmproc.c

diff --git a/tools/asmproc.c b/tools/asmproc.c
index 4b40090..e152669 100644 (file)
--- a/tools/asmproc.c
+++ b/tools/asmproc.c
@@ -3,38 +3,7 @@
 #include <string.h>
 
 #include "my_assert.h"
-
-static int my_isblank(char c)
-{
-       return c == '\t' || c == ' ' || c == '\r' || c == '\n';
-}
-
-static char *sskip(char *s)
-{
-       while (my_isblank(*s))
-               s++;
-
-       return s;
-}
-
-static char *next_word(char *w, size_t wsize, char *s)
-{
-       size_t i;
-
-       s = sskip(s);
-
-       for (i = 0; i < wsize - 1; i++) {
-               if (*s == 0 || my_isblank(s[i]))
-                       break;
-               w[i] = s[i];
-       }
-       w[i] = 0;
-
-       if (*s != 0 && !my_isblank(s[i]))
-               printf("warning: '%s' truncated\n", w);
-
-       return s + i;
-}
+#include "my_str.h"
 
 struct sl_item {
        char *name;
@@ -142,7 +111,8 @@ int main(int argc, char *argv[])
        char word4[256];
        char word5[256];
        char word6[256];
-       char *p;
+       char func[256];
+       char *p, *p2;
        int i;
 
        if (argc < 4) {
@@ -199,6 +169,11 @@ int main(int argc, char *argv[])
                p = next_word(word2, sizeof(word2), p);
 
                if (IS_OR2(word2, "proc", "endp")) {
+                       if (IS(word2, "proc"))
+                               strcpy(func, word);
+                       else
+                               func[0] = 0;
+
                        ssym.name = word;
                        sym = bsearch(&ssym, symlist, symlist_cnt,
                                sizeof(symlist[0]), cmp_sym);
@@ -213,7 +188,9 @@ int main(int argc, char *argv[])
                        ssym.name = word2;
                        sym = bsearch(&ssym, symlist, symlist_cnt,
                                sizeof(symlist[0]), cmp_sym);
-                       if (sym != NULL && sym->callsites) {
+                       if (sym != NULL
+                           && (sym->callsites || IS(word2, func)))
+                       {
                                fprintf(fout, "\t\t%s\t%s%s", word,
                                        sym_use(sym), p);
                                continue;
@@ -226,21 +203,29 @@ int main(int argc, char *argv[])
 
                p = next_word(word3, sizeof(word3), p);
 
-               // dd offset <sym>
                // push offset <sym>
                // jcc short <sym>
-               if ( (IS_OR2(word, "dd", "push") && IS(word2, "offset"))
+               if ( (IS(word, "push") && IS(word2, "offset"))
                  || (word[0] == 'j' && IS(word2, "short")) ) {
                        ssym.name = word3;
                        sym = bsearch(&ssym, symlist, symlist_cnt,
                                sizeof(symlist[0]), cmp_sym);
-                       if (sym != NULL && sym->callsites) {
+                       if (sym != NULL
+                           && (sym->callsites || IS(word3, func)))
+                       {
                                fprintf(fout, "\t\t%s %s %s%s",
                                        word, word2, sym_use(sym), p);
                                continue;
                        }
                }
 
+               // dd offset <sym>
+               if (IS(word, "dd") && IS(word2, "offset")) {
+                       fprintf(fout, "\t\tdd");
+                       strcpy(word, word3);
+                       goto offset_loop;
+               }
+
                p = sskip(p);
                if (*p == 0 || *p == ';')
                        goto pass; // need at least 4 words
@@ -249,14 +234,9 @@ int main(int argc, char *argv[])
 
                // <name> dd offset <sym>
                if (IS(word2, "dd") && IS(word3, "offset")) {
-                       ssym.name = word4;
-                       sym = bsearch(&ssym, symlist, symlist_cnt,
-                               sizeof(symlist[0]), cmp_sym);
-                       if (sym != NULL && sym->callsites) {
-                               fprintf(fout, "%s\tdd offset %s%s", word,
-                                       sym_use(sym), p);
-                               continue;
-                       }
+                       fprintf(fout, "%s\tdd", word);
+                       strcpy(word, word4);
+                       goto offset_loop;
                }
 
                // mov <something>, offset <sym>
@@ -301,6 +281,33 @@ int main(int argc, char *argv[])
 
 pass:
                fwrite(line, 1, strlen(line), fout);
+               continue;
+
+offset_loop:
+               while (1) {
+                       p2 = strchr(word, ',');
+                       if (p2)
+                               *p2 = 0;
+
+                       ssym.name = word;
+                       sym = bsearch(&ssym, symlist, symlist_cnt,
+                               sizeof(symlist[0]), cmp_sym);
+                       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++) {
@@ -313,3 +320,5 @@ pass:
 
        return 0;
 }
+
+// vim:ts=2:shiftwidth=2