X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Fasmproc.c;h=f52e0a6e22db38855622585732c460e31631669c;hb=7ba45c344765db59116cae21972f2ea5facf3815;hp=e8e9efb98447b344f1ba12592adaa4dd9973ba12;hpb=0c5547d1fce8d03c8ea1836236aa6a6c5bf6e816;p=ia32rtools.git

diff --git a/tools/asmproc.c b/tools/asmproc.c
index e8e9efb..f52e0a6 100644
--- 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;
@@ -124,6 +93,10 @@ const char *sym_use(const struct sl_item *sym)
 	return buf;
 }
 
+#define IS(w, y) !strcasecmp(w, y)
+#define IS_OR2(w, x, y) (IS(w, x) || IS(w, y))
+#define IS_OR3(w, x, y, z) (IS(w, x) || IS(w, y) || IS(w, z))
+
 int main(int argc, char *argv[])
 {
 	struct sl_item *symlist, *sym, ssym = { NULL, };
@@ -136,6 +109,9 @@ int main(int argc, char *argv[])
 	char word2[256];
 	char word3[256];
 	char word4[256];
+	char word5[256];
+	char word6[256];
+	char func[256];
 	char *p;
 	int i;
 
@@ -192,7 +168,12 @@ int main(int argc, char *argv[])
 
 		p = next_word(word2, sizeof(word2), p);
 
-		if (!strcasecmp(word2, "proc") || !strcasecmp(word2, "endp")) {
+		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);
@@ -203,11 +184,13 @@ int main(int argc, char *argv[])
 			}
 		}
 
-		if (!strcasecmp(word, "call") || !strcasecmp(word, "jmp")) {
+		if (IS_OR3(word, "call", "jmp", "public")) {
 			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;
@@ -220,13 +203,19 @@ int main(int argc, char *argv[])
 
 		p = next_word(word3, sizeof(word3), p);
 
-		if (!strcasecmp(word, "dd") && !strcasecmp(word2, "offset")) {
+		// dd offset <sym>
+		// push offset <sym>
+		// jcc short <sym>
+		if ( (IS_OR2(word, "dd", "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) {
-				fprintf(fout, "\t\tdd offset %s%s",
-					sym_use(sym), p);
+			if (sym != NULL
+			    && (sym->callsites || IS(word3, func)))
+			{
+				fprintf(fout, "\t\t%s %s %s%s",
+					word, word2, sym_use(sym), p);
 				continue;
 			}
 		}
@@ -237,7 +226,8 @@ int main(int argc, char *argv[])
 
 		p = next_word(word4, sizeof(word4), p);
 
-		if (!strcasecmp(word2, "dd") && !strcasecmp(word3, "offset")) {
+		// <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);
@@ -248,6 +238,46 @@ int main(int argc, char *argv[])
 			}
 		}
 
+		// mov <something>, offset <sym>
+		// jcc <some> ptr <sym>
+		if ( (IS(word, "mov") && IS(word3, "offset"))
+		  || (word[0] == 'j' && IS(word3, "ptr")) ) {
+			ssym.name = word4;
+			sym = bsearch(&ssym, symlist, symlist_cnt,
+				sizeof(symlist[0]), cmp_sym);
+			if (sym != NULL && sym->callsites) {
+				fprintf(fout, "\t\t%s\t%s %s %s%s",
+					word, word2, word3,
+					sym_use(sym), p);
+				continue;
+			}
+		}
+
+		p = sskip(p);
+		if (*p == 0 || *p == ';')
+			goto pass; // need at least 5 words
+
+		p = next_word(word5, sizeof(word5), p);
+
+		p = sskip(p);
+		if (*p == 0 || *p == ';')
+			goto pass; // need at least 6 words
+
+		p = next_word(word6, sizeof(word6), p);
+
+		// <op> dword ptr <something>, offset <sym>
+		if ( IS(word2, "dword") && IS(word3, "ptr")
+		  && IS(word5, "offset") ) {
+			ssym.name = word6;
+			sym = bsearch(&ssym, symlist, symlist_cnt,
+				sizeof(symlist[0]), cmp_sym);
+			if (sym != NULL && sym->callsites) {
+				fprintf(fout, "\t\t%s\tdword ptr %s offset %s%s",
+					word, word4, sym_use(sym), p);
+				continue;
+			}
+		}
+
 pass:
 		fwrite(line, 1, strlen(line), fout);
 	}