X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Fasmproc.c;h=e15266948dd3a29268ea86098708c1b0bd2da002;hb=054f95b2d6d035e4ea49601072f5b3d3d162a491;hp=0297664f3ca73fd085fdf87747c86c13940ed24c;hpb=8022df01f333cb5018c838a5b13e49edbb57d6b4;p=ia32rtools.git diff --git a/tools/asmproc.c b/tools/asmproc.c index 0297664..e152669 100644 --- a/tools/asmproc.c +++ b/tools/asmproc.c @@ -3,42 +3,11 @@ #include #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; - unsigned int is_replace:1; + unsigned int callsites:1; unsigned int found:1; }; @@ -48,22 +17,16 @@ static int cmp_sym(const void *p1_, const void *p2_) const char *s1 = p1->name, *s2 = p2->name; int i; - // replace is with syms from C with '_' prepended - if (p1->is_replace) - s1++; - if (p2->is_replace) - s2++; - for (i = 0; ; i++) { + if ((s1[i] | s2[i]) == 0) + break; + if (s1[i] == s2[i]) continue; - if (s1[i] == 0) { - if (s2[i] == 0 || s2[i] == '@') - break; - } - - if (s2[i] == 0 || s1[i] == '@') + if (s1[i] == 0 && s2[i] == '@') + break; + if (s1[i] == '@' && s2[i] == 0) break; return s1[i] - s2[i]; @@ -86,21 +49,21 @@ static int cmp_sym_sort(const void *p1_, const void *p2_) return ret; } -void read_list(struct sl_item **sl_in, int *cnt, int *alloc, FILE *f, int is_repl) +void read_list(struct sl_item **sl_in, int *cnt, int *alloc, + FILE *f, int callsites) { struct sl_item *sl = *sl_in; int c = *cnt; char line[256]; char word[256]; - char *r; while (fgets(line, sizeof(line), f) != NULL) { - r = next_word(word, sizeof(word), line); - if (r == word) + next_word(word, sizeof(word), line); + if (word[0] == 0 || word[0] == ';' || word[0] == '#') continue; sl[c].name = strdup(word); - sl[c].is_replace = is_repl; + sl[c].callsites = callsites; sl[c].found = 0; c++; @@ -121,8 +84,7 @@ const char *sym_use(const struct sl_item *sym) static char buf[256+3]; int ret; - ret = snprintf(buf, sizeof(buf), "%s%s", - sym->is_replace ? "" : "rm_", sym->name); + ret = snprintf(buf, sizeof(buf), "rm_%s", sym->name); if (ret >= sizeof(buf)) { printf("truncation detected: '%s'\n", buf); exit(1); @@ -131,9 +93,14 @@ 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, }; + int patch_callsites = 0; FILE *fout, *fin, *f; int symlist_alloc; int symlist_cnt; @@ -142,13 +109,15 @@ int main(int argc, char *argv[]) char word2[256]; char word3[256]; char word4[256]; - char *p; + char word5[256]; + char word6[256]; + char func[256]; + char *p, *p2; int i; - if (argc != 5) { - // rmlist - prefix func with 'rm_', callsites with '_' - // renlist - prefix func and callsites with 'rm_' - printf("usage:\n%s \n", + if (argc < 4) { + // -c - patch callsites + printf("usage:\n%s [[-c] ]*>\n", argv[0]); return 1; } @@ -158,22 +127,27 @@ int main(int argc, char *argv[]) symlist = calloc(symlist_alloc, sizeof(symlist[0])); my_assert_not(symlist, NULL); - f = fopen(argv[3], "r"); - my_assert_not(f, NULL); - read_list(&symlist, &symlist_cnt, &symlist_alloc, f, 1); - fclose(f); + for (i = 3; i < argc; i++) { + if (strcmp(argv[i], "-c") == 0) { + patch_callsites = 1; + continue; + } - f = fopen(argv[4], "r"); - my_assert_not(f, NULL); - read_list(&symlist, &symlist_cnt, &symlist_alloc, f, 0); - fclose(f); + f = fopen(argv[i], "r"); + my_assert_not(f, NULL); + read_list(&symlist, &symlist_cnt, &symlist_alloc, + f, patch_callsites); + fclose(f); + + patch_callsites = 0; + } qsort(symlist, symlist_cnt, sizeof(symlist[0]), cmp_sym_sort); #if 0 printf("symlist:\n"); for (i = 0; i < symlist_cnt; i++) - printf("%d '%s'\n", symlist[i].is_replace, symlist[i].name); + printf("%d '%s'\n", symlist[i].callsites, symlist[i].name); #endif fin = fopen(argv[2], "r"); @@ -194,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); @@ -205,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) { + if (sym != NULL + && (sym->callsites || IS(word2, func))) + { fprintf(fout, "\t\t%s\t%s%s", word, sym_use(sym), p); continue; @@ -222,36 +203,111 @@ int main(int argc, char *argv[]) p = next_word(word3, sizeof(word3), p); - if (!strcasecmp(word, "dd") && !strcasecmp(word2, "offset")) { + // push offset + // jcc short + 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) { - 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; } } + // dd offset + 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 p = next_word(word4, sizeof(word4), p); - if (!strcasecmp(word2, "dd") && !strcasecmp(word3, "offset")) { + // dd offset + if (IS(word2, "dd") && IS(word3, "offset")) { + fprintf(fout, "%s\tdd", word); + strcpy(word, word4); + goto offset_loop; + } + + // mov , offset + // jcc ptr + 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) { - fprintf(fout, "%s\tdd offset %s%s", word, + 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); + + // dword ptr , offset + 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); + 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++) { @@ -264,3 +320,5 @@ pass: return 0; } + +// vim:ts=2:shiftwidth=2