#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;
for (; *s != 0; s++) {
if (*s == '"') {
- strcpy(t, "\\22");
+ strcpy(t, "\\\"");
t += strlen(t);
continue;
}
}
*t++ = *s;
}
- *t = *s;
+ *t++ = *s;
+ if (t - buf > sizeof(buf))
+ aerr("string is too long\n");
return strcpy(s, buf);
}
char last_sym[32];
unsigned long val;
unsigned long cnt;
+ uint64_t val64;
const char *sym;
enum dx_type type;
char **pub_syms;
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) {
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");
- 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, "\"");
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);
}
}
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);
}
first = 0;