/*
* ia32rtools
- * (C) notaz, 2013,2014
+ * (C) notaz, 2013-2015
*
* This work is licensed under the terms of 3-clause BSD license.
* See COPYING file in the top-level directory.
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <stdint.h>
+#include <inttypes.h>
#include "my_assert.h"
#include "my_str.h"
#include "common.h"
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
-#define IS(w, y) !strcmp(w, y)
-#define IS_START(w, y) !strncmp(w, y, strlen(y))
-
#include "protoparse.h"
static const char *asmfn;
}
static const struct parsed_proto *check_var(FILE *fhdr,
- const char *sym, const char *varname)
+ const char *sym, const char *varname, int is_export)
{
const struct parsed_proto *pp, *pp_sym;
char fp_sym[256], fp_var[256], *p;
return NULL;
}
+ if (is_export)
+ return NULL;
if (!pp->is_func && !pp->is_fptr)
return NULL;
return pp;
}
- if (pp_cmp_func(pp, pp_sym)) {
+ if (!pp_compatible_func(pp_sym, pp)) {
pp_print(fp_sym, sizeof(fp_sym), pp_sym);
- anote("var: %s\n", fp_var);
- anote("sym: %s\n", fp_sym);
+ anote("entry: %s\n", fp_var);
+ anote("label: %s\n", fp_sym);
awarn("^ mismatch\n");
}
FILE *fout, *fasm, *fhdr = NULL, *frlist;
const struct parsed_proto *pp;
int no_decorations = 0;
+ int header_mode = 0;
+ int maybe_func_table;
+ int in_export_table;
+ int rm_labels_lines;
+ int is_zero_val;
char comment_char = '#';
char words[20][256];
char word[256];
char last_sym[32];
unsigned long val;
unsigned long cnt;
+ uint64_t val64;
const char *sym;
enum dx_type type;
char **pub_syms;
char **rlist;
int rlist_cnt = 0;
int rlist_alloc;
- int header_mode = 0;
int is_ro = 0;
int is_label;
int is_bss;
while (my_fgets(line, sizeof(line), frlist)) {
p = sskip(line);
- if (*p == 0 || *p == ';')
+ if (*p == 0 || *p == ';' || *p == '#')
continue;
p = next_word(words[0], sizeof(words[0]), p);
qsort(unwanted_syms, ARRAY_SIZE(unwanted_syms),
sizeof(unwanted_syms[0]), cmpstringp);
- last_sym[0] = 0;
-
while (1) {
+ last_sym[0] = 0;
+ g_func_sym_pp = NULL;
+ maybe_func_table = 0;
+ in_export_table = 0;
+ rm_labels_lines = 0;
+
next_section(fasm, line);
if (feof(fasm))
break;
while (my_fgets(line, sizeof(line), fasm))
{
+ is_zero_val = 0;
sym = NULL;
asmln++;
if (i != 0 && !header_mode)
fprintf(fout, "\t\t .skip 0x%x\n", i);
}
+ else if (IS_START(p, "; Export Address"))
+ in_export_table = 1;
+ else if (IS_START(p, "; Export"))
+ in_export_table = 0;
continue;
}
if (*p == ';') {
p = sskip(p + 1);
- if (IS_START(p, "sctclrtype"))
+ if (IS_START(p, "sctclrtype")) {
+ maybe_func_table = 0;
g_func_sym_pp = NULL;
+ }
}
if (wordc == 2 && IS(words[1], "ends"))
if (header_mode)
continue;
- val = parse_number(words[1]);
+ val = parse_number(words[1], 0);
fprintf(fout, "\t\t .align %d", align_value(val));
goto fin;
}
+ if (IS(words[0], "public")) {
+ // skip, sym should appear in header anyway
+ continue;
+ }
+
w = 1;
type = parse_dx_directive(words[0]);
if (type == DXT_UNSPEC) {
}
snprintf(last_sym, sizeof(last_sym), "%s", sym);
+ maybe_func_table = type == DXT_DWORD;
+
+ if (IS_START(sym, "__IMPORT_DESCRIPTOR_")) {
+ rm_labels_lines = 5;
+ maybe_func_table = 0;
+ }
pp = proto_parse(fhdr, sym, 1);
if (pp != NULL) {
fprintf(fout, "%s", escape_string(word));
}
else {
- val = parse_number(words[w]);
+ val = parse_number(words[w], 0);
if (val & ~0xff)
aerr("bad string trailing byte?\n");
// unfortunately \xHH is unusable - gas interprets
if (w == wordc - 2) {
if (IS_START(words[w + 1], "dup(")) {
- cnt = parse_number(words[w]);
+ cnt = parse_number(words[w], 0);
p = words[w + 1] + 4;
p2 = strchr(p, ')');
if (p2 == NULL)
val = 0;
if (!IS(word, "?"))
- val = parse_number(word);
+ val = parse_number(word, 0);
fprintf(fout, ".fill 0x%02lx,%d,0x%02lx",
cnt, type_size(type), val);
p = words[w];
if (IS_START(p, "loc_") || IS_START(p, "__imp")
|| strchr(p, '?') || strchr(p, '@')
+ || rm_labels_lines > 0
|| bsearch(&p, rlist, rlist_cnt, sizeof(rlist[0]),
cmpstringp))
{
snprintf(g_comment, sizeof(g_comment), "%s", p);
}
else {
- pp = check_var(fhdr, sym, p);
+ const char *f_sym = maybe_func_table ? last_sym : NULL;
+
+ pp = check_var(fhdr, f_sym, p, in_export_table);
if (pp == NULL) {
fprintf(fout, "%s%s",
(no_decorations || p[0] == '_') ? "" : "_", p);
}
}
else {
- val = parse_number(words[w]);
- if (val < 10)
- fprintf(fout, "%ld", val);
+ val64 = parse_number(words[w], 1);
+ if (val64 < 10)
+ fprintf(fout, "%d", (int)val64);
else
- fprintf(fout, "0x%lx", val);
+ fprintf(fout, "0x%" PRIx64, val64);
+
+ is_zero_val = val64 == 0;
}
first = 0;
}
fin:
+ if (!is_zero_val)
+ maybe_func_table = 0;
+
+ if (rm_labels_lines > 0)
+ rm_labels_lines--;
+
if (g_comment[0] != 0) {
fprintf(fout, "\t\t%c %s", comment_char, g_comment);
g_comment[0] = 0;