notaz.gp2x.de
/
ia32rtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more 32bit fixes
[ia32rtools.git]
/
tools
/
cvt_data.c
diff --git
a/tools/cvt_data.c
b/tools/cvt_data.c
index
bc9b2da
..
c71c2f8
100644
(file)
--- a/
tools/cvt_data.c
+++ b/
tools/cvt_data.c
@@
-10,6
+10,8
@@
#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"
@@
-195,7
+197,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;
}
@@
-206,7
+208,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);
}
@@
-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;
@@
-560,7
+565,7
@@
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;
}
@@
-688,10
+693,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
+707,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
+717,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);
@@
-796,11
+803,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;