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

diff --git a/tools/asmproc.c b/tools/asmproc.c
index e152669..fe6fa47 100644
--- 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
@@ -311,7 +330,7 @@ offset_loop:
 	}
 
 	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);
 	}