X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Ftranslate.c;h=12f01f9fae33c9de96c4c2cf2f4f473940f4fbb8;hb=c1fbaecc86ab7ee1bd0fa42ea5a30f063130a9fd;hp=95e8802525e05c1a0505695faa6c4a5e01f47973;hpb=16057ce1aaef8f239faf0209ef7af813d949713c;p=ia32rtools.git
diff --git a/tools/translate.c b/tools/translate.c
index 95e8802..12f01f9 100644
--- a/tools/translate.c
+++ b/tools/translate.c
@@ -4,21 +4,27 @@
*
* This work is licensed under the terms of 3-clause BSD license.
* See COPYING file in the top-level directory.
+ *
+ * recognized asm hint comments:
+ * sctattr - function attributes (see code)
+ * sctend - force end of function/chunk
+ * sctpatch:
- replace current asm line with
+ * sctproto:
- prototype of ref'd function or struct
+ * sctref - variable is referenced, make global
+ * sctskip_start - start of skipped code chunk (inclusive)
+ * sctskip_end - end of skipped code chunk (inclusive)
*/
#define _GNU_SOURCE
#include
#include
#include
+#include
#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;
@@ -63,6 +69,7 @@ enum op_flags {
OPF_FPUSH = (1 << 22), /* pushes x87 stack */
OPF_FPOP = (1 << 23), /* pops x87 stack */
OPF_FSHIFT = (1 << 24), /* x87 stack shift is actually needed */
+ OPF_FINT = (1 << 25), /* integer float op arg */
};
enum op_op {
@@ -107,6 +114,7 @@ enum op_op {
OP_ADC,
OP_SBB,
OP_BSF,
+ OP_BSR,
OP_INC,
OP_DEC,
OP_NEG,
@@ -156,6 +164,8 @@ enum op_op {
OPP_ALLSHL,
OPP_ALLSHR,
OPP_FTOL,
+ OPP_CIPOW,
+ OPP_ABORT,
// undefined
OP_UD2,
};
@@ -195,7 +205,7 @@ struct parsed_opr {
unsigned int type_from_var:1; // .. in header, sometimes wrong
unsigned int size_mismatch:1; // type override differs from C
unsigned int size_lt:1; // type override is larger than C
- unsigned int had_ds:1; // had ds: prefix
+ unsigned int segment:7; // had segment override (enum segment)
const struct parsed_proto *pp; // for OPT_LABEL
unsigned int val;
char name[NAMELEN];
@@ -281,6 +291,15 @@ enum x87_const {
X87_CONST_Z,
};
+enum segment {
+ SEG_CS = 1,
+ SEG_DS,
+ SEG_SS,
+ SEG_ES,
+ SEG_FS,
+ SEG_GS,
+};
+
// note: limited to 32k due to p_argnext
#define MAX_OPS 4096
#define MAX_ARG_GRP 2
@@ -300,6 +319,8 @@ static int g_bp_frame;
static int g_sp_frame;
static int g_stack_frame_used;
static int g_stack_fsz;
+static int g_seh_found;
+static int g_seh_size;
static int g_ida_func_attr;
static int g_sct_func_attr;
static int g_stack_clear_start; // in dwords
@@ -307,6 +328,7 @@ static int g_stack_clear_len;
static int g_regmask_init;
static int g_skip_func;
static int g_allow_regfunc;
+static int g_allow_user_icall;
static int g_quiet_pp;
static int g_header_mode;
@@ -347,6 +369,7 @@ enum x86_regs {
#define mxAX (1 << xAX)
#define mxCX (1 << xCX)
#define mxDX (1 << xDX)
+#define mxSP (1 << xSP)
#define mxST0 (1 << xST0)
#define mxST1 (1 << xST1)
#define mxST1_0 (mxST1 | mxST0)
@@ -398,12 +421,12 @@ static int check_segment_prefix(const char *s)
return 0;
switch (s[0]) {
- case 'c': return 1;
- case 'd': return 2;
- case 's': return 3;
- case 'e': return 4;
- case 'f': return 5;
- case 'g': return 6;
+ case 'c': return SEG_CS;
+ case 'd': return SEG_DS;
+ case 's': return SEG_SS;
+ case 'e': return SEG_ES;
+ case 'f': return SEG_FS;
+ case 'g': return SEG_GS;
default: return 0;
}
}
@@ -479,7 +502,7 @@ static int parse_indmode(char *name, int *regmask, int need_c_cvt)
}
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;
}
@@ -511,12 +534,12 @@ static int is_reg_in_str(const char *s)
}
static const char *parse_stack_el(const char *name, char *extra_reg,
- int early_try)
+ int *base_val, int early_try)
{
const char *p, *p2, *s;
char *endp = NULL;
char buf[32];
- long val;
+ long val = -1;
int len;
if (g_bp_frame || early_try)
@@ -575,8 +598,9 @@ static const char *parse_stack_el(const char *name, char *extra_reg,
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;
}
@@ -589,6 +613,8 @@ static const char *parse_stack_el(const char *name, char *extra_reg,
if ('0' <= *p && *p <= '9')
return NULL;
+ if (base_val != NULL)
+ *base_val = val;
return p;
}
@@ -616,6 +642,9 @@ static int guess_lmod_from_name(struct parsed_opr *opr)
static int guess_lmod_from_c_type(enum opr_lenmod *lmod,
const struct parsed_type *c_type)
{
+ static const char *qword_types[] = {
+ "uint64_t", "int64_t", "__int64",
+ };
static const char *dword_types[] = {
"uint32_t", "int", "_DWORD", "UINT_PTR", "DWORD",
"WPARAM", "LPARAM", "UINT", "__int32",
@@ -664,6 +693,13 @@ static int guess_lmod_from_c_type(enum opr_lenmod *lmod,
}
}
+ for (i = 0; i < ARRAY_SIZE(qword_types); i++) {
+ if (IS(n, qword_types[i])) {
+ *lmod = OPLM_QWORD;
+ return 1;
+ }
+ }
+
return 0;
}
@@ -758,9 +794,7 @@ static int parse_operand(struct parsed_opr *opr,
opr->type = OPT_LABEL;
ret = check_segment_prefix(label);
if (ret != 0) {
- if (ret >= 5)
- aerr("fs/gs used\n");
- opr->had_ds = 1;
+ opr->segment = ret;
label += 3;
}
strcpy(opr->name, label);
@@ -809,10 +843,10 @@ static int parse_operand(struct parsed_opr *opr,
ret = check_segment_prefix(words[w]);
if (ret != 0) {
- if (ret >= 5)
- aerr("fs/gs used\n");
- opr->had_ds = 1;
+ opr->segment = ret;
memmove(words[w], words[w] + 3, strlen(words[w]) - 2);
+ if (ret == SEG_FS && IS(words[w], "0"))
+ g_seh_found = 1;
}
strcpy(opr->name, words[w]);
@@ -823,11 +857,12 @@ static int parse_operand(struct parsed_opr *opr,
aerr("[] parse failure\n");
parse_indmode(opr->name, regmask_indirect, 1);
- if (opr->lmod == OPLM_UNSPEC && parse_stack_el(opr->name, NULL, 1))
+ if (opr->lmod == OPLM_UNSPEC
+ && parse_stack_el(opr->name, NULL, NULL, 1))
{
// might be an equ
struct parsed_equ *eq =
- equ_find(NULL, parse_stack_el(opr->name, NULL, 1), &i);
+ equ_find(NULL, parse_stack_el(opr->name, NULL, NULL, 1), &i);
if (eq)
opr->lmod = eq->lmod;
@@ -849,7 +884,7 @@ static int parse_operand(struct parsed_opr *opr,
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);
@@ -971,6 +1006,7 @@ static const struct {
{ "adc", OP_ADC, 2, 2, OPF_DATA|OPF_FLAGS|OPF_CC, PFO_C },
{ "sbb", OP_SBB, 2, 2, OPF_DATA|OPF_FLAGS|OPF_CC, PFO_C },
{ "bsf", OP_BSF, 2, 2, OPF_DATA|OPF_FLAGS },
+ { "bsr", OP_BSR, 2, 2, OPF_DATA|OPF_FLAGS },
{ "inc", OP_INC, 1, 1, OPF_DATA|OPF_FLAGS },
{ "dec", OP_DEC, 1, 1, OPF_DATA|OPF_FLAGS },
{ "neg", OP_NEG, 1, 1, OPF_DATA|OPF_FLAGS },
@@ -1045,14 +1081,14 @@ static const struct {
{ "setnle", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_LE, 1 },
// x87
{ "fld", OP_FLD, 1, 1, OPF_FPUSH },
- { "fild", OP_FILD, 1, 1, OPF_FPUSH },
+ { "fild", OP_FILD, 1, 1, OPF_FPUSH|OPF_FINT },
{ "fld1", OP_FLDc, 0, 0, OPF_FPUSH },
{ "fldln2", OP_FLDc, 0, 0, OPF_FPUSH },
{ "fldz", OP_FLDc, 0, 0, OPF_FPUSH },
{ "fst", OP_FST, 1, 1, 0 },
{ "fstp", OP_FST, 1, 1, OPF_FPOP },
- { "fist", OP_FIST, 1, 1, 0 },
- { "fistp", OP_FIST, 1, 1, OPF_FPOP },
+ { "fist", OP_FIST, 1, 1, OPF_FINT },
+ { "fistp", OP_FIST, 1, 1, OPF_FPOP|OPF_FINT },
{ "fadd", OP_FADD, 0, 2, 0 },
{ "faddp", OP_FADD, 0, 2, OPF_FPOP },
{ "fdiv", OP_FDIV, 0, 2, 0 },
@@ -1065,12 +1101,12 @@ static const struct {
{ "fdivrp", OP_FDIVR, 0, 2, OPF_FPOP },
{ "fsubr", OP_FSUBR, 0, 2, 0 },
{ "fsubrp", OP_FSUBR, 0, 2, OPF_FPOP },
- { "fiadd", OP_FIADD, 1, 1, 0 },
- { "fidiv", OP_FIDIV, 1, 1, 0 },
- { "fimul", OP_FIMUL, 1, 1, 0 },
- { "fisub", OP_FISUB, 1, 1, 0 },
- { "fidivr", OP_FIDIVR, 1, 1, 0 },
- { "fisubr", OP_FISUBR, 1, 1, 0 },
+ { "fiadd", OP_FIADD, 1, 1, OPF_FINT },
+ { "fidiv", OP_FIDIV, 1, 1, OPF_FINT },
+ { "fimul", OP_FIMUL, 1, 1, OPF_FINT },
+ { "fisub", OP_FISUB, 1, 1, OPF_FINT },
+ { "fidivr", OP_FIDIVR, 1, 1, OPF_FINT },
+ { "fisubr", OP_FISUBR, 1, 1, OPF_FINT },
{ "fcom", OP_FCOM, 0, 1, 0 },
{ "fcomp", OP_FCOM, 0, 1, OPF_FPOP },
{ "fnstsw", OP_FNSTSW, 1, 1, OPF_DATA },
@@ -1089,6 +1125,8 @@ static const struct {
{ "_allshl",OPP_ALLSHL },
{ "_allshr",OPP_ALLSHR },
{ "_ftol", OPP_FTOL },
+ { "_CIpow", OPP_CIPOW },
+ { "abort", OPP_ABORT },
// must be last
{ "ud2", OP_UD2 },
};
@@ -1718,16 +1756,15 @@ static struct parsed_equ *equ_find(struct parsed_op *po, const char *name,
*extra_offs = 0;
namelen = strlen(name);
- p = strchr(name, '+');
+ p = strpbrk(name, "+-");
if (p != NULL) {
namelen = p - name;
if (namelen <= 0)
ferr(po, "equ parse failed for '%s'\n", name);
- if (IS_START(p, "0x"))
- p += 2;
+ 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);
}
@@ -1747,7 +1784,7 @@ static struct parsed_equ *equ_find(struct parsed_op *po, const char *name,
static int is_stack_access(struct parsed_op *po,
const struct parsed_opr *popr)
{
- return (parse_stack_el(popr->name, NULL, 0)
+ return (parse_stack_el(popr->name, NULL, NULL, 0)
|| (g_bp_frame && !(po->flags & OPF_EBP_S)
&& IS_START(popr->name, "ebp")));
}
@@ -1771,15 +1808,15 @@ static void parse_stack_access(struct parsed_op *po,
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 {
- bp_arg = parse_stack_el(name, ofs_reg, 0);
- snprintf(g_comment, sizeof(g_comment), "%s", bp_arg);
+ bp_arg = parse_stack_el(name, ofs_reg, NULL, 0);
eq = equ_find(po, bp_arg, &offset);
if (eq == NULL)
ferr(po, "detected but missing eq\n");
@@ -1797,11 +1834,47 @@ static void parse_stack_access(struct parsed_op *po,
}
*offset_out = offset;
- *stack_ra_out = stack_ra;
+ if (stack_ra_out)
+ *stack_ra_out = stack_ra;
if (bp_arg_out)
*bp_arg_out = bp_arg;
}
+static int parse_stack_esp_offset(struct parsed_op *po,
+ const char *name, int *offset_out)
+{
+ char ofs_reg[16] = { 0, };
+ struct parsed_equ *eq;
+ const char *bp_arg;
+ char *endp = NULL;
+ int base_val = 0;
+ int offset = 0;
+
+ if (strstr(name, "esp") == NULL)
+ return -1;
+ bp_arg = parse_stack_el(name, ofs_reg, &base_val, 0);
+ if (bp_arg == NULL) {
+ // just plain offset?
+ if (!IS_START(name, "esp+"))
+ return -1;
+ errno = 0;
+ offset = strtol(name + 4, &endp, 0);
+ if (endp == NULL || *endp != 0 || errno != 0)
+ return -1;
+ *offset_out = offset;
+ return 0;
+ }
+
+ if (ofs_reg[0] != 0)
+ return -1;
+ eq = equ_find(po, bp_arg, &offset);
+ if (eq == NULL)
+ ferr(po, "detected but missing eq\n");
+ offset += eq->offset;
+ *offset_out = base_val + offset;
+ return 0;
+}
+
static int stack_frame_access(struct parsed_op *po,
struct parsed_opr *popr, char *buf, size_t buf_size,
const char *name, const char *cast, int is_src, int is_lea)
@@ -1816,14 +1889,16 @@ static int stack_frame_access(struct parsed_op *po,
int offset = 0;
int retval = -1;
int sf_ofs;
- int lim;
- if (po->flags & OPF_EBP_S)
+ if (g_bp_frame && (po->flags & OPF_EBP_S)
+ && !(po->regmask_src & mxSP))
ferr(po, "stack_frame_access while ebp is scratch\n");
parse_stack_access(po, name, ofs_reg, &offset,
&stack_ra, &bp_arg, is_lea);
+ snprintf(g_comment, sizeof(g_comment), "%s", bp_arg);
+
if (offset > stack_ra)
{
arg_i = (offset - stack_ra - 4) / 4;
@@ -1917,12 +1992,20 @@ static int stack_frame_access(struct parsed_op *po,
}
break;
+ case OPLM_QWORD:
+ ferr_assert(po, !(offset & 7));
+ if (cast[0])
+ prefix = cast;
+ snprintf(buf, buf_size, "%s%sa%d",
+ prefix, is_lea ? "&" : "", i + 1);
+ break;
+
default:
ferr(po, "bp_arg bad lmod: %d\n", popr->lmod);
}
if (unaligned)
- snprintf(g_comment, sizeof(g_comment), "%s unaligned", bp_arg);
+ strcat(g_comment, " unaligned");
// common problem
guess_lmod_from_c_type(&tmp_lmod, &g_func_pp->arg[i].type);
@@ -1945,8 +2028,7 @@ static int stack_frame_access(struct parsed_op *po,
g_stack_frame_used = 1;
sf_ofs = g_stack_fsz + offset;
- lim = (ofs_reg[0] != 0) ? -4 : 0;
- if (offset > 0 || sf_ofs < lim)
+ if (ofs_reg[0] == 0 && (offset > 0 || sf_ofs < 0))
ferr(po, "bp_stack offset %d/%d\n", offset, g_stack_fsz);
if (is_lea)
@@ -1990,8 +2072,9 @@ static int stack_frame_access(struct parsed_op *po,
case OPLM_QWORD:
ferr_assert(po, !(sf_ofs & 7));
ferr_assert(po, ofs_reg[0] == 0);
- // float callers set is_lea
- ferr_assert(po, is_lea);
+ // only used for x87 int64/float, float sets is_lea
+ if (!is_lea && (po->flags & OPF_FINT))
+ prefix = "*(s64 *)&";
snprintf(buf, buf_size, "%ssf.q[%d]", prefix, sf_ofs / 8);
break;
@@ -2011,7 +2094,7 @@ static void check_func_pp(struct parsed_op *po,
int ret, i;
if (pp->argc_reg != 0) {
- if (/*!g_allow_regfunc &&*/ !pp->is_fastcall) {
+ if (!g_allow_user_icall && !pp->is_fastcall) {
pp_print(buf, sizeof(buf), pp);
ferr(po, "%s: unexpected reg arg in icall: %s\n", pfx, buf);
}
@@ -2048,6 +2131,14 @@ static const char *check_label_read_ref(struct parsed_op *po,
return pp->name;
}
+static void check_opr(struct parsed_op *po, struct parsed_opr *popr)
+{
+ if (popr->segment == SEG_FS)
+ ferr(po, "fs: used\n");
+ if (popr->segment == SEG_GS)
+ ferr(po, "gs: used\n");
+}
+
static char *out_src_opr(char *buf, size_t buf_size,
struct parsed_op *po, struct parsed_opr *popr, const char *cast,
int is_lea)
@@ -2058,6 +2149,8 @@ static char *out_src_opr(char *buf, size_t buf_size,
char *p;
int ret;
+ check_opr(po, popr);
+
if (cast == NULL)
cast = "";
@@ -2172,6 +2265,8 @@ static char *out_src_opr(char *buf, size_t buf_size,
static char *out_dst_opr(char *buf, size_t buf_size,
struct parsed_op *po, struct parsed_opr *popr)
{
+ check_opr(po, popr);
+
switch (popr->type) {
case OPT_REG:
switch (popr->lmod) {
@@ -2229,8 +2324,9 @@ static char *out_src_opr_u32(char *buf, size_t buf_size,
return out_src_opr(buf, buf_size, po, popr, NULL, 0);
}
-static char *out_src_opr_float(char *buf, size_t buf_size,
- struct parsed_op *po, struct parsed_opr *popr, int need_float_stack)
+static char *out_opr_float(char *buf, size_t buf_size,
+ struct parsed_op *po, struct parsed_opr *popr, int is_src,
+ int need_float_stack)
{
const char *cast = NULL;
char tmp[256];
@@ -2252,6 +2348,12 @@ static char *out_src_opr_float(char *buf, size_t buf_size,
break;
case OPT_REGMEM:
+ if (popr->lmod == OPLM_QWORD && is_stack_access(po, popr)) {
+ stack_frame_access(po, popr, buf, buf_size,
+ popr->name, "", is_src, 0);
+ break;
+ }
+ // fallthrough
case OPT_LABEL:
case OPT_OFFSET:
switch (popr->lmod) {
@@ -2266,7 +2368,7 @@ static char *out_src_opr_float(char *buf, size_t buf_size,
break;
}
out_src_opr(tmp, sizeof(tmp), po, popr, "", 1);
- snprintf(buf, buf_size, "*((%s *)%s)", cast, tmp);
+ snprintf(buf, buf_size, "*(%s *)(%s)", cast, tmp);
break;
default:
@@ -2276,11 +2378,16 @@ static char *out_src_opr_float(char *buf, size_t buf_size,
return buf;
}
+static char *out_src_opr_float(char *buf, size_t buf_size,
+ struct parsed_op *po, struct parsed_opr *popr, int need_float_stack)
+{
+ return out_opr_float(buf, buf_size, po, popr, 1, need_float_stack);
+}
+
static char *out_dst_opr_float(char *buf, size_t buf_size,
struct parsed_op *po, struct parsed_opr *popr, int need_float_stack)
{
- // same?
- return out_src_opr_float(buf, buf_size, po, popr, need_float_stack);
+ return out_opr_float(buf, buf_size, po, popr, 0, need_float_stack);
}
static void out_test_for_cc(char *buf, size_t buf_size,
@@ -2294,7 +2401,7 @@ static void out_test_for_cc(char *buf, size_t buf_size,
switch (pfo) {
case PFO_Z:
- case PFO_BE: // CF=1||ZF=1; CF=0
+ case PFO_BE: // CF==1||ZF==1; CF=0
snprintf(buf, buf_size, "(%s%s %s 0)",
cast, expr, is_inv ? "!=" : "==");
break;
@@ -2305,11 +2412,21 @@ static void out_test_for_cc(char *buf, size_t buf_size,
scast, expr, is_inv ? ">=" : "<");
break;
- case PFO_LE: // ZF=1||SF!=OF; OF=0
+ case PFO_LE: // ZF==1||SF!=OF; OF=0
snprintf(buf, buf_size, "(%s%s %s 0)",
scast, expr, is_inv ? ">" : "<=");
break;
+ case PFO_C: // CF=0
+ case PFO_O: // OF=0
+ snprintf(buf, buf_size, "(%d)", !!is_inv);
+ break;
+
+ case PFO_P: // PF==1
+ snprintf(buf, buf_size, "(%sdo_parity(%s))",
+ is_inv ? "!" : "", expr);
+ break;
+
default:
ferr(po, "%s: unhandled parsed_flag_op: %d\n", __func__, pfo);
}
@@ -2500,7 +2617,7 @@ static const char *op_to_c(struct parsed_op *po)
// note: this skips over calls and rm'd stuff assuming they're handled
// so it's intended to use at one of final passes
static int scan_for_pop(int i, int opcnt, int magic, int reg,
- int depth, int flags_set)
+ int depth, int seen_noreturn, int flags_set)
{
struct parsed_op *po;
int relevant;
@@ -2516,10 +2633,12 @@ static int scan_for_pop(int i, int opcnt, int magic, int reg,
if (po->flags & OPF_TAIL) {
if (po->op == OP_CALL) {
if (po->pp != NULL && po->pp->is_noreturn)
- // assume no stack cleanup for noreturn
- return 1;
+ seen_noreturn = 1;
+ else
+ goto out;
}
- return -1; // deadend
+ else
+ goto out;
}
if (po->flags & (OPF_RMD|OPF_DONE|OPF_FARG))
@@ -2531,7 +2650,7 @@ static int scan_for_pop(int i, int opcnt, int magic, int reg,
for (j = 0; j < po->btj->count; j++) {
check_i(po, po->btj->d[j].bt_i);
ret |= scan_for_pop(po->btj->d[j].bt_i, opcnt, magic, reg,
- depth, flags_set);
+ depth, seen_noreturn, flags_set);
if (ret < 0)
return ret; // dead end
}
@@ -2541,7 +2660,7 @@ static int scan_for_pop(int i, int opcnt, int magic, int reg,
check_i(po, po->bt_i);
if (po->flags & OPF_CJMP) {
ret |= scan_for_pop(po->bt_i, opcnt, magic, reg,
- depth, flags_set);
+ depth, seen_noreturn, flags_set);
if (ret < 0)
return ret; // dead end
}
@@ -2570,7 +2689,9 @@ static int scan_for_pop(int i, int opcnt, int magic, int reg,
}
}
- return -1;
+out:
+ // for noreturn, assume msvc skipped stack cleanup
+ return seen_noreturn ? 1 : -1;
}
// scan for 'reg' pop backwards starting from i
@@ -2620,8 +2741,9 @@ static int scan_for_rsave_pop_reg(int i, int magic, int reg, int set_flags)
return -1;
}
- // nothing interesting on this path
- return 0;
+ // nothing interesting on this path,
+ // still return ret for something recursive calls could find
+ return ret;
}
static void find_reachable_exits(int i, int opcnt, int magic,
@@ -2672,7 +2794,8 @@ static int scan_for_pop_ret(int i, int opcnt, int reg, int set_flags)
{
static int exits[MAX_EXITS];
static int exit_count;
- int j, ret;
+ int found = 0;
+ int e, j, ret;
if (!set_flags) {
exit_count = 0;
@@ -2682,13 +2805,23 @@ static int scan_for_pop_ret(int i, int opcnt, int reg, int set_flags)
}
for (j = 0; j < exit_count; j++) {
- ret = scan_for_rsave_pop_reg(exits[j], i + opcnt * 16 + set_flags,
+ e = exits[j];
+ ret = scan_for_rsave_pop_reg(e, i + opcnt * 16 + set_flags,
reg, set_flags);
- if (ret == -1)
- return -1;
+ if (ret != -1) {
+ found |= ret;
+ continue;
+ }
+ if (ops[e].op == OP_CALL && ops[e].pp != NULL
+ && ops[e].pp->is_noreturn)
+ {
+ // assume stack cleanup was skipped
+ continue;
+ }
+ return -1;
}
- return 1;
+ return found;
}
// scan for one or more pop of push
@@ -3057,8 +3190,11 @@ static int scan_for_mod_opr0(struct parsed_op *po_test,
return -1;
}
-static int scan_for_flag_set(int i, int magic, int *branched,
- int *setters, int *setter_cnt)
+static int try_resolve_const(int i, const struct parsed_opr *opr,
+ int magic, unsigned int *val);
+
+static int scan_for_flag_set(int i, int opcnt, int magic,
+ int *branched, int *setters, int *setter_cnt)
{
struct label_ref *lr;
int ret;
@@ -3077,7 +3213,7 @@ static int scan_for_flag_set(int i, int magic, int *branched,
lr = &g_label_refs[i];
for (; lr->next; lr = lr->next) {
check_i(&ops[i], lr->i);
- ret = scan_for_flag_set(lr->i, magic,
+ ret = scan_for_flag_set(lr->i, opcnt, magic,
branched, setters, setter_cnt);
if (ret < 0)
return ret;
@@ -3088,7 +3224,7 @@ static int scan_for_flag_set(int i, int magic, int *branched,
i = lr->i;
continue;
}
- ret = scan_for_flag_set(lr->i, magic,
+ ret = scan_for_flag_set(lr->i, opcnt, magic,
branched, setters, setter_cnt);
if (ret < 0)
return ret;
@@ -3098,6 +3234,20 @@ static int scan_for_flag_set(int i, int magic, int *branched,
if (ops[i].flags & OPF_FLAGS) {
setters[*setter_cnt] = i;
(*setter_cnt)++;
+
+ if (ops[i].flags & OPF_REP) {
+ struct parsed_opr opr = OPR_INIT(OPT_REG, OPLM_DWORD, xCX);
+ unsigned int uval;
+
+ ret = try_resolve_const(i, &opr, i + opcnt * 7, &uval);
+ if (ret != 1 || uval == 0) {
+ // can't treat it as full setter because of ecx=0 case,
+ // also disallow delayed compare
+ *branched = 1;
+ continue;
+ }
+ }
+
return 0;
}
@@ -3297,7 +3447,8 @@ static void scan_fwd_set_flags(int i, int opcnt, int magic, int flags)
}
static const struct parsed_proto *try_recover_pp(
- struct parsed_op *po, const struct parsed_opr *opr, int *search_instead)
+ struct parsed_op *po, const struct parsed_opr *opr,
+ int is_call, int *search_instead)
{
const struct parsed_proto *pp = NULL;
char buf[256];
@@ -3336,10 +3487,12 @@ static const struct parsed_proto *try_recover_pp(
if (arg == g_func_pp->argc)
ferr(po, "stack arg %d not in prototype?\n", arg_i);
- pp = g_func_pp->arg[arg].fptr;
- if (pp == NULL)
- ferr(po, "icall sa: arg%d is not a fptr?\n", arg + 1);
- check_func_pp(po, pp, "icall arg");
+ pp = g_func_pp->arg[arg].pp;
+ if (is_call) {
+ if (pp == NULL)
+ ferr(po, "icall arg: arg%d has no pp\n", arg + 1);
+ check_func_pp(po, pp, "icall arg");
+ }
}
else if (opr->type == OPT_REGMEM && strchr(opr->name + 1, '[')) {
// label[index]
@@ -3420,19 +3573,19 @@ static void scan_for_call_type(int i, const struct parsed_opr *opr,
}
if (i == g_func_pp->argc)
return;
- pp = g_func_pp->arg[i].fptr;
+ pp = g_func_pp->arg[i].pp;
if (pp == NULL)
ferr(po, "icall: arg%d (%s) is not a fptr?\n",
i + 1, g_func_pp->arg[i].reg);
check_func_pp(po, pp, "icall reg-arg");
}
else
- pp = try_recover_pp(po, opr, NULL);
+ pp = try_recover_pp(po, opr, 1, NULL);
if (*pp_found != NULL && pp != NULL && *pp_found != pp) {
if (!IS((*pp_found)->ret_type.name, pp->ret_type.name)
|| (*pp_found)->is_stdcall != pp->is_stdcall
- || (*pp_found)->is_fptr != pp->is_fptr
+ //|| (*pp_found)->is_fptr != pp->is_fptr
|| (*pp_found)->argc != pp->argc
|| (*pp_found)->argc_reg != pp->argc_reg
|| (*pp_found)->argc_stack != pp->argc_stack)
@@ -3564,6 +3717,13 @@ static int get_pp_arg_regmask_dst(const struct parsed_proto *pp)
return regmask | mxAX;
}
+static int are_ops_same(struct parsed_op *po1, struct parsed_op *po2)
+{
+ return po1->op == po2->op && po1->operand_cnt == po2->operand_cnt
+ && memcmp(po1->operand, po2->operand,
+ sizeof(po1->operand[0]) * po1->operand_cnt) == 0;
+}
+
static void resolve_branches_parse_calls(int opcnt)
{
static const struct {
@@ -3576,12 +3736,16 @@ static void resolve_branches_parse_calls(int opcnt)
{ "__allshl", OPP_ALLSHL, OPF_DATA, mxAX|mxDX|mxCX, mxAX|mxDX },
{ "__allshr", OPP_ALLSHR, OPF_DATA, mxAX|mxDX|mxCX, mxAX|mxDX },
{ "__ftol", OPP_FTOL, OPF_FPOP, mxST0, mxAX | mxDX },
+ // more precise? Wine gets away with just __ftol handler
+ { "__ftol2", OPP_FTOL, OPF_FPOP, mxST0, mxAX | mxDX },
+ { "__CIpow", OPP_CIPOW, OPF_FPOP, mxST0|mxST1, mxST0 },
};
const struct parsed_proto *pp_c;
struct parsed_proto *pp;
struct parsed_data *pd;
struct parsed_op *po;
const char *tmpname;
+ enum op_op prev_op;
int i, l;
int ret;
@@ -3645,8 +3809,10 @@ static void resolve_branches_parse_calls(int opcnt)
if (pp != NULL) {
if (pp->is_fptr)
check_func_pp(po, pp, "fptr var call");
- if (pp->is_noreturn)
+ if (pp->is_noreturn) {
po->flags |= OPF_TAIL;
+ po->flags &= ~OPF_ATAIL; // most likely...
+ }
}
po->pp = pp;
continue;
@@ -3691,19 +3857,98 @@ static void resolve_branches_parse_calls(int opcnt)
tailcall:
po->op = OP_CALL;
po->flags |= OPF_TAIL;
- if (i > 0 && ops[i - 1].op == OP_POP)
+ prev_op = i > 0 ? ops[i - 1].op : OP_UD2;
+ if (prev_op == OP_POP)
po->flags |= OPF_ATAIL;
+ if (g_stack_fsz + g_bp_frame == 0 && prev_op != OP_PUSH
+ && (g_func_pp == NULL || g_func_pp->argc_stack > 0))
+ {
+ po->flags |= OPF_ATAIL;
+ }
i--; // reprocess
}
}
-static void scan_prologue_epilogue(int opcnt)
+static int resolve_origin(int i, const struct parsed_opr *opr,
+ int magic, int *op_i, int *is_caller);
+
+static void eliminate_seh(int opcnt)
+{
+ int i, j, k, ret;
+
+ for (i = 0; i < opcnt; i++) {
+ if (ops[i].op != OP_MOV)
+ continue;
+ if (ops[i].operand[0].segment != SEG_FS)
+ continue;
+ if (!IS(opr_name(&ops[i], 0), "0"))
+ continue;
+
+ ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ if (ops[i].operand[1].reg == xSP) {
+ for (j = i - 1; j >= 0; j--) {
+ if (ops[j].op != OP_PUSH)
+ continue;
+ ops[j].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ g_seh_size += 4;
+ if (ops[j].operand[0].val == ~0)
+ break;
+ if (ops[j].operand[0].type == OPT_REG) {
+ k = -1;
+ ret = resolve_origin(j, &ops[j].operand[0],
+ j + opcnt * 22, &k, NULL);
+ if (ret == 1)
+ ops[k].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ }
+ }
+ if (j < 0)
+ ferr(ops, "missing seh terminator\n");
+ }
+ else {
+ k = -1;
+ ret = resolve_origin(i, &ops[i].operand[1],
+ i + opcnt * 23, &k, NULL);
+ if (ret == 1)
+ ops[k].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ }
+ }
+
+ // assume all sf writes above g_seh_size to be seh related
+ // (probably unsafe but oh well)
+ for (i = 0; i < opcnt; i++) {
+ const struct parsed_opr *opr;
+ char ofs_reg[16];
+ int offset = 0;
+
+ if (ops[i].op != OP_MOV)
+ continue;
+ opr = &ops[i].operand[0];
+ if (opr->type != OPT_REGMEM)
+ continue;
+ if (!is_stack_access(&ops[i], opr))
+ continue;
+
+ parse_stack_access(&ops[i], opr->name, ofs_reg, &offset,
+ NULL, NULL, 0);
+ if (offset < 0 && offset >= -g_seh_size)
+ ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ }
+}
+
+static void scan_prologue_epilogue(int opcnt, int *stack_align)
{
int ecx_push = 0, esp_sub = 0, pusha = 0;
int sandard_epilogue;
int found;
int i, j, l;
+ if (g_seh_found) {
+ eliminate_seh(opcnt);
+ // ida treats seh as part of sf
+ g_stack_fsz = g_seh_size;
+ esp_sub = 1;
+ }
+
if (ops[0].op == OP_PUSH && IS(opr_name(&ops[0], 0), "ebp")
&& ops[1].op == OP_MOV
&& IS(opr_name(&ops[1], 0), "ebp")
@@ -3712,7 +3957,10 @@ static void scan_prologue_epilogue(int opcnt)
g_bp_frame = 1;
ops[0].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
ops[1].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
- i = 2;
+
+ for (i = 2; i < opcnt; i++)
+ if (!(ops[i].flags & OPF_DONE))
+ break;
if (ops[i].op == OP_PUSHA) {
ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
@@ -3720,8 +3968,21 @@ static void scan_prologue_epilogue(int opcnt)
i++;
}
+ if (ops[i].op == OP_AND && ops[i].operand[0].reg == xSP
+ && ops[i].operand[1].type == OPT_CONST)
+ {
+ l = ops[i].operand[1].val;
+ j = ffs(l) - 1;
+ if (j == -1 || (l >> j) != -1)
+ ferr(&ops[i], "unhandled esp align: %x\n", l);
+ if (stack_align != NULL)
+ *stack_align = 1 << j;
+ ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ i++;
+ }
+
if (ops[i].op == OP_SUB && IS(opr_name(&ops[i], 0), "esp")) {
- g_stack_fsz = opr_const(&ops[i], 1);
+ g_stack_fsz += opr_const(&ops[i], 1);
ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
i++;
}
@@ -3734,7 +3995,7 @@ static void scan_prologue_epilogue(int opcnt)
i++;
}
// and another way..
- if (i == 2 && ops[i].op == OP_MOV && ops[i].operand[0].reg == xAX
+ if (ops[i].op == OP_MOV && ops[i].operand[0].reg == xAX
&& ops[i].operand[1].type == OPT_CONST
&& ops[i + 1].op == OP_CALL
&& IS(opr_name(&ops[i + 1], 0), "__alloca_probe"))
@@ -3823,7 +4084,10 @@ static void scan_prologue_epilogue(int opcnt)
}
// non-bp frame
- i = 0;
+ for (i = 0; i < opcnt; i++)
+ if (!(ops[i].flags & OPF_DONE))
+ break;
+
while (ops[i].op == OP_PUSH && IS(opr_name(&ops[i], 0), "ecx")) {
ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
g_stack_fsz += 4;
@@ -3837,7 +4101,7 @@ static void scan_prologue_epilogue(int opcnt)
if (ops[i].op == OP_SUB && ops[i].operand[0].reg == xSP
&& ops[i].operand[1].type == OPT_CONST)
{
- g_stack_fsz = ops[i].operand[1].val;
+ g_stack_fsz += ops[i].operand[1].val;
ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
i++;
esp_sub = 1;
@@ -3879,7 +4143,8 @@ static void scan_prologue_epilogue(int opcnt)
ferr(&ops[i], "unhandled prologue\n");
// recheck
- i = g_stack_fsz = ecx_push = 0;
+ i = ecx_push = 0;
+ g_stack_fsz = g_seh_size;
while (ops[i].op == OP_PUSH && IS(opr_name(&ops[i], 0), "ecx")) {
if (!(ops[i].flags & OPF_RMD))
break;
@@ -3908,7 +4173,7 @@ static void scan_prologue_epilogue(int opcnt)
j--;
}
- if (ecx_push > 0) {
+ if (ecx_push > 0 && !esp_sub) {
for (l = 0; l < ecx_push; l++) {
if (ops[j].op == OP_POP && IS(opr_name(&ops[j], 0), "ecx"))
/* pop ecx */;
@@ -3920,13 +4185,22 @@ static void scan_prologue_epilogue(int opcnt)
l += ops[j].operand[1].val / 4 - 1;
}
else
- ferr(&ops[j], "'pop ecx' expected\n");
+ break;
ops[j].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
j--;
}
- if (l != ecx_push)
+ if (l != ecx_push) {
+ if (i < opcnt && ops[i].op == OP_CALL
+ && ops[i].pp != NULL && ops[i].pp->is_noreturn)
+ {
+ // noreturn tailcall with no epilogue
+ i++;
+ found = 1;
+ continue;
+ }
ferr(&ops[j], "epilogue scan failed\n");
+ }
found = 1;
}
@@ -3934,21 +4208,25 @@ static void scan_prologue_epilogue(int opcnt)
if (esp_sub) {
if (ops[j].op != OP_ADD
|| !IS(opr_name(&ops[j], 0), "esp")
- || ops[j].operand[1].type != OPT_CONST
- || ops[j].operand[1].val != g_stack_fsz)
+ || ops[j].operand[1].type != OPT_CONST)
{
- if (ops[i].op == OP_CALL && ops[i].pp != NULL
- && ops[i].pp->is_noreturn)
+ if (i < opcnt && ops[i].op == OP_CALL
+ && ops[i].pp != NULL && ops[i].pp->is_noreturn)
{
// noreturn tailcall with no epilogue
i++;
+ found = 1;
continue;
}
ferr(&ops[j], "'add esp' expected\n");
}
- ops[j].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
- ops[j].operand[1].val = 0; // hack for stack arg scanner
+ if (ops[j].operand[1].val < g_stack_fsz)
+ ferr(&ops[j], "esp adj is too low (need %d)\n", g_stack_fsz);
+
+ ops[j].operand[1].val -= g_stack_fsz; // for stack arg scanner
+ if (ops[j].operand[1].val == 0)
+ ops[j].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
found = 1;
}
@@ -3971,10 +4249,6 @@ static int resolve_origin(int i, const struct parsed_opr *opr,
struct label_ref *lr;
int ret = 0;
- if (ops[i].cc_scratch == magic)
- return 0;
- ops[i].cc_scratch = magic;
-
while (1) {
if (g_labels[i] != NULL) {
lr = &g_label_refs[i];
@@ -4003,10 +4277,9 @@ static int resolve_origin(int i, const struct parsed_opr *opr,
continue;
if (*op_i >= 0) {
- if (*op_i == i)
+ if (*op_i == i || are_ops_same(&ops[*op_i], &ops[i]))
return ret | 1;
- // XXX: could check if the other op does the same
return -1;
}
@@ -4025,10 +4298,6 @@ static int resolve_last_ref(int i, const struct parsed_opr *opr,
struct label_ref *lr;
int ret = 0;
- if (ops[i].cc_scratch == magic)
- return 0;
- ops[i].cc_scratch = magic;
-
while (1) {
if (g_labels[i] != NULL) {
lr = &g_label_refs[i];
@@ -4282,16 +4551,103 @@ static int resolve_used_bits(int i, int opcnt, int reg,
return 0;
}
+static const struct parsed_proto *resolve_deref(int i, int magic,
+ struct parsed_opr *opr, int level)
+{
+ struct parsed_opr opr_s = OPR_INIT(OPT_REG, OPLM_DWORD, 0);
+ const struct parsed_proto *pp = NULL;
+ int from_caller = 0;
+ char s_reg[4];
+ int offset = 0;
+ int len = 0;
+ int j = -1;
+ int k = -1;
+ int reg;
+ int ret;
+
+ ret = sscanf(opr->name, "%3s+%x%n", s_reg, &offset, &len);
+ if (ret != 2 || len != strlen(opr->name)) {
+ ret = sscanf(opr->name, "%3s%n", s_reg, &len);
+ if (ret != 1 || len != strlen(opr->name))
+ return NULL;
+ }
+
+ reg = char_array_i(regs_r32, ARRAY_SIZE(regs_r32), s_reg);
+ if (reg < 0)
+ return NULL;
+
+ opr_s.reg = reg;
+ ret = resolve_origin(i, &opr_s, i + magic, &j, NULL);
+ if (ret != 1)
+ return NULL;
+
+ if (ops[j].op == OP_MOV && ops[j].operand[1].type == OPT_REGMEM
+ && strlen(ops[j].operand[1].name) == 3
+ && ops[j].operand[0].lmod == OPLM_DWORD
+ && ops[j].pp == NULL // no hint
+ && level == 0)
+ {
+ // allow one simple dereference (com/directx)
+ reg = char_array_i(regs_r32, ARRAY_SIZE(regs_r32),
+ ops[j].operand[1].name);
+ if (reg < 0)
+ return NULL;
+ opr_s.reg = reg;
+ ret = resolve_origin(j, &opr_s, j + magic, &k, NULL);
+ if (ret != 1)
+ return NULL;
+ j = k;
+ }
+ if (ops[j].op != OP_MOV || ops[j].operand[0].lmod != OPLM_DWORD)
+ return NULL;
+
+ if (ops[j].pp != NULL) {
+ // type hint in asm
+ pp = ops[j].pp;
+ }
+ else if (ops[j].operand[1].type == OPT_REGMEM) {
+ pp = try_recover_pp(&ops[j], &ops[j].operand[1], 0, NULL);
+ if (pp == NULL) {
+ // maybe structure ptr in structure
+ pp = resolve_deref(j, magic, &ops[j].operand[1], level + 1);
+ }
+ }
+ else if (ops[j].operand[1].type == OPT_LABEL)
+ pp = proto_parse(g_fhdr, ops[j].operand[1].name, g_quiet_pp);
+ else if (ops[j].operand[1].type == OPT_REG) {
+ // maybe arg reg?
+ k = -1;
+ ret = resolve_origin(j, &ops[j].operand[1], i + magic,
+ &k, &from_caller);
+ if (ret != 1 && from_caller && k == -1 && g_func_pp != NULL) {
+ for (k = 0; k < g_func_pp->argc; k++) {
+ if (g_func_pp->arg[k].reg == NULL)
+ continue;
+ if (IS(g_func_pp->arg[k].reg, ops[j].operand[1].name)) {
+ pp = g_func_pp->arg[k].pp;
+ break;
+ }
+ }
+ }
+ }
+
+ if (pp == NULL)
+ return NULL;
+ if (pp->is_func || pp->is_fptr || !pp->type.is_struct) {
+ if (offset != 0)
+ ferr(&ops[j], "expected struct, got '%s %s'\n",
+ pp->type.name, pp->name);
+ return NULL;
+ }
+
+ return proto_lookup_struct(g_fhdr, pp->type.name, offset);
+}
+
static const struct parsed_proto *resolve_icall(int i, int opcnt,
int *pp_i, int *multi_src)
{
const struct parsed_proto *pp = NULL;
int search_advice = 0;
- int offset = -1;
- char name[256];
- char s_reg[4];
- int reg, len;
- int ret;
*multi_src = 0;
*pp_i = -1;
@@ -4299,67 +4655,14 @@ static const struct parsed_proto *resolve_icall(int i, int opcnt,
switch (ops[i].operand[0].type) {
case OPT_REGMEM:
// try to resolve struct member calls
- ret = sscanf(ops[i].operand[0].name, "%3s+%x%n",
- s_reg, &offset, &len);
- if (ret == 2 && len == strlen(ops[i].operand[0].name))
- {
- reg = char_array_i(regs_r32, ARRAY_SIZE(regs_r32), s_reg);
- if (reg >= 0) {
- struct parsed_opr opr = OPR_INIT(OPT_REG, OPLM_DWORD, reg);
- int j = -1;
- ret = resolve_origin(i, &opr, i + opcnt * 19, &j, NULL);
- if (ret != 1)
- break;
- if (ops[j].op == OP_MOV && ops[j].operand[1].type == OPT_REGMEM
- && ops[j].operand[0].lmod == OPLM_DWORD
- && ops[j].pp == NULL) // no hint
- {
- // allow one simple dereference (directx)
- reg = char_array_i(regs_r32, ARRAY_SIZE(regs_r32),
- ops[j].operand[1].name);
- if (reg < 0)
- break;
- struct parsed_opr opr2 = OPR_INIT(OPT_REG, OPLM_DWORD, reg);
- int k = -1;
- ret = resolve_origin(j, &opr2, j + opcnt * 19, &k, NULL);
- if (ret != 1)
- break;
- j = k;
- }
- if (ops[j].op != OP_MOV)
- break;
- if (ops[j].operand[0].lmod != OPLM_DWORD)
- break;
- if (ops[j].pp != NULL) {
- // type hint in asm
- pp = ops[j].pp;
- }
- else if (ops[j].operand[1].type == OPT_REGMEM) {
- // allow 'hello[ecx]' - assume array of same type items
- ret = sscanf(ops[j].operand[1].name, "%[^[][e%2s]",
- name, s_reg);
- if (ret != 2)
- break;
- pp = proto_parse(g_fhdr, name, g_quiet_pp);
- }
- else if (ops[j].operand[1].type == OPT_LABEL)
- pp = proto_parse(g_fhdr, ops[j].operand[1].name, g_quiet_pp);
- else
- break;
- if (pp == NULL)
- break;
- if (pp->is_func || pp->is_fptr || !pp->type.is_struct) {
- pp = NULL;
- break;
- }
- pp = proto_lookup_struct(g_fhdr, pp->type.name, offset);
- }
+ pp = resolve_deref(i, i + opcnt * 19, &ops[i].operand[0], 0);
+ if (pp != NULL)
break;
- }
// fallthrough
case OPT_LABEL:
case OPT_OFFSET:
- pp = try_recover_pp(&ops[i], &ops[i].operand[0], &search_advice);
+ pp = try_recover_pp(&ops[i], &ops[i].operand[0],
+ 1, &search_advice);
if (!search_advice)
break;
// fallthrough
@@ -4515,6 +4818,9 @@ static struct parsed_proto *process_call(int i, int opcnt)
ferr(po, "too many args for '%s'\n", tmpname);
}
if (pp->argc_stack > adj / 4) {
+ if (pp->is_noreturn)
+ // assume no stack adjust was emited
+ goto out;
fnote(po, "(this call)\n");
ferr(&ops[ret], "stack tracking failed for '%s': %x %x\n",
tmpname, pp->argc_stack * 4, adj);
@@ -4527,12 +4833,75 @@ static struct parsed_proto *process_call(int i, int opcnt)
ferr(po, "missing esp_adjust for vararg func '%s'\n",
pp->name);
+out:
return pp;
}
-static int collect_call_args_early(struct parsed_op *po, int i,
- struct parsed_proto *pp, int *regmask)
+static int collect_call_args_no_push(int i, struct parsed_proto *pp,
+ int *regmask_ffca)
+{
+ struct parsed_op *po;
+ int offset = 0;
+ int base_arg;
+ int j, arg;
+ int ret;
+
+ for (base_arg = 0; base_arg < pp->argc; base_arg++)
+ if (pp->arg[base_arg].reg == NULL)
+ break;
+
+ for (j = i; j > 0; )
+ {
+ ferr_assert(&ops[j], g_labels[j] == NULL);
+ j--;
+
+ po = &ops[j];
+ ferr_assert(po, po->op != OP_PUSH);
+ if (po->op == OP_FST)
+ {
+ if (po->operand[0].type != OPT_REGMEM)
+ continue;
+ ret = parse_stack_esp_offset(po, po->operand[0].name, &offset);
+ if (ret != 0)
+ continue;
+ if (offset < 0 || offset >= pp->argc_stack * 4 || (offset & 3)) {
+ //ferr(po, "offset %d, %d args\n", offset, pp->argc_stack);
+ continue;
+ }
+
+ arg = base_arg + offset / 4;
+ po->p_argnext = -1;
+ po->p_argnum = arg + 1;
+ ferr_assert(po, pp->arg[arg].datap == NULL);
+ pp->arg[arg].datap = po;
+ po->flags |= OPF_DONE | OPF_FARGNR | OPF_FARG;
+ if (regmask_ffca != NULL)
+ *regmask_ffca |= 1 << arg;
+ }
+ else if (po->op == OP_SUB && po->operand[0].reg == xSP
+ && po->operand[1].type == OPT_CONST)
+ {
+ po->flags |= OPF_RMD | OPF_DONE | OPF_FARGNR | OPF_FARG;
+ break;
+ }
+ }
+
+ for (arg = base_arg; arg < pp->argc; arg++) {
+ ferr_assert(&ops[i], pp->arg[arg].reg == NULL);
+ po = pp->arg[arg].datap;
+ if (po == NULL)
+ ferr(&ops[i], "arg %d/%d not found\n", arg, pp->argc);
+ if (po->operand[0].lmod == OPLM_QWORD)
+ arg++;
+ }
+
+ return 0;
+}
+
+static int collect_call_args_early(int i, struct parsed_proto *pp,
+ int *regmask, int *regmask_ffca)
{
+ struct parsed_op *po;
int arg, ret;
int j;
@@ -4547,19 +4916,20 @@ static int collect_call_args_early(struct parsed_op *po, int i,
return -1;
j--;
- if (ops[j].op == OP_CALL)
+ po = &ops[j];
+ if (po->op == OP_CALL)
return -1;
- else if (ops[j].op == OP_ADD && ops[j].operand[0].reg == xSP)
+ else if (po->op == OP_ADD && po->operand[0].reg == xSP)
return -1;
- else if (ops[j].op == OP_POP)
+ else if (po->op == OP_POP)
return -1;
- else if (ops[j].flags & OPF_CJMP)
+ else if (po->flags & OPF_CJMP)
return -1;
- else if (ops[j].op == OP_PUSH) {
- if (ops[j].flags & (OPF_FARG|OPF_FARGNR))
+ else if (po->op == OP_PUSH) {
+ if (po->flags & (OPF_FARG|OPF_FARGNR))
return -1;
if (!g_header_mode) {
- ret = scan_for_mod(&ops[j], j + 1, i, 1);
+ ret = scan_for_mod(po, j + 1, i, 1);
if (ret >= 0)
return -1;
}
@@ -4572,6 +4942,17 @@ static int collect_call_args_early(struct parsed_op *po, int i,
if (pp->arg[arg].reg == NULL)
break;
}
+ else if (po->op == OP_SUB && po->operand[0].reg == xSP
+ && po->operand[1].type == OPT_CONST)
+ {
+ if (po->flags & (OPF_RMD|OPF_DONE))
+ return -1;
+ if (po->operand[1].val != pp->argc_stack * 4)
+ ferr(po, "unexpected esp adjust: %d\n",
+ po->operand[1].val * 4);
+ ferr_assert(po, pp->argc - arg == pp->argc_stack);
+ return collect_call_args_no_push(i, pp, regmask_ffca);
+ }
}
if (arg < pp->argc)
@@ -4592,7 +4973,7 @@ static int collect_call_args_early(struct parsed_op *po, int i,
ferr_assert(&ops[j], pp->arg[arg].datap == NULL);
pp->arg[arg].datap = &ops[j];
- if (ops[j].operand[0].type == OPT_REG)
+ if (regmask != NULL && ops[j].operand[0].type == OPT_REG)
*regmask |= 1 << ops[j].operand[0].reg;
ops[j].flags |= OPF_RMD | OPF_DONE | OPF_FARGNR | OPF_FARG;
@@ -4608,9 +4989,31 @@ static int collect_call_args_early(struct parsed_op *po, int i,
return 0;
}
+static int sync_argnum(struct parsed_op *po, int argnum)
+{
+ struct parsed_op *po_tmp;
+
+ // see if other branches don't have higher argnum
+ for (po_tmp = po; po_tmp != NULL; ) {
+ if (argnum < po_tmp->p_argnum)
+ argnum = po_tmp->p_argnum;
+ // note: p_argnext is active on current collect_call_args only
+ po_tmp = po_tmp->p_argnext >= 0 ? &ops[po_tmp->p_argnext] : NULL;
+ }
+
+ // make all argnums consistent
+ for (po_tmp = po; po_tmp != NULL; ) {
+ if (po_tmp->p_argnum != 0)
+ po_tmp->p_argnum = argnum;
+ po_tmp = po_tmp->p_argnext >= 0 ? &ops[po_tmp->p_argnext] : NULL;
+ }
+
+ return argnum;
+}
+
static int collect_call_args_r(struct parsed_op *po, int i,
- struct parsed_proto *pp, int *regmask, int *save_arg_vars,
- int *arg_grp, int arg, int magic, int need_op_saving, int may_reuse)
+ struct parsed_proto *pp, int *regmask, int *arg_grp,
+ int arg, int argnum, int magic, int need_op_saving, int may_reuse)
{
struct parsed_proto *pp_tmp;
struct parsed_op *po_tmp;
@@ -4618,7 +5021,6 @@ static int collect_call_args_r(struct parsed_op *po, int i,
int need_to_save_current;
int arg_grp_current = 0;
int save_args_seen = 0;
- int save_args;
int ret = 0;
int reg;
char buf[32];
@@ -4629,7 +5031,7 @@ static int collect_call_args_r(struct parsed_op *po, int i,
return -1;
}
- for (; arg < pp->argc; arg++)
+ for (; arg < pp->argc; arg++, argnum++)
if (pp->arg[arg].reg == NULL)
break;
magic = (magic & 0xffffff) | (arg << 24);
@@ -4655,8 +5057,8 @@ static int collect_call_args_r(struct parsed_op *po, int i,
check_i(&ops[j], lr->i);
if ((ops[lr->i].flags & (OPF_JMP|OPF_CJMP)) != OPF_JMP)
may_reuse = 1;
- ret = collect_call_args_r(po, lr->i, pp, regmask, save_arg_vars,
- arg_grp, arg, magic, need_op_saving, may_reuse);
+ ret = collect_call_args_r(po, lr->i, pp, regmask, arg_grp,
+ arg, argnum, magic, need_op_saving, may_reuse);
if (ret < 0)
return ret;
}
@@ -4670,8 +5072,8 @@ static int collect_call_args_r(struct parsed_op *po, int i,
continue;
}
need_op_saving = 1;
- ret = collect_call_args_r(po, lr->i, pp, regmask, save_arg_vars,
- arg_grp, arg, magic, need_op_saving, may_reuse);
+ ret = collect_call_args_r(po, lr->i, pp, regmask, arg_grp,
+ arg, argnum, magic, need_op_saving, may_reuse);
if (ret < 0)
return ret;
}
@@ -4684,8 +5086,8 @@ static int collect_call_args_r(struct parsed_op *po, int i,
pp_tmp = ops[j].pp;
if (pp_tmp == NULL)
- ferr(po, "arg collect hit unparsed call '%s'\n",
- ops[j].operand[0].name);
+ ferr(po, "arg collect %d/%d hit unparsed call '%s'\n",
+ arg, pp->argc, ops[j].operand[0].name);
if (may_reuse && pp_tmp->argc_stack > 0)
ferr(po, "arg collect %d/%d hit '%s' with %d stack args\n",
arg, pp->argc, opr_name(&ops[j], 0), pp_tmp->argc_stack);
@@ -4729,8 +5131,9 @@ static int collect_call_args_r(struct parsed_op *po, int i,
ops[j].p_argnext = po_tmp - ops;
pp->arg[arg].datap = &ops[j];
+ argnum = sync_argnum(&ops[j], argnum);
+
need_to_save_current = 0;
- save_args = 0;
reg = -1;
if (ops[j].operand[0].type == OPT_REG)
reg = ops[j].operand[0].reg;
@@ -4740,25 +5143,15 @@ static int collect_call_args_r(struct parsed_op *po, int i,
need_to_save_current = (ret >= 0);
}
if (need_op_saving || need_to_save_current) {
- // mark this push as one that needs operand saving
- ops[j].flags &= ~OPF_RMD;
- if (ops[j].p_argnum == 0) {
- ops[j].p_argnum = arg + 1;
- save_args |= 1 << arg;
- }
- else if (ops[j].p_argnum < arg + 1) {
- // XXX: might kill valid var..
- //*save_arg_vars &= ~(1 << (ops[j].p_argnum - 1));
- ops[j].p_argnum = arg + 1;
- save_args |= 1 << arg;
- }
+ // mark this arg as one that needs operand saving
+ pp->arg[arg].is_saved = 1;
- if (save_args_seen & (1 << (ops[j].p_argnum - 1))) {
+ if (save_args_seen & (1 << (argnum - 1))) {
save_args_seen = 0;
arg_grp_current++;
if (arg_grp_current >= MAX_ARG_GRP)
ferr(&ops[j], "out of arg groups (arg%d), f %s\n",
- ops[j].p_argnum, pp->name);
+ argnum, pp->name);
}
}
else if (ops[j].p_argnum == 0)
@@ -4794,7 +5187,7 @@ static int collect_call_args_r(struct parsed_op *po, int i,
{
ops[k].flags |= OPF_RMD | OPF_NOREGS | OPF_DONE;
ops[j].flags |= OPF_RMD | OPF_NOREGS | OPF_VAPUSH;
- save_args &= ~(1 << arg);
+ pp->arg[arg].is_saved = 0;
reg = -1;
}
else
@@ -4810,23 +5203,27 @@ static int collect_call_args_r(struct parsed_op *po, int i,
ops[k].flags |= OPF_RMD | OPF_DONE;
ops[j].flags |= OPF_RMD;
ops[j].p_argpass = ret + 1;
- save_args &= ~(1 << arg);
+ pp->arg[arg].is_saved = 0;
reg = -1;
}
}
}
}
- *save_arg_vars |= save_args;
+ if (pp->arg[arg].is_saved) {
+ ops[j].flags &= ~OPF_RMD;
+ ops[j].p_argnum = argnum;
+ }
// tracking reg usage
if (reg >= 0)
*regmask |= 1 << reg;
arg++;
+ argnum++;
if (!pp->is_unresolved) {
// next arg
- for (; arg < pp->argc; arg++)
+ for (; arg < pp->argc; arg++, argnum++)
if (pp->arg[arg].reg == NULL)
break;
}
@@ -4854,19 +5251,17 @@ static int collect_call_args_r(struct parsed_op *po, int i,
}
static int collect_call_args(struct parsed_op *po, int i,
- struct parsed_proto *pp, int *regmask, int *save_arg_vars,
- int magic)
+ struct parsed_proto *pp, int *regmask, int magic)
{
// arg group is for cases when pushes for
// multiple funcs are going on
struct parsed_op *po_tmp;
- int save_arg_vars_current = 0;
int arg_grp = 0;
int ret;
int a;
- ret = collect_call_args_r(po, i, pp, regmask,
- &save_arg_vars_current, &arg_grp, 0, magic, 0, 0);
+ ret = collect_call_args_r(po, i, pp, regmask, &arg_grp,
+ 0, 1, magic, 0, 0);
if (ret < 0)
return ret;
@@ -4879,14 +5274,10 @@ static int collect_call_args(struct parsed_op *po, int i,
po_tmp = pp->arg[a].datap;
while (po_tmp != NULL) {
po_tmp->p_arggrp = arg_grp;
- if (po_tmp->p_argnext > 0)
- po_tmp = &ops[po_tmp->p_argnext];
- else
- po_tmp = NULL;
+ po_tmp = po_tmp->p_argnext >= 0 ? &ops[po_tmp->p_argnext] : NULL;
}
}
}
- save_arg_vars[arg_grp] |= save_arg_vars_current;
if (pp->is_unresolved) {
pp->argc += ret;
@@ -4956,9 +5347,10 @@ static void reg_use_pass(int i, int opcnt, unsigned char *cbits,
flags_set = OPF_RSAVE | OPF_DONE;
}
- ret = scan_for_pop(i + 1, opcnt, i + opcnt * 3, reg, 0, 0);
+ ret = scan_for_pop(i + 1, opcnt, i + opcnt * 3, reg, 0, 0, 0);
if (ret == 1) {
- scan_for_pop(i + 1, opcnt, i + opcnt * 4, reg, 0, flags_set);
+ scan_for_pop(i + 1, opcnt, i + opcnt * 4,
+ reg, 0, 0, flags_set);
}
else {
ret = scan_for_pop_ret(i + 1, opcnt, po->operand[0].reg, 0);
@@ -5107,7 +5499,7 @@ static void pp_insert_reg_arg(struct parsed_proto *pp, const char *reg)
pp->argc_reg++;
}
-static void output_std_flags(FILE *fout, struct parsed_op *po,
+static void output_std_flag_z(FILE *fout, struct parsed_op *po,
int *pfomask, const char *dst_opr_text)
{
if (*pfomask & (1 << PFO_Z)) {
@@ -5115,6 +5507,11 @@ static void output_std_flags(FILE *fout, struct parsed_op *po,
lmod_cast_u(po, po->operand[0].lmod), dst_opr_text);
*pfomask &= ~(1 << PFO_Z);
}
+}
+
+static void output_std_flag_s(FILE *fout, struct parsed_op *po,
+ int *pfomask, const char *dst_opr_text)
+{
if (*pfomask & (1 << PFO_S)) {
fprintf(fout, "\n cond_s = (%s%s < 0);",
lmod_cast_s(po, po->operand[0].lmod), dst_opr_text);
@@ -5122,6 +5519,13 @@ static void output_std_flags(FILE *fout, struct parsed_op *po,
}
}
+static void output_std_flags(FILE *fout, struct parsed_op *po,
+ int *pfomask, const char *dst_opr_text)
+{
+ output_std_flag_z(fout, po, pfomask, dst_opr_text);
+ output_std_flag_s(fout, po, pfomask, dst_opr_text);
+}
+
enum {
OPP_FORCE_NORETURN = (1 << 0),
OPP_SIMPLE_ARGS = (1 << 1),
@@ -5164,9 +5568,11 @@ static void output_pp(FILE *fout, const struct parsed_proto *pp,
for (i = 0; i < pp->argc; i++) {
if (i > 0)
fprintf(fout, ", ");
- if (pp->arg[i].fptr != NULL && !(flags & OPP_SIMPLE_ARGS)) {
+ if (pp->arg[i].pp != NULL && pp->arg[i].pp->is_func
+ && !(flags & OPP_SIMPLE_ARGS))
+ {
// func pointer
- output_pp(fout, pp->arg[i].fptr, 0);
+ output_pp(fout, pp->arg[i].pp, 0);
}
else if (pp->arg[i].type.is_retreg) {
fprintf(fout, "u32 *r_%s", pp->arg[i].reg);
@@ -5176,6 +5582,9 @@ static void output_pp(FILE *fout, const struct parsed_proto *pp,
if (!pp->is_fptr)
fprintf(fout, " a%d", i + 1);
}
+
+ if (pp->arg[i].type.is_64bit)
+ i++;
}
if (pp->is_vararg) {
if (i > 0)
@@ -5206,7 +5615,6 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
char buf1[256], buf2[256], buf3[256], cast[64];
struct parsed_proto *pp, *pp_tmp;
struct parsed_data *pd;
- unsigned int uval;
int save_arg_vars[MAX_ARG_GRP] = { 0, };
unsigned char cbits[MAX_OPS / 8];
const char *float_type;
@@ -5220,12 +5628,15 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
int had_decl = 0;
int label_pending = 0;
int need_double = 0;
+ int stack_align = 0;
+ int stack_fsz_adj = 0;
int regmask_save = 0; // used regs saved/restored in this func
int regmask_arg; // regs from this function args (fastcall, etc)
int regmask_ret; // regs needed on ret
int regmask_now; // temp
int regmask_init = 0; // regs that need zero initialization
int regmask_pp = 0; // regs used in complex push-pop graph
+ int regmask_ffca = 0; // float function call args
int regmask = 0; // used regs
int pfomask = 0;
int found = 0;
@@ -5238,6 +5649,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
g_bp_frame = g_sp_frame = g_stack_fsz = 0;
g_stack_frame_used = 0;
+ g_seh_size = 0;
if (g_sct_func_attr & SCTFA_CLEAR_REGS)
regmask_init = g_regmask_init;
@@ -5255,7 +5667,21 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
// pass2:
// - handle ebp/esp frame, remove ops related to it
- scan_prologue_epilogue(opcnt);
+ scan_prologue_epilogue(opcnt, &stack_align);
+
+ // handle a case where sf size is unalignment, but is
+ // placed in a way that elements are still aligned
+ if (g_stack_fsz & 4) {
+ for (i = 0; i < g_eqcnt; i++) {
+ if (g_eqs[i].lmod != OPLM_QWORD)
+ continue;
+ if (!(g_eqs[i].offset & 4)) {
+ g_stack_fsz += 4;
+ stack_fsz_adj = 4;
+ }
+ break;
+ }
+ }
// pass3:
// - remove dead labels
@@ -5283,10 +5709,12 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
{
pp = process_call_early(i, opcnt, &j);
if (pp != NULL) {
- if (!(po->flags & OPF_ATAIL))
+ if (!(po->flags & OPF_ATAIL)) {
// since we know the args, try to collect them
- if (collect_call_args_early(po, i, pp, ®mask) != 0)
+ ret = collect_call_args_early(i, pp, ®mask, ®mask_ffca);
+ if (ret != 0)
pp = NULL;
+ }
}
if (pp != NULL) {
@@ -5328,8 +5756,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
if (!pp->is_unresolved && !(po->flags & OPF_ATAIL)) {
// since we know the args, collect them
- collect_call_args(po, i, pp, ®mask, save_arg_vars,
- i + opcnt * 2);
+ collect_call_args(po, i, pp, ®mask, i + opcnt * 2);
}
// for unresolved, collect after other passes
}
@@ -5395,6 +5822,8 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
reg_use_pass(0, opcnt, cbits, regmask_init, ®mask,
0, ®mask_save, ®mask_init, regmask_arg);
+ need_float_stack = !!(regmask & mxST7_2);
+
// pass7:
// - find flag set ops for their users
// - do unresolved calls
@@ -5410,7 +5839,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
{
int setters[16], cnt = 0, branched = 0;
- ret = scan_for_flag_set(i, i + opcnt * 6,
+ ret = scan_for_flag_set(i, opcnt, i + opcnt * 6,
&branched, setters, &cnt);
if (ret < 0 || cnt <= 0)
ferr(po, "unable to trace flag setter(s)\n");
@@ -5487,19 +5916,18 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
if (pp->is_unresolved) {
int regmask_stack = 0;
- collect_call_args(po, i, pp, ®mask, save_arg_vars,
- i + opcnt * 2);
+ collect_call_args(po, i, pp, ®mask, i + opcnt * 2);
// this is pretty rough guess:
// see ecx and edx were pushed (and not their saved versions)
for (arg = 0; arg < pp->argc; arg++) {
- if (pp->arg[arg].reg != NULL)
+ if (pp->arg[arg].reg != NULL && !pp->arg[arg].is_saved)
continue;
tmp_op = pp->arg[arg].datap;
if (tmp_op == NULL)
ferr(po, "parsed_op missing for arg%d\n", arg);
- if (tmp_op->p_argnum == 0 && tmp_op->operand[0].type == OPT_REG)
+ if (tmp_op->operand[0].type == OPT_REG)
regmask_stack |= 1 << tmp_op->operand[0].reg;
}
@@ -5599,15 +6027,25 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
default:
break;
}
+
+ // this might need it's own pass...
+ if (po->op != OP_FST && po->p_argnum > 0)
+ save_arg_vars[po->p_arggrp] |= 1 << (po->p_argnum - 1);
+
+ // correct for "full stack" mode late enable
+ if ((po->flags & (OPF_PPUSH|OPF_FPOP)) && need_float_stack)
+ po->flags |= OPF_FSHIFT;
}
float_type = need_double ? "double" : "float";
- need_float_stack = !!(regmask & mxST7_2);
float_st0 = need_float_stack ? "f_st[f_stp & 7]" : "f_st0";
float_st1 = need_float_stack ? "f_st[(f_stp + 1) & 7]" : "f_st1";
// output starts here
+ if (g_seh_found)
+ fprintf(fout, "// had SEH\n");
+
// define userstack size
if (g_func_pp->is_userstack) {
fprintf(fout, "#ifndef US_SZ_%s\n", g_func_pp->name);
@@ -5689,6 +6127,9 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
// declare stack frame, va_arg
if (g_stack_fsz) {
+ if (stack_fsz_adj)
+ fprintf(fout, " // stack_fsz_adj %d\n", stack_fsz_adj);
+
fprintf(fout, " union { u32 d[%d];", (g_stack_fsz + 3) / 4);
if (g_func_lmods & (1 << OPLM_WORD))
fprintf(fout, " u16 w[%d];", (g_stack_fsz + 1) / 2);
@@ -5696,6 +6137,11 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
fprintf(fout, " u8 b[%d];", g_stack_fsz);
if (g_func_lmods & (1 << OPLM_QWORD))
fprintf(fout, " double q[%d];", (g_stack_fsz + 7) / 8);
+
+ if (stack_align > 8)
+ ferr(ops, "unhandled stack align of %d\n", stack_align);
+ else if (stack_align == 8)
+ fprintf(fout, " u64 align;");
fprintf(fout, " } sf;\n");
had_decl = 1;
}
@@ -5807,6 +6253,15 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
}
}
+ if (regmask_ffca) {
+ for (reg = 0; reg < 32; reg++) {
+ if (regmask_ffca & (1 << reg)) {
+ fprintf(fout, " %s fs_%d;\n", float_type, reg + 1);
+ had_decl = 1;
+ }
+ }
+ }
+
// declare push-pop temporaries
if (regmask_pp) {
for (reg = 0; reg < 8; reg++) {
@@ -5943,32 +6398,6 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
pfomask = po->pfomask;
- if (po->flags & (OPF_REPZ|OPF_REPNZ)) {
- struct parsed_opr opr = OPR_INIT(OPT_REG, OPLM_DWORD, xCX);
- ret = try_resolve_const(i, &opr, opcnt * 7 + i, &uval);
-
- if (ret != 1 || uval == 0) {
- // we need initial flags for ecx=0 case..
- if (i > 0 && ops[i - 1].op == OP_XOR
- && IS(ops[i - 1].operand[0].name,
- ops[i - 1].operand[1].name))
- {
- fprintf(fout, " cond_z = ");
- if (pfomask & (1 << PFO_C))
- fprintf(fout, "cond_c = ");
- fprintf(fout, "0;\n");
- }
- else if (last_arith_dst != NULL) {
- out_src_opr_u32(buf3, sizeof(buf3), po, last_arith_dst);
- out_test_for_cc(buf1, sizeof(buf1), po, PFO_Z, 0,
- last_arith_dst->lmod, buf3);
- fprintf(fout, " cond_z = %s;\n", buf1);
- }
- else
- ferr(po, "missing initial ZF\n");
- }
- }
-
switch (po->op)
{
case OP_MOV:
@@ -6124,7 +6553,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
if (po->flags & OPF_REP) {
assert_operand_cnt(3);
fprintf(fout,
- " for (; ecx != 0; ecx--) {\n");
+ " while (ecx != 0) {\n");
if (pfomask & (1 << PFO_C)) {
// ugh..
fprintf(fout,
@@ -6135,6 +6564,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
" cond_z = (%sesi == %sedi); esi %c= %d, edi %c= %d;\n",
buf1, buf1, l, j, l, j);
fprintf(fout,
+ " ecx--;\n"
" if (cond_z %s 0) break;\n",
(po->flags & OPF_REPZ) ? "==" : "!=");
fprintf(fout,
@@ -6162,12 +6592,13 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
if (po->flags & OPF_REP) {
assert_operand_cnt(3);
fprintf(fout,
- " for (; ecx != 0; ecx--) {\n");
+ " while (ecx != 0) {\n");
fprintf(fout,
" cond_z = (%seax == %sedi); edi %c= %d;\n",
lmod_cast_u(po, po->operand[1].lmod),
lmod_cast_u_ptr(po, po->operand[1].lmod), l, j);
fprintf(fout,
+ " ecx--;\n"
" if (cond_z %s 0) break;\n",
(po->flags & OPF_REPZ) ? "==" : "!=");
fprintf(fout,
@@ -6360,9 +6791,13 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
propagate_lmod(po, &po->operand[0], &po->operand[1]);
if (IS(opr_name(po, 0), opr_name(po, 1))) {
// special case for XOR
- if (pfomask & (1 << PFO_BE)) { // weird, but it happens..
- fprintf(fout, " cond_be = 1;\n");
- pfomask &= ~(1 << PFO_BE);
+ int z = PFOB_O | PFOB_C | PFOB_S | (1 << PFO_L);
+ for (j = 0; j <= PFO_LE; j++) {
+ if (pfomask & (1 << j)) {
+ fprintf(fout, " cond_%s = %d;\n",
+ parsed_flag_op_names[j], (1 << j) & z ? 0 : 1);
+ pfomask &= ~(1 << j);
+ }
}
fprintf(fout, " %s = 0;",
out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]));
@@ -6447,15 +6882,20 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
break;
case OP_BSF:
+ case OP_BSR:
+ // on SKL, if src is 0, dst is left unchanged
assert_operand_cnt(2);
+ out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]);
out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1]);
- fprintf(fout, " %s = %s ? __builtin_ffs(%s) - 1 : 0;",
- out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]),
- buf2, buf2);
- output_std_flags(fout, po, &pfomask, buf1);
+ output_std_flag_z(fout, po, &pfomask, buf2);
+ if (po->op == OP_BSF)
+ snprintf(buf3, sizeof(buf3), "__builtin_ffs(%s) - 1", buf2);
+ else
+ snprintf(buf3, sizeof(buf3), "31 - __builtin_clz(%s)", buf2);
+ fprintf(fout, " if (%s) %s = %s;", buf2, buf1, buf3);
last_arith_dst = &po->operand[0];
delayed_flag_op = NULL;
- strcat(g_comment, " bsf");
+ strcat(g_comment, po->op == OP_BSF ? " bsf" : " bsr");
break;
case OP_DEC:
@@ -6500,10 +6940,11 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
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:
@@ -6709,10 +7150,13 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
pp->has_structarg ? "_sa" : "");
if (po->flags & OPF_ATAIL) {
- if (pp->argc_stack != g_func_pp->argc_stack
- || (pp->argc_stack > 0
- && pp->is_stdcall != g_func_pp->is_stdcall))
- ferr(po, "incompatible tailcall\n");
+ int check_compat =
+ g_func_pp->is_stdcall && g_func_pp->argc_stack > 0;
+ check_compat |= pp->argc_stack > 0;
+ if (check_compat
+ && (pp->argc_stack != g_func_pp->argc_stack
+ || pp->is_stdcall != g_func_pp->is_stdcall))
+ ferr(po, "incompatible arg-reuse tailcall\n");
if (g_func_pp->has_retreg)
ferr(po, "TODO: retreg+tailcall\n");
@@ -6750,6 +7194,13 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
if (pp->arg[arg].reg != NULL) {
if (pp->arg[arg].type.is_retreg)
fprintf(fout, "&%s", pp->arg[arg].reg);
+ else if (IS(pp->arg[arg].reg, "ebp")
+ && g_bp_frame && !(po->flags & OPF_EBP_S))
+ {
+ // rare special case
+ fprintf(fout, "%s(u32)&sf.b[sizeof(sf)]", cast);
+ strcat(g_comment, " bp_ref");
+ }
else
fprintf(fout, "%s%s", cast, pp->arg[arg].reg);
continue;
@@ -6763,10 +7214,16 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
if (tmp_op->flags & OPF_VAPUSH) {
fprintf(fout, "ap");
}
+ else if (tmp_op->op == OP_FST) {
+ fprintf(fout, "fs_%d", tmp_op->p_argnum);
+ if (tmp_op->operand[0].lmod == OPLM_QWORD)
+ arg++;
+ }
else if (tmp_op->p_argpass != 0) {
fprintf(fout, "a%d", tmp_op->p_argpass);
}
- else if (tmp_op->p_argnum != 0) {
+ else if (pp->arg[arg].is_saved) {
+ ferr_assert(po, tmp_op->p_argnum > 0);
fprintf(fout, "%s%s", cast,
saved_arg_name(buf1, sizeof(buf1),
tmp_op->p_arggrp, tmp_op->p_argnum));
@@ -6925,7 +7382,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
case OPP_ALLSHL:
case OPP_ALLSHR:
fprintf(fout, " tmp64 = ((u64)edx << 32) | eax;\n");
- fprintf(fout, " tmp64 = (s64)tmp64 %s= LOBYTE(ecx);\n",
+ fprintf(fout, " tmp64 = (s64)tmp64 %s LOBYTE(ecx);\n",
po->op == OPP_ALLSHL ? "<<" : ">>");
fprintf(fout, " edx = tmp64 >> 32; eax = tmp64;");
strcat(g_comment, po->op == OPP_ALLSHL
@@ -6992,13 +7449,19 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
break;
case OP_FST:
- dead_dst = po->operand[0].type == OPT_REG
- && po->operand[0].reg == xST0;
- if (!dead_dst) {
- fprintf(fout, " %s = %s;",
- out_dst_opr_float(buf1, sizeof(buf1), po, &po->operand[0],
- need_float_stack), float_st0);
+ if (po->flags & OPF_FARG) {
+ // store to stack as func arg
+ snprintf(buf1, sizeof(buf1), "fs_%d", po->p_argnum);
+ dead_dst = 0;
+ }
+ else {
+ out_dst_opr_float(buf1, sizeof(buf1), po, &po->operand[0],
+ need_float_stack);
+ dead_dst = po->operand[0].type == OPT_REG
+ && po->operand[0].reg == xST0;
}
+ if (!dead_dst)
+ fprintf(fout, " %s = %s;", buf1, float_st0);
if (po->flags & OPF_FSHIFT) {
if (need_float_stack)
fprintf(fout, " f_stp++;");
@@ -7125,7 +7588,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
z_check = ((long)po->datap >> 16) & 1;
out_src_opr_float(buf1, sizeof(buf1), po, &po->operand[0],
need_float_stack);
- if (mask == 0x0100) { // C0 -> <
+ if (mask == 0x0100 || mask == 0x0500) { // C0 -> <
fprintf(fout, " f_sw = %s < %s ? 0x0100 : 0;",
float_st0, buf1);
}
@@ -7192,6 +7655,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
fprintf(fout, " f_st0 = f_st1 * log2%s(f_st0);",
need_double ? "" : "f");
}
+ strcat(g_comment, " fyl2x");
break;
case OP_FSIN:
@@ -7230,9 +7694,26 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
strcat(g_comment, " ftol");
break;
+ case OPP_CIPOW:
+ if (need_float_stack) {
+ fprintf(fout, " %s = pow%s(%s, %s);", float_st1,
+ need_double ? "" : "f", float_st1, float_st0);
+ fprintf(fout, " f_stp++;");
+ }
+ else {
+ fprintf(fout, " f_st0 = pow%s(f_st1, f_st0);",
+ need_double ? "" : "f");
+ }
+ strcat(g_comment, " CIpow");
+ break;
+
+ case OPP_ABORT:
+ fprintf(fout, " do_skip_code_abort();");
+ break;
+
// mmx
case OP_EMMS:
- strcpy(g_comment, " (emms)");
+ fprintf(fout, " do_emms();");
break;
default:
@@ -7280,7 +7761,8 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
last_arith_dst = NULL;
}
- label_pending = 0;
+ if (!no_output)
+ label_pending = 0;
}
if (g_stack_fsz && !g_stack_frame_used)
@@ -7492,11 +7974,11 @@ static void gen_hdr_dep_pass(int i, int opcnt, unsigned char *cbits,
if (po->flags & OPF_DONE)
continue;
- ret = scan_for_pop(i + 1, opcnt, i + opcnt * 2, reg, 0, 0);
+ ret = scan_for_pop(i + 1, opcnt, i + opcnt * 2, reg, 0, 0, 0);
if (ret == 1) {
regmask_save |= 1 << reg;
po->flags |= OPF_RMD;
- scan_for_pop(i + 1, opcnt, i + opcnt * 3, reg, 0, OPF_RMD);
+ scan_for_pop(i + 1, opcnt, i + opcnt * 3, reg, 0, 0, OPF_RMD);
continue;
}
}
@@ -7506,8 +7988,11 @@ static void gen_hdr_dep_pass(int i, int opcnt, unsigned char *cbits,
po->regmask_dst |= 1 << xAX;
dep = hg_fp_find_dep(fp, po->operand[0].name);
- if (dep != NULL)
+ if (dep != NULL) {
dep->regmask_live = regmask_save | regmask_dst;
+ if (g_bp_frame && !(po->flags & OPF_EBP_S))
+ dep->regmask_live |= 1 << xBP;
+ }
}
else if (po->op == OP_RET) {
if (po->operand_cnt > 0) {
@@ -7570,7 +8055,6 @@ static void gen_hdr_dep_pass(int i, int opcnt, unsigned char *cbits,
static void gen_hdr(const char *funcn, int opcnt)
{
- int save_arg_vars[MAX_ARG_GRP] = { 0, };
unsigned char cbits[MAX_OPS / 8];
const struct parsed_proto *pp_c;
struct parsed_proto *pp;
@@ -7592,6 +8076,7 @@ static void gen_hdr(const char *funcn, int opcnt)
g_bp_frame = g_sp_frame = g_stack_fsz = 0;
g_stack_frame_used = 0;
+ g_seh_size = 0;
// pass1:
// - resolve all branches
@@ -7600,7 +8085,7 @@ static void gen_hdr(const char *funcn, int opcnt)
// pass2:
// - handle ebp/esp frame, remove ops related to it
- scan_prologue_epilogue(opcnt);
+ scan_prologue_epilogue(opcnt, NULL);
// pass3:
// - remove dead labels
@@ -7656,7 +8141,7 @@ static void gen_hdr(const char *funcn, int opcnt)
if (pp != NULL) {
if (!(po->flags & OPF_ATAIL))
// since we know the args, try to collect them
- if (collect_call_args_early(po, i, pp, ®mask_dummy) != 0)
+ if (collect_call_args_early(i, pp, NULL, NULL) != 0)
pp = NULL;
}
@@ -7701,8 +8186,8 @@ static void gen_hdr(const char *funcn, int opcnt)
if (!pp->is_unresolved && !(po->flags & OPF_ATAIL)) {
// since we know the args, collect them
- ret = collect_call_args(po, i, pp, ®mask_dummy, save_arg_vars,
- i + opcnt * 1);
+ ret = collect_call_args(po, i, pp, ®mask_dummy,
+ i + opcnt * 1);
}
}
}
@@ -7727,7 +8212,7 @@ static void gen_hdr(const char *funcn, int opcnt)
// noreturn OS functions
break;
}
- if (ops[i].op != OP_NOP)
+ if (ops[i].op != OP_NOP && ops[i].op != OPP_ABORT)
ferr(&ops[i], "unreachable code\n");
}
@@ -8055,10 +8540,14 @@ static int ida_xrefs_show_need(FILE *fasm, char *p,
long pos;
p = strrchr(p, ';');
- if (p != NULL && *p == ';' && IS_START(p + 2, "DATA XREF: ")) {
- p += 13;
- if (is_xref_needed(p, rlist, rlist_len))
+ if (p != NULL && *p == ';') {
+ if (IS_START(p + 2, "sctref"))
return 1;
+ if (IS_START(p + 2, "DATA XREF: ")) {
+ p += 13;
+ if (is_xref_needed(p, rlist, rlist_len))
+ return 1;
+ }
}
pos = ftell(fasm);
@@ -8077,6 +8566,12 @@ static int ida_xrefs_show_need(FILE *fasm, char *p,
p = strrchr(p, ';');
p += 2;
+
+ if (IS_START(p, "sctref")) {
+ found_need = 1;
+ break;
+ }
+
// it's printed once, but no harm to check again
if (IS_START(p, "DATA XREF: "))
p += 11;
@@ -8270,7 +8765,7 @@ static int cmp_chunks(const void *p1, const void *p2)
return strcmp(c1->name, c2->name);
}
-static void scan_ahead(FILE *fasm)
+static void scan_ahead_for_chunks(FILE *fasm)
{
char words[2][256];
char line[256];
@@ -8351,7 +8846,8 @@ int main(int argc, char *argv[])
char *sctproto = NULL;
int in_func = 0;
int pending_endp = 0;
- int skip_func = 0;
+ int skip_code = 0;
+ int skip_code_end = 0;
int skip_warned = 0;
int eq_alloc;
int verbose = 0;
@@ -8370,6 +8866,8 @@ int main(int argc, char *argv[])
verbose = 1;
else if (IS(argv[arg], "-rf"))
g_allow_regfunc = 1;
+ else if (IS(argv[arg], "-uc"))
+ g_allow_user_icall = 1;
else if (IS(argv[arg], "-m"))
multi_seg = 1;
else if (IS(argv[arg], "-hdr"))
@@ -8384,6 +8882,7 @@ int main(int argc, char *argv[])
"options:\n"
" -hdr - header generation mode\n"
" -rf - allow unannotated indirect calls\n"
+ " -uc - allow ind. calls/refs to __usercall\n"
" -m - allow multiple .text sections\n"
"[rlist] is a file with function names to skip,"
" one per line\n",
@@ -8414,6 +8913,8 @@ int main(int argc, char *argv[])
memset(words, 0, sizeof(words));
for (; arg < argc; arg++) {
+ int skip_func = 0;
+
frlist = fopen(argv[arg], "r");
my_assert_not(frlist, NULL);
@@ -8445,7 +8946,6 @@ int main(int argc, char *argv[])
}
rlist[rlist_len++] = strdup(words[0]);
}
- skip_func = 0;
fclose(frlist);
frlist = NULL;
@@ -8606,7 +9106,7 @@ int main(int argc, char *argv[])
if (addr > f_addr && !scanned_ahead) {
//anote("scan_ahead caused by '%s', addr %lx\n",
// g_func, addr);
- scan_ahead(fasm);
+ scan_ahead_for_chunks(fasm);
scanned_ahead = 1;
func_chunks_sorted = 0;
}
@@ -8628,7 +9128,12 @@ parse_words:
if (*p != 0 && *p != ';')
aerr("too many words\n");
- // alow asm patches in comments
+ if (skip_code_end) {
+ skip_code_end = 0;
+ skip_code = 0;
+ }
+
+ // allow asm patches in comments
if (*p == ';') {
if (IS_START(p, "; sctpatch:")) {
p = sskip(p + 11);
@@ -8644,6 +9149,20 @@ parse_words:
if (!pending_endp)
break;
}
+ else if (IS_START(p, "; sctskip_start")) {
+ if (in_func && !g_skip_func) {
+ if (!skip_code) {
+ ops[pi].op = OPP_ABORT;
+ ops[pi].asmln = asmln;
+ pi++;
+ }
+ skip_code = 1;
+ }
+ }
+ else if (IS_START(p, "; sctskip_end")) {
+ if (skip_code)
+ skip_code_end = 1;
+ }
}
if (wordc == 0) {
@@ -8712,7 +9231,7 @@ do_pending_endp:
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++;
}
@@ -8736,6 +9255,7 @@ do_pending_endp:
skip_warned = 0;
g_skip_func = 0;
g_func[0] = 0;
+ g_seh_found = 0;
func_chunks_used = 0;
func_chunk_i = -1;
if (pi != 0) {
@@ -8783,9 +9303,11 @@ do_pending_endp:
if (!IS(g_func, words[0]))
aerr("endp '%s' while in_func '%s'?\n",
words[0], g_func);
+ if (skip_code)
+ aerr("endp '%s' while skipping code\n", words[0]);
if ((g_ida_func_attr & IDAFA_THUNK) && pi == 1
- && ops[0].op == OP_JMP && ops[0].operand[0].had_ds)
+ && ops[0].op == OP_JMP && ops[0].operand[0].segment)
{
// import jump
g_skip_func = 1;
@@ -8850,7 +9372,7 @@ do_pending_endp:
continue;
}
- if (!in_func || g_skip_func) {
+ if (!in_func || g_skip_func || skip_code) {
if (!skip_warned && !g_skip_func && g_labels[pi] != NULL) {
if (verbose)
anote("skipping from '%s'\n", g_labels[pi]);
@@ -8889,7 +9411,7 @@ do_pending_endp:
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;
}