translate: rework cc, jcc to func, lods

[ia32rtools.git] / tools / asmproc.c

diff --git a/tools/asmproc.c b/tools/asmproc.c
index c016fd5..be6d4cc 100644 (file)
--- a/tools/asmproc.c
+++ b/tools/asmproc.c
@@ -227,9 +227,7 @@ int main(int argc, char *argv[])
                p = next_word(word3, sizeof(word3), p);
 
                // push offset <sym>
-               // jcc short <sym>
-               if ( (IS(word, "push") && IS(word2, "offset"))
-                 || (word[0] == 'j' && IS(word2, "short") && !IS(word3, "exit")) ) {
+               if (IS(word, "push") && IS(word2, "offset")) {
                        ssym.name = word3;
                        sym = bsearch(&ssym, symlist, symlist_cnt,
                                sizeof(symlist[0]), cmp_sym);
@@ -240,6 +238,22 @@ int main(int argc, char *argv[])
                        }
                }
 
+               // jcc short <sym>
+               if (word[0] == 'j' && IS(word2, "short") && !IS(word3, "exit")) {
+                       ssym.name = word3;
+                       sym = bsearch(&ssym, symlist, symlist_cnt,
+                               sizeof(symlist[0]), cmp_sym);
+                       if (sym != NULL) {
+                               fprintf(fout, "\t\t%s ", word);
+                               // for conditional "call", don't print 'short'
+                               if (IS(word3, func))
+                                       fprintf(fout, "short ");
+                               fprintf(fout, "%s%s",
+                                 sym_use(sym, sym->callsites || IS(word3, func)), p);
+                               continue;
+                       }
+               }
+
                // dd offset <sym>
                if (IS(word, "dd")
                        && (IS(word2, "offset") || strstr(p, "offset")))