+/*
+ * 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.
+ */
+
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
static const char *asmfn;
static int asmln;
+static const struct parsed_proto *g_func_sym_pp;
+static char g_comment[256];
+static int g_warn_cnt;
+static int g_cconv_novalidate;
+static int g_arm_mode;
+
// note: must be in ascending order
enum dx_type {
DXT_UNSPEC,
#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(); \
case DXT_BYTE:
return ".byte";
case DXT_WORD:
- return ".word";
+ return ".hword";
case DXT_DWORD:
return ".long";
case DXT_QUAD:
return strcpy(s, buf);
}
-static void check_sym(FILE *fhdr, const char *name)
+static void sprint_pp_short(const struct parsed_proto *pp, char *buf,
+ size_t buf_size)
{
- const struct parsed_proto *pp;
- char buf[256];
- int i, l;
+ 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, ")");
+}
- pp = proto_parse(fhdr, name, 1);
+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], *p;
+ int i;
+
+ pp = proto_parse(fhdr, varname, 1);
if (pp == NULL) {
- if (IS_START(name, "sub_"))
- aerr("sub_ sym missing proto: '%s'\n", name);
- return;
+ if (IS_START(varname, "sub_"))
+ awarn("sub_ sym missing proto: '%s'\n", varname);
+ return NULL;
}
if (!pp->is_func && !pp->is_fptr)
- return;
+ return NULL;
+
+ pp_print(fp_var, sizeof(fp_var), pp);
+
if (pp->argc_reg == 0)
- return;
+ goto check_sym;
if (pp->argc_reg == 1 && pp->argc_stack == 0
&& IS(pp->arg[0].reg, "ecx"))
{
- return;
+ goto check_sym;
}
- if (pp->argc_reg == 2
- && IS(pp->arg[0].reg, "ecx")
- && IS(pp->arg[1].reg, "edx"))
+ if (!g_cconv_novalidate
+ && (pp->argc_reg != 2
+ || !IS(pp->arg[0].reg, "ecx")
+ || !IS(pp->arg[1].reg, "edx")))
{
- return;
+ awarn("unhandled reg call: %s\n", fp_var);
}
- snprintf(buf, sizeof(buf), "%s %s(",
- pp->ret_type.name, name);
- l = strlen(buf);
- for (i = 0; i < pp->argc_reg; i++) {
- snprintf(buf + l, sizeof(buf) - l, "%s%s",
- i == 0 ? "" : ", ", pp->arg[i].reg);
- l = strlen(buf);
+check_sym:
+ // fptrs must use 32bit args, callsite might have no information and
+ // lack a cast to smaller types, which results in incorrectly masked
+ // args passed (callee may assume masked args, it does on ARM)
+ for (i = 0; i < pp->argc; i++) {
+ if (pp->arg[i].type.is_ptr)
+ continue;
+ p = pp->arg[i].type.name;
+ if (strstr(p, "int8") || strstr(p, "int16")
+ || strstr(p, "char") || strstr(p, "short"))
+ {
+ awarn("reference to %s with arg%d '%s'\n", pp->name, i + 1, p);
+ }
}
- if (pp->argc_stack > 0) {
- snprintf(buf + l, sizeof(buf) - l, ", {%d stack}", pp->argc_stack);
- l = strlen(buf);
+
+ 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_cmp_func(pp, pp_sym)) {
+ pp_print(fp_sym, sizeof(fp_sym), pp_sym);
+ anote("var: %s\n", fp_var);
+ anote("sym: %s\n", fp_sym);
+ awarn("^ mismatch\n");
}
- snprintf(buf + l, sizeof(buf) - l, ")");
-
- aerr("unhandled reg call: %s\n", buf);
+
+ 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 align_value(int src_val)
+{
+ if (src_val <= 0) {
+ awarn("bad align: %d\n", src_val);
+ src_val = 1;
+ }
+ if (!g_arm_mode)
+ return src_val;
+
+ return __builtin_ffs(src_val) - 1;
}
static int cmpstringp(const void *p1, const void *p2)
return strcmp(*(char * const *)p1, *(char * const *)p2);
}
+/* XXX: maybe move to external file? */
+static const char *unwanted_syms[] = {
+ "aRuntimeError",
+ "aTlossError",
+ "aSingError",
+ "aDomainError",
+ "aR6029ThisAppli",
+ "aR6028UnableToI",
+ "aR6027NotEnough",
+ "aR6026NotEnough",
+ "aR6025PureVirtu",
+ "aR6024NotEnough",
+ "aR6019UnableToO",
+ "aR6018Unexpecte",
+ "aR6017Unexpecte",
+ "aR6016NotEnough",
+ "aAbnormalProgra",
+ "aR6009NotEnough",
+ "aR6008NotEnough",
+ "aR6002FloatingP",
+ "aMicrosoftVisua",
+ "aRuntimeErrorPr",
+ "aThisApplicatio",
+ "aMicrosoftFindF",
+ "aMicrosoftOffic",
+};
+
+static int is_unwanted_sym(const char *sym)
+{
+ return bsearch(&sym, unwanted_syms, ARRAY_SIZE(unwanted_syms),
+ sizeof(unwanted_syms[0]), cmpstringp) != NULL;
+}
+
int main(int argc, char *argv[])
{
FILE *fout, *fasm, *fhdr, *frlist;
+ const struct parsed_proto *pp;
+ int no_decorations = 0;
+ char comment_char = '#';
char words[20][256];
char word[256];
char line[256];
- char comment[256];
+ char last_sym[32];
unsigned long val;
unsigned long cnt;
const char *sym;
char *p2;
if (argc < 4) {
- printf("usage:\n%s <.s> <.asm> <hdrf> [rlist]*\n",
+ // -nd: no symbol decorations
+ printf("usage:\n%s [-nd] [-i] [-a] <.s> <.asm> <hdrf> [rlist]*\n",
argv[0]);
return 1;
}
+ for (arg = 1; arg < argc; arg++) {
+ if (IS(argv[arg], "-nd"))
+ no_decorations = 1;
+ else if (IS(argv[arg], "-i"))
+ g_cconv_novalidate = 1;
+ else if (IS(argv[arg], "-a")) {
+ comment_char = '@';
+ g_arm_mode = 1;
+ }
+ else
+ break;
+ }
+
arg_out = arg++;
asmfn = argv[arg++];
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);
if (rlist_cnt > 0)
qsort(rlist, rlist_cnt, sizeof(rlist[0]), cmpstringp);
+ qsort(unwanted_syms, ARRAY_SIZE(unwanted_syms),
+ sizeof(unwanted_syms[0]), cmpstringp);
+
+ last_sym[0] = 0;
+
while (1) {
next_section(fasm, line);
if (feof(fasm))
else
aerr("unhandled section: '%s'\n", line);
- fprintf(fout, ".align 4\n");
+ fprintf(fout, ".align %d\n", align_value(4));
while (fgets(line, sizeof(line), fasm))
{
asmln++;
p = sskip(line);
- if (*p == 0 || *p == ';')
+ if (*p == 0)
+ continue;
+
+ if (*p == ';') {
+ if (IS_START(p, ";org") && sscanf(p + 5, "%Xh", &i) == 1) {
+ // ;org is only seen at section start, so assume . addr 0
+ i &= 0xfff;
+ if (i != 0)
+ fprintf(fout, "\t\t .skip 0x%x\n", i);
+ }
continue;
+ }
for (wordc = 0; wordc < ARRAY_SIZE(words); wordc++) {
p = sskip(next_word_s(words[wordc], sizeof(words[0]), p));
}
}
+ 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"))
if (IS(words[0], "align")) {
val = parse_number(words[1]);
- fprintf(fout, "\t\t .align %ld", val);
+ fprintf(fout, "\t\t .align %d", align_value(val));
goto fin;
}
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);
+ snprintf(last_sym, sizeof(last_sym), "%s", sym);
+
+ pp = proto_parse(fhdr, sym, 1);
+ if (pp != NULL) {
+ g_func_sym_pp = 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);
}
- pub_syms[pub_sym_cnt++] = strdup(sym);
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] == '\'') {
+ // fill out some unwanted strings with zeroes..
+ if (type == DXT_BYTE && words[w][0] == '\''
+ && is_unwanted_sym(last_sym))
+ {
+ len = 0;
+ for (; w < wordc; w++) {
+ if (words[w][0] == '\'') {
+ p = words[w] + 1;
+ for (; *p && *p != '\''; p++)
+ len++;
+ }
+ else {
+ // assume encoded byte
+ len++;
+ }
+ }
+ fprintf(fout, ".skip %d", len);
+ goto fin;
+ }
+ else 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 \"");
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 (w != wordc - 1)
aerr("TODO\n");
- fprintf(fout, "%s %s", type_name_float(type), words[w]);
+ if (g_arm_mode && type == DXT_TEN) {
+ fprintf(fout, ".fill 10");
+ snprintf(g_comment, sizeof(g_comment), "%s %s",
+ type_name_float(type), words[w]);
+ }
+ else
+ fprintf(fout, "%s %s", type_name_float(type), words[w]);
goto fin;
}
}
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", p);
+ snprintf(g_comment, sizeof(g_comment), "%s", p);
}
else {
- check_sym(fhdr, p);
- fprintf(fout, "_%s", p);
+ 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);
+ }
}
}
else {
}
fin:
- if (comment[0] != 0) {
- fprintf(fout, "\t\t# %s", comment);
- comment[0] = 0;
+ if (g_comment[0] != 0) {
+ fprintf(fout, "\t\t%c %s", comment_char, g_comment);
+ g_comment[0] = 0;
}
fprintf(fout, "\n");
- (void)proto_parse;
}
}
// dump public syms
for (i = 0; i < pub_sym_cnt; i++)
- fprintf(fout, ".global _%s\n", pub_syms[i]);
+ fprintf(fout, ".global %s%s\n",
+ no_decorations ? "" : "_", pub_syms[i]);
fclose(fout);
fclose(fasm);