#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <errno.h>
#include "my_assert.h"
#include "my_str.h"
}
if ('0' <= w[0] && w[0] <= '9') {
- number = parse_number(w);
+ number = parse_number(w, 0);
printf_number(d, sizeof(cvtbuf) - (d - cvtbuf), number);
continue;
}
if (len < sizeof(buf) - 1) {
strncpy(buf, s, len);
buf[len] = 0;
+ errno = 0;
val = strtol(buf, &endp, 16);
- if (val == 0 || *endp != 0) {
+ if (val == 0 || *endp != 0 || errno != 0) {
aerr("%s num parse fail for '%s'\n", __func__, buf);
return NULL;
}
else if (('0' <= words[w][0] && words[w][0] <= '9')
|| words[w][0] == '-')
{
- number = parse_number(words[w]);
+ number = parse_number(words[w], 0);
opr->type = OPT_CONST;
opr->val = number;
printf_number(opr->name, sizeof(opr->name), number);
if (namelen <= 0)
ferr(po, "equ parse failed for '%s'\n", name);
+ errno = 0;
*extra_offs = strtol(p, &endp, 16);
- if (*endp != 0)
+ if (*endp != 0 || errno != 0)
ferr(po, "equ parse failed for '%s'\n", name);
}
p = name + 4;
if (IS_START(p, "0x"))
p += 2;
+ errno = 0;
offset = strtoul(p, &endp, 16);
if (name[3] == '-')
offset = -offset;
- if (*endp != 0)
+ if (*endp != 0 || errno != 0)
ferr(po, "ebp- parse of '%s' failed\n", name);
}
else {
// just plain offset?
if (!IS_START(name, "esp+"))
return -1;
+ errno = 0;
offset = strtol(name + 4, &endp, 0);
- if (endp == NULL || *endp != 0)
+ if (endp == NULL || *endp != 0 || errno != 0)
return -1;
*offset_out = offset;
return 0;
if (po->pp != NULL && po->pp->is_noreturn)
seen_noreturn = 1;
else
- return -1;
+ goto out;
}
else
- return -1; // deadend
+ goto out;
}
if (po->flags & (OPF_RMD|OPF_DONE|OPF_FARG))
}
}
+out:
// for noreturn, assume msvc skipped stack cleanup
return seen_noreturn ? 1 : -1;
}
lmod_cast_s(po, po->operand[0].lmod), buf2);
last_arith_dst = &po->operand[0];
delayed_flag_op = NULL;
- if (pfomask & (1 << PFO_C)) {
+ if (pfomask & PFOB_C) {
fprintf(fout, "\n cond_c = (%s != 0);", buf1);
- pfomask &= ~(1 << PFO_C);
+ pfomask &= ~PFOB_C;
}
+ output_std_flags(fout, po, &pfomask, buf1);
break;
case OP_IMUL:
if (pd->type == OPT_OFFSET)
pd->d[pd->count].u.label = strdup(words[i]);
else
- pd->d[pd->count].u.val = parse_number(words[i]);
+ pd->d[pd->count].u.val = parse_number(words[i], 0);
pd->d[pd->count].bt_i = -1;
pd->count++;
}
else
aerr("bad lmod: '%s'\n", words[2]);
- g_eqs[g_eqcnt].offset = parse_number(words[4]);
+ g_eqs[g_eqcnt].offset = parse_number(words[4], 0);
g_eqcnt++;
continue;
}