notaz.gp2x.de
/
ia32rtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
translate: add fptr-arg checking
[ia32rtools.git]
/
tools
/
cvt_data.c
diff --git
a/tools/cvt_data.c
b/tools/cvt_data.c
index
93c5fd0
..
abcdd41
100644
(file)
--- a/
tools/cvt_data.c
+++ b/
tools/cvt_data.c
@@
-1,6
+1,6
@@
/*
* ia32rtools
/*
* 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.
*
* This work is licensed under the terms of 3-clause BSD license.
* See COPYING file in the top-level directory.
@@
-10,15
+10,13
@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#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"
#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;
#include "protoparse.h"
static const char *asmfn;
@@
-195,7
+193,7
@@
static char *escape_string(char *s)
for (; *s != 0; s++) {
if (*s == '"') {
for (; *s != 0; s++) {
if (*s == '"') {
- strcpy(t, "\\
x22
");
+ strcpy(t, "\\
\"
");
t += strlen(t);
continue;
}
t += strlen(t);
continue;
}
@@
-206,7
+204,9
@@
static char *escape_string(char *s)
}
*t++ = *s;
}
}
*t++ = *s;
}
- *t = *s;
+ *t++ = *s;
+ if (t - buf > sizeof(buf))
+ aerr("string is too long\n");
return strcpy(s, buf);
}
return strcpy(s, buf);
}
@@
-239,7
+239,7
@@
static void sprint_pp_short(const struct parsed_proto *pp, char *buf,
}
static const struct parsed_proto *check_var(FILE *fhdr,
}
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;
{
const struct parsed_proto *pp, *pp_sym;
char fp_sym[256], fp_var[256], *p;
@@
-252,6
+252,8
@@
static const struct parsed_proto *check_var(FILE *fhdr,
return NULL;
}
return NULL;
}
+ if (is_export)
+ return NULL;
if (!pp->is_func && !pp->is_fptr)
return NULL;
if (!pp->is_func && !pp->is_fptr)
return NULL;
@@
-304,10
+306,10
@@
check_sym:
return pp;
}
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);
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");
}
awarn("^ mismatch\n");
}
@@
-379,6
+381,8
@@
int main(int argc, char *argv[])
FILE *fout, *fasm, *fhdr = NULL, *frlist;
const struct parsed_proto *pp;
int no_decorations = 0;
FILE *fout, *fasm, *fhdr = NULL, *frlist;
const struct parsed_proto *pp;
int no_decorations = 0;
+ int in_export_table = 0;
+ int rm_labels_lines = 0;
char comment_char = '#';
char words[20][256];
char word[256];
char comment_char = '#';
char words[20][256];
char word[256];
@@
-386,6
+390,7
@@
int main(int argc, char *argv[])
char last_sym[32];
unsigned long val;
unsigned long cnt;
char last_sym[32];
unsigned long val;
unsigned long cnt;
+ uint64_t val64;
const char *sym;
enum dx_type type;
char **pub_syms;
const char *sym;
enum dx_type type;
char **pub_syms;
@@
-459,7
+464,7
@@
int main(int argc, char *argv[])
while (my_fgets(line, sizeof(line), frlist)) {
p = sskip(line);
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);
continue;
p = next_word(words[0], sizeof(words[0]), p);
@@
-525,6
+530,10
@@
int main(int argc, char *argv[])
if (i != 0 && !header_mode)
fprintf(fout, "\t\t .skip 0x%x\n", i);
}
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;
}
continue;
}
@@
-560,11
+569,16
@@
int main(int argc, char *argv[])
if (header_mode)
continue;
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;
}
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) {
w = 1;
type = parse_dx_directive(words[0]);
if (type == DXT_UNSPEC) {
@@
-612,6
+626,8
@@
int main(int argc, char *argv[])
}
snprintf(last_sym, sizeof(last_sym), "%s", sym);
}
snprintf(last_sym, sizeof(last_sym), "%s", sym);
+ if (IS_START(sym, "__IMPORT_DESCRIPTOR_"))
+ rm_labels_lines = 5;
pp = proto_parse(fhdr, sym, 1);
if (pp != NULL) {
pp = proto_parse(fhdr, sym, 1);
if (pp != NULL) {
@@
-688,10
+704,12
@@
int main(int argc, char *argv[])
fprintf(fout, "%s", escape_string(word));
}
else {
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");
if (val & ~0xff)
aerr("bad string trailing byte?\n");
- fprintf(fout, "\\x%02lx", val);
+ // unfortunately \xHH is unusable - gas interprets
+ // things like \x27b as 0x7b, so have to use octal here
+ fprintf(fout, "\\%03lo", val);
}
}
fprintf(fout, "\"");
}
}
fprintf(fout, "\"");
@@
-700,7
+718,7
@@
int main(int argc, char *argv[])
if (w == wordc - 2) {
if (IS_START(words[w + 1], "dup(")) {
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)
p = words[w + 1] + 4;
p2 = strchr(p, ')');
if (p2 == NULL)
@@
-710,7
+728,7
@@
int main(int argc, char *argv[])
val = 0;
if (!IS(word, "?"))
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);
fprintf(fout, ".fill 0x%02lx,%d,0x%02lx",
cnt, type_size(type), val);
@@
-775,6
+793,7
@@
int main(int argc, char *argv[])
p = words[w];
if (IS_START(p, "loc_") || IS_START(p, "__imp")
|| strchr(p, '?') || strchr(p, '@')
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))
{
|| bsearch(&p, rlist, rlist_cnt, sizeof(rlist[0]),
cmpstringp))
{
@@
-782,7
+801,7
@@
int main(int argc, char *argv[])
snprintf(g_comment, sizeof(g_comment), "%s", p);
}
else {
snprintf(g_comment, sizeof(g_comment), "%s", p);
}
else {
- pp = check_var(fhdr, sym, p);
+ pp = check_var(fhdr, sym, p
, in_export_table
);
if (pp == NULL) {
fprintf(fout, "%s%s",
(no_decorations || p[0] == '_') ? "" : "_", p);
if (pp == NULL) {
fprintf(fout, "%s%s",
(no_decorations || p[0] == '_') ? "" : "_", p);
@@
-796,17
+815,20
@@
int main(int argc, char *argv[])
}
}
else {
}
}
else {
- val
= parse_number(words[w]
);
- if (val < 10)
- fprintf(fout, "%
ld", val
);
+ val
64 = parse_number(words[w], 1
);
+ if (val
64
< 10)
+ fprintf(fout, "%
d", (int)val64
);
else
else
- fprintf(fout, "0x%
lx", val
);
+ fprintf(fout, "0x%
" PRIx64, val64
);
}
first = 0;
}
fin:
}
first = 0;
}
fin:
+ 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;
if (g_comment[0] != 0) {
fprintf(fout, "\t\t%c %s", comment_char, g_comment);
g_comment[0] = 0;