X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Ftranslate.c;h=673e4ba5cc71e21f6686733e1454978ca8d45b69;hb=3a0df3103860ae32f3fac4d72f07d12e08886d4d;hp=503468d76e92fbd2dc47b1415b97e73125627fff;hpb=bfacdc83cf1cd04fdc3b92c4640733791363decb;p=ia32rtools.git
diff --git a/tools/translate.c b/tools/translate.c
index 503468d..673e4ba 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;
@@ -42,7 +48,7 @@ enum op_flags {
OPF_DATA = (1 << 1), /* data processing - writes to dst opr */
OPF_FLAGS = (1 << 2), /* sets flags */
OPF_JMP = (1 << 3), /* branch, call */
- OPF_CJMP = (1 << 4), /* cond. branch (cc or jecxz) */
+ OPF_CJMP = (1 << 4), /* cond. branch (cc or jecxz/loop) */
OPF_CC = (1 << 5), /* uses flags */
OPF_TAIL = (1 << 6), /* ret or tail call */
OPF_RSAVE = (1 << 7), /* push/pop is local reg save/load */
@@ -59,6 +65,12 @@ enum op_flags {
OPF_VAPUSH = (1 << 18), /* vararg ptr push (as call arg) */
OPF_DONE = (1 << 19), /* already fully handled by analysis */
OPF_PPUSH = (1 << 20), /* part of complex push-pop graph */
+ OPF_NOREGS = (1 << 21), /* don't track regs of this op */
+ OPF_FPUSH = (1 << 22), /* pushes x87 stack */
+ OPF_FPOP = (1 << 23), /* pops x87 stack */
+ OPF_FPOPP = (1 << 24), /* pops x87 stack twice */
+ OPF_FSHIFT = (1 << 25), /* x87 stack shift is actually needed */
+ OPF_FINT = (1 << 26), /* integer float op arg */
};
enum op_op {
@@ -66,6 +78,8 @@ enum op_op {
OP_NOP,
OP_PUSH,
OP_POP,
+ OP_PUSHA,
+ OP_POPA,
OP_LEAVE,
OP_MOV,
OP_LEA,
@@ -73,7 +87,9 @@ enum op_op {
OP_MOVSX,
OP_XCHG,
OP_NOT,
+ OP_XLAT,
OP_CDQ,
+ OP_BSWAP,
OP_LODS,
OP_STOS,
OP_MOVS,
@@ -90,6 +106,7 @@ enum op_op {
OP_SHL,
OP_SHR,
OP_SAR,
+ OP_SHLD,
OP_SHRD,
OP_ROL,
OP_ROR,
@@ -98,6 +115,7 @@ enum op_op {
OP_ADC,
OP_SBB,
OP_BSF,
+ OP_BSR,
OP_INC,
OP_DEC,
OP_NEG,
@@ -110,13 +128,47 @@ enum op_op {
OP_CALL,
OP_JMP,
OP_JECXZ,
+ OP_LOOP,
OP_JCC,
OP_SCC,
- // x87
- // mmx
- OP_EMMS,
- // undefined
- OP_UD2,
+ // x87
+ OP_FLD,
+ OP_FILD,
+ OP_FLDc,
+ OP_FST,
+ OP_FIST,
+ OP_FADD,
+ OP_FDIV,
+ OP_FMUL,
+ OP_FSUB,
+ OP_FDIVR,
+ OP_FSUBR,
+ OP_FIADD,
+ OP_FIDIV,
+ OP_FIMUL,
+ OP_FISUB,
+ OP_FIDIVR,
+ OP_FISUBR,
+ OP_FCOM,
+ OP_FNSTSW,
+ OP_FCHS,
+ OP_FCOS,
+ OP_FPATAN,
+ OP_FPTAN,
+ OP_FSIN,
+ OP_FSQRT,
+ OP_FXCH,
+ OP_FYL2X,
+ // mmx
+ OP_EMMS,
+ // pseudo-ops for lib calls
+ OPP_ALLSHL,
+ OPP_ALLSHR,
+ OPP_FTOL,
+ OPP_CIPOW,
+ OPP_ABORT,
+ // undefined
+ OP_UD2,
};
enum opr_type {
@@ -137,20 +189,25 @@ enum opr_lenmod {
OPLM_QWORD,
};
+#define MAX_EXITS 128
+
#define MAX_OPERANDS 3
#define NAMELEN 112
+#define OPR_INIT(type_, lmod_, reg_) \
+ { type_, lmod_, reg_, }
+
struct parsed_opr {
enum opr_type type;
enum opr_lenmod lmod;
+ int reg;
unsigned int is_ptr:1; // pointer in C
unsigned int is_array:1; // array in C
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
- int reg;
unsigned int val;
char name[NAMELEN];
};
@@ -178,10 +235,12 @@ struct parsed_op {
};
// datap:
-// OP_CALL - parser proto hint (str)
+// on start: function/data type hint (sctproto)
+// after analysis:
// (OPF_CC) - points to one of (OPF_FLAGS) that affects cc op
// OP_PUSH - points to OP_POP in complex push/pop graph
// OP_POP - points to OP_PUSH in simple push/pop pair
+// OP_FCOM - needed_status_word_bits | (is_z_check << 16)
struct parsed_equ {
char name[64];
@@ -218,6 +277,30 @@ enum ida_func_attr {
IDAFA_FPD = (1 << 5),
};
+enum sct_func_attr {
+ SCTFA_CLEAR_SF = (1 << 0), // clear stack frame
+ SCTFA_CLEAR_REGS = (1 << 1), // clear registers (mask)
+};
+
+enum x87_const {
+ X87_CONST_1 = 1,
+ X87_CONST_2T,
+ X87_CONST_2E,
+ X87_CONST_PI,
+ X87_CONST_LG2,
+ X87_CONST_LN2,
+ 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
@@ -230,15 +313,23 @@ static struct label_ref g_label_refs[MAX_OPS];
static const struct parsed_proto *g_func_pp;
static struct parsed_data *g_func_pd;
static int g_func_pd_cnt;
+static int g_func_lmods;
static char g_func[256];
static char g_comment[256];
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
+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;
@@ -253,20 +344,38 @@ static int g_header_mode;
dump_op(op_), ##__VA_ARGS__)
#define ferr_assert(op_, cond) do { \
- if (!(cond)) ferr(op_, "assertion '%s' failed on ln :%d\n", #cond, \
- __LINE__); \
+ if (!(cond)) ferr(op_, "assertion '%s' failed\n", #cond); \
} while (0)
const char *regs_r32[] = {
"eax", "ebx", "ecx", "edx", "esi", "edi", "ebp", "esp",
// not r32, but list here for easy parsing and printing
"mm0", "mm1", "mm2", "mm3", "mm4", "mm5", "mm6", "mm7",
+ "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)"
};
const char *regs_r16[] = { "ax", "bx", "cx", "dx", "si", "di", "bp", "sp" };
const char *regs_r8l[] = { "al", "bl", "cl", "dl" };
const char *regs_r8h[] = { "ah", "bh", "ch", "dh" };
-enum x86_regs { xUNSPEC = -1, xAX, xBX, xCX, xDX, xSI, xDI, xBP, xSP };
+enum x86_regs {
+ xUNSPEC = -1,
+ xAX, xBX, xCX, xDX,
+ xSI, xDI, xBP, xSP,
+ xMM0, xMM1, xMM2, xMM3, // mmx
+ xMM4, xMM5, xMM6, xMM7,
+ xST0, xST1, xST2, xST3, // x87
+ xST4, xST5, xST6, xST7,
+};
+
+#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)
+#define mxST7_2 (0xfc << xST0)
+#define mxSTa (0xff << xST0)
// possible basic comparison types (without inversion)
enum parsed_flag_op {
@@ -313,12 +422,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;
}
}
@@ -394,7 +503,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;
}
@@ -426,12 +535,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)
@@ -490,8 +599,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;
}
@@ -504,24 +614,26 @@ 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;
}
static int guess_lmod_from_name(struct parsed_opr *opr)
{
- if (!strncmp(opr->name, "dword_", 6)) {
+ if (IS_START(opr->name, "dword_") || IS_START(opr->name, "off_")) {
opr->lmod = OPLM_DWORD;
return 1;
}
- if (!strncmp(opr->name, "word_", 5)) {
+ if (IS_START(opr->name, "word_")) {
opr->lmod = OPLM_WORD;
return 1;
}
- if (!strncmp(opr->name, "byte_", 5)) {
+ if (IS_START(opr->name, "byte_")) {
opr->lmod = OPLM_BYTE;
return 1;
}
- if (!strncmp(opr->name, "qword_", 6)) {
+ if (IS_START(opr->name, "qword_")) {
opr->lmod = OPLM_QWORD;
return 1;
}
@@ -531,6 +643,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",
@@ -579,6 +694,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;
}
@@ -587,7 +709,7 @@ static char *default_cast_to(char *buf, size_t buf_size,
{
buf[0] = 0;
- if (!opr->is_ptr)
+ if (!opr->is_ptr || strchr(opr->name, '['))
return buf;
if (opr->pp == NULL || opr->pp->type.name == NULL
|| opr->pp->is_fptr)
@@ -673,9 +795,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);
@@ -724,10 +844,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]);
@@ -738,13 +858,17 @@ 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;
+
+ // might be unaligned access
+ g_func_lmods |= 1 << OPLM_BYTE;
}
return wordc;
}
@@ -761,7 +885,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);
@@ -836,6 +960,8 @@ static const struct {
{ "nop", OP_NOP, 0, 0, 0 },
{ "push", OP_PUSH, 1, 1, 0 },
{ "pop", OP_POP, 1, 1, OPF_DATA },
+ { "pusha",OP_PUSHA, 0, 0, 0 },
+ { "popa", OP_POPA, 0, 0, OPF_DATA },
{ "leave",OP_LEAVE, 0, 0, OPF_DATA },
{ "mov" , OP_MOV, 2, 2, OPF_DATA },
{ "lea", OP_LEA, 2, 2, OPF_DATA },
@@ -843,7 +969,9 @@ static const struct {
{ "movsx",OP_MOVSX, 2, 2, OPF_DATA },
{ "xchg", OP_XCHG, 2, 2, OPF_DATA },
{ "not", OP_NOT, 1, 1, OPF_DATA },
+ { "xlat", OP_XLAT, 0, 0, OPF_DATA },
{ "cdq", OP_CDQ, 0, 0, OPF_DATA },
+ { "bswap",OP_BSWAP, 1, 1, OPF_DATA },
{ "lodsb",OP_LODS, 0, 0, OPF_DATA },
{ "lodsw",OP_LODS, 0, 0, OPF_DATA },
{ "lodsd",OP_LODS, 0, 0, OPF_DATA },
@@ -870,6 +998,7 @@ static const struct {
{ "shr", OP_SHR, 2, 2, OPF_DATA|OPF_FLAGS },
{ "sal", OP_SHL, 2, 2, OPF_DATA|OPF_FLAGS },
{ "sar", OP_SAR, 2, 2, OPF_DATA|OPF_FLAGS },
+ { "shld", OP_SHLD, 3, 3, OPF_DATA|OPF_FLAGS },
{ "shrd", OP_SHRD, 3, 3, OPF_DATA|OPF_FLAGS },
{ "rol", OP_ROL, 2, 2, OPF_DATA|OPF_FLAGS },
{ "ror", OP_ROR, 2, 2, OPF_DATA|OPF_FLAGS },
@@ -878,6 +1007,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 },
@@ -891,6 +1021,7 @@ static const struct {
{ "call", OP_CALL, 1, 1, OPF_JMP|OPF_DATA|OPF_FLAGS },
{ "jmp", OP_JMP, 1, 1, OPF_JMP },
{ "jecxz",OP_JECXZ, 1, 1, OPF_JMP|OPF_CJMP },
+ { "loop", OP_LOOP, 1, 1, OPF_JMP|OPF_CJMP|OPF_DATA },
{ "jo", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_O, 0 }, // 70 OF=1
{ "jno", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_O, 1 }, // 71 OF=0
{ "jc", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_C, 0 }, // 72 CF=1
@@ -950,9 +1081,57 @@ static const struct {
{ "setg", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_LE, 1 },
{ "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|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, 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 },
+ { "fdivp", OP_FDIV, 0, 2, OPF_FPOP },
+ { "fmul", OP_FMUL, 0, 2, 0 },
+ { "fmulp", OP_FMUL, 0, 2, OPF_FPOP },
+ { "fsub", OP_FSUB, 0, 2, 0 },
+ { "fsubp", OP_FSUB, 0, 2, OPF_FPOP },
+ { "fdivr", OP_FDIVR, 0, 2, 0 },
+ { "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, 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 },
+ { "fcompp", OP_FCOM, 0, 0, OPF_FPOPP },
+ { "fucom", OP_FCOM, 0, 1, 0 },
+ { "fucomp", OP_FCOM, 0, 1, OPF_FPOP },
+ { "fucompp",OP_FCOM, 0, 0, OPF_FPOPP },
+ { "fnstsw", OP_FNSTSW, 1, 1, OPF_DATA },
+ { "fchs", OP_FCHS, 0, 0, 0 },
+ { "fcos", OP_FCOS, 0, 0, 0 },
+ { "fpatan", OP_FPATAN, 0, 0, OPF_FPOP },
+ { "fptan", OP_FPTAN, 0, 0, OPF_FPUSH },
+ { "fsin", OP_FSIN, 0, 0, 0 },
+ { "fsqrt", OP_FSQRT, 0, 0, 0 },
+ { "fxch", OP_FXCH, 1, 1, 0 },
+ { "fyl2x", OP_FYL2X, 0, 0, OPF_FPOP },
// mmx
- { "emms", OP_EMMS, 0, 0, OPF_DATA },
- { "movq", OP_MOV, 2, 2, OPF_DATA },
+ { "emms", OP_EMMS, 0, 0, OPF_DATA },
+ { "movq", OP_MOV, 2, 2, OPF_DATA },
+ // pseudo-ops for lib calls
+ { "_allshl",OPP_ALLSHL },
+ { "_allshr",OPP_ALLSHR },
+ { "_ftol", OPP_FTOL },
+ { "_CIpow", OPP_CIPOW },
+ { "abort", OPP_ABORT },
// must be last
{ "ud2", OP_UD2 },
};
@@ -966,7 +1145,7 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc)
int op_w = 0;
int opr = 0;
int w = 0;
- int i;
+ int i, j;
for (i = 0; i < ARRAY_SIZE(pref_table); i++) {
if (IS(words[w], pref_table[i].name)) {
@@ -1017,6 +1196,9 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc)
else
op->regmask_src |= regmask;
op->regmask_src |= regmask_ind;
+
+ if (op->operand[opr].lmod != OPLM_UNSPEC)
+ g_func_lmods |= 1 << op->operand[opr].lmod;
}
if (w < wordc)
@@ -1047,6 +1229,7 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc)
case OP_INC:
case OP_DEC:
case OP_NEG:
+ case OP_BSWAP:
// more below..
op->regmask_src |= op->regmask_dst;
break;
@@ -1072,6 +1255,13 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc)
break;
// ops with implicit argumets
+ case OP_XLAT:
+ op->operand_cnt = 2;
+ setup_reg_opr(&op->operand[0], xAX, OPLM_BYTE, &op->regmask_src);
+ op->regmask_dst = op->regmask_src;
+ setup_reg_opr(&op->operand[1], xBX, OPLM_DWORD, &op->regmask_src);
+ break;
+
case OP_CDQ:
op->operand_cnt = 2;
setup_reg_opr(&op->operand[0], xDX, OPLM_DWORD, &op->regmask_dst);
@@ -1081,49 +1271,62 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc)
case OP_LODS:
case OP_STOS:
case OP_SCAS:
- if (op->operand_cnt != 0)
- break;
if (words[op_w][4] == 'b')
lmod = OPLM_BYTE;
else if (words[op_w][4] == 'w')
lmod = OPLM_WORD;
else if (words[op_w][4] == 'd')
lmod = OPLM_DWORD;
- op->operand_cnt = 3;
- setup_reg_opr(&op->operand[0], op->op == OP_LODS ? xSI : xDI,
- lmod, &op->regmask_src);
- setup_reg_opr(&op->operand[1], xCX, OPLM_DWORD, &op->regmask_src);
+ j = 0;
+ op->regmask_src = 0;
+ setup_reg_opr(&op->operand[j++], op->op == OP_LODS ? xSI : xDI,
+ OPLM_DWORD, &op->regmask_src);
op->regmask_dst = op->regmask_src;
- setup_reg_opr(&op->operand[2], xAX, OPLM_DWORD,
+ setup_reg_opr(&op->operand[j++], xAX, lmod,
op->op == OP_LODS ? &op->regmask_dst : &op->regmask_src);
+ if (op->flags & OPF_REP) {
+ setup_reg_opr(&op->operand[j++], xCX, OPLM_DWORD, &op->regmask_src);
+ op->regmask_dst |= 1 << xCX;
+ }
+ op->operand_cnt = j;
break;
case OP_MOVS:
case OP_CMPS:
- if (op->operand_cnt != 0)
- break;
if (words[op_w][4] == 'b')
lmod = OPLM_BYTE;
else if (words[op_w][4] == 'w')
lmod = OPLM_WORD;
else if (words[op_w][4] == 'd')
lmod = OPLM_DWORD;
- op->operand_cnt = 3;
- setup_reg_opr(&op->operand[0], xDI, lmod, &op->regmask_src);
- setup_reg_opr(&op->operand[1], xSI, OPLM_DWORD, &op->regmask_src);
- setup_reg_opr(&op->operand[2], xCX, OPLM_DWORD, &op->regmask_src);
+ j = 0;
+ op->regmask_src = 0;
+ // note: lmod is not correct, don't have where to place it
+ setup_reg_opr(&op->operand[j++], xDI, lmod, &op->regmask_src);
+ setup_reg_opr(&op->operand[j++], xSI, OPLM_DWORD, &op->regmask_src);
+ if (op->flags & OPF_REP)
+ setup_reg_opr(&op->operand[j++], xCX, OPLM_DWORD, &op->regmask_src);
+ op->operand_cnt = j;
op->regmask_dst = op->regmask_src;
break;
+ case OP_LOOP:
+ op->regmask_dst = 1 << xCX;
+ // fallthrough
case OP_JECXZ:
- op->operand_cnt = 1;
+ op->operand_cnt = 2;
op->regmask_src = 1 << xCX;
- op->operand[0].type = OPT_REG;
- op->operand[0].reg = xCX;
- op->operand[0].lmod = OPLM_DWORD;
+ op->operand[1].type = OPT_REG;
+ op->operand[1].reg = xCX;
+ op->operand[1].lmod = OPLM_DWORD;
break;
case OP_IMUL:
+ if (op->operand_cnt == 2) {
+ if (op->operand[0].type != OPT_REG)
+ aerr("reg expected\n");
+ op->regmask_src |= 1 << op->operand[0].reg;
+ }
if (op->operand_cnt != 1)
break;
// fallthrough
@@ -1155,6 +1358,7 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc)
op->operand[1].lmod = OPLM_BYTE;
break;
+ case OP_SHLD:
case OP_SHRD:
op->regmask_src |= op->regmask_dst;
if (op->operand[2].lmod == OPLM_UNSPEC)
@@ -1179,7 +1383,7 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc)
&& op->operand[0].reg == op->operand[1].reg
&& IS(op->operand[0].name, op->operand[1].name)) // ! ah, al..
{
- op->flags |= OPF_RMD | OPF_DONE;
+ op->flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
op->regmask_src = op->regmask_dst = 0;
}
break;
@@ -1191,7 +1395,7 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc)
char buf[16];
snprintf(buf, sizeof(buf), "%s+0", op->operand[0].name);
if (IS(buf, op->operand[1].name))
- op->flags |= OPF_RMD | OPF_DONE;
+ op->flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
}
break;
@@ -1205,9 +1409,102 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc)
op->regmask_src = 1 << xBP;
break;
+ case OP_FLD:
+ case OP_FILD:
+ op->regmask_dst |= mxST0;
+ break;
+
+ case OP_FLDc:
+ op->regmask_dst |= mxST0;
+ if (IS(words[op_w] + 3, "1"))
+ op->operand[0].val = X87_CONST_1;
+ else if (IS(words[op_w] + 3, "ln2"))
+ op->operand[0].val = X87_CONST_LN2;
+ else if (IS(words[op_w] + 3, "z"))
+ op->operand[0].val = X87_CONST_Z;
+ else
+ aerr("TODO\n");
+ break;
+
+ case OP_FST:
+ case OP_FIST:
+ op->regmask_src |= mxST0;
+ break;
+
+ case OP_FADD:
+ case OP_FDIV:
+ case OP_FMUL:
+ case OP_FSUB:
+ case OP_FDIVR:
+ case OP_FSUBR:
+ op->regmask_src |= mxST0;
+ if (op->operand_cnt == 2)
+ op->regmask_src |= op->regmask_dst;
+ else if (op->operand_cnt == 1) {
+ memcpy(&op->operand[1], &op->operand[0], sizeof(op->operand[1]));
+ op->operand[0].type = OPT_REG;
+ op->operand[0].lmod = OPLM_QWORD;
+ op->operand[0].reg = xST0;
+ op->regmask_dst |= mxST0;
+ }
+ else
+ // IDA doesn't use this
+ aerr("no operands?\n");
+ break;
+
+ case OP_FIADD:
+ case OP_FIDIV:
+ case OP_FIMUL:
+ case OP_FISUB:
+ case OP_FIDIVR:
+ case OP_FISUBR:
+ case OP_FCHS:
+ case OP_FCOS:
+ case OP_FSIN:
+ case OP_FSQRT:
+ case OP_FXCH:
+ op->regmask_src |= mxST0;
+ op->regmask_dst |= mxST0;
+ break;
+
+ case OP_FPATAN:
+ case OP_FYL2X:
+ op->regmask_src |= mxST0 | mxST1;
+ op->regmask_dst |= mxST0;
+ break;
+
+ case OP_FPTAN:
+ aerr("TODO\n");
+ break;
+
+ case OP_FCOM:
+ op->regmask_src |= mxST0;
+ if (op->operand_cnt == 0) {
+ op->operand_cnt = 1;
+ op->operand[0].type = OPT_REG;
+ op->operand[0].lmod = OPLM_QWORD;
+ op->operand[0].reg = xST1;
+ op->regmask_src |= mxST1;
+ }
+ break;
+
default:
break;
}
+
+ if (op->operand[0].type == OPT_REG
+ && op->operand[1].type == OPT_CONST)
+ {
+ struct parsed_opr *op1 = &op->operand[1];
+ if ((op->op == OP_AND && op1->val == 0)
+ || (op->op == OP_OR
+ && (op1->val == ~0
+ || (op->operand[0].lmod == OPLM_WORD && op1->val == 0xffff)
+ || (op->operand[0].lmod == OPLM_BYTE && op1->val == 0xff))))
+ {
+ op->regmask_src = 0;
+ }
+ }
}
static const char *op_name(struct parsed_op *po)
@@ -1375,10 +1672,45 @@ static const char *opr_reg_p(struct parsed_op *po, struct parsed_opr *popr)
return regs_r32[popr->reg];
}
+static int check_simple_cast(const char *cast, int *bits, int *is_signed)
+{
+ if (IS_START(cast, "(s8)") || IS_START(cast, "(u8)"))
+ *bits = 8;
+ else if (IS_START(cast, "(s16)") || IS_START(cast, "(u16)"))
+ *bits = 16;
+ else if (IS_START(cast, "(s32)") || IS_START(cast, "(u32)"))
+ *bits = 32;
+ else if (IS_START(cast, "(s64)") || IS_START(cast, "(u64)"))
+ *bits = 64;
+ else
+ return -1;
+
+ *is_signed = cast[1] == 's' ? 1 : 0;
+ return 0;
+}
+
+static int check_deref_cast(const char *cast, int *bits)
+{
+ if (IS_START(cast, "*(u8 *)"))
+ *bits = 8;
+ else if (IS_START(cast, "*(u16 *)"))
+ *bits = 16;
+ else if (IS_START(cast, "*(u32 *)"))
+ *bits = 32;
+ else if (IS_START(cast, "*(u64 *)"))
+ *bits = 64;
+ else
+ return -1;
+
+ return 0;
+}
+
// cast1 is the "final" cast
static const char *simplify_cast(const char *cast1, const char *cast2)
{
static char buf[256];
+ int bits1, bits2;
+ int s1, s2;
if (cast1[0] == 0)
return cast2;
@@ -1386,14 +1718,22 @@ static const char *simplify_cast(const char *cast1, const char *cast2)
return cast1;
if (IS(cast1, cast2))
return cast1;
- if (IS(cast1, "(s8)") && IS(cast2, "(u8)"))
- return cast1;
- if (IS(cast1, "(s16)") && IS(cast2, "(u16)"))
- return cast1;
- if (IS(cast1, "(u8)") && IS_START(cast2, "*(u8 *)"))
- return cast2;
- if (IS(cast1, "(u16)") && IS_START(cast2, "*(u16 *)"))
- return cast2;
+
+ if (check_simple_cast(cast1, &bits1, &s1) == 0
+ && check_simple_cast(cast2, &bits2, &s2) == 0)
+ {
+ if (bits1 <= bits2)
+ return cast1;
+ }
+ if (check_simple_cast(cast1, &bits1, &s1) == 0
+ && check_deref_cast(cast2, &bits2) == 0)
+ {
+ if (bits1 == bits2) {
+ snprintf(buf, sizeof(buf), "*(%c%d *)", s1 ? 's' : 'u', bits1);
+ return buf;
+ }
+ }
+
if (strchr(cast1, '*') && IS_START(cast2, "(u32)"))
return cast1;
@@ -1428,16 +1768,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);
}
@@ -1457,7 +1796,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")));
}
@@ -1481,15 +1820,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");
@@ -1507,11 +1846,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)
@@ -1526,14 +1901,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;
@@ -1627,12 +2004,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);
@@ -1655,8 +2040,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)
@@ -1697,6 +2081,15 @@ static int stack_frame_access(struct parsed_op *po,
snprintf(buf, buf_size, "%ssf.d[%d]", prefix, sf_ofs / 4);
break;
+ case OPLM_QWORD:
+ ferr_assert(po, !(sf_ofs & 7));
+ ferr_assert(po, ofs_reg[0] == 0);
+ // 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;
+
default:
ferr(po, "bp_stack bad lmod: %d\n", popr->lmod);
}
@@ -1713,7 +2106,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);
}
@@ -1750,6 +2143,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)
@@ -1760,6 +2161,8 @@ static char *out_src_opr(char *buf, size_t buf_size,
char *p;
int ret;
+ check_opr(po, popr);
+
if (cast == NULL)
cast = "";
@@ -1874,6 +2277,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) {
@@ -1931,6 +2336,72 @@ 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_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];
+
+ switch (popr->type) {
+ case OPT_REG:
+ if (popr->reg < xST0 || popr->reg > xST7)
+ ferr(po, "bad reg: %d\n", popr->reg);
+
+ if (need_float_stack) {
+ if (popr->reg == xST0)
+ snprintf(buf, buf_size, "f_st[f_stp & 7]");
+ else
+ snprintf(buf, buf_size, "f_st[(f_stp + %d) & 7]",
+ popr->reg - xST0);
+ }
+ else
+ snprintf(buf, buf_size, "f_st%d", popr->reg - xST0);
+ 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) {
+ case OPLM_QWORD:
+ cast = "double";
+ break;
+ case OPLM_DWORD:
+ cast = "float";
+ break;
+ default:
+ ferr(po, "unhandled lmod: %d\n", popr->lmod);
+ break;
+ }
+ out_src_opr(tmp, sizeof(tmp), po, popr, "", 1);
+ snprintf(buf, buf_size, "*(%s *)(%s)", cast, tmp);
+ break;
+
+ default:
+ ferr(po, "invalid float type: %d\n", popr->type);
+ }
+
+ 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)
+{
+ 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,
struct parsed_op *po, enum parsed_flag_op pfo, int is_inv,
enum opr_lenmod lmod, const char *expr)
@@ -1942,7 +2413,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;
@@ -1953,18 +2424,29 @@ 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);
}
}
static void out_cmp_for_cc(char *buf, size_t buf_size,
- struct parsed_op *po, enum parsed_flag_op pfo, int is_inv)
+ struct parsed_op *po, enum parsed_flag_op pfo, int is_inv,
+ int is_neg)
{
const char *cast, *scast, *cast_use;
char buf1[256], buf2[256];
@@ -1998,8 +2480,13 @@ static void out_cmp_for_cc(char *buf, size_t buf_size,
out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], cast_use, 0);
if (po->op == OP_DEC)
snprintf(buf2, sizeof(buf2), "1");
- else
- out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], cast_use, 0);
+ else {
+ char cast_op2[64];
+ snprintf(cast_op2, sizeof(cast_op2) - 1, "%s", cast_use);
+ if (is_neg)
+ strcat(cast_op2, "-");
+ out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], cast_op2, 0);
+ }
switch (pfo) {
case PFO_C:
@@ -2067,7 +2554,7 @@ static void out_cmp_test(char *buf, size_t buf_size,
po->operand[0].lmod, buf3);
}
else if (po->op == OP_CMP) {
- out_cmp_for_cc(buf, buf_size, po, pfo, is_inv);
+ out_cmp_for_cc(buf, buf_size, po, pfo, is_inv, 0);
}
else
ferr(po, "%s: unhandled op: %d\n", __func__, po->op);
@@ -2130,13 +2617,6 @@ static const char *op_to_c(struct parsed_op *po)
}
}
-static void op_set_clear_flag(struct parsed_op *po,
- enum op_flags flag_set, enum op_flags flag_clear)
-{
- po->flags |= flag_set;
- po->flags &= ~flag_clear;
-}
-
// last op in stream - unconditional branch or ret
#define LAST_OP(_i) ((ops[_i].flags & OPF_TAIL) \
|| ((ops[_i].flags & (OPF_JMP|OPF_CJMP|OPF_RMD)) == OPF_JMP \
@@ -2146,32 +2626,34 @@ static void op_set_clear_flag(struct parsed_op *po,
if ((i) < 0) \
ferr(po, "bad " #i ": %d\n", i)
-static int scan_for_pop(int i, int opcnt, const char *reg,
- int magic, int depth, int *maxdepth, int do_flags)
+// 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 seen_noreturn, int flags_set)
{
- const struct parsed_proto *pp;
struct parsed_op *po;
+ int relevant;
int ret = 0;
int j;
for (; i < opcnt; i++) {
po = &ops[i];
if (po->cc_scratch == magic)
- break; // already checked
+ return ret; // already checked
po->cc_scratch = magic;
if (po->flags & OPF_TAIL) {
if (po->op == OP_CALL) {
- pp = proto_parse(g_fhdr, po->operand[0].name, g_quiet_pp);
- if (pp != NULL && pp->is_noreturn)
- // no stack cleanup for noreturn
- return ret;
+ if (po->pp != NULL && po->pp->is_noreturn)
+ seen_noreturn = 1;
+ else
+ goto out;
}
- return -1; // deadend
+ else
+ goto out;
}
- if ((po->flags & (OPF_RMD|OPF_DONE))
- || (po->op == OP_PUSH && po->p_argnum != 0)) // arg push
+ if (po->flags & (OPF_RMD|OPF_DONE|OPF_FARG))
continue;
if ((po->flags & OPF_JMP) && po->op != OP_CALL) {
@@ -2179,8 +2661,8 @@ static int scan_for_pop(int i, int opcnt, const char *reg,
// jumptable
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, reg, magic,
- depth, maxdepth, do_flags);
+ ret |= scan_for_pop(po->btj->d[j].bt_i, opcnt, magic, reg,
+ depth, seen_noreturn, flags_set);
if (ret < 0)
return ret; // dead end
}
@@ -2189,8 +2671,8 @@ static int scan_for_pop(int i, int opcnt, const char *reg,
check_i(po, po->bt_i);
if (po->flags & OPF_CJMP) {
- ret |= scan_for_pop(po->bt_i, opcnt, reg, magic,
- depth, maxdepth, do_flags);
+ ret |= scan_for_pop(po->bt_i, opcnt, magic, reg,
+ depth, seen_noreturn, flags_set);
if (ret < 0)
return ret; // dead end
}
@@ -2200,110 +2682,353 @@ static int scan_for_pop(int i, int opcnt, const char *reg,
continue;
}
+ relevant = 0;
if ((po->op == OP_POP || po->op == OP_PUSH)
- && po->operand[0].type == OPT_REG
- && IS(po->operand[0].name, reg))
+ && po->operand[0].type == OPT_REG && po->operand[0].reg == reg)
{
- if (po->op == OP_PUSH && !(po->flags & OPF_FARGNR)) {
- depth++;
- if (depth > *maxdepth)
- *maxdepth = depth;
- if (do_flags)
- op_set_clear_flag(po, OPF_RSAVE, OPF_RMD);
- }
- else if (po->op == OP_POP) {
- if (depth == 0) {
- if (do_flags)
- op_set_clear_flag(po, OPF_RMD, OPF_RSAVE);
- return 1;
- }
- else {
- depth--;
- if (depth < 0) // should not happen
- ferr(po, "fail with depth\n");
- if (do_flags)
- op_set_clear_flag(po, OPF_RSAVE, OPF_RMD);
- }
+ relevant = 1;
+ }
+
+ if (po->op == OP_PUSH) {
+ depth++;
+ }
+ else if (po->op == OP_POP) {
+ if (relevant && depth == 0) {
+ po->flags |= flags_set;
+ return 1;
}
+ depth--;
}
}
- return ret;
+out:
+ // for noreturn, assume msvc skipped stack cleanup
+ return seen_noreturn ? 1 : -1;
}
-// scan for pop starting from 'ret' op (all paths)
-static int scan_for_pop_ret(int i, int opcnt, const char *reg,
- int flag_set)
+// scan for 'reg' pop backwards starting from i
+// intended to use for register restore search, so other reg
+// references are considered an error
+static int scan_for_rsave_pop_reg(int i, int magic, int reg, int set_flags)
{
- int found = 0;
- int j;
-
- for (; i < opcnt; i++) {
- if (!(ops[i].flags & OPF_TAIL))
- continue;
+ struct parsed_op *po;
+ struct label_ref *lr;
+ int ret = 0;
- for (j = i - 1; j >= 0; j--) {
- if (ops[j].flags & (OPF_RMD|OPF_DONE))
- continue;
- if (ops[j].flags & OPF_JMP)
- return -1;
+ ops[i].cc_scratch = magic;
- if (ops[j].op == OP_POP && ops[j].datap == NULL
- && ops[j].operand[0].type == OPT_REG
- && IS(ops[j].operand[0].name, reg))
- {
- found = 1;
- ops[j].flags |= flag_set;
- break;
+ while (1)
+ {
+ if (g_labels[i] != NULL) {
+ lr = &g_label_refs[i];
+ for (; lr != NULL; lr = lr->next) {
+ check_i(&ops[i], lr->i);
+ ret |= scan_for_rsave_pop_reg(lr->i, magic, reg, set_flags);
+ if (ret < 0)
+ return ret;
}
+ if (i > 0 && LAST_OP(i - 1))
+ return ret;
+ }
+
+ i--;
+ if (i < 0)
+ break;
+
+ if (ops[i].cc_scratch == magic)
+ return ret;
+ ops[i].cc_scratch = magic;
- if (g_labels[j] != NULL)
+ po = &ops[i];
+ if (po->op == OP_POP && po->operand[0].reg == reg) {
+ if (po->flags & (OPF_RMD|OPF_DONE))
return -1;
+
+ po->flags |= set_flags;
+ return 1;
}
+
+ // this also covers the case where we reach corresponding push
+ if ((po->regmask_dst | po->regmask_src) & (1 << reg))
+ return -1;
}
- return found ? 0 : -1;
+ // nothing interesting on this path,
+ // still return ret for something recursive calls could find
+ return ret;
}
-static void scan_for_pop_const(int i, int opcnt, int *regmask_pp)
+static void find_reachable_exits(int i, int opcnt, int magic,
+ int *exits, int *exit_count)
{
struct parsed_op *po;
- int is_multipath = 0;
int j;
- for (j = i + 1; j < opcnt; j++) {
- po = &ops[j];
-
- if (po->op == OP_JMP && po->btj == NULL) {
- ferr_assert(po, po->bt_i >= 0);
- j = po->bt_i - 1;
- continue;
- }
+ for (; i < opcnt; i++)
+ {
+ po = &ops[i];
+ if (po->cc_scratch == magic)
+ return;
+ po->cc_scratch = magic;
- if ((po->flags & (OPF_JMP|OPF_TAIL|OPF_RSAVE))
- || po->op == OP_PUSH)
- {
- break;
+ if (po->flags & OPF_TAIL) {
+ ferr_assert(po, *exit_count < MAX_EXITS);
+ exits[*exit_count] = i;
+ (*exit_count)++;
+ return;
}
- if (g_labels[j] != NULL)
- is_multipath = 1;
+ if ((po->flags & OPF_JMP) && po->op != OP_CALL) {
+ if (po->flags & OPF_RMD)
+ continue;
- if (po->op == OP_POP && !(po->flags & OPF_RMD))
- {
- is_multipath |= !!(po->flags & OPF_PPUSH);
- if (is_multipath) {
- ops[i].flags |= OPF_PPUSH | OPF_DONE;
- ops[i].datap = po;
- po->flags |= OPF_PPUSH | OPF_DONE;
- *regmask_pp |= 1 << po->operand[0].reg;
- }
- else {
- ops[i].flags |= OPF_RMD | OPF_DONE;
- po->flags |= OPF_DONE;
- po->datap = &ops[i];
+ if (po->btj != NULL) {
+ for (j = 0; j < po->btj->count; j++) {
+ check_i(po, po->btj->d[j].bt_i);
+ find_reachable_exits(po->btj->d[j].bt_i, opcnt, magic,
+ exits, exit_count);
+ }
+ return;
}
- break;
+
+ check_i(po, po->bt_i);
+ if (po->flags & OPF_CJMP)
+ find_reachable_exits(po->bt_i, opcnt, magic, exits, exit_count);
+ else
+ i = po->bt_i - 1;
+ continue;
+ }
+ }
+}
+
+// scan for 'reg' pop backwards starting from exits (all paths)
+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 found = 0;
+ int e, j, ret;
+
+ if (!set_flags) {
+ exit_count = 0;
+ find_reachable_exits(i, opcnt, i + opcnt * 15, exits,
+ &exit_count);
+ ferr_assert(&ops[i], exit_count > 0);
+ }
+
+ for (j = 0; j < exit_count; j++) {
+ e = exits[j];
+ ret = scan_for_rsave_pop_reg(e, i + opcnt * 16 + set_flags,
+ reg, set_flags);
+ 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 found;
+}
+
+// scan for one or more pop of push
+static int scan_for_pop_const_r(int i, int opcnt, int magic,
+ int push_i, int is_probe)
+{
+ struct parsed_op *po;
+ struct label_ref *lr;
+ int ret = 0;
+ int j;
+
+ for (; i < opcnt; i++)
+ {
+ po = &ops[i];
+ if (po->cc_scratch == magic)
+ return ret; // already checked
+ po->cc_scratch = magic;
+
+ if (po->flags & OPF_JMP) {
+ if (po->flags & OPF_RMD)
+ continue;
+ if (po->op == OP_CALL)
+ return -1;
+
+ if (po->btj != NULL) {
+ for (j = 0; j < po->btj->count; j++) {
+ check_i(po, po->btj->d[j].bt_i);
+ ret |= scan_for_pop_const_r(po->btj->d[j].bt_i, opcnt, magic,
+ push_i, is_probe);
+ if (ret < 0)
+ return ret;
+ }
+ return ret;
+ }
+
+ check_i(po, po->bt_i);
+ if (po->flags & OPF_CJMP) {
+ ret |= scan_for_pop_const_r(po->bt_i, opcnt, magic, push_i,
+ is_probe);
+ if (ret < 0)
+ return ret;
+ }
+ else {
+ i = po->bt_i - 1;
+ }
+ continue;
+ }
+
+ if ((po->flags & (OPF_TAIL|OPF_RSAVE)) || po->op == OP_PUSH)
+ return -1;
+
+ if (g_labels[i] != NULL) {
+ // all refs must be visited
+ lr = &g_label_refs[i];
+ for (; lr != NULL; lr = lr->next) {
+ check_i(po, lr->i);
+ if (ops[lr->i].cc_scratch != magic)
+ return -1;
+ }
+ if (i > 0 && !LAST_OP(i - 1) && ops[i - 1].cc_scratch != magic)
+ return -1;
+ }
+
+ if (po->op == OP_POP)
+ {
+ if (po->flags & (OPF_RMD|OPF_DONE))
+ return -1;
+
+ if (!is_probe) {
+ po->flags |= OPF_DONE;
+ po->datap = &ops[push_i];
+ }
+ return 1;
+ }
+ }
+
+ return -1;
+}
+
+static void scan_for_pop_const(int i, int opcnt, int magic)
+{
+ int ret;
+
+ ret = scan_for_pop_const_r(i + 1, opcnt, magic, i, 1);
+ if (ret == 1) {
+ ops[i].flags |= OPF_RMD | OPF_DONE;
+ scan_for_pop_const_r(i + 1, opcnt, magic + 1, i, 0);
+ }
+}
+
+// check if all branch targets within a marked path are also marked
+// note: the path checked must not be empty or end with a branch
+static int check_path_branches(int opcnt, int magic)
+{
+ struct parsed_op *po;
+ int i, j;
+
+ for (i = 0; i < opcnt; i++) {
+ po = &ops[i];
+ if (po->cc_scratch != magic)
+ continue;
+
+ if (po->flags & OPF_JMP) {
+ if ((po->flags & OPF_RMD) || po->op == OP_CALL)
+ continue;
+
+ if (po->btj != NULL) {
+ for (j = 0; j < po->btj->count; j++) {
+ check_i(po, po->btj->d[j].bt_i);
+ if (ops[po->btj->d[j].bt_i].cc_scratch != magic)
+ return 0;
+ }
+ }
+
+ check_i(po, po->bt_i);
+ if (ops[po->bt_i].cc_scratch != magic)
+ return 0;
+ if ((po->flags & OPF_CJMP) && ops[i + 1].cc_scratch != magic)
+ return 0;
+ }
+ }
+
+ return 1;
+}
+
+// scan for multiple pushes for given pop
+static int scan_pushes_for_pop_r(int i, int magic, int pop_i,
+ int is_probe)
+{
+ int reg = ops[pop_i].operand[0].reg;
+ struct parsed_op *po;
+ struct label_ref *lr;
+ int ret = 0;
+
+ ops[i].cc_scratch = magic;
+
+ while (1)
+ {
+ if (g_labels[i] != NULL) {
+ lr = &g_label_refs[i];
+ for (; lr != NULL; lr = lr->next) {
+ check_i(&ops[i], lr->i);
+ ret |= scan_pushes_for_pop_r(lr->i, magic, pop_i, is_probe);
+ if (ret < 0)
+ return ret;
+ }
+ if (i > 0 && LAST_OP(i - 1))
+ return ret;
+ }
+
+ i--;
+ if (i < 0)
+ break;
+
+ if (ops[i].cc_scratch == magic)
+ return ret;
+ ops[i].cc_scratch = magic;
+
+ po = &ops[i];
+ if (po->op == OP_CALL)
+ return -1;
+ if ((po->flags & (OPF_TAIL|OPF_RSAVE)) || po->op == OP_POP)
+ return -1;
+
+ if (po->op == OP_PUSH)
+ {
+ if (po->datap != NULL)
+ return -1;
+ if (po->operand[0].type == OPT_REG && po->operand[0].reg == reg)
+ // leave this case for reg save/restore handlers
+ return -1;
+
+ if (!is_probe) {
+ po->flags |= OPF_PPUSH | OPF_DONE;
+ po->datap = &ops[pop_i];
+ }
+ return 1;
+ }
+ }
+
+ return -1;
+}
+
+static void scan_pushes_for_pop(int i, int opcnt, int *regmask_pp)
+{
+ int magic = i + opcnt * 14;
+ int ret;
+
+ ret = scan_pushes_for_pop_r(i, magic, i, 1);
+ if (ret == 1) {
+ ret = check_path_branches(opcnt, magic);
+ if (ret == 1) {
+ ops[i].flags |= OPF_PPUSH | OPF_DONE;
+ *regmask_pp |= 1 << ops[i].operand[0].reg;
+ scan_pushes_for_pop_r(i, magic + 1, i, 0);
}
}
}
@@ -2332,6 +3057,8 @@ static void scan_propagate_df(int i, int opcnt)
return;
}
+ if (po->flags & OPF_RMD)
+ continue;
check_i(po, po->bt_i);
if (po->flags & OPF_CJMP)
scan_propagate_df(po->bt_i, opcnt);
@@ -2379,14 +3106,8 @@ static int is_opr_referenced(const struct parsed_opr *opr,
static int is_opr_read(const struct parsed_opr *opr,
const struct parsed_op *po)
{
- int mask;
-
if (opr->type == OPT_REG) {
- mask = po->regmask_src;
- if (po->op == OP_CALL)
- // assume worst case
- mask |= (1 << xAX) | (1 << xCX) | (1 << xDX);
- if ((1 << opr->reg) & mask)
+ if (po->regmask_src & (1 << opr->reg))
return 1;
else
return 0;
@@ -2402,24 +3123,20 @@ static int is_opr_modified(const struct parsed_opr *opr,
{
int mask;
- if (!(po->flags & OPF_DATA))
- return 0;
-
if (opr->type == OPT_REG) {
if (po->op == OP_CALL) {
- mask = (1 << xAX) | (1 << xCX) | (1 << xDX);
- if ((1 << opr->reg) & mask)
+ mask = po->regmask_dst;
+ mask |= (1 << xAX) | (1 << xCX) | (1 << xDX); // ?
+ if (mask & (1 << opr->reg))
return 1;
else
return 0;
}
- if (po->operand[0].type == OPT_REG) {
- if (po->regmask_dst & (1 << opr->reg))
- return 1;
- else
- return 0;
- }
+ if (po->regmask_dst & (1 << opr->reg))
+ return 1;
+ else
+ return 0;
}
return IS(po->operand[0].name, opr->name);
@@ -2485,16 +3202,20 @@ 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;
while (i >= 0) {
if (ops[i].cc_scratch == magic) {
- ferr(&ops[i], "%s looped\n", __func__);
- return -1;
+ // is this a problem?
+ //ferr(&ops[i], "%s looped\n", __func__);
+ return 0;
}
ops[i].cc_scratch = magic;
@@ -2504,7 +3225,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;
@@ -2515,7 +3236,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;
@@ -2525,6 +3246,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;
}
@@ -2656,7 +3391,7 @@ static int scan_for_esp_adjust(int i, int opcnt,
if (do_update && *adj >= 0) {
po->flags |= OPF_RMD;
if (!*is_multipath)
- po->flags |= OPF_DONE;
+ po->flags |= OPF_DONE | OPF_NOREGS;
}
*adj += lmod_bytes(po, po->operand[0].lmod);
@@ -2724,7 +3459,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];
@@ -2763,10 +3499,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]
@@ -2836,7 +3574,7 @@ static void scan_for_call_type(int i, const struct parsed_opr *opr,
if (i < 0) {
// reached the top - can only be an arg-reg
- if (opr->type != OPT_REG)
+ if (opr->type != OPT_REG || g_func_pp == NULL)
return;
for (i = 0; i < g_func_pp->argc; i++) {
@@ -2847,19 +3585,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)
@@ -2943,14 +3681,85 @@ static void clear_labels(int count)
}
}
+static int get_pp_arg_regmask_src(const struct parsed_proto *pp)
+{
+ int regmask = 0;
+ int i, reg;
+
+ for (i = 0; i < pp->argc; i++) {
+ if (pp->arg[i].reg != NULL) {
+ reg = char_array_i(regs_r32,
+ ARRAY_SIZE(regs_r32), pp->arg[i].reg);
+ if (reg < 0)
+ ferr(ops, "arg '%s' of func '%s' is not a reg?\n",
+ pp->arg[i].reg, pp->name);
+ regmask |= 1 << reg;
+ }
+ }
+
+ return regmask;
+}
+
+static int get_pp_arg_regmask_dst(const struct parsed_proto *pp)
+{
+ int regmask = 0;
+ int i, reg;
+
+ if (pp->has_retreg) {
+ for (i = 0; i < pp->argc; i++) {
+ if (pp->arg[i].type.is_retreg) {
+ reg = char_array_i(regs_r32,
+ ARRAY_SIZE(regs_r32), pp->arg[i].reg);
+ ferr_assert(ops, reg >= 0);
+ regmask |= 1 << reg;
+ }
+ }
+ }
+
+ if (strstr(pp->ret_type.name, "int64"))
+ return regmask | (1 << xAX) | (1 << xDX);
+ if (IS(pp->ret_type.name, "float")
+ || IS(pp->ret_type.name, "double"))
+ {
+ return regmask | mxST0;
+ }
+ if (strcasecmp(pp->ret_type.name, "void") == 0)
+ return regmask;
+
+ 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 {
+ const char *name;
+ enum op_op op;
+ unsigned int flags;
+ unsigned int regmask_src;
+ unsigned int regmask_dst;
+ } pseudo_ops[] = {
+ { "__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;
- int i, l, ret;
+ enum op_op prev_op;
+ int i, l;
+ int ret;
for (i = 0; i < opcnt; i++)
{
@@ -2958,13 +3767,54 @@ static void resolve_branches_parse_calls(int opcnt)
po->bt_i = -1;
po->btj = NULL;
+ if (po->datap != NULL) {
+ pp = calloc(1, sizeof(*pp));
+ my_assert_not(pp, NULL);
+
+ ret = parse_protostr(po->datap, pp);
+ if (ret < 0)
+ ferr(po, "bad protostr supplied: %s\n", (char *)po->datap);
+ free(po->datap);
+ po->datap = NULL;
+ po->pp = pp;
+ }
+
if (po->op == OP_CALL) {
pp = NULL;
- if (po->operand[0].type == OPT_LABEL) {
+ if (po->pp != NULL)
+ pp = po->pp;
+ else if (po->operand[0].type == OPT_LABEL)
+ {
tmpname = opr_name(po, 0);
if (IS_START(tmpname, "loc_"))
ferr(po, "call to loc_*\n");
+ if (IS(tmpname, "__alloca_probe"))
+ continue;
+ if (IS(tmpname, "__SEH_prolog")) {
+ ferr_assert(po, g_seh_found == 0);
+ g_seh_found = 2;
+ continue;
+ }
+ if (IS(tmpname, "__SEH_epilog"))
+ continue;
+
+ // convert some calls to pseudo-ops
+ for (l = 0; l < ARRAY_SIZE(pseudo_ops); l++) {
+ if (!IS(tmpname, pseudo_ops[l].name))
+ continue;
+
+ po->op = pseudo_ops[l].op;
+ po->operand_cnt = 0;
+ po->regmask_src = pseudo_ops[l].regmask_src;
+ po->regmask_dst = pseudo_ops[l].regmask_dst;
+ po->flags = pseudo_ops[l].flags;
+ po->flags |= po->regmask_dst ? OPF_DATA : 0;
+ break;
+ }
+ if (l < ARRAY_SIZE(pseudo_ops))
+ continue;
+
pp_c = proto_parse(g_fhdr, tmpname, g_header_mode);
if (!g_header_mode && pp_c == NULL)
ferr(po, "proto_parse failed for call '%s'\n", tmpname);
@@ -2974,22 +3824,14 @@ static void resolve_branches_parse_calls(int opcnt)
my_assert_not(pp, NULL);
}
}
- else if (po->datap != NULL) {
- pp = calloc(1, sizeof(*pp));
- my_assert_not(pp, NULL);
-
- ret = parse_protostr(po->datap, pp);
- if (ret < 0)
- ferr(po, "bad protostr supplied: %s\n", (char *)po->datap);
- free(po->datap);
- po->datap = NULL;
- }
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;
@@ -3034,56 +3876,232 @@ 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_writes(int opcnt)
{
- int ecx_push = 0, esp_sub = 0;
+ const struct parsed_opr *opr;
+ char ofs_reg[16];
+ int offset;
+ int i;
+
+ // assume all sf writes above g_seh_size to be seh related
+ // (probably unsafe but oh well)
+ for (i = 0; i < opcnt; i++) {
+ 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;
+
+ offset = 0;
+ 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 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;
+ }
+ }
+
+ eliminate_seh_writes(opcnt);
+}
+
+static void eliminate_seh_calls(int opcnt)
+{
+ int epilog_found = 0;
+ int i;
+
+ g_bp_frame = 1;
+ g_seh_size = 0x10;
+
+ i = 0;
+ ferr_assert(&ops[i], ops[i].op == OP_PUSH
+ && ops[i].operand[0].type == OPT_CONST);
+ g_stack_fsz = g_seh_size + ops[i].operand[0].val;
+ ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+
+ i++;
+ ferr_assert(&ops[i], ops[i].op == OP_PUSH
+ && ops[i].operand[0].type == OPT_OFFSET);
+ ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+
+ i++;
+ ferr_assert(&ops[i], ops[i].op == OP_CALL
+ && IS(opr_name(&ops[i], 0), "__SEH_prolog"));
+ ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+
+ for (i++; i < opcnt; i++) {
+ if (ops[i].op != OP_CALL)
+ continue;
+ if (!IS(opr_name(&ops[i], 0), "__SEH_epilog"))
+ continue;
+
+ ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ epilog_found = 1;
+ }
+ ferr_assert(ops, epilog_found);
+
+ eliminate_seh_writes(opcnt);
+}
+
+static int scan_prologue(int i, int opcnt, int *ecx_push, int *esp_sub)
+{
+ int j;
+
+ for (; 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;
+ (*ecx_push)++;
+ i++;
+ }
+
+ for (; i < opcnt; i++) {
+ if (i > 0 && g_labels[i] != NULL)
+ break;
+ if (ops[i].op == OP_PUSH || (ops[i].flags & (OPF_JMP|OPF_TAIL)))
+ break;
+ if (ops[i].op == OP_SUB && ops[i].operand[0].reg == xSP
+ && ops[i].operand[1].type == OPT_CONST)
+ {
+ g_stack_fsz += opr_const(&ops[i], 1);
+ ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ i++;
+ *esp_sub = 1;
+ break;
+ }
+ if (ops[i].op == OP_MOV && ops[i].operand[0].reg == xAX
+ && ops[i].operand[1].type == OPT_CONST)
+ {
+ for (j = i + 1; j < opcnt; j++)
+ if (!(ops[j].flags & OPF_DONE))
+ break;
+ if (ops[j].op == OP_CALL
+ && IS(opr_name(&ops[j], 0), "__alloca_probe"))
+ {
+ g_stack_fsz += opr_const(&ops[i], 1);
+ ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ ops[j].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ i = j + 1;
+ *esp_sub = 1;
+ }
+ break;
+ }
+ }
+
+ return i;
+}
+
+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 == 2) {
+ eliminate_seh_calls(opcnt);
+ return;
+ }
+ 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")
&& IS(opr_name(&ops[1], 1), "esp"))
{
g_bp_frame = 1;
- ops[0].flags |= OPF_RMD | OPF_DONE;
- ops[1].flags |= OPF_RMD | OPF_DONE;
- i = 2;
+ ops[0].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ ops[1].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+
+ for (i = 2; i < opcnt; i++)
+ if (!(ops[i].flags & OPF_DONE))
+ break;
- if (ops[2].op == OP_SUB && IS(opr_name(&ops[2], 0), "esp")) {
- g_stack_fsz = opr_const(&ops[2], 1);
- ops[2].flags |= OPF_RMD | OPF_DONE;
+ if (ops[i].op == OP_PUSHA) {
+ ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ pusha = 1;
i++;
}
- else {
- // another way msvc builds stack frame..
- i = 2;
- while (ops[i].op == OP_PUSH && IS(opr_name(&ops[i], 0), "ecx")) {
- g_stack_fsz += 4;
- ops[i].flags |= OPF_RMD | OPF_DONE;
- ecx_push++;
- i++;
- }
- // and another way..
- if (i == 2 && 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"))
- {
- g_stack_fsz += ops[i].operand[1].val;
- ops[i].flags |= OPF_RMD | OPF_DONE;
- i++;
- ops[i].flags |= OPF_RMD | OPF_DONE;
- 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++;
}
+ i = scan_prologue(i, opcnt, &ecx_push, &esp_sub);
+
found = 0;
do {
for (; i < opcnt; i++)
@@ -3097,10 +4115,20 @@ static void scan_prologue_epilogue(int opcnt)
j--;
}
- if ((ops[j].op == OP_POP && IS(opr_name(&ops[j], 0), "ebp"))
- || ops[j].op == OP_LEAVE)
+ sandard_epilogue = 0;
+ if (ops[j].op == OP_POP && IS(opr_name(&ops[j], 0), "ebp"))
{
- ops[j].flags |= OPF_RMD | OPF_DONE;
+ ops[j].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ // the standard epilogue is sometimes even used without a sf
+ if (ops[j - 1].op == OP_MOV
+ && IS(opr_name(&ops[j - 1], 0), "esp")
+ && IS(opr_name(&ops[j - 1], 1), "ebp"))
+ sandard_epilogue = 1;
+ }
+ else if (ops[j].op == OP_LEAVE)
+ {
+ ops[j].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ sandard_epilogue = 1;
}
else if (ops[i].op == OP_CALL && ops[i].pp != NULL
&& ops[i].pp->is_noreturn)
@@ -3113,15 +4141,12 @@ static void scan_prologue_epilogue(int opcnt)
else if (!(g_ida_func_attr & IDAFA_NORETURN))
ferr(&ops[j], "'pop ebp' expected\n");
- if (g_stack_fsz != 0) {
+ if (g_stack_fsz != 0 || sandard_epilogue) {
if (ops[j].op == OP_LEAVE)
j--;
- else if (ops[j].op == OP_POP
- && ops[j - 1].op == OP_MOV
- && IS(opr_name(&ops[j - 1], 0), "esp")
- && IS(opr_name(&ops[j - 1], 1), "ebp"))
+ else if (sandard_epilogue) // mov esp, ebp
{
- ops[j - 1].flags |= OPF_RMD | OPF_DONE;
+ ops[j - 1].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
j -= 2;
}
else if (!(g_ida_func_attr & IDAFA_NORETURN))
@@ -3136,6 +4161,13 @@ static void scan_prologue_epilogue(int opcnt)
}
}
+ if (pusha) {
+ if (ops[j].op == OP_POPA)
+ ops[j].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS;
+ else
+ ferr(&ops[j], "popa expected\n");
+ }
+
found = 1;
i++;
} while (i < opcnt);
@@ -3146,26 +4178,7 @@ static void scan_prologue_epilogue(int opcnt)
}
// non-bp frame
- i = 0;
- while (ops[i].op == OP_PUSH && IS(opr_name(&ops[i], 0), "ecx")) {
- ops[i].flags |= OPF_RMD | OPF_DONE;
- g_stack_fsz += 4;
- ecx_push++;
- i++;
- }
-
- for (; i < opcnt; i++) {
- if (ops[i].op == OP_PUSH || (ops[i].flags & (OPF_JMP|OPF_TAIL)))
- break;
- 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;
- ops[i].flags |= OPF_RMD | OPF_DONE;
- esp_sub = 1;
- break;
- }
- }
+ i = scan_prologue(0, opcnt, &ecx_push, &esp_sub);
if (ecx_push && !esp_sub) {
// could actually be args for a call..
@@ -3180,7 +4193,7 @@ static void scan_prologue_epilogue(int opcnt)
while (i > 0 && j > 0) {
i--;
if (ops[i].op == OP_PUSH) {
- ops[i].flags &= ~(OPF_RMD | OPF_DONE);
+ ops[i].flags &= ~(OPF_RMD | OPF_DONE | OPF_NOREGS);
j--;
}
}
@@ -3188,7 +4201,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;
@@ -3204,11 +4218,11 @@ static void scan_prologue_epilogue(int opcnt)
{
g_sp_frame = 1;
- i++;
do {
for (; i < opcnt; i++)
if (ops[i].flags & OPF_TAIL)
break;
+
j = i - 1;
if (i == opcnt && (ops[j].flags & OPF_JMP)) {
if (ops[j].bt_i != -1 || ops[j].btj != NULL)
@@ -3216,9 +4230,20 @@ static void scan_prologue_epilogue(int opcnt)
i--;
j--;
}
+ else if (i < opcnt && (ops[i].flags & OPF_ATAIL)) {
+ // skip arg updates for arg-reuse tailcall
+ for (; j >= 0; j--) {
+ if (ops[j].op != OP_MOV)
+ break;
+ if (ops[j].operand[0].type != OPT_REGMEM)
+ break;
+ if (strstr(ops[j].operand[0].name, "arg_") == NULL)
+ break;
+ }
+ }
- if (ecx_push > 0) {
- for (l = 0; l < ecx_push; l++) {
+ if (ecx_push > 0 && !esp_sub) {
+ for (l = 0; l < ecx_push && j >= 0; l++) {
if (ops[j].op == OP_POP && IS(opr_name(&ops[j], 0), "ecx"))
/* pop ecx */;
else if (ops[j].op == OP_ADD
@@ -3229,13 +4254,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;
+ 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;
}
@@ -3243,12 +4277,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 (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;
- 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;
}
@@ -3260,46 +4307,17 @@ static void scan_prologue_epilogue(int opcnt)
}
}
-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;
-
- *multi_src = 0;
- *pp_i = -1;
-
- switch (ops[i].operand[0].type) {
- case OPT_REGMEM:
- case OPT_LABEL:
- case OPT_OFFSET:
- pp = try_recover_pp(&ops[i], &ops[i].operand[0], &search_advice);
- if (!search_advice)
- break;
- // fallthrough
- default:
- scan_for_call_type(i, &ops[i].operand[0], i + opcnt * 9, &pp,
- pp_i, multi_src);
- break;
- }
-
- return pp;
-}
-
// find an instruction that changed opr before i op
// *op_i must be set to -1 by the caller
-// *entry is set to 1 if one source is determined to be the caller
+// *is_caller is set to 1 if one source is determined to be g_func arg
// returns 1 if found, *op_i is then set to origin
+// returns -1 if multiple origins are found
static int resolve_origin(int i, const struct parsed_opr *opr,
int magic, int *op_i, int *is_caller)
{
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];
@@ -3328,10 +4346,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;
}
@@ -3350,10 +4367,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];
@@ -3384,10 +4397,49 @@ static int resolve_last_ref(int i, const struct parsed_opr *opr,
}
}
+// adjust datap of all reachable 'op' insns when moving back
+// returns 1 if at least 1 op was found
+// returns -1 if path without an op was found
+static int adjust_prev_op(int i, enum op_op op, int magic, void *datap)
+{
+ 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];
+ for (; lr != NULL; lr = lr->next) {
+ check_i(&ops[i], lr->i);
+ ret |= adjust_prev_op(lr->i, op, magic, datap);
+ }
+ if (i > 0 && LAST_OP(i - 1))
+ return ret;
+ }
+
+ i--;
+ if (i < 0)
+ return -1;
+
+ if (ops[i].cc_scratch == magic)
+ return 0;
+ ops[i].cc_scratch = magic;
+
+ if (ops[i].op != op)
+ continue;
+
+ ops[i].datap = datap;
+ return 1;
+ }
+}
+
// find next instruction that reads opr
-// if multiple results are found - fail
// *op_i must be set to -1 by the caller
-// returns 1 if found, *op_i is then set to referencer insn
+// on return, *op_i is set to first referencer insn
+// returns 1 if exactly 1 referencer is found
static int find_next_read(int i, int opcnt,
const struct parsed_opr *opr, int magic, int *op_i)
{
@@ -3397,7 +4449,7 @@ static int find_next_read(int i, int opcnt,
for (; i < opcnt; i++)
{
if (ops[i].cc_scratch == magic)
- return 0;
+ return ret;
ops[i].cc_scratch = magic;
po = &ops[i];
@@ -3416,21 +4468,28 @@ static int find_next_read(int i, int opcnt,
continue;
check_i(po, po->bt_i);
if (po->flags & OPF_CJMP) {
- ret = find_next_read(po->bt_i, opcnt, opr, magic, op_i);
+ ret |= find_next_read(po->bt_i, opcnt, opr, magic, op_i);
if (ret < 0)
return ret;
}
-
- i = po->bt_i - 1;
+ else
+ i = po->bt_i - 1;
continue;
}
if (!is_opr_read(opr, po)) {
- if (is_opr_modified(opr, po))
+ int full_opr = 1;
+ if (opr->type == OPT_REG && po->operand[0].type == OPT_REG
+ && opr->reg == po->operand[0].reg && (po->flags & OPF_DATA))
+ {
+ full_opr = po->operand[0].lmod >= opr->lmod;
+ }
+ if (is_opr_modified(opr, po) && full_opr) {
// it's overwritten
- return 0;
+ return ret;
+ }
if (po->flags & OPF_TAIL)
- return 0;
+ return ret;
continue;
}
@@ -3444,6 +4503,65 @@ static int find_next_read(int i, int opcnt,
return 0;
}
+// find next instruction that reads opr
+// *op_i must be set to -1 by the caller
+// on return, *op_i is set to first flag user insn
+// returns 1 if exactly 1 flag user is found
+static int find_next_flag_use(int i, int opcnt, int magic, int *op_i)
+{
+ struct parsed_op *po;
+ int j, ret = 0;
+
+ for (; i < opcnt; i++)
+ {
+ if (ops[i].cc_scratch == magic)
+ return ret;
+ ops[i].cc_scratch = magic;
+
+ po = &ops[i];
+ if (po->op == OP_CALL)
+ return -1;
+ if (po->flags & OPF_JMP) {
+ if (po->btj != NULL) {
+ // jumptable
+ for (j = 0; j < po->btj->count; j++) {
+ check_i(po, po->btj->d[j].bt_i);
+ ret |= find_next_flag_use(po->btj->d[j].bt_i, opcnt,
+ magic, op_i);
+ }
+ return ret;
+ }
+
+ if (po->flags & OPF_RMD)
+ continue;
+ check_i(po, po->bt_i);
+ if (po->flags & OPF_CJMP)
+ goto found;
+ else
+ i = po->bt_i - 1;
+ continue;
+ }
+
+ if (!(po->flags & OPF_CC)) {
+ if (po->flags & OPF_FLAGS)
+ // flags changed
+ return ret;
+ if (po->flags & OPF_TAIL)
+ return ret;
+ continue;
+ }
+
+found:
+ if (*op_i >= 0)
+ return -1;
+
+ *op_i = i;
+ return 1;
+ }
+
+ return 0;
+}
+
static int try_resolve_const(int i, const struct parsed_opr *opr,
int magic, unsigned int *val)
{
@@ -3463,6 +4581,169 @@ static int try_resolve_const(int i, const struct parsed_opr *opr,
return -1;
}
+static int resolve_used_bits(int i, int opcnt, int reg,
+ int *mask, int *is_z_check)
+{
+ struct parsed_opr opr = OPR_INIT(OPT_REG, OPLM_WORD, reg);
+ int j = -1, k = -1;
+ int ret;
+
+ ret = find_next_read(i, opcnt, &opr, i + opcnt * 20, &j);
+ if (ret != 1)
+ return -1;
+
+ find_next_read(j + 1, opcnt, &opr, i + opcnt * 20 + 1, &k);
+ if (k != -1) {
+ fnote(&ops[j], "(first read)\n");
+ ferr(&ops[k], "TODO: bit resolve: multiple readers\n");
+ }
+
+ if (ops[j].op != OP_TEST || ops[j].operand[1].type != OPT_CONST)
+ ferr(&ops[j], "TODO: bit resolve: not a const test\n");
+
+ ferr_assert(&ops[j], ops[j].operand[0].type == OPT_REG);
+ ferr_assert(&ops[j], ops[j].operand[0].reg == reg);
+
+ *mask = ops[j].operand[1].val;
+ if (ops[j].operand[0].lmod == OPLM_BYTE
+ && ops[j].operand[0].name[1] == 'h')
+ {
+ *mask <<= 8;
+ }
+ ferr_assert(&ops[j], (*mask & ~0xffff) == 0);
+
+ *is_z_check = 0;
+ ret = find_next_flag_use(j + 1, opcnt, i + opcnt * 20 + 2, &k);
+ if (ret == 1)
+ *is_z_check = ops[k].pfo == PFO_Z;
+
+ 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;
+
+ *multi_src = 0;
+ *pp_i = -1;
+
+ switch (ops[i].operand[0].type) {
+ case OPT_REGMEM:
+ // try to resolve struct member calls
+ 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],
+ 1, &search_advice);
+ if (!search_advice)
+ break;
+ // fallthrough
+ default:
+ scan_for_call_type(i, &ops[i].operand[0], i + opcnt * 9, &pp,
+ pp_i, multi_src);
+ break;
+ }
+
+ return pp;
+}
+
static struct parsed_proto *process_call_early(int i, int opcnt,
int *adj_i)
{
@@ -3536,16 +4817,16 @@ static struct parsed_proto *process_call(int i, int opcnt)
&& ops[call_i].operand[1].type == OPT_LABEL)
{
// no other source users?
- ret = resolve_last_ref(i, &po->operand[0], opcnt * 10,
+ ret = resolve_last_ref(i, &po->operand[0], i + opcnt * 10,
&ref_i);
if (ret == 1 && call_i == ref_i) {
// and nothing uses it after us?
ref_i = -1;
- ret = find_next_read(i + 1, opcnt, &po->operand[0],
- opcnt * 11, &ref_i);
- if (ret != 1)
+ find_next_read(i + 1, opcnt, &po->operand[0],
+ i + opcnt * 11, &ref_i);
+ if (ref_i == -1)
// then also don't need the source mov
- ops[call_i].flags |= OPF_RMD;
+ ops[call_i].flags |= OPF_RMD | OPF_NOREGS;
}
}
break;
@@ -3606,6 +4887,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);
@@ -3618,12 +4902,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;
@@ -3638,20 +4985,23 @@ 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))
- return -1;
- ret = scan_for_mod(&ops[j], j + 1, i, 1);
- if (ret >= 0)
+ else if (po->op == OP_PUSH) {
+ if (po->flags & (OPF_FARG|OPF_FARGNR))
return -1;
+ if (!g_header_mode) {
+ ret = scan_for_mod(po, j + 1, i, 1);
+ if (ret >= 0)
+ return -1;
+ }
if (pp->arg[arg].type.is_va_list)
return -1;
@@ -3661,6 +5011,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)
@@ -3681,7 +5042,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;
@@ -3697,9 +5058,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;
@@ -3707,7 +5090,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];
@@ -3718,7 +5100,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);
@@ -3744,8 +5126,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;
}
@@ -3759,8 +5141,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;
}
@@ -3773,8 +5155,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);
@@ -3787,7 +5169,8 @@ static int collect_call_args_r(struct parsed_op *po, int i,
if (pp->is_unresolved)
break;
- ferr(po, "arg collect %d/%d hit esp adjust of %d\n",
+ fnote(po, "(this call)\n");
+ ferr(&ops[j], "arg collect %d/%d hit esp adjust of %d\n",
arg, pp->argc, ops[j].operand[1].val);
}
else if (ops[j].op == OP_POP && !(ops[j].flags & OPF_DONE))
@@ -3795,7 +5178,8 @@ static int collect_call_args_r(struct parsed_op *po, int i,
if (pp->is_unresolved)
break;
- ferr(po, "arg collect %d/%d hit pop\n", arg, pp->argc);
+ fnote(po, "(this call)\n");
+ ferr(&ops[j], "arg collect %d/%d hit pop\n", arg, pp->argc);
}
else if (ops[j].flags & OPF_CJMP)
{
@@ -3816,8 +5200,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;
@@ -3827,25 +5212,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)
@@ -3861,25 +5236,31 @@ static int collect_call_args_r(struct parsed_op *po, int i,
ops[j].flags &= ~OPF_RSAVE;
// check for __VALIST
- if (!pp->is_unresolved && pp->arg[arg].type.is_va_list) {
+ if (!pp->is_unresolved && g_func_pp != NULL
+ && pp->arg[arg].type.is_va_list)
+ {
k = -1;
ret = resolve_origin(j, &ops[j].operand[0],
magic + 1, &k, NULL);
if (ret == 1 && k >= 0)
{
if (ops[k].op == OP_LEA) {
+ if (!g_func_pp->is_vararg)
+ ferr(&ops[k], "lea used, but %s is not vararg?\n",
+ g_func_pp->name);
+
snprintf(buf, sizeof(buf), "arg_%X",
g_func_pp->argc_stack * 4);
- if (!g_func_pp->is_vararg
- || strstr(ops[k].operand[1].name, buf))
+ if (strstr(ops[k].operand[1].name, buf)
+ || strstr(ops[k].operand[1].name, "arglist"))
{
- ops[k].flags |= OPF_RMD | OPF_DONE;
- ops[j].flags |= OPF_RMD | OPF_VAPUSH;
- save_args &= ~(1 << arg);
+ ops[k].flags |= OPF_RMD | OPF_NOREGS | OPF_DONE;
+ ops[j].flags |= OPF_RMD | OPF_NOREGS | OPF_VAPUSH;
+ pp->arg[arg].is_saved = 0;
reg = -1;
}
else
- ferr(&ops[j], "lea va_list used, but no vararg?\n");
+ ferr(&ops[k], "va_list arg detection failed\n");
}
// check for va_list from g_func_pp arg too
else if (ops[k].op == OP_MOV
@@ -3891,23 +5272,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;
}
@@ -3935,19 +5320,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;
@@ -3960,14 +5343,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;
@@ -3980,6 +5359,205 @@ static int collect_call_args(struct parsed_op *po, int i,
return ret;
}
+static void reg_use_pass(int i, int opcnt, unsigned char *cbits,
+ int regmask_now, int *regmask,
+ int regmask_save_now, int *regmask_save,
+ int *regmask_init, int regmask_arg)
+{
+ struct parsed_op *po;
+ int already_saved;
+ int regmask_new;
+ int regmask_op;
+ int flags_set;
+ int ret, reg;
+ int j;
+
+ for (; i < opcnt; i++)
+ {
+ po = &ops[i];
+ if (cbits[i >> 3] & (1 << (i & 7)))
+ return;
+ cbits[i >> 3] |= (1 << (i & 7));
+
+ if ((po->flags & OPF_JMP) && po->op != OP_CALL) {
+ if (po->flags & (OPF_RMD|OPF_DONE))
+ continue;
+ if (po->btj != NULL) {
+ for (j = 0; j < po->btj->count; j++) {
+ check_i(po, po->btj->d[j].bt_i);
+ reg_use_pass(po->btj->d[j].bt_i, opcnt, cbits,
+ regmask_now, regmask, regmask_save_now, regmask_save,
+ regmask_init, regmask_arg);
+ }
+ return;
+ }
+
+ check_i(po, po->bt_i);
+ if (po->flags & OPF_CJMP)
+ reg_use_pass(po->bt_i, opcnt, cbits,
+ regmask_now, regmask, regmask_save_now, regmask_save,
+ regmask_init, regmask_arg);
+ else
+ i = po->bt_i - 1;
+ continue;
+ }
+
+ if (po->op == OP_PUSH && !(po->flags & (OPF_FARG|OPF_DONE))
+ && !g_func_pp->is_userstack
+ && po->operand[0].type == OPT_REG)
+ {
+ reg = po->operand[0].reg;
+ ferr_assert(po, reg >= 0);
+
+ already_saved = 0;
+ flags_set = OPF_RSAVE | OPF_RMD | OPF_DONE;
+ if (regmask_now & (1 << reg)) {
+ already_saved = regmask_save_now & (1 << reg);
+ flags_set = OPF_RSAVE | OPF_DONE;
+ }
+
+ 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, 0, flags_set);
+ }
+ else {
+ ret = scan_for_pop_ret(i + 1, opcnt, po->operand[0].reg, 0);
+ if (ret == 1) {
+ scan_for_pop_ret(i + 1, opcnt, po->operand[0].reg,
+ flags_set);
+ }
+ }
+ if (ret == 1) {
+ ferr_assert(po, !already_saved);
+ po->flags |= flags_set;
+
+ if (regmask_now & (1 << reg)) {
+ regmask_save_now |= (1 << reg);
+ *regmask_save |= regmask_save_now;
+ }
+ continue;
+ }
+ }
+ else if (po->op == OP_POP && (po->flags & OPF_RSAVE)) {
+ reg = po->operand[0].reg;
+ ferr_assert(po, reg >= 0);
+
+ if (regmask_save_now & (1 << reg))
+ regmask_save_now &= ~(1 << reg);
+ else
+ regmask_now &= ~(1 << reg);
+ continue;
+ }
+ else if (po->op == OP_CALL) {
+ if ((po->regmask_dst & (1 << xAX))
+ && !(po->regmask_dst & (1 << xDX)))
+ {
+ if (po->flags & OPF_TAIL)
+ // don't need eax, will do "return f();" or "f(); return;"
+ po->regmask_dst &= ~(1 << xAX);
+ else {
+ struct parsed_opr opr = OPR_INIT(OPT_REG, OPLM_DWORD, xAX);
+ j = -1;
+ find_next_read(i + 1, opcnt, &opr, i + opcnt * 17, &j);
+ if (j == -1)
+ // not used
+ po->regmask_dst &= ~(1 << xAX);
+ }
+ }
+
+ // not "full stack" mode and have something in stack
+ if (!(regmask_now & mxST7_2) && (regmask_now & mxST1_0))
+ ferr(po, "float stack is not empty on func call\n");
+ }
+
+ if (po->flags & OPF_NOREGS)
+ continue;
+
+ // if incomplete register is used, clear it on init to avoid
+ // later use of uninitialized upper part in some situations
+ if ((po->flags & OPF_DATA) && po->operand[0].type == OPT_REG
+ && po->operand[0].lmod != OPLM_DWORD)
+ {
+ reg = po->operand[0].reg;
+ ferr_assert(po, reg >= 0);
+
+ if (!(regmask_now & (1 << reg)))
+ *regmask_init |= 1 << reg;
+ }
+
+ regmask_op = po->regmask_src | po->regmask_dst;
+
+ regmask_new = po->regmask_src & ~regmask_now & ~regmask_arg;
+ regmask_new &= ~(1 << xSP);
+ if (g_bp_frame && !(po->flags & OPF_EBP_S))
+ regmask_new &= ~(1 << xBP);
+
+ if (regmask_new != 0)
+ fnote(po, "uninitialized reg mask: %x\n", regmask_new);
+
+ if (regmask_op & (1 << xBP)) {
+ if (g_bp_frame && !(po->flags & OPF_EBP_S)) {
+ if (po->regmask_dst & (1 << xBP))
+ // compiler decided to drop bp frame and use ebp as scratch
+ scan_fwd_set_flags(i + 1, opcnt, i + opcnt * 5, OPF_EBP_S);
+ else
+ regmask_op &= ~(1 << xBP);
+ }
+ }
+
+ if (po->flags & OPF_FPUSH) {
+ if (regmask_now & mxST1)
+ regmask_now |= mxSTa; // switch to "full stack" mode
+ if (regmask_now & mxSTa)
+ po->flags |= OPF_FSHIFT;
+ if (!(regmask_now & mxST7_2)) {
+ regmask_now =
+ (regmask_now & ~mxST1_0) | ((regmask_now & mxST0) << 1);
+ }
+ }
+
+ regmask_now |= regmask_op;
+ *regmask |= regmask_now;
+
+ // released regs
+ if (po->flags & OPF_FPOPP) {
+ if ((regmask_now & mxSTa) == 0)
+ ferr(po, "float pop on empty stack?\n");
+ if (regmask_now & mxST7_2)
+ po->flags |= OPF_FSHIFT;
+ if (!(regmask_now & mxST7_2))
+ regmask_now &= ~mxST1_0;
+ }
+ else if (po->flags & OPF_FPOP) {
+ if ((regmask_now & mxSTa) == 0)
+ ferr(po, "float pop on empty stack?\n");
+ if (regmask_now & (mxST7_2 | mxST1))
+ po->flags |= OPF_FSHIFT;
+ if (!(regmask_now & mxST7_2)) {
+ regmask_now =
+ (regmask_now & ~mxST1_0) | ((regmask_now & mxST1) >> 1);
+ }
+ }
+
+ if (po->flags & OPF_TAIL) {
+ if (!(regmask_now & mxST7_2)) {
+ if (get_pp_arg_regmask_dst(g_func_pp) & mxST0) {
+ if (!(regmask_now & mxST0))
+ ferr(po, "no st0 on float return, mask: %x\n",
+ regmask_now);
+ }
+ else if (regmask_now & mxST1_0)
+ ferr(po, "float regs on tail: %x\n", regmask_now);
+ }
+
+ // there is support for "conditional tailcall", sort of
+ if (!(po->flags & OPF_CC))
+ return;
+ }
+ }
+}
+
static void pp_insert_reg_arg(struct parsed_proto *pp, const char *reg)
{
int i;
@@ -3998,7 +5576,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)) {
@@ -4006,6 +5584,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);
@@ -4013,6 +5596,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),
@@ -4055,9 +5645,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);
@@ -4067,6 +5659,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)
@@ -4076,25 +5671,6 @@ static void output_pp(FILE *fout, const struct parsed_proto *pp,
fprintf(fout, ")");
}
-static int get_pp_arg_regmask(const struct parsed_proto *pp)
-{
- int regmask = 0;
- int i, reg;
-
- for (i = 0; i < pp->argc; i++) {
- if (pp->arg[i].reg != NULL) {
- reg = char_array_i(regs_r32,
- ARRAY_SIZE(regs_r32), pp->arg[i].reg);
- if (reg < 0)
- ferr(ops, "arg '%s' of func '%s' is not a reg?\n",
- pp->arg[i].reg, pp->name);
- regmask |= 1 << reg;
- }
- }
-
- return regmask;
-}
-
static char *saved_arg_name(char *buf, size_t buf_size, int grp, int num)
{
char buf1[16];
@@ -4116,22 +5692,32 @@ 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, };
- int cond_vars = 0;
+ unsigned char cbits[MAX_OPS / 8];
+ const char *float_type;
+ const char *float_st0;
+ const char *float_st1;
+ int need_float_stack = 0;
+ int need_float_sw = 0; // status word
int need_tmp_var = 0;
int need_tmp64 = 0;
+ int cond_vars = 0;
int had_decl = 0;
int label_pending = 0;
- int regmask_save = 0; // regs saved/restored in this func
- int regmask_arg = 0; // regs carrying function args (fastcall, etc)
+ 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;
- int depth = 0;
+ int dead_dst;
int no_output;
int i, j, l;
int arg;
@@ -4140,12 +5726,16 @@ 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;
g_func_pp = proto_parse(fhdr, funcn, 0);
if (g_func_pp == NULL)
ferr(ops, "proto_parse failed for '%s'\n", funcn);
- regmask_arg = get_pp_arg_regmask(g_func_pp);
+ regmask_arg = get_pp_arg_regmask_src(g_func_pp);
+ regmask_ret = get_pp_arg_regmask_dst(g_func_pp);
// pass1:
// - resolve all branches
@@ -4154,16 +5744,34 @@ 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
+ // - set regs needed at ret
for (i = 0; i < opcnt; i++)
{
if (g_labels[i] != NULL && g_label_refs[i].i == -1) {
free(g_labels[i]);
g_labels[i] = NULL;
}
+
+ if (ops[i].op == OP_RET)
+ ops[i].regmask_src |= regmask_ret;
}
// pass4:
@@ -4178,10 +5786,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) {
@@ -4191,7 +5801,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
patch_esp_adjust(&ops[j], pp->argc_stack * 4);
else {
for (l = 0; l < pp->argc_stack; l++)
- ops[j + l].flags |= OPF_DONE | OPF_RMD;
+ ops[j + l].flags |= OPF_DONE | OPF_RMD | OPF_NOREGS;
}
}
@@ -4204,113 +5814,109 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
}
// pass5:
- // - process calls
- // - handle push /pop pairs
+ // - process calls, stage 2
+ // - handle some push/pop pairs
+ // - scan for STD/CLD, propagate DF
+ // - try to resolve needed x87 status word bits
for (i = 0; i < opcnt; i++)
{
+ int mask, z_check;
+
po = &ops[i];
- if (po->flags & (OPF_RMD|OPF_DONE))
+ if (po->flags & OPF_RMD)
continue;
- if (po->op == OP_CALL && !(po->flags & OPF_DONE))
+ if (po->op == OP_CALL)
{
- pp = process_call(i, opcnt);
+ if (!(po->flags & OPF_DONE)) {
+ pp = process_call(i, 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);
+ if (!pp->is_unresolved && !(po->flags & OPF_ATAIL)) {
+ // since we know the args, collect them
+ collect_call_args(po, i, pp, ®mask, i + opcnt * 2);
+ }
+ // for unresolved, collect after other passes
}
+ pp = po->pp;
+ ferr_assert(po, pp != NULL);
+
+ po->regmask_src |= get_pp_arg_regmask_src(pp);
+ po->regmask_dst |= get_pp_arg_regmask_dst(pp);
+
+ if (po->regmask_dst & mxST0)
+ po->flags |= OPF_FPUSH;
+
if (strstr(pp->ret_type.name, "int64"))
need_tmp64 = 1;
+
+ continue;
+ }
+
+ if (po->flags & OPF_DONE)
+ continue;
+
+ switch (po->op) {
+ case OP_PUSH:
+ if (!(po->flags & OPF_FARG) && !(po->flags & OPF_RSAVE)
+ && po->operand[0].type == OPT_CONST)
+ {
+ scan_for_pop_const(i, opcnt, i + opcnt * 12);
+ }
+ break;
+
+ case OP_POP:
+ scan_pushes_for_pop(i, opcnt, ®mask_pp);
+ break;
+
+ case OP_STD:
+ po->flags |= OPF_DF | OPF_RMD | OPF_DONE;
+ scan_propagate_df(i + 1, opcnt);
+ break;
+
+ case OP_FNSTSW:
+ need_float_sw = 1;
+ if (po->operand[0].type != OPT_REG || po->operand[0].reg != xAX)
+ ferr(po, "TODO: fnstsw to mem\n");
+ ret = resolve_used_bits(i + 1, opcnt, xAX, &mask, &z_check);
+ if (ret != 0)
+ ferr(po, "fnstsw resolve failed\n");
+ ret = adjust_prev_op(i, OP_FCOM, i + opcnt * 21,
+ (void *)(long)(mask | (z_check << 16)));
+ if (ret != 1)
+ ferr(po, "failed to find fcom: %d\n", ret);
+ break;
+
+ default:
+ break;
}
- else if (po->op == OP_PUSH && !(po->flags & OPF_FARG)
- && !(po->flags & OPF_RSAVE) && po->operand[0].type == OPT_CONST)
- scan_for_pop_const(i, opcnt, ®mask_pp);
}
// pass6:
// - find POPs for PUSHes, rm both
- // - scan for STD/CLD, propagate DF
// - scan for all used registers
+ memset(cbits, 0, sizeof(cbits));
+ 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 unreselved calls
+ // - do unresolved calls
// - declare indirect functions
+ // - other op specific processing
for (i = 0; i < opcnt; i++)
{
po = &ops[i];
if (po->flags & (OPF_RMD|OPF_DONE))
continue;
- if (po->op == OP_PUSH && (po->flags & OPF_RSAVE)) {
- reg = po->operand[0].reg;
- if (!(regmask & (1 << reg)))
- // not a reg save after all, rerun scan_for_pop
- po->flags &= ~OPF_RSAVE;
- else
- regmask_save |= 1 << reg;
- }
-
- if (po->op == OP_PUSH && !(po->flags & OPF_FARG)
- && !(po->flags & OPF_RSAVE) && !g_func_pp->is_userstack)
- {
- if (po->operand[0].type == OPT_REG)
- {
- reg = po->operand[0].reg;
- if (reg < 0)
- ferr(po, "reg not set for push?\n");
-
- depth = 0;
- ret = scan_for_pop(i + 1, opcnt,
- po->operand[0].name, i + opcnt * 3, 0, &depth, 0);
- if (ret == 1) {
- if (depth > 1)
- ferr(po, "too much depth: %d\n", depth);
-
- po->flags |= OPF_RMD;
- scan_for_pop(i + 1, opcnt, po->operand[0].name,
- i + opcnt * 4, 0, &depth, 1);
- continue;
- }
- ret = scan_for_pop_ret(i + 1, opcnt, po->operand[0].name, 0);
- if (ret == 0) {
- arg = OPF_RMD;
- if (regmask & (1 << reg)) {
- if (regmask_save & (1 << reg))
- ferr(po, "%s already saved?\n", po->operand[0].name);
- arg = OPF_RSAVE;
- }
- po->flags |= arg;
- scan_for_pop_ret(i + 1, opcnt, po->operand[0].name, arg);
- continue;
- }
- }
- }
-
- if (po->op == OP_STD) {
- po->flags |= OPF_DF | OPF_RMD | OPF_DONE;
- scan_propagate_df(i + 1, opcnt);
- }
-
- regmask_now = po->regmask_src | po->regmask_dst;
- if (regmask_now & (1 << xBP)) {
- if (g_bp_frame && !(po->flags & OPF_EBP_S)) {
- if (po->regmask_dst & (1 << xBP))
- // compiler decided to drop bp frame and use ebp as scratch
- scan_fwd_set_flags(i + 1, opcnt, i + opcnt * 5, OPF_EBP_S);
- else
- regmask_now &= ~(1 << xBP);
- }
- }
-
- regmask |= regmask_now;
-
if (po->flags & OPF_CC)
{
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");
@@ -4364,36 +5970,41 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
cond_vars |= 1 << PFO_C;
}
- if (po->op == OP_CMPS || po->op == OP_SCAS) {
+ switch (po->op) {
+ case OP_CMPS:
+ case OP_SCAS:
cond_vars |= 1 << PFO_Z;
- }
- else if (po->op == OP_MUL
- || (po->op == OP_IMUL && po->operand_cnt == 1))
- {
+ break;
+
+ case OP_MUL:
if (po->operand[0].lmod == OPLM_DWORD)
need_tmp64 = 1;
- }
- else if (po->op == OP_CALL) {
+ break;
+
+ case OP_IMUL:
+ if (po->operand_cnt == 1 && po->operand[0].lmod == OPLM_DWORD)
+ need_tmp64 = 1;
+ break;
+
+ case OP_CALL:
// note: resolved non-reg calls are OPF_DONE already
pp = po->pp;
- if (pp == NULL)
- ferr(po, "NULL pp\n");
+ ferr_assert(po, pp != NULL);
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;
}
@@ -4421,77 +6032,98 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
if (pp->argc_stack > 0)
pp->is_stdcall = 1;
}
+ break;
- for (arg = 0; arg < pp->argc; arg++) {
- if (pp->arg[arg].reg != NULL) {
- reg = char_array_i(regs_r32,
- ARRAY_SIZE(regs_r32), pp->arg[arg].reg);
- if (reg < 0)
- ferr(ops, "arg '%s' is not a reg?\n", pp->arg[arg].reg);
- if (!(regmask & (1 << reg))) {
- regmask_init |= 1 << reg;
- regmask |= 1 << reg;
+ case OP_MOV:
+ if (po->operand[0].pp != NULL && po->operand[1].pp != NULL)
+ {
+ // = offset
+ if ((po->operand[1].pp->is_func || po->operand[1].pp->is_fptr)
+ && !IS_START(po->operand[1].name, "off_"))
+ {
+ if (!po->operand[0].pp->is_fptr)
+ ferr(po, "%s not declared as fptr when it should be\n",
+ po->operand[0].name);
+ if (pp_cmp_func(po->operand[0].pp, po->operand[1].pp)) {
+ pp_print(buf1, sizeof(buf1), po->operand[0].pp);
+ pp_print(buf2, sizeof(buf2), po->operand[1].pp);
+ fnote(po, "var: %s\n", buf1);
+ fnote(po, "func: %s\n", buf2);
+ ferr(po, "^ mismatch\n");
}
}
}
- }
- else if (po->op == OP_MOV && po->operand[0].pp != NULL
- && po->operand[1].pp != NULL)
- {
- // = offset
- if ((po->operand[1].pp->is_func || po->operand[1].pp->is_fptr)
- && !IS_START(po->operand[1].name, "off_"))
- {
- if (!po->operand[0].pp->is_fptr)
- ferr(po, "%s not declared as fptr when it should be\n",
- po->operand[0].name);
- if (pp_cmp_func(po->operand[0].pp, po->operand[1].pp)) {
- pp_print(buf1, sizeof(buf1), po->operand[0].pp);
- pp_print(buf2, sizeof(buf2), po->operand[1].pp);
- fnote(po, "var: %s\n", buf1);
- fnote(po, "func: %s\n", buf2);
- ferr(po, "^ mismatch\n");
- }
- }
- }
- else if (po->op == OP_RET && !IS(g_func_pp->ret_type.name, "void"))
- regmask |= 1 << xAX;
- else if (po->op == OP_DIV || po->op == OP_IDIV) {
- // 32bit division is common, look for it
- if (po->op == OP_DIV)
- ret = scan_for_reg_clear(i, xDX);
- else
- ret = scan_for_cdq_edx(i);
- if (ret >= 0)
- po->flags |= OPF_32BIT;
+ break;
+
+ case OP_DIV:
+ case OP_IDIV:
+ if (po->operand[0].lmod == OPLM_DWORD) {
+ // 32bit division is common, look for it
+ if (po->op == OP_DIV)
+ ret = scan_for_reg_clear(i, xDX);
+ else
+ ret = scan_for_cdq_edx(i);
+ if (ret >= 0)
+ po->flags |= OPF_32BIT;
+ else
+ need_tmp64 = 1;
+ }
else
- need_tmp64 = 1;
- }
- else if (po->op == OP_CLD)
+ need_tmp_var = 1;
+ break;
+
+ case OP_CLD:
po->flags |= OPF_RMD | OPF_DONE;
+ break;
- if (po->op == OP_RCL || po->op == OP_RCR || po->op == OP_XCHG) {
+ case OP_RCL:
+ case OP_RCR:
+ case OP_XCHG:
need_tmp_var = 1;
- }
- }
+ break;
- // pass7:
- // - confirm regmask_save, it might have been reduced
- if (regmask_save != 0)
- {
- regmask_save = 0;
- for (i = 0; i < opcnt; i++) {
- po = &ops[i];
- if (po->flags & OPF_RMD)
- continue;
+ case OP_FLD:
+ if (po->operand[0].lmod == OPLM_QWORD)
+ need_double = 1;
+ break;
- if (po->op == OP_PUSH && (po->flags & OPF_RSAVE))
- regmask_save |= 1 << po->operand[0].reg;
+ case OPP_ALLSHL:
+ case OPP_ALLSHR:
+ need_tmp64 = 1;
+ break;
+
+ case OPP_FTOL: {
+ struct parsed_opr opr = OPR_INIT(OPT_REG, OPLM_DWORD, xDX);
+ j = -1;
+ find_next_read(i + 1, opcnt, &opr, i + opcnt * 18, &j);
+ if (j == -1)
+ po->flags |= OPF_32BIT;
+ break;
+ }
+
+ 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|OPF_FPOPP))
+ && need_float_stack)
+ po->flags |= OPF_FSHIFT;
}
+ float_type = need_double ? "double" : "float";
+ 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);
@@ -4573,8 +6205,22 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
// declare stack frame, va_arg
if (g_stack_fsz) {
- fprintf(fout, " union { u32 d[%d]; u16 w[%d]; u8 b[%d]; } sf;\n",
- (g_stack_fsz + 3) / 4, (g_stack_fsz + 1) / 2, 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);
+ if (g_func_lmods & (1 << OPLM_BYTE))
+ 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;
}
@@ -4627,6 +6273,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
}
}
}
+ // ... mmx
if (regmask_now & 0xff00) {
for (reg = 8; reg < 16; reg++) {
if (regmask_now & (1 << reg)) {
@@ -4638,6 +6285,30 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
}
}
}
+ // ... x87
+ if (need_float_stack) {
+ fprintf(fout, " %s f_st[8];\n", float_type);
+ fprintf(fout, " int f_stp = 0;\n");
+ had_decl = 1;
+ }
+ else {
+ if (regmask_now & 0xff0000) {
+ for (reg = 16; reg < 24; reg++) {
+ if (regmask_now & (1 << reg)) {
+ fprintf(fout, " %s f_st%d", float_type, reg - 16);
+ if (regmask_init & (1 << reg))
+ fprintf(fout, " = 0");
+ fprintf(fout, ";\n");
+ had_decl = 1;
+ }
+ }
+ }
+ }
+
+ if (need_float_sw) {
+ fprintf(fout, " u16 f_sw;\n");
+ had_decl = 1;
+ }
if (regmask_save) {
for (reg = 0; reg < 8; reg++) {
@@ -4660,6 +6331,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++) {
@@ -4692,6 +6372,24 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
if (had_decl)
fprintf(fout, "\n");
+ // do stack clear, if needed
+ if (g_sct_func_attr & SCTFA_CLEAR_SF) {
+ fprintf(fout, " ");
+ if (g_stack_clear_len != 0) {
+ if (g_stack_clear_len <= 4) {
+ for (i = 0; i < g_stack_clear_len; i++)
+ fprintf(fout, "sf.d[%d] = ", g_stack_clear_start + i);
+ fprintf(fout, "0;\n");
+ }
+ else {
+ fprintf(fout, "memset(&sf[%d], 0, %d);\n",
+ g_stack_clear_start, g_stack_clear_len * 4);
+ }
+ }
+ else
+ fprintf(fout, "memset(&sf, 0, sizeof(sf));\n");
+ }
+
if (g_func_pp->is_vararg) {
if (g_func_pp->argc_stack == 0)
ferr(ops, "vararg func without stack args?\n");
@@ -4778,35 +6476,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 = {0,};
- opr.type = OPT_REG;
- opr.reg = xCX;
- opr.lmod = OPLM_DWORD;
- 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:
@@ -4874,6 +6543,14 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
fprintf(fout, " %s = ~%s;", buf1, buf1);
break;
+ case OP_XLAT:
+ 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 = *(u8 *)(%s + %s);", buf1, buf2, buf1);
+ strcpy(g_comment, "xlat");
+ break;
+
case OP_CDQ:
assert_operand_cnt(2);
fprintf(fout, " %s = (s32)%s >> 31;",
@@ -4882,46 +6559,55 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
strcpy(g_comment, "cdq");
break;
+ case OP_BSWAP:
+ assert_operand_cnt(1);
+ out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]);
+ fprintf(fout, " %s = __builtin_bswap32(%s);", buf1, buf1);
+ break;
+
case OP_LODS:
- assert_operand_cnt(3);
if (po->flags & OPF_REP) {
+ assert_operand_cnt(3);
// hmh..
ferr(po, "TODO\n");
}
else {
- fprintf(fout, " eax = %sesi; esi %c= %d;",
- lmod_cast_u_ptr(po, po->operand[0].lmod),
+ assert_operand_cnt(2);
+ fprintf(fout, " %s = %sesi; esi %c= %d;",
+ out_dst_opr(buf1, sizeof(buf1), po, &po->operand[1]),
+ lmod_cast_u_ptr(po, po->operand[1].lmod),
(po->flags & OPF_DF) ? '-' : '+',
- lmod_bytes(po, po->operand[0].lmod));
+ lmod_bytes(po, po->operand[1].lmod));
strcpy(g_comment, "lods");
}
break;
case OP_STOS:
- assert_operand_cnt(3);
if (po->flags & OPF_REP) {
+ assert_operand_cnt(3);
fprintf(fout, " for (; ecx != 0; ecx--, edi %c= %d)\n",
(po->flags & OPF_DF) ? '-' : '+',
- lmod_bytes(po, po->operand[0].lmod));
+ lmod_bytes(po, po->operand[1].lmod));
fprintf(fout, " %sedi = eax;",
- lmod_cast_u_ptr(po, po->operand[0].lmod));
+ lmod_cast_u_ptr(po, po->operand[1].lmod));
strcpy(g_comment, "rep stos");
}
else {
+ assert_operand_cnt(2);
fprintf(fout, " %sedi = eax; edi %c= %d;",
- lmod_cast_u_ptr(po, po->operand[0].lmod),
+ lmod_cast_u_ptr(po, po->operand[1].lmod),
(po->flags & OPF_DF) ? '-' : '+',
- lmod_bytes(po, po->operand[0].lmod));
+ lmod_bytes(po, po->operand[1].lmod));
strcpy(g_comment, "stos");
}
break;
case OP_MOVS:
- assert_operand_cnt(3);
j = lmod_bytes(po, po->operand[0].lmod);
strcpy(buf1, lmod_cast_u_ptr(po, po->operand[0].lmod));
l = (po->flags & OPF_DF) ? '-' : '+';
if (po->flags & OPF_REP) {
+ assert_operand_cnt(3);
fprintf(fout,
" for (; ecx != 0; ecx--, edi %c= %d, esi %c= %d)\n",
l, j, l, j);
@@ -4930,6 +6616,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
strcpy(g_comment, "rep movs");
}
else {
+ assert_operand_cnt(2);
fprintf(fout, " %sedi = %sesi; edi %c= %d; esi %c= %d;",
buf1, buf1, l, j, l, j);
strcpy(g_comment, "movs");
@@ -4938,13 +6625,13 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
case OP_CMPS:
// repe ~ repeat while ZF=1
- assert_operand_cnt(3);
j = lmod_bytes(po, po->operand[0].lmod);
strcpy(buf1, lmod_cast_u_ptr(po, po->operand[0].lmod));
l = (po->flags & OPF_DF) ? '-' : '+';
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,
@@ -4955,6 +6642,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,
@@ -4963,6 +6651,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
(po->flags & OPF_REPZ) ? "e" : "ne");
}
else {
+ assert_operand_cnt(2);
fprintf(fout,
" cond_z = (%sesi == %sedi); esi %c= %d; edi %c= %d;",
buf1, buf1, l, j, l, j);
@@ -4976,17 +6665,18 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
case OP_SCAS:
// only does ZF (for now)
// repe ~ repeat while ZF=1
- assert_operand_cnt(3);
- j = lmod_bytes(po, po->operand[0].lmod);
+ j = lmod_bytes(po, po->operand[1].lmod);
l = (po->flags & OPF_DF) ? '-' : '+';
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[0].lmod),
- lmod_cast_u_ptr(po, po->operand[0].lmod), l, j);
+ 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,
@@ -4995,9 +6685,10 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
(po->flags & OPF_REPZ) ? "e" : "ne");
}
else {
+ assert_operand_cnt(2);
fprintf(fout, " cond_z = (%seax == %sedi); edi %c= %d;",
- lmod_cast_u(po, po->operand[0].lmod),
- lmod_cast_u_ptr(po, po->operand[0].lmod), l, j);
+ lmod_cast_u(po, po->operand[1].lmod),
+ lmod_cast_u_ptr(po, po->operand[1].lmod), l, j);
strcpy(g_comment, "scas");
}
pfomask &= ~(1 << PFO_Z);
@@ -5007,22 +6698,20 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
// arithmetic w/flags
case OP_AND:
- if (po->operand[1].type == OPT_CONST && !po->operand[1].val) {
- // deal with complex dst clear
- assert_operand_cnt(2);
- fprintf(fout, " %s = %s;",
- out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]),
- out_src_opr(buf2, sizeof(buf2), po, &po->operand[1],
- default_cast_to(buf3, sizeof(buf3), &po->operand[0]), 0));
- output_std_flags(fout, po, &pfomask, buf1);
- last_arith_dst = &po->operand[0];
- delayed_flag_op = NULL;
- break;
- }
- // fallthrough
+ if (po->operand[1].type == OPT_CONST && !po->operand[1].val)
+ goto dualop_arith_const;
+ propagate_lmod(po, &po->operand[0], &po->operand[1]);
+ goto dualop_arith;
+
case OP_OR:
propagate_lmod(po, &po->operand[0], &po->operand[1]);
- // fallthrough
+ if (po->operand[1].type == OPT_CONST) {
+ j = lmod_bytes(po, po->operand[0].lmod);
+ if (((1ull << j * 8) - 1) == po->operand[1].val)
+ goto dualop_arith_const;
+ }
+ goto dualop_arith;
+
dualop_arith:
assert_operand_cnt(2);
fprintf(fout, " %s %s= %s;",
@@ -5034,6 +6723,18 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
delayed_flag_op = NULL;
break;
+ dualop_arith_const:
+ // and 0, or ~0 used instead mov
+ assert_operand_cnt(2);
+ fprintf(fout, " %s = %s;",
+ out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]),
+ out_src_opr(buf2, sizeof(buf2), po, &po->operand[1],
+ default_cast_to(buf3, sizeof(buf3), &po->operand[0]), 0));
+ output_std_flags(fout, po, &pfomask, buf1);
+ last_arith_dst = &po->operand[0];
+ delayed_flag_op = NULL;
+ break;
+
case OP_SHL:
case OP_SHR:
assert_operand_cnt(2);
@@ -5058,8 +6759,11 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
ferr(po, "TODO\n");
pfomask &= ~(1 << PFO_C);
}
- fprintf(fout, " %s %s= %s;", buf1, op_to_c(po),
+ fprintf(fout, " %s %s= %s", buf1, op_to_c(po),
out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1]));
+ if (po->operand[1].type != OPT_CONST)
+ fprintf(fout, " & 0x1f");
+ fprintf(fout, ";");
output_std_flags(fout, po, &pfomask, buf1);
last_arith_dst = &po->operand[0];
delayed_flag_op = NULL;
@@ -5076,16 +6780,29 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
delayed_flag_op = NULL;
break;
+ case OP_SHLD:
case OP_SHRD:
assert_operand_cnt(3);
propagate_lmod(po, &po->operand[0], &po->operand[1]);
l = lmod_bytes(po, po->operand[0].lmod) * 8;
- out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]);
- out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1]);
out_src_opr_u32(buf3, sizeof(buf3), po, &po->operand[2]);
- fprintf(fout, " %s >>= %s; %s |= %s << (%d - %s);",
- buf1, buf3, buf1, buf2, l, buf3);
- strcpy(g_comment, "shrd");
+ if (po->operand[2].type != OPT_CONST) {
+ // no handling for "undefined" case, hopefully not needed
+ snprintf(buf2, sizeof(buf2), "(%s & 0x1f)", buf3);
+ strcpy(buf3, buf2);
+ }
+ out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1]);
+ out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]);
+ if (po->op == OP_SHLD) {
+ fprintf(fout, " %s <<= %s; %s |= %s >> (%d - %s);",
+ buf1, buf3, buf1, buf2, l, buf3);
+ strcpy(g_comment, "shld");
+ }
+ else {
+ fprintf(fout, " %s >>= %s; %s |= %s << (%d - %s);",
+ buf1, buf3, buf1, buf2, l, buf3);
+ strcpy(g_comment, "shrd");
+ }
output_std_flags(fout, po, &pfomask, buf1);
last_arith_dst = &po->operand[0];
delayed_flag_op = NULL;
@@ -5152,9 +6869,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]));
@@ -5175,7 +6896,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
fprintf(fout, " cond_c = tmp64 >> 32;\n");
fprintf(fout, " %s = (u32)tmp64;",
out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]));
- strcat(g_comment, "add64");
+ strcat(g_comment, " add64");
}
else {
fprintf(fout, " cond_c = ((u32)%s + %s) >> %d;\n",
@@ -5190,6 +6911,12 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
delayed_flag_op = NULL;
break;
}
+ if (pfomask & (1 << PFO_LE)) {
+ out_cmp_for_cc(buf1, sizeof(buf1), po, PFO_LE, 0, 1);
+ fprintf(fout, " cond_%s = %s;\n",
+ parsed_flag_op_names[PFO_LE], buf1);
+ pfomask &= ~(1 << PFO_LE);
+ }
goto dualop_arith;
case OP_SUB:
@@ -5202,7 +6929,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
if (j == PFO_Z || j == PFO_S)
continue;
- out_cmp_for_cc(buf1, sizeof(buf1), po, j, 0);
+ out_cmp_for_cc(buf1, sizeof(buf1), po, j, 0, 0);
fprintf(fout, " cond_%s = %s;\n",
parsed_flag_op_names[j], buf1);
pfomask &= ~(1 << j);
@@ -5233,15 +6960,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:
@@ -5252,7 +6984,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
if (j == PFO_Z || j == PFO_S || j == PFO_C)
continue;
- out_cmp_for_cc(buf1, sizeof(buf1), po, j, 0);
+ out_cmp_for_cc(buf1, sizeof(buf1), po, j, 0, 0);
fprintf(fout, " cond_%s = %s;\n",
parsed_flag_op_names[j], buf1);
pfomask &= ~(1 << j);
@@ -5286,10 +7018,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:
@@ -5327,34 +7060,51 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
case OP_DIV:
case OP_IDIV:
assert_operand_cnt(1);
- if (po->operand[0].lmod != OPLM_DWORD)
- ferr(po, "unhandled lmod %d\n", po->operand[0].lmod);
-
out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]);
- strcpy(buf2, lmod_cast(po, po->operand[0].lmod,
+ strcpy(cast, lmod_cast(po, po->operand[0].lmod,
po->op == OP_IDIV));
switch (po->operand[0].lmod) {
case OPLM_DWORD:
if (po->flags & OPF_32BIT)
- snprintf(buf3, sizeof(buf3), "%seax", buf2);
+ snprintf(buf2, sizeof(buf2), "%seax", cast);
else {
fprintf(fout, " tmp64 = ((u64)edx << 32) | eax;\n");
- snprintf(buf3, sizeof(buf3), "%stmp64",
+ snprintf(buf2, sizeof(buf2), "%stmp64",
(po->op == OP_IDIV) ? "(s64)" : "");
}
if (po->operand[0].type == OPT_REG
&& po->operand[0].reg == xDX)
{
- fprintf(fout, " eax = %s / %s%s;", buf3, buf2, buf1);
- fprintf(fout, " edx = %s %% %s%s;\n", buf3, buf2, buf1);
+ fprintf(fout, " eax = %s / %s%s;\n", buf2, cast, buf1);
+ fprintf(fout, " edx = %s %% %s%s;", buf2, cast, buf1);
+ }
+ else {
+ fprintf(fout, " edx = %s %% %s%s;\n", buf2, cast, buf1);
+ fprintf(fout, " eax = %s / %s%s;", buf2, cast, buf1);
+ }
+ break;
+ case OPLM_WORD:
+ fprintf(fout, " tmp = (edx << 16) | (eax & 0xffff);\n");
+ snprintf(buf2, sizeof(buf2), "%stmp",
+ (po->op == OP_IDIV) ? "(s32)" : "");
+ if (po->operand[0].type == OPT_REG
+ && po->operand[0].reg == xDX)
+ {
+ fprintf(fout, " LOWORD(eax) = %s / %s%s;\n",
+ buf2, cast, buf1);
+ fprintf(fout, " LOWORD(edx) = %s %% %s%s;",
+ buf2, cast, buf1);
}
else {
- fprintf(fout, " edx = %s %% %s%s;\n", buf3, buf2, buf1);
- fprintf(fout, " eax = %s / %s%s;", buf3, buf2, buf1);
+ fprintf(fout, " LOWORD(edx) = %s %% %s%s;\n",
+ buf2, cast, buf1);
+ fprintf(fout, " LOWORD(eax) = %s / %s%s;",
+ buf2, cast, buf1);
}
+ strcat(g_comment, " div16");
break;
default:
- ferr(po, "unhandled division type\n");
+ ferr(po, "unhandled div lmod %d\n", po->operand[0].lmod);
}
last_arith_dst = NULL;
delayed_flag_op = NULL;
@@ -5391,7 +7141,13 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
case OP_JECXZ:
fprintf(fout, " if (ecx == 0)\n");
fprintf(fout, " goto %s;", po->operand[0].name);
- strcat(g_comment, "jecxz");
+ strcat(g_comment, " jecxz");
+ break;
+
+ case OP_LOOP:
+ fprintf(fout, " if (--ecx != 0)\n");
+ fprintf(fout, " goto %s;", po->operand[0].name);
+ strcat(g_comment, " loop");
break;
case OP_JMP:
@@ -5431,7 +7187,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
fprintf(fout, "%s%s = %s;\n", buf3, pp->name,
out_src_opr(buf1, sizeof(buf1), po, &po->operand[0],
"(void *)", 0));
- if (pp->is_unresolved)
+ if (pp->is_unresolved || IS_START(pp->name, "i_guess"))
fprintf(fout, "%sunresolved_call(\"%s:%d\", %s);\n",
buf3, asmfn, po->asmln, pp->name);
}
@@ -5444,17 +7200,26 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
}
else if (!IS(pp->ret_type.name, "void")) {
if (po->flags & OPF_TAIL) {
- if (!IS(g_func_pp->ret_type.name, "void")) {
+ if (regmask_ret & mxAX) {
fprintf(fout, "return ");
if (g_func_pp->ret_type.is_ptr != pp->ret_type.is_ptr)
fprintf(fout, "(%s)", g_func_pp->ret_type.name);
}
+ else if (regmask_ret & mxST0)
+ ferr(po, "float tailcall\n");
}
- else if (regmask & (1 << xAX)) {
+ else if (po->regmask_dst & mxAX) {
fprintf(fout, "eax = ");
if (pp->ret_type.is_ptr)
fprintf(fout, "(u32)");
}
+ else if (po->regmask_dst & mxST0) {
+ ferr_assert(po, po->flags & OPF_FPUSH);
+ if (need_float_stack)
+ fprintf(fout, "f_st[--f_stp & 7] = ");
+ else
+ fprintf(fout, "f_st0 = ");
+ }
}
if (pp->name[0] == 0)
@@ -5463,10 +7228,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");
@@ -5504,6 +7272,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;
@@ -5517,10 +7292,29 @@ 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 (pp->arg[arg].type.is_64bit) {
+ ferr_assert(po, tmp_op->p_argpass == 0);
+ ferr_assert(po, !pp->arg[arg].is_saved);
+ ferr_assert(po, cast[0] == 0);
+ out_src_opr(buf1, sizeof(buf1),
+ tmp_op, &tmp_op->operand[0], cast, 0);
+ tmp_op = pp->arg[++arg].datap;
+ ferr_assert(po, tmp_op != NULL);
+ out_src_opr(buf2, sizeof(buf2),
+ tmp_op, &tmp_op->operand[0], cast, 0);
+ fprintf(fout, "((u64)(%s) << 32) | (%s)",
+ buf2, buf1);
+ }
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));
@@ -5552,21 +7346,22 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
ret = 0;
else if (IS(pp->ret_type.name, "void"))
ret = 1;
- else if (IS(g_func_pp->ret_type.name, "void"))
+ else if (!(regmask_ret & (1 << xAX)))
ret = 1;
// else already handled as 'return f()'
if (ret) {
- if (!IS(g_func_pp->ret_type.name, "void")) {
- ferr(po, "int func -> void func tailcall?\n");
- }
- else {
- fprintf(fout, "\n%sreturn;", buf3);
- strcat(g_comment, " ^ tailcall");
- }
+ fprintf(fout, "\n%sreturn;", buf3);
+ strcat(g_comment, " ^ tailcall");
}
else
strcat(g_comment, " tailcall");
+
+ if ((regmask_ret & (1 << xAX))
+ && IS(pp->ret_type.name, "void") && !pp->is_noreturn)
+ {
+ ferr(po, "int func -> void func tailcall?\n");
+ }
}
if (pp->is_noreturn)
strcat(g_comment, " noreturn");
@@ -5592,7 +7387,10 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
g_func_pp->arg[arg].reg, g_func_pp->arg[arg].reg);
}
- if (IS(g_func_pp->ret_type.name, "void")) {
+ if (regmask_ret & mxST0) {
+ fprintf(fout, " return %s;", float_st0);
+ }
+ else if (!(regmask_ret & mxAX)) {
if (i != opcnt - 1 || label_pending)
fprintf(fout, " return;");
}
@@ -5645,7 +7443,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
break;
}
else if (po->flags & OPF_PPUSH) {
- // push/pop graph
+ // push/pop graph / non-const
ferr_assert(po, po->datap == NULL);
fprintf(fout, " %s = pp_%s;", buf1, buf1);
break;
@@ -5671,9 +7469,348 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
no_output = 1;
break;
+ // pseudo ops
+ case OPP_ALLSHL:
+ case OPP_ALLSHR:
+ fprintf(fout, " tmp64 = ((u64)edx << 32) | eax;\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
+ ? " allshl" : " allshr");
+ break;
+
+ // x87
+ case OP_FLD:
+ if (need_float_stack) {
+ out_src_opr_float(buf1, sizeof(buf1),
+ po, &po->operand[0], 1);
+ if (po->regmask_src & mxSTa) {
+ fprintf(fout, " f_st[(f_stp - 1) & 7] = %s; f_stp--;",
+ buf1);
+ }
+ else
+ fprintf(fout, " f_st[--f_stp & 7] = %s;", buf1);
+ }
+ else {
+ if (po->flags & OPF_FSHIFT)
+ fprintf(fout, " f_st1 = f_st0;");
+ if (po->operand[0].type == OPT_REG
+ && po->operand[0].reg == xST0)
+ {
+ strcat(g_comment, " fld st");
+ break;
+ }
+ fprintf(fout, " f_st0 = %s;",
+ out_src_opr_float(buf1, sizeof(buf1),
+ po, &po->operand[0], 0));
+ }
+ strcat(g_comment, " fld");
+ break;
+
+ case OP_FILD:
+ out_src_opr(buf1, sizeof(buf1), po, &po->operand[0],
+ lmod_cast(po, po->operand[0].lmod, 1), 0);
+ snprintf(buf2, sizeof(buf2), "(%s)%s", float_type, buf1);
+ if (need_float_stack) {
+ fprintf(fout, " f_st[--f_stp & 7] = %s;", buf2);
+ }
+ else {
+ if (po->flags & OPF_FSHIFT)
+ fprintf(fout, " f_st1 = f_st0;");
+ fprintf(fout, " f_st0 = %s;", buf2);
+ }
+ strcat(g_comment, " fild");
+ break;
+
+ case OP_FLDc:
+ if (need_float_stack)
+ fprintf(fout, " f_st[--f_stp & 7] = ");
+ else {
+ if (po->flags & OPF_FSHIFT)
+ fprintf(fout, " f_st1 = f_st0;");
+ fprintf(fout, " f_st0 = ");
+ }
+ switch (po->operand[0].val) {
+ case X87_CONST_1: fprintf(fout, "1.0;"); break;
+ case X87_CONST_LN2: fprintf(fout, "0.693147180559945;"); break;
+ case X87_CONST_Z: fprintf(fout, "0.0;"); break;
+ default: ferr(po, "TODO\n"); break;
+ }
+ break;
+
+ case OP_FST:
+ 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++;");
+ else
+ fprintf(fout, " f_st0 = f_st1;");
+ }
+ if (dead_dst && !(po->flags & OPF_FSHIFT))
+ no_output = 1;
+ else
+ strcat(g_comment, " fst");
+ break;
+
+ case OP_FIST:
+ fprintf(fout, " %s = %s%s;",
+ out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]),
+ lmod_cast(po, po->operand[0].lmod, 1), float_st0);
+ if (po->flags & OPF_FSHIFT) {
+ if (need_float_stack)
+ fprintf(fout, " f_stp++;");
+ else
+ fprintf(fout, " f_st0 = f_st1;");
+ }
+ strcat(g_comment, " fist");
+ break;
+
+ case OP_FADD:
+ case OP_FDIV:
+ case OP_FMUL:
+ case OP_FSUB:
+ out_dst_opr_float(buf1, sizeof(buf1), po, &po->operand[0],
+ need_float_stack);
+ out_src_opr_float(buf2, sizeof(buf2), po, &po->operand[1],
+ need_float_stack);
+ dead_dst = (po->flags & OPF_FPOP)
+ && po->operand[0].type == OPT_REG
+ && po->operand[0].reg == xST0;
+ switch (po->op) {
+ case OP_FADD: j = '+'; break;
+ case OP_FDIV: j = '/'; break;
+ case OP_FMUL: j = '*'; break;
+ case OP_FSUB: j = '-'; break;
+ default: j = 'x'; break;
+ }
+ if (need_float_stack) {
+ if (!dead_dst)
+ fprintf(fout, " %s %c= %s;", buf1, j, buf2);
+ if (po->flags & OPF_FSHIFT)
+ fprintf(fout, " f_stp++;");
+ }
+ else {
+ if (po->flags & OPF_FSHIFT) {
+ // note: assumes only 2 regs handled
+ if (!dead_dst)
+ fprintf(fout, " f_st0 = f_st1 %c f_st0;", j);
+ else
+ fprintf(fout, " f_st0 = f_st1;");
+ }
+ else if (!dead_dst)
+ fprintf(fout, " %s %c= %s;", buf1, j, buf2);
+ }
+ no_output = (dead_dst && !(po->flags & OPF_FSHIFT));
+ break;
+
+ case OP_FDIVR:
+ case OP_FSUBR:
+ out_dst_opr_float(buf1, sizeof(buf1), po, &po->operand[0],
+ need_float_stack);
+ out_src_opr_float(buf2, sizeof(buf2), po, &po->operand[1],
+ need_float_stack);
+ out_src_opr_float(buf3, sizeof(buf3), po, &po->operand[0],
+ need_float_stack);
+ dead_dst = (po->flags & OPF_FPOP)
+ && po->operand[0].type == OPT_REG
+ && po->operand[0].reg == xST0;
+ j = po->op == OP_FDIVR ? '/' : '-';
+ if (need_float_stack) {
+ if (!dead_dst)
+ fprintf(fout, " %s = %s %c %s;", buf1, buf2, j, buf3);
+ if (po->flags & OPF_FSHIFT)
+ fprintf(fout, " f_stp++;");
+ }
+ else {
+ if (po->flags & OPF_FSHIFT) {
+ if (!dead_dst)
+ fprintf(fout, " f_st0 = f_st0 %c f_st1;", j);
+ else
+ fprintf(fout, " f_st0 = f_st1;");
+ }
+ else if (!dead_dst)
+ fprintf(fout, " %s = %s %c %s;", buf1, buf2, j, buf3);
+ }
+ no_output = (dead_dst && !(po->flags & OPF_FSHIFT));
+ break;
+
+ case OP_FIADD:
+ case OP_FIDIV:
+ case OP_FIMUL:
+ case OP_FISUB:
+ switch (po->op) {
+ case OP_FIADD: j = '+'; break;
+ case OP_FIDIV: j = '/'; break;
+ case OP_FIMUL: j = '*'; break;
+ case OP_FISUB: j = '-'; break;
+ default: j = 'x'; break;
+ }
+ fprintf(fout, " %s %c= (%s)%s;", float_st0,
+ j, float_type,
+ out_src_opr(buf1, sizeof(buf1), po, &po->operand[0],
+ lmod_cast(po, po->operand[0].lmod, 1), 0));
+ break;
+
+ case OP_FIDIVR:
+ case OP_FISUBR:
+ fprintf(fout, " %s = %s %c %s;", float_st0,
+ out_src_opr_float(buf2, sizeof(buf2), po, &po->operand[1],
+ need_float_stack),
+ po->op == OP_FIDIVR ? '/' : '-', float_st0);
+ break;
+
+ case OP_FCOM: {
+ int mask, z_check;
+ ferr_assert(po, po->datap != NULL);
+ mask = (long)po->datap & 0xffff;
+ z_check = ((long)po->datap >> 16) & 1;
+ out_src_opr_float(buf1, sizeof(buf1), po, &po->operand[0],
+ need_float_stack);
+ if (mask == 0x0100 || mask == 0x0500) { // C0 -> <
+ fprintf(fout, " f_sw = %s < %s ? 0x0100 : 0;",
+ float_st0, buf1);
+ }
+ else if (mask == 0x4000 || mask == 0x4400) { // C3 -> =
+ fprintf(fout, " f_sw = %s == %s ? 0x4000 : 0;",
+ float_st0, buf1);
+ }
+ else if (mask == 0x4100) { // C3, C0
+ if (z_check) {
+ fprintf(fout, " f_sw = %s <= %s ? 0x4100 : 0;",
+ float_st0, buf1);
+ strcat(g_comment, " z_chk_det");
+ }
+ else {
+ fprintf(fout, " f_sw = %s == %s ? 0x4000 : "
+ "(%s < %s ? 0x0100 : 0);",
+ float_st0, buf1, float_st0, buf1);
+ }
+ }
+ else
+ ferr(po, "unhandled sw mask: %x\n", mask);
+ if (po->flags & OPF_FSHIFT) {
+ if (need_float_stack) {
+ if (po->flags & OPF_FPOPP)
+ fprintf(fout, " f_stp += 2;");
+ else
+ fprintf(fout, " f_stp++;");
+ }
+ else {
+ ferr_assert(po, !(po->flags & OPF_FPOPP));
+ fprintf(fout, " f_st0 = f_st1;");
+ }
+ }
+ break;
+ }
+
+ case OP_FNSTSW:
+ fprintf(fout, " %s = f_sw;",
+ out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]));
+ break;
+
+ case OP_FCHS:
+ fprintf(fout, " %s = -%s;", float_st0, float_st0);
+ break;
+
+ case OP_FCOS:
+ fprintf(fout, " %s = cos%s(%s);", float_st0,
+ need_double ? "" : "f", float_st0);
+ break;
+
+ case OP_FPATAN:
+ if (need_float_stack) {
+ fprintf(fout, " %s = atan%s(%s / %s);", float_st1,
+ need_double ? "" : "f", float_st1, float_st0);
+ fprintf(fout, " f_stp++;");
+ }
+ else {
+ fprintf(fout, " f_st0 = atan%s(f_st1 / f_st0);",
+ need_double ? "" : "f");
+ }
+ break;
+
+ case OP_FYL2X:
+ if (need_float_stack) {
+ fprintf(fout, " %s = %s * log2%s(%s);", float_st1,
+ float_st1, need_double ? "" : "f", float_st0);
+ fprintf(fout, " f_stp++;");
+ }
+ else {
+ fprintf(fout, " f_st0 = f_st1 * log2%s(f_st0);",
+ need_double ? "" : "f");
+ }
+ strcat(g_comment, " fyl2x");
+ break;
+
+ case OP_FSIN:
+ fprintf(fout, " %s = sin%s(%s);", float_st0,
+ need_double ? "" : "f", float_st0);
+ break;
+
+ case OP_FSQRT:
+ fprintf(fout, " %s = sqrt%s(%s);", float_st0,
+ need_double ? "" : "f", float_st0);
+ break;
+
+ case OP_FXCH:
+ dead_dst = po->operand[0].type == OPT_REG
+ && po->operand[0].reg == xST0;
+ if (!dead_dst) {
+ out_src_opr_float(buf1, sizeof(buf1), po, &po->operand[0],
+ need_float_stack);
+ fprintf(fout, " { %s t = %s; %s = %s; %s = t; }", float_type,
+ float_st0, float_st0, buf1, buf1);
+ strcat(g_comment, " fxch");
+ }
+ else
+ no_output = 1;
+ break;
+
+ case OPP_FTOL:
+ ferr_assert(po, po->flags & OPF_32BIT);
+ fprintf(fout, " eax = (s32)%s;", float_st0);
+ if (po->flags & OPF_FSHIFT) {
+ if (need_float_stack)
+ fprintf(fout, " f_stp++;");
+ else
+ fprintf(fout, " f_st0 = f_st1;");
+ }
+ 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:
@@ -5721,7 +7858,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)
@@ -5790,10 +7928,13 @@ static struct scanned_var {
} *hg_vars;
static int hg_var_cnt;
+static char **hg_refs;
+static int hg_ref_cnt;
+
static void output_hdr_fp(FILE *fout, const struct func_prototype *fp,
int count);
-struct func_prototype *hg_fp_add(const char *funcn)
+static struct func_prototype *hg_fp_add(const char *funcn)
{
struct func_prototype *fp;
@@ -5855,6 +7996,19 @@ static int hg_fp_cmp_id(const void *p1_, const void *p2_)
}
#endif
+static void hg_ref_add(const char *name)
+{
+ if ((hg_ref_cnt & 0xff) == 0) {
+ hg_refs = realloc(hg_refs, sizeof(hg_refs[0]) * (hg_ref_cnt + 0x100));
+ my_assert_not(hg_refs, NULL);
+ memset(hg_refs + hg_ref_cnt, 0, sizeof(hg_refs[0]) * 0x100);
+ }
+
+ hg_refs[hg_ref_cnt] = strdup(name);
+ my_assert_not(hg_refs[hg_ref_cnt], NULL);
+ hg_ref_cnt++;
+}
+
// recursive register dep pass
// - track saved regs (part 2)
// - try to figure out arg-regs
@@ -5866,7 +8020,6 @@ static void gen_hdr_dep_pass(int i, int opcnt, unsigned char *cbits,
struct func_proto_dep *dep;
struct parsed_op *po;
int from_caller = 0;
- int depth;
int j, l;
int reg;
int ret;
@@ -5880,6 +8033,9 @@ static void gen_hdr_dep_pass(int i, int opcnt, unsigned char *cbits,
po = &ops[i];
if ((po->flags & OPF_JMP) && po->op != OP_CALL) {
+ if (po->flags & OPF_RMD)
+ continue;
+
if (po->btj != NULL) {
// jumptable
for (j = 0; j < po->btj->count; j++) {
@@ -5906,8 +8062,7 @@ static void gen_hdr_dep_pass(int i, int opcnt, unsigned char *cbits,
else if (po->op == OP_PUSH && po->operand[0].type == OPT_REG)
{
reg = po->operand[0].reg;
- if (reg < 0)
- ferr(po, "reg not set for push?\n");
+ ferr_assert(po, reg >= 0);
if (po->flags & OPF_RSAVE) {
regmask_save |= 1 << reg;
@@ -5916,14 +8071,11 @@ static void gen_hdr_dep_pass(int i, int opcnt, unsigned char *cbits,
if (po->flags & OPF_DONE)
continue;
- depth = 0;
- ret = scan_for_pop(i + 1, opcnt,
- po->operand[0].name, i + opcnt * 2, 0, &depth, 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,
- po->operand[0].name, i + opcnt * 3, 0, &depth, 1);
+ scan_for_pop(i + 1, opcnt, i + opcnt * 3, reg, 0, 0, OPF_RMD);
continue;
}
}
@@ -5933,8 +8085,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) {
@@ -5954,9 +8109,7 @@ static void gen_hdr_dep_pass(int i, int opcnt, unsigned char *cbits,
ret = 1;
}
else {
- struct parsed_opr opr = { 0, };
- opr.type = OPT_REG;
- opr.reg = xAX;
+ struct parsed_opr opr = OPR_INIT(OPT_REG, OPLM_DWORD, xAX);
j = -1;
from_caller = 0;
ret = resolve_origin(i, &opr, i + opcnt * 4, &j, &from_caller);
@@ -5999,7 +8152,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;
@@ -6021,6 +8173,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
@@ -6029,7 +8182,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
@@ -6068,7 +8221,7 @@ static void gen_hdr(const char *funcn, int opcnt)
continue;
if (po->op == OP_PUSH && po->operand[0].type == OPT_CONST)
- scan_for_pop_const(i, opcnt, ®mask_dummy);
+ scan_for_pop_const(i, opcnt, i + opcnt * 13);
}
// pass5:
@@ -6085,7 +8238,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;
}
@@ -6096,7 +8249,7 @@ static void gen_hdr(const char *funcn, int opcnt)
patch_esp_adjust(&ops[j], pp->argc_stack * 4);
else {
for (l = 0; l < pp->argc_stack; l++)
- ops[j + l].flags |= OPF_DONE | OPF_RMD;
+ ops[j + l].flags |= OPF_DONE | OPF_RMD | OPF_NOREGS;
}
}
@@ -6114,23 +8267,24 @@ static void gen_hdr(const char *funcn, int opcnt)
if (po->flags & (OPF_RMD|OPF_DONE))
continue;
- if (po->op == OP_PUSH && po->operand[0].type == OPT_REG)
+ if (po->op == OP_PUSH && po->operand[0].type == OPT_REG
+ && po->operand[0].reg != xCX)
{
- ret = scan_for_pop_ret(i + 1, opcnt, po->operand[0].name, 0);
- if (ret == 0) {
+ ret = scan_for_pop_ret(i + 1, opcnt, po->operand[0].reg, 0);
+ if (ret == 1) {
// regmask_save |= 1 << po->operand[0].reg; // do it later
po->flags |= OPF_RSAVE | OPF_RMD | OPF_DONE;
- scan_for_pop_ret(i + 1, opcnt, po->operand[0].name, OPF_RMD);
+ scan_for_pop_ret(i + 1, opcnt, po->operand[0].reg, OPF_RMD);
}
}
- else if (po->op == OP_CALL && !(po->flags & OPF_DONE))
+ else if (po->op == OP_CALL)
{
pp = process_call(i, 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);
}
}
}
@@ -6148,7 +8302,14 @@ static void gen_hdr(const char *funcn, int opcnt)
if (cbits[i >> 3] & (1 << (i & 7)))
continue;
- if (ops[i].op != OP_NOP)
+ if (g_labels[i] == NULL && i > 0 && ops[i - 1].op == OP_CALL
+ && ops[i - 1].pp != NULL && ops[i - 1].pp->is_osinc)
+ {
+ // the compiler sometimes still generates code after
+ // noreturn OS functions
+ break;
+ }
+ if (ops[i].op != OP_NOP && ops[i].op != OPP_ABORT)
ferr(&ops[i], "unreachable code\n");
}
@@ -6164,7 +8325,7 @@ static void gen_hdr(const char *funcn, int opcnt)
fp->argc_stack--;
}
- fp->regmask_dep = regmask_dep & ~(1 << xSP);
+ fp->regmask_dep = regmask_dep & ~((1 << xSP) | mxSTa);
fp->has_ret = has_ret;
#if 0
printf("// has_ret %d, regmask_dep %x\n",
@@ -6205,6 +8366,24 @@ static void hg_fp_resolve_deps(struct func_prototype *fp)
}
}
+// make all thiscall/edx arg functions referenced from .data fastcall
+static void do_func_refs_from_data(void)
+{
+ struct func_prototype *fp, fp_s;
+ int i;
+
+ for (i = 0; i < hg_ref_cnt; i++) {
+ strcpy(fp_s.name, hg_refs[i]);
+ fp = bsearch(&fp_s, hg_fp, hg_fp_cnt,
+ sizeof(hg_fp[0]), hg_fp_cmp_name);
+ if (fp == NULL)
+ continue;
+
+ if (fp->argc_stack != 0 && (fp->regmask_dep & (mxCX | mxDX)))
+ fp->regmask_dep |= mxCX | mxDX;
+ }
+}
+
static void output_hdr_fp(FILE *fout, const struct func_prototype *fp,
int count)
{
@@ -6212,7 +8391,7 @@ static void output_hdr_fp(FILE *fout, const struct func_prototype *fp,
char *p, namebuf[NAMELEN];
const char *name;
int regmask_dep;
- int argc_stack;
+ int argc_normal;
int j, arg;
for (; count > 0; count--, fp++) {
@@ -6250,18 +8429,25 @@ static void output_hdr_fp(FILE *fout, const struct func_prototype *fp,
}
regmask_dep = fp->regmask_dep;
- argc_stack = fp->argc_stack;
+ argc_normal = fp->argc_stack;
fprintf(fout, "%-5s", fp->pp ? fp->pp->ret_type.name :
(fp->has_ret ? "int" : "void"));
- if (regmask_dep && (fp->is_stdcall || argc_stack == 0)
- && (regmask_dep & ~((1 << xCX) | (1 << xDX))) == 0)
+ if (regmask_dep && (fp->is_stdcall || fp->argc_stack > 0)
+ && (regmask_dep & ~mxCX) == 0)
+ {
+ fprintf(fout, "/*__thiscall*/ ");
+ argc_normal++;
+ regmask_dep = 0;
+ }
+ else if (regmask_dep && (fp->is_stdcall || fp->argc_stack == 0)
+ && (regmask_dep & ~(mxCX | mxDX)) == 0)
{
fprintf(fout, " __fastcall ");
- if (!(regmask_dep & (1 << xDX)) && argc_stack == 0)
- argc_stack = 1;
+ if (!(regmask_dep & (1 << xDX)) && fp->argc_stack == 0)
+ argc_normal = 1;
else
- argc_stack += 2;
+ argc_normal += 2;
regmask_dep = 0;
}
else if (regmask_dep && !fp->is_stdcall) {
@@ -6291,7 +8477,7 @@ static void output_hdr_fp(FILE *fout, const struct func_prototype *fp,
}
}
- for (j = 0; j < argc_stack; j++) {
+ for (j = 0; j < argc_normal; j++) {
arg++;
if (arg != 1)
fprintf(fout, ", ");
@@ -6334,7 +8520,7 @@ static void output_hdr(FILE *fout)
fp->pp = &pp_cache[i];
fp->argc_stack = fp->pp->argc_stack;
fp->is_stdcall = fp->pp->is_stdcall;
- fp->regmask_dep = get_pp_arg_regmask(fp->pp);
+ fp->regmask_dep = get_pp_arg_regmask_src(fp->pp);
fp->has_ret = !IS(fp->pp->ret_type.name, "void");
}
@@ -6343,6 +8529,9 @@ static void output_hdr(FILE *fout)
for (i = 0; i < hg_fp_cnt; i++)
hg_fp_resolve_deps(&hg_fp[i]);
+ // adjust functions referenced from data segment
+ do_func_refs_from_data();
+
// note: messes up .proto ptr, don't use
//qsort(hg_fp, hg_fp_cnt, sizeof(hg_fp[0]), hg_fp_cmp_id);
@@ -6386,7 +8575,7 @@ static char *next_word_s(char *w, size_t wsize, char *s)
s = sskip(s);
i = 0;
- if (*s == '\'') {
+ if (*s == '\'' && s[1] != '\r' && s[1] != '\n') {
w[0] = s[0];
for (i = 1; i < wsize - 1; i++) {
if (s[i] == 0) {
@@ -6412,11 +8601,93 @@ static char *next_word_s(char *w, size_t wsize, char *s)
return s + i;
}
-static void scan_variables(FILE *fasm)
+static int cmpstringp(const void *p1, const void *p2)
+{
+ return strcmp(*(char * const *)p1, *(char * const *)p2);
+}
+
+static int is_xref_needed(char *p, char **rlist, int rlist_len)
+{
+ char *p2;
+
+ p = sskip(p);
+ if (strstr(p, "..."))
+ // unable to determine, assume needed
+ return 1;
+
+ if (*p == '.') // .text, .data, ...
+ // ref from other data or non-function -> no
+ return 0;
+
+ p2 = strpbrk(p, "+:\r\n\x18");
+ if (p2 != NULL)
+ *p2 = 0;
+ if (bsearch(&p, rlist, rlist_len, sizeof(rlist[0]), cmpstringp))
+ // referenced from removed code
+ return 0;
+
+ return 1;
+}
+
+static int ida_xrefs_show_need(FILE *fasm, char *p,
+ char **rlist, int rlist_len)
+{
+ int found_need = 0;
+ char line[256];
+ long pos;
+
+ p = strrchr(p, ';');
+ 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);
+ while (1)
+ {
+ if (!my_fgets(line, sizeof(line), fasm))
+ break;
+ // non-first line is always indented
+ if (!my_isblank(line[0]))
+ break;
+
+ // should be no content, just comment
+ p = sskip(line);
+ if (*p != ';')
+ break;
+
+ 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;
+
+ if (is_xref_needed(p, rlist, rlist_len)) {
+ found_need = 1;
+ break;
+ }
+ }
+ fseek(fasm, pos, SEEK_SET);
+ return found_need;
+}
+
+static void scan_variables(FILE *fasm, char **rlist, int rlist_len)
{
struct scanned_var *var;
char line[256] = { 0, };
- char words[3][256];
+ char words[4][256];
+ int no_identifier;
char *p = NULL;
int wordc;
int l;
@@ -6455,8 +8726,7 @@ static void scan_variables(FILE *fasm)
asmln++;
p = line;
- if (my_isblank(*p))
- continue;
+ no_identifier = my_isblank(*p);
p = sskip(p);
if (*p == 0 || *p == ';')
@@ -6476,11 +8746,21 @@ static void scan_variables(FILE *fasm)
if (wordc < 2)
continue;
+ if (no_identifier) {
+ if (wordc >= 3 && IS(words[0], "dd") && IS(words[1], "offset"))
+ hg_ref_add(words[2]);
+ continue;
+ }
+
if (IS_START(words[0], "__IMPORT_DESCRIPTOR_")) {
// when this starts, we don't need anything from this section
break;
}
+ // check refs comment(s)
+ if (!ida_xrefs_show_need(fasm, p, rlist, rlist_len))
+ continue;
+
if ((hg_var_cnt & 0xff) == 0) {
hg_vars = realloc(hg_vars, sizeof(hg_vars[0])
* (hg_var_cnt + 0x100));
@@ -6508,8 +8788,11 @@ static void scan_variables(FILE *fasm)
continue;
}
- if (IS(words[1], "dd"))
+ if (IS(words[1], "dd")) {
var->lmod = OPLM_DWORD;
+ if (wordc >= 4 && IS(words[2], "offset"))
+ hg_ref_add(words[3]);
+ }
else if (IS(words[1], "dw"))
var->lmod = OPLM_WORD;
else if (IS(words[1], "db")) {
@@ -6579,12 +8862,7 @@ static int cmp_chunks(const void *p1, const void *p2)
return strcmp(c1->name, c2->name);
}
-static int cmpstringp(const void *p1, const void *p2)
-{
- return strcmp(*(char * const *)p1, *(char * const *)p2);
-}
-
-static void scan_ahead(FILE *fasm)
+static void scan_ahead_for_chunks(FILE *fasm)
{
char words[2][256];
char line[256];
@@ -6665,7 +8943,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;
@@ -6684,6 +8963,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"))
@@ -6698,6 +8979,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",
@@ -6728,6 +9010,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);
@@ -6759,7 +9043,6 @@ int main(int argc, char *argv[])
}
rlist[rlist_len++] = strdup(words[0]);
}
- skip_func = 0;
fclose(frlist);
frlist = NULL;
@@ -6781,7 +9064,7 @@ int main(int argc, char *argv[])
}
if (g_header_mode)
- scan_variables(fasm);
+ scan_variables(fasm, rlist, rlist_len);
while (my_fgets(line, sizeof(line), fasm))
{
@@ -6835,6 +9118,46 @@ int main(int argc, char *argv[])
}
}
}
+ else if (p[2] == 's' && IS_START(p, "; sctattr:"))
+ {
+ static const char *attrs[] = {
+ "clear_sf",
+ "clear_regmask",
+ };
+
+ // parse manual attribute-list comment
+ g_sct_func_attr = 0;
+ p = sskip(p + 10);
+
+ for (; *p != 0; p = sskip(p)) {
+ for (i = 0; i < ARRAY_SIZE(attrs); i++) {
+ if (!strncmp(p, attrs[i], strlen(attrs[i]))) {
+ g_sct_func_attr |= 1 << i;
+ p += strlen(attrs[i]);
+ break;
+ }
+ }
+ if (*p == '=') {
+ j = ret = 0;
+ if (i == 0)
+ // clear_sf=start,len (in dwords)
+ ret = sscanf(p, "=%d,%d%n", &g_stack_clear_start,
+ &g_stack_clear_len, &j);
+ else if (i == 1)
+ // clear_regmask=
+ ret = sscanf(p, "=%x%n", &g_regmask_init, &j) + 1;
+ if (ret < 2) {
+ anote("unparsed attr value: %s\n", p);
+ break;
+ }
+ p += j;
+ }
+ else if (i == ARRAY_SIZE(attrs)) {
+ anote("unparsed sct attr: %s\n", p);
+ break;
+ }
+ }
+ }
else if (p[2] == 'S' && IS_START(p, "; START OF FUNCTION CHUNK FOR "))
{
p += 30;
@@ -6878,9 +9201,9 @@ int main(int argc, char *argv[])
unsigned long addr = strtoul(p, NULL, 16);
unsigned long f_addr = strtoul(g_func + 4, NULL, 16);
if (addr > f_addr && !scanned_ahead) {
- anote("scan_ahead caused by '%s', addr %lx\n",
- g_func, addr);
- scan_ahead(fasm);
+ //anote("scan_ahead caused by '%s', addr %lx\n",
+ // g_func, addr);
+ scan_ahead_for_chunks(fasm);
scanned_ahead = 1;
func_chunks_sorted = 0;
}
@@ -6902,7 +9225,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);
@@ -6918,6 +9246,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) {
@@ -6986,7 +9328,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++;
}
@@ -7003,9 +9345,14 @@ do_pending_endp:
pending_endp = 0;
in_func = 0;
g_ida_func_attr = 0;
+ g_sct_func_attr = 0;
+ g_stack_clear_start = 0;
+ g_stack_clear_len = 0;
+ g_regmask_init = 0;
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) {
@@ -7024,6 +9371,7 @@ do_pending_endp:
pd->d = NULL;
}
g_func_pd_cnt = 0;
+ g_func_lmods = 0;
pd = NULL;
if (end)
@@ -7052,9 +9400,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;
@@ -7119,7 +9469,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]);
@@ -7158,7 +9508,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;
}
@@ -7168,11 +9518,8 @@ do_pending_endp:
parse_op(&ops[pi], words, wordc);
- if (sctproto != NULL) {
- if (ops[pi].op == OP_CALL || ops[pi].op == OP_JMP)
- ops[pi].datap = sctproto;
- sctproto = NULL;
- }
+ ops[pi].datap = sctproto;
+ sctproto = NULL;
pi++;
}