notaz.gp2x.de
/
ia32rtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
api for fog
[ia32rtools.git]
/
tools
/
cvt_data.c
diff --git
a/tools/cvt_data.c
b/tools/cvt_data.c
index
09e7ebc
..
a00c081
100644
(file)
--- a/
tools/cvt_data.c
+++ b/
tools/cvt_data.c
@@
-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;
@@
-388,6
+386,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;
@@
-562,11
+561,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) {
@@
-690,7
+694,7
@@
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");
// unfortunately \xHH is unusable - gas interprets
if (val & ~0xff)
aerr("bad string trailing byte?\n");
// unfortunately \xHH is unusable - gas interprets
@@
-704,7
+708,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)
@@
-714,7
+718,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);
@@
-800,11
+804,11
@@
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;
}
first = 0;