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
8f999a3
..
a00c081
100644
(file)
--- a/
tools/cvt_data.c
+++ b/
tools/cvt_data.c
@@
-10,13
+10,12
@@
#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 "my_assert.h"
#include "my_str.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 "common.h"
#include "protoparse.h"
#include "protoparse.h"
@@
-87,7
+86,7
@@
static void next_section(FILE *fasm, char *name)
name[0] = 0;
name[0] = 0;
- while (fgets(line, sizeof(line), fasm))
+ while (
my_
fgets(line, sizeof(line), fasm))
{
wordc = 0;
asmln++;
{
wordc = 0;
asmln++;
@@
-96,14
+95,8
@@
static void next_section(FILE *fasm, char *name)
if (*p == 0)
continue;
if (*p == 0)
continue;
- if (*p == ';') {
- while (strlen(line) == sizeof(line) - 1) {
- // one of those long comment lines..
- if (!fgets(line, sizeof(line), fasm))
- break;
- }
+ if (*p == ';')
continue;
continue;
- }
for (wordc = 0; wordc < ARRAY_SIZE(words); wordc++) {
p = sskip(next_word(words[wordc], sizeof(words[0]), p));
for (wordc = 0; wordc < ARRAY_SIZE(words); wordc++) {
p = sskip(next_word(words[wordc], sizeof(words[0]), p));
@@
-200,7
+193,7
@@
static char *escape_string(char *s)
for (; *s != 0; s++) {
if (*s == '"') {
for (; *s != 0; s++) {
if (*s == '"') {
- strcpy(t, "\\
22
");
+ strcpy(t, "\\
\"
");
t += strlen(t);
continue;
}
t += strlen(t);
continue;
}
@@
-211,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);
}
@@
-391,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;
@@
-462,7
+458,7
@@
int main(int argc, char *argv[])
frlist = fopen(argv[arg], "r");
my_assert_not(frlist, NULL);
frlist = fopen(argv[arg], "r");
my_assert_not(frlist, NULL);
- while (fgets(line, sizeof(line), frlist)) {
+ while (
my_
fgets(line, sizeof(line), frlist)) {
p = sskip(line);
if (*p == 0 || *p == ';')
continue;
p = sskip(line);
if (*p == 0 || *p == ';')
continue;
@@
-514,7
+510,7
@@
int main(int argc, char *argv[])
if (!header_mode)
fprintf(fout, ".align %d\n", align_value(4));
if (!header_mode)
fprintf(fout, ".align %d\n", align_value(4));
- while (fgets(line, sizeof(line), fasm))
+ while (
my_
fgets(line, sizeof(line), fasm))
{
sym = NULL;
asmln++;
{
sym = NULL;
asmln++;
@@
-565,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) {
@@
-693,10
+694,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, "\"");
@@
-705,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)
@@
-715,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);
@@
-801,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;