static const char *asmfn;
static int asmln;
-static FILE *g_fhdr;
+static const struct parsed_proto *g_func_sym_pp;
+static char g_comment[256];
+static int g_warn_cnt;
+
+// note: must be in ascending order
enum dx_type {
DXT_UNSPEC,
DXT_BYTE,
DXT_TEN,
};
+#define anote(fmt, ...) \
+ printf("%s:%d: note: " fmt, asmfn, asmln, ##__VA_ARGS__)
+#define awarn(fmt, ...) do { \
+ printf("%s:%d: warning: " fmt, asmfn, asmln, ##__VA_ARGS__); \
+ if (++g_warn_cnt == 10) { \
+ fcloseall(); \
+ exit(1); \
+ } \
+} while (0)
#define aerr(fmt, ...) do { \
printf("%s:%d: error: " fmt, asmfn, asmln, ##__VA_ARGS__); \
fcloseall(); \
return "<bad>";
}
+static const char *type_name_float(enum dx_type type)
+{
+ switch (type) {
+ case DXT_DWORD:
+ return ".float";
+ case DXT_QUAD:
+ return ".double";
+ case DXT_TEN:
+ return ".tfloat";
+ default:
+ break;
+ }
+ return "<bad_float>";
+}
+
static int type_size(enum dx_type type)
{
switch (type) {
return strcpy(s, buf);
}
+static void sprint_pp_short(const struct parsed_proto *pp, char *buf,
+ size_t buf_size)
+{
+ char *p = buf;
+ size_t l;
+ int i;
+
+ if (pp->ret_type.is_ptr)
+ *p++ = 'p';
+ else if (IS(pp->ret_type.name, "void"))
+ *p++ = 'v';
+ else
+ *p++ = 'i';
+ *p++ = '(';
+ l = 2;
+
+ for (i = 0; i < pp->argc; i++) {
+ if (pp->arg[i].reg != NULL)
+ snprintf(buf + l, buf_size - l, "%s%s",
+ i == 0 ? "" : ",", pp->arg[i].reg);
+ else
+ snprintf(buf + l, buf_size - l, "%sa%d",
+ i == 0 ? "" : ",", i + 1);
+ l = strlen(buf);
+ }
+ snprintf(buf + l, buf_size - l, ")");
+}
+
+static const struct parsed_proto *check_var(FILE *fhdr,
+ const char *sym, const char *varname)
+{
+ const struct parsed_proto *pp, *pp_sym;
+ char fp_sym[256], fp_var[256];
+ int i, bad = 0;
+
+ pp = proto_parse(fhdr, varname, 1);
+ if (pp == NULL) {
+ if (IS_START(varname, "sub_"))
+ awarn("sub_ sym missing proto: '%s'\n", varname);
+ return NULL;
+ }
+
+ if (!pp->is_func && !pp->is_fptr)
+ return NULL;
+
+ pp_print(fp_var, sizeof(fp_var), pp);
+
+ if (pp->argc_reg == 0)
+ goto check_sym;
+ if (pp->argc_reg == 1 && pp->argc_stack == 0
+ && IS(pp->arg[0].reg, "ecx"))
+ {
+ goto check_sym;
+ }
+ if (pp->argc_reg != 2
+ || !IS(pp->arg[0].reg, "ecx")
+ || !IS(pp->arg[1].reg, "edx"))
+ {
+ awarn("unhandled reg call: %s\n", fp_var);
+ }
+
+check_sym:
+ sprint_pp_short(pp, g_comment, sizeof(g_comment));
+
+ if (sym != NULL) {
+ g_func_sym_pp = NULL;
+ pp_sym = proto_parse(fhdr, sym, 1);
+ if (pp_sym == NULL)
+ return pp;
+ if (!pp_sym->is_fptr)
+ aerr("func ptr data, but label '%s' !is_fptr\n", pp_sym->name);
+ g_func_sym_pp = pp_sym;
+ }
+ else {
+ pp_sym = g_func_sym_pp;
+ if (pp_sym == NULL)
+ return pp;
+ }
+
+ if (pp->argc != pp_sym->argc || pp->argc_reg != pp_sym->argc_reg)
+ bad = 1;
+ else {
+ for (i = 0; i < pp->argc; i++) {
+ if ((pp->arg[i].reg != NULL) != (pp_sym->arg[i].reg != NULL)) {
+ bad = 1;
+ break;
+ }
+ if ((pp->arg[i].reg != NULL)
+ && !IS(pp->arg[i].reg, pp_sym->arg[i].reg))
+ {
+ bad = 1;
+ break;
+ }
+ }
+ }
+
+ if (bad) {
+ pp_print(fp_sym, sizeof(fp_sym), pp_sym);
+ anote("var: %s\n", fp_var);
+ anote("sym: %s\n", fp_sym);
+ awarn("^ mismatch\n");
+ }
+
+ return pp;
+}
+
+static void output_decorated_pp(FILE *fout,
+ const struct parsed_proto *pp)
+{
+ if (pp->name[0] != '_')
+ fprintf(fout, pp->is_fastcall ? "@" : "_");
+ fprintf(fout, "%s", pp->name);
+ if (pp->is_stdcall && pp->argc > 0)
+ fprintf(fout, "@%d", pp->argc * 4);
+}
+
+static int cmpstringp(const void *p1, const void *p2)
+{
+ return strcmp(*(char * const *)p1, *(char * const *)p2);
+}
+
int main(int argc, char *argv[])
{
- FILE *fout, *fasm;
+ FILE *fout, *fasm, *fhdr, *frlist;
+ const struct parsed_proto *pp;
+ int no_decorations = 0;
char words[20][256];
- //int sep_after[20];
char word[256];
char line[256];
- char comment[256];
unsigned long val;
unsigned long cnt;
const char *sym;
enum dx_type type;
+ char **pub_syms;
+ int pub_sym_cnt = 0;
+ int pub_sym_alloc;
+ char **rlist;
+ int rlist_cnt = 0;
+ int rlist_alloc;
int is_label;
+ int is_bss;
int wordc;
int first;
int arg_out;
int arg = 1;
int len;
- int w;
+ int w, i;
char *p;
char *p2;
- if (argc != 4) {
- printf("usage:\n%s <.s> <.asm> <hdrf>\n",
+ if (argc < 4) {
+ // -nd: no symbol decorations
+ printf("usage:\n%s [-nd] <.s> <.asm> <hdrf> [rlist]*\n",
argv[0]);
return 1;
}
+ for (arg = 1; arg < argc; arg++) {
+ if (IS(argv[arg], "-nd"))
+ no_decorations = 1;
+ else
+ break;
+ }
+
arg_out = arg++;
asmfn = argv[arg++];
my_assert_not(fasm, NULL);
hdrfn = argv[arg++];
- g_fhdr = fopen(hdrfn, "r");
- my_assert_not(g_fhdr, NULL);
+ fhdr = fopen(hdrfn, "r");
+ my_assert_not(fhdr, NULL);
fout = fopen(argv[arg_out], "w");
my_assert_not(fout, NULL);
- comment[0] = 0;
+ pub_sym_alloc = 64;
+ pub_syms = malloc(pub_sym_alloc * sizeof(pub_syms[0]));
+ my_assert_not(pub_syms, NULL);
+
+ rlist_alloc = 64;
+ rlist = malloc(rlist_alloc * sizeof(rlist[0]));
+ my_assert_not(rlist, NULL);
+
+ for (; arg < argc; arg++) {
+ frlist = fopen(argv[arg], "r");
+ my_assert_not(frlist, NULL);
+
+ while (fgets(line, sizeof(line), frlist)) {
+ p = sskip(line);
+ if (*p == 0 || *p == ';')
+ continue;
+
+ p = next_word(words[0], sizeof(words[0]), p);
+ if (words[0][0] == 0)
+ continue;
- while (!feof(fasm)) {
+ if (rlist_cnt >= rlist_alloc) {
+ rlist_alloc = rlist_alloc * 2 + 64;
+ rlist = realloc(rlist, rlist_alloc * sizeof(rlist[0]));
+ my_assert_not(rlist, NULL);
+ }
+ rlist[rlist_cnt++] = strdup(words[0]);
+ }
+
+ fclose(frlist);
+ frlist = NULL;
+ }
+
+ if (rlist_cnt > 0)
+ qsort(rlist, rlist_cnt, sizeof(rlist[0]), cmpstringp);
+
+ while (1) {
next_section(fasm, line);
+ if (feof(fasm))
+ break;
if (IS(line + 1, "text"))
continue;
continue;
for (wordc = 0; wordc < ARRAY_SIZE(words); wordc++) {
- //sep_after[wordc] = 0;
p = sskip(next_word_s(words[wordc], sizeof(words[0]), p));
if (*p == 0 || *p == ';') {
wordc++;
break;
}
if (*p == ',') {
- //sep_after[wordc] = 1;
p = sskip(p + 1);
}
}
+ if (*p == ';') {
+ p = sskip(p + 1);
+ if (IS_START(p, "sctclrtype"))
+ g_func_sym_pp = NULL;
+ }
+
if (wordc == 2 && IS(words[1], "ends"))
break;
+ if (wordc <= 2 && IS(words[0], "end"))
+ break;
if (wordc < 2)
aerr("unhandled: '%s'\n", words[0]);
aerr("unhandled decl: '%s %s'\n", words[0], words[1]);
if (sym != NULL) {
+ // public/global name
+ if (pub_sym_cnt >= pub_sym_alloc) {
+ pub_sym_alloc *= 2;
+ pub_syms = realloc(pub_syms, pub_sym_alloc * sizeof(pub_syms[0]));
+ my_assert_not(pub_syms, NULL);
+ }
+ pub_syms[pub_sym_cnt++] = strdup(sym);
+
+ pp = proto_parse(fhdr, sym, 1);
+ if (pp != NULL)
+ g_func_sym_pp = NULL;
+
len = strlen(sym);
- fprintf(fout, "_%s:", sym);
+ fprintf(fout, "%s%s:", no_decorations ? "" : "_", sym);
len += 2;
if (len < 8)
fprintf(fout, "\t\t ");
}
- if (type == DXT_BYTE && words[w][0] == '\'') {
+ if (type == DXT_BYTE
+ && (words[w][0] == '\''
+ || (w + 1 < wordc && words[w + 1][0] == '\'')))
+ {
// string; use asciz for most common case
if (w == wordc - 2 && IS(words[w + 1], "0")) {
fprintf(fout, ".asciz \"");
aerr("bad dup?\n");
memmove(word, p, p2 - p);
word[p2 - p] = 0;
- val = parse_number(word);
+
+ val = 0;
+ if (!IS(word, "?"))
+ val = parse_number(word);
fprintf(fout, ".fill 0x%02lx,%d,0x%02lx",
cnt, type_size(type), val);
p = words[w];
val = (p[1] << 24) | (p[2] << 16) | (p[3] << 8) | p[4];
fprintf(fout, ".long 0x%lx", val);
- snprintf(comment, sizeof(comment), "%s", words[w]);
+ snprintf(g_comment, sizeof(g_comment), "%s", words[w]);
goto fin;
}
- if ((type == DXT_QUAD || type == DXT_TEN)
- && strchr(words[w], '.'))
+ if (type >= DXT_DWORD && strchr(words[w], '.'))
{
if (w != wordc - 1)
aerr("TODO\n");
- fprintf(fout, type == DXT_TEN ? ".tfloat " : ".double ");
- fprintf(fout, "%s", words[w]);
+ fprintf(fout, "%s %s", type_name_float(type), words[w]);
goto fin;
}
if (!first)
fprintf(fout, ", ");
- is_label = 0;
- if (w >= wordc - 2 && IS(words[w], "offset")) {
+ is_label = is_bss = 0;
+ if (w <= wordc - 2 && IS(words[w], "offset")) {
is_label = 1;
w++;
}
+ else if (IS(words[w], "?")) {
+ is_bss = 1;
+ }
else if (type == DXT_DWORD
&& !('0' <= words[w][0] && words[w][0] <= '9'))
{
is_label = 1;
}
- if (is_label) {
+ if (is_bss) {
+ fprintf(fout, "0");
+ }
+ else if (is_label) {
p = words[w];
- if (IS_START(p, "loc_") || strchr(p, '?') || strchr(p, '@'))
+ if (IS_START(p, "loc_") || IS_START(p, "__imp")
+ || strchr(p, '?') || strchr(p, '@')
+ || bsearch(&p, rlist, rlist_cnt, sizeof(rlist[0]),
+ cmpstringp))
{
fprintf(fout, "0");
- snprintf(comment, sizeof(comment), "%s", words[w + 1]);
- goto fin;
+ snprintf(g_comment, sizeof(g_comment), "%s", p);
+ }
+ else {
+ pp = check_var(fhdr, sym, p);
+ if (pp == NULL) {
+ fprintf(fout, "%s%s",
+ (no_decorations || p[0] == '_') ? "" : "_", p);
+ }
+ else {
+ if (no_decorations)
+ fprintf(fout, "%s", pp->name);
+ else
+ output_decorated_pp(fout, pp);
+ }
}
- fprintf(fout, "_%s", p);
}
else {
val = parse_number(words[w]);
}
fin:
- if (comment[0] != 0) {
- fprintf(fout, "\t\t# %s", comment);
- comment[0] = 0;
+ if (g_comment[0] != 0) {
+ fprintf(fout, "\t\t# %s", g_comment);
+ g_comment[0] = 0;
}
fprintf(fout, "\n");
- (void)proto_parse;
}
}
+ fprintf(fout, "\n");
+
+ // dump public syms
+ for (i = 0; i < pub_sym_cnt; i++)
+ fprintf(fout, ".global %s%s\n",
+ no_decorations ? "" : "_", pub_syms[i]);
+
fclose(fout);
fclose(fasm);
- fclose(g_fhdr);
+ fclose(fhdr);
return 0;
}