X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Fasmproc.c;h=6e6b62bc9eef560fe26eb971c18ddddab0734fc2;hb=315b77eb1daa01b075f6a08fc88a782f89d88dff;hp=e15266948dd3a29268ea86098708c1b0bd2da002;hpb=de50b98baf577c2ab9b9f680ea102c1dad14eb7c;p=ia32rtools.git

diff --git a/tools/asmproc.c b/tools/asmproc.c
index e152669..6e6b62b 100644
--- a/tools/asmproc.c
+++ b/tools/asmproc.c
@@ -1,3 +1,11 @@
+/*
+ * ia32rtools
+ * (C) notaz, 2013,2014
+ *
+ * This work is licensed under the terms of 3-clause BSD license.
+ * See COPYING file in the top-level directory.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -9,6 +17,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_)
@@ -17,6 +26,11 @@ static int cmp_sym(const void *p1_, const void *p2_)
 	const char *s1 = p1->name, *s2 = p2->name;
 	int i;
 
+	if (*s1 == '_')
+		s1++;
+	if (*s2 == '_')
+		s2++;
+
 	for (i = 0; ; i++) {
 		if ((s1[i] | s2[i]) == 0)
 			break;
@@ -50,7 +64,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 +78,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++;
 
@@ -79,12 +94,13 @@ void read_list(struct sl_item **sl_in, int *cnt, int *alloc,
 	*cnt = c;
 }
 
-const char *sym_use(const struct sl_item *sym)
+const char *sym_use(const struct sl_item *sym, int is_rm)
 {
 	static char buf[256+3];
 	int ret;
 
-	ret = snprintf(buf, sizeof(buf), "rm_%s", sym->name);
+	ret = snprintf(buf, sizeof(buf), "%s%s",
+	  is_rm ? "rm_" : "", sym->name);
 	if (ret >= sizeof(buf)) {
 		printf("truncation detected: '%s'\n", buf);
 		exit(1);
@@ -101,6 +117,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 +133,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 +150,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);
@@ -179,20 +202,28 @@ int main(int argc, char *argv[])
 				sizeof(symlist[0]), cmp_sym);
 			if (sym != NULL) {
 				sym->found = 1;
-				fprintf(fout, "rm_%s\t%s%s", word, word2, p);
+				fprintf(fout, "%s\t%s%s", sym_use(sym, 1), word2, p);
 				continue;
 			}
 		}
 
-		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);
-			if (sym != NULL
-			    && (sym->callsites || IS(word2, func)))
-			{
+			if (sym != NULL) {
 				fprintf(fout, "\t\t%s\t%s%s", word,
-					sym_use(sym), p);
+					sym_use(sym, sym->callsites || IS(word2, func)), p);
+				continue;
+			}
+		}
+
+		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, 1), p);
 				continue;
 			}
 		}
@@ -204,25 +235,39 @@ int main(int argc, char *argv[])
 		p = next_word(word3, sizeof(word3), p);
 
 		// push offset <sym>
+		if (IS(word, "push") && IS(word2, "offset")) {
+			ssym.name = word3;
+			sym = bsearch(&ssym, symlist, symlist_cnt,
+				sizeof(symlist[0]), cmp_sym);
+			if (sym != NULL) {
+				fprintf(fout, "\t\t%s %s %s%s", word, word2,
+				  sym_use(sym, sym->callsites || IS(word3, func)), p);
+				continue;
+			}
+		}
+
 		// jcc short <sym>
-		if ( (IS(word, "push") && IS(word2, "offset"))
-		  || (word[0] == 'j' && IS(word2, "short")) ) {
+		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
-			    && (sym->callsites || IS(word3, func)))
-			{
-				fprintf(fout, "\t\t%s %s %s%s",
-					word, word2, sym_use(sym), p);
+			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")) {
+		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 +278,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;
 		}
 
@@ -246,10 +294,10 @@ int main(int argc, char *argv[])
 			ssym.name = word4;
 			sym = bsearch(&ssym, symlist, symlist_cnt,
 				sizeof(symlist[0]), cmp_sym);
-			if (sym != NULL && sym->callsites) {
+			if (sym != NULL) {
 				fprintf(fout, "\t\t%s\t%s %s %s%s",
 					word, word2, word3,
-					sym_use(sym), p);
+					sym_use(sym, sym->callsites), p);
 				continue;
 			}
 		}
@@ -272,9 +320,9 @@ int main(int argc, char *argv[])
 			ssym.name = word6;
 			sym = bsearch(&ssym, symlist, symlist_cnt,
 				sizeof(symlist[0]), cmp_sym);
-			if (sym != NULL && sym->callsites) {
+			if (sym != NULL) {
 				fprintf(fout, "\t\t%s\tdword ptr %s offset %s%s",
-					word, word4, sym_use(sym), p);
+					word, word4, sym_use(sym, sym->callsites), p);
 				continue;
 			}
 		}
@@ -285,6 +333,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;
@@ -293,25 +354,15 @@ offset_loop:
 			sym = bsearch(&ssym, symlist, symlist_cnt,
 				sizeof(symlist[0]), cmp_sym);
 			fprintf(fout, " offset %s%s",
-				(sym != NULL && sym->callsites) ? sym_use(sym) : word,
+				(sym != NULL) ? sym_use(sym, sym->callsites) : 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);
 	}