+/*
+ * 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 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 {
case DXT_BYTE:
return ".byte";
case DXT_WORD:
- return ".word";
+ return ".hword";
case DXT_DWORD:
return ".long";
case DXT_QUAD:
const char *sym, const char *varname)
{
const struct parsed_proto *pp, *pp_sym;
- char fp_sym[256], fp_var[256];
- int i, bad = 0;
+ char fp_sym[256], fp_var[256], *p;
+ int i;
pp = proto_parse(fhdr, varname, 1);
if (pp == NULL) {
}
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);
+ }
+ }
+
sprint_pp_short(pp, g_comment, sizeof(g_comment));
if (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) {
+ 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);
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);
int main(int argc, char *argv[])
{
- FILE *fout, *fasm, *fhdr, *frlist;
+ FILE *fout, *fasm, *fhdr = NULL, *frlist;
const struct parsed_proto *pp;
int no_decorations = 0;
+ char comment_char = '#';
char words[20][256];
char word[256];
char line[256];
char **rlist;
int rlist_cnt = 0;
int rlist_alloc;
+ int header_mode = 0;
+ int is_ro = 0;
int is_label;
int is_bss;
int wordc;
if (argc < 4) {
// -nd: no symbol decorations
- printf("usage:\n%s [-nd] [-i] <.s> <.asm> <hdrf> [rlist]*\n",
- argv[0]);
+ printf("usage:\n%s [-nd] [-i] [-a] <.s> <.asm> <hdrf> [rlist]*\n"
+ "%s -hdr <.h> <.asm>\n",
+ argv[0], argv[0]);
return 1;
}
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 if (IS(argv[arg], "-hdr"))
+ header_mode = 1;
else
break;
}
fasm = fopen(asmfn, "r");
my_assert_not(fasm, NULL);
- hdrfn = argv[arg++];
- fhdr = fopen(hdrfn, "r");
- my_assert_not(fhdr, NULL);
+ if (!header_mode) {
+ hdrfn = argv[arg++];
+ fhdr = fopen(hdrfn, "r");
+ my_assert_not(fhdr, NULL);
+ }
fout = fopen(argv[arg_out], "w");
my_assert_not(fout, NULL);
if (IS(line + 1, "text"))
continue;
- if (IS(line + 1, "rdata"))
- fprintf(fout, "\n.section .rodata\n");
- else if (IS(line + 1, "data"))
- fprintf(fout, "\n.data\n");
+ if (IS(line + 1, "rdata")) {
+ is_ro = 1;
+ if (!header_mode)
+ fprintf(fout, "\n.section .rodata\n");
+ }
+ else if (IS(line + 1, "data")) {
+ is_ro = 0;
+ if (!header_mode)
+ fprintf(fout, "\n.data\n");
+ }
else
aerr("unhandled section: '%s'\n", line);
- fprintf(fout, ".align 4\n");
+ if (!header_mode)
+ 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 && !header_mode)
+ 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));
continue;
if (IS(words[0], "align")) {
+ if (header_mode)
+ continue;
+
val = parse_number(words[1]);
- fprintf(fout, "\t\t .align %ld", val);
+ fprintf(fout, "\t\t .align %d", align_value(val));
goto fin;
}
if (type == DXT_UNSPEC)
aerr("unhandled decl: '%s %s'\n", words[0], words[1]);
- if (sym != NULL) {
+ if (sym != NULL)
+ {
+ if (header_mode) {
+ int is_str = 0;
+
+ fprintf(fout, "extern ");
+ if (is_ro)
+ fprintf(fout, "const ");
+
+ switch (type) {
+ case DXT_BYTE:
+ for (i = w; i < wordc; i++)
+ if (words[i][0] == '\'')
+ is_str = 1;
+ if (is_str)
+ fprintf(fout, "char %s[];\n", sym);
+ else
+ fprintf(fout, "uint8_t %s;\n", sym);
+ break;
+
+ case DXT_WORD:
+ fprintf(fout, "uint16_t %s;\n", sym);
+ break;
+
+ case DXT_DWORD:
+ fprintf(fout, "uint32_t %s;\n", sym);
+ break;
+
+ default:
+ fprintf(fout, "_UNKNOWN %s;\n", sym);
+ break;
+ }
+
+ continue;
+ }
+
snprintf(last_sym, sizeof(last_sym), "%s", sym);
pp = proto_parse(fhdr, sym, 1);
fprintf(fout, " ");
}
else {
+ if (header_mode)
+ continue;
+
fprintf(fout, "\t\t ");
}
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;
}
fin:
if (g_comment[0] != 0) {
- fprintf(fout, "\t\t# %s", g_comment);
+ fprintf(fout, "\t\t%c %s", comment_char, g_comment);
g_comment[0] = 0;
}
fprintf(fout, "\n");
fclose(fout);
fclose(fasm);
- fclose(fhdr);
+ if (fhdr != NULL)
+ fclose(fhdr);
return 0;
}
notaz.gp2x.de / ia32rtools.git / blobdiff