X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Ftranslate.c;h=d80d32bece13d636392d72a946be8dac8f2a6afe;hb=b2bd20c04cbabc101db5bfdf35bb9f5fd5aebe33;hp=b18650d57a0f3cccabe3ae876f7d47e98ebe7ec3;hpb=30c8c549ab171e7682e6426f2757dc08faaa9e33;p=ia32rtools.git diff --git a/tools/translate.c b/tools/translate.c index b18650d..d80d32b 100644 --- a/tools/translate.c +++ b/tools/translate.c @@ -13,6 +13,7 @@ #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) @@ -41,7 +42,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 */ @@ -57,6 +58,8 @@ enum op_flags { OPF_LOCK = (1 << 17), /* op has lock prefix */ 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 */ }; enum op_op { @@ -71,6 +74,7 @@ enum op_op { OP_MOVSX, OP_XCHG, OP_NOT, + OP_XLAT, OP_CDQ, OP_LODS, OP_STOS, @@ -88,6 +92,7 @@ enum op_op { OP_SHL, OP_SHR, OP_SAR, + OP_SHLD, OP_SHRD, OP_ROL, OP_ROR, @@ -108,6 +113,7 @@ enum op_op { OP_CALL, OP_JMP, OP_JECXZ, + OP_LOOP, OP_JCC, OP_SCC, // x87 @@ -135,12 +141,18 @@ 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 @@ -148,7 +160,6 @@ struct parsed_opr { unsigned int size_lt:1; // type override is larger than C unsigned int had_ds:1; // had ds: prefix const struct parsed_proto *pp; // for OPT_LABEL - int reg; unsigned int val; char name[NAMELEN]; }; @@ -176,9 +187,10 @@ struct parsed_op { }; // datap: -// OP_CALL - parser proto hint (str) +// OP_CALL - parser proto hint (str) // (OPF_CC) - points to one of (OPF_FLAGS) that affects cc op -// OP_POP - points to OP_PUSH in push/pop pair +// OP_PUSH - points to OP_POP in complex push/pop graph +// OP_POP - points to OP_PUSH in simple push/pop pair struct parsed_equ { char name[64]; @@ -240,8 +252,8 @@ static int g_quiet_pp; static int g_header_mode; #define ferr(op_, fmt, ...) do { \ - printf("%s:%d: error: [%s] '%s': " fmt, asmfn, (op_)->asmln, g_func, \ - dump_op(op_), ##__VA_ARGS__); \ + printf("%s:%d: error %u: [%s] '%s': " fmt, asmfn, (op_)->asmln, \ + __LINE__, g_func, dump_op(op_), ##__VA_ARGS__); \ fcloseall(); \ exit(1); \ } while (0) @@ -250,8 +262,7 @@ 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[] = { @@ -506,19 +517,19 @@ static const char *parse_stack_el(const char *name, char *extra_reg, 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; } @@ -840,6 +851,7 @@ 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 }, { "lodsb",OP_LODS, 0, 0, OPF_DATA }, { "lodsw",OP_LODS, 0, 0, OPF_DATA }, @@ -867,6 +879,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 }, @@ -888,6 +901,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 @@ -1069,6 +1083,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], xDX, 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); @@ -1112,15 +1133,23 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc) 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 @@ -1176,7 +1205,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; @@ -1188,7 +1217,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,6 +1234,17 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc) default: break; } + + if (op->operand[0].type == OPT_REG + && op->operand[0].lmod == OPLM_DWORD + && op->operand[1].type == OPT_CONST) + { + if ((op->op == OP_AND && op->operand[1].val == 0) + || (op->op == OP_OR && op->operand[1].val == ~0)) + { + op->regmask_src = 0; + } + } } static const char *op_name(struct parsed_op *po) @@ -2127,66 +2167,60 @@ 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 \ && ops[_i].op != OP_CALL)) -static int scan_for_pop(int i, int opcnt, const char *reg, - int magic, int depth, int *maxdepth, int do_flags) +#define check_i(po, i) \ + if ((i) < 0) \ + ferr(po, "bad " #i ": %d\n", i) + +// note: this skips over calls and rm'd stuff assuming they're handled +// so it's intended to use at one of final passes +static int scan_for_pop(int i, int opcnt, int magic, int reg, + int depth, int flags_set) { - 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) + // assume no stack cleanup for noreturn + return 1; } return -1; // deadend } - 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) { if (po->btj != NULL) { // jumptable for (j = 0; j < po->btj->count; j++) { - ret |= scan_for_pop(po->btj->d[j].bt_i, opcnt, reg, magic, - depth, maxdepth, do_flags); + check_i(po, po->btj->d[j].bt_i); + ret |= scan_for_pop(po->btj->d[j].bt_i, opcnt, magic, reg, + depth, flags_set); if (ret < 0) return ret; // dead end } return ret; } - if (po->bt_i < 0) { - ferr(po, "dead branch\n"); - return -1; - } - + 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, flags_set); if (ret < 0) return ret; // dead end } @@ -2196,88 +2230,339 @@ 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; + return -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; + 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_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; + + 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; + } + + // nothing interesting on this path + return 0; +} + +static void find_reachable_exits(int i, int opcnt, int magic, + int *exits, int *exit_count) +{ + struct parsed_op *po; int j; - for (; i < opcnt; i++) { - if (!(ops[i].flags & OPF_TAIL)) + for (; i < opcnt; i++) + { + po = &ops[i]; + if (po->cc_scratch == magic) + return; + po->cc_scratch = magic; + + if (po->flags & OPF_TAIL) { + ferr_assert(po, *exit_count < MAX_EXITS); + exits[*exit_count] = i; + (*exit_count)++; + return; + } + + if ((po->flags & OPF_JMP) && po->op != OP_CALL) { + if (po->flags & OPF_RMD) + continue; + + 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; + } + + 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 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++) { + ret = scan_for_rsave_pop_reg(exits[j], i + opcnt * 16 + set_flags, + reg, set_flags); + if (ret == -1) + return -1; + } + + return 1; +} + +// 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; - for (j = i - 1; j >= 0; j--) { - if (ops[j].flags & (OPF_RMD|OPF_DONE)) + if (po->flags & OPF_JMP) { + if (po->flags & OPF_RMD) continue; - if (ops[j].flags & OPF_JMP) + if (po->op == OP_CALL) return -1; - 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; + 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 (g_labels[j] != NULL) + 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 found ? 0 : -1; + return -1; } -static void scan_for_pop_const(int i, int opcnt) +static void scan_for_pop_const(int i, int opcnt, int magic) { - int j; + int ret; - for (j = i + 1; j < opcnt; j++) { - if ((ops[j].flags & (OPF_JMP|OPF_TAIL|OPF_RSAVE)) - || ops[j].op == OP_PUSH || g_labels[i] != NULL) - { - break; + 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; } + } - if (ops[j].op == OP_POP && !(ops[j].flags & (OPF_RMD|OPF_DONE))) - { - ops[i].flags |= OPF_RMD | OPF_DONE; - ops[j].flags |= OPF_DONE; - ops[j].datap = &ops[i]; + 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); } } } @@ -2299,16 +2584,16 @@ static void scan_propagate_df(int i, int opcnt) if (po->flags & OPF_JMP) { if (po->btj != NULL) { // jumptable - for (j = 0; j < po->btj->count; j++) + for (j = 0; j < po->btj->count; j++) { + check_i(po, po->btj->d[j].bt_i); scan_propagate_df(po->btj->d[j].bt_i, opcnt); + } return; } - if (po->bt_i < 0) { - ferr(po, "dead branch\n"); - 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); else @@ -2328,30 +2613,64 @@ static void scan_propagate_df(int i, int opcnt) ferr(po, "missing DF clear?\n"); } -// is operand 'opr' modified by parsed_op 'po'? -static int is_opr_modified(const struct parsed_opr *opr, +// is operand 'opr' referenced by parsed_op 'po'? +static int is_opr_referenced(const struct parsed_opr *opr, const struct parsed_op *po) { - int mask; - - if ((po->flags & OPF_RMD) || !(po->flags & OPF_DATA)) - return 0; + int i, mask; + + if (opr->type == OPT_REG) { + mask = po->regmask_dst | po->regmask_src; + if (po->op == OP_CALL) + mask |= (1 << xAX) | (1 << xCX) | (1 << xDX); + if ((1 << opr->reg) & mask) + return 1; + else + return 0; + } + + for (i = 0; i < po->operand_cnt; i++) + if (IS(po->operand[0].name, opr->name)) + return 1; + + return 0; +} + +// is operand 'opr' read by parsed_op 'po'? +static int is_opr_read(const struct parsed_opr *opr, + const struct parsed_op *po) +{ + if (opr->type == OPT_REG) { + if (po->regmask_src & (1 << opr->reg)) + return 1; + else + return 0; + } + + // yes I'm lazy + return 0; +} + +// is operand 'opr' modified by parsed_op 'po'? +static int is_opr_modified(const struct parsed_opr *opr, + const struct parsed_op *po) +{ + int mask; 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); @@ -2417,10 +2736,6 @@ static int scan_for_mod_opr0(struct parsed_op *po_test, return -1; } -#define check_i(po, i) \ - if ((i) < 0) \ - ferr(po, "bad " #i ": %d\n", i) - static int scan_for_flag_set(int i, int magic, int *branched, int *setters, int *setter_cnt) { @@ -2429,8 +2744,9 @@ static int scan_for_flag_set(int i, int magic, int *branched, 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; @@ -2543,10 +2859,16 @@ static void patch_esp_adjust(struct parsed_op *po, int adj) static int scan_for_esp_adjust(int i, int opcnt, int adj_expect, int *adj, int *is_multipath, int do_update) { + int adj_expect_unknown = 0; struct parsed_op *po; int first_pop = -1; + int adj_best = 0; *adj = *is_multipath = 0; + if (adj_expect < 0) { + adj_expect_unknown = 1; + adj_expect = 32 * 4; // enough? + } for (; i < opcnt && *adj < adj_expect; i++) { if (g_labels[i] != NULL) @@ -2586,10 +2908,12 @@ 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); + if (*adj > adj_best) + adj_best = *adj; } else if (po->flags & (OPF_JMP|OPF_TAIL)) { if (po->op == OP_JMP && po->btj == NULL) { @@ -2604,12 +2928,15 @@ static int scan_for_esp_adjust(int i, int opcnt, break; if (po->pp != NULL && po->pp->is_stdcall) break; + if (adj_expect_unknown && first_pop >= 0) + break; // assume it's another cdecl call } } if (first_pop >= 0) { - // probably 'pop ecx' was used.. + // probably only 'pop ecx' was used + *adj = adj_best; return first_pop; } @@ -2714,7 +3041,8 @@ static const struct parsed_proto *try_recover_pp( } static void scan_for_call_type(int i, const struct parsed_opr *opr, - int magic, const struct parsed_proto **pp_found, int *multi) + int magic, const struct parsed_proto **pp_found, int *pp_i, + int *multi) { const struct parsed_proto *pp = NULL; struct parsed_op *po; @@ -2727,7 +3055,7 @@ static void scan_for_call_type(int i, const struct parsed_opr *opr, lr = &g_label_refs[i]; for (; lr != NULL; lr = lr->next) { check_i(&ops[i], lr->i); - scan_for_call_type(lr->i, opr, magic, pp_found, multi); + scan_for_call_type(lr->i, opr, magic, pp_found, pp_i, multi); } if (i > 0 && LAST_OP(i - 1)) return; @@ -2760,7 +3088,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++) { @@ -2792,24 +3120,206 @@ static void scan_for_call_type(int i, const struct parsed_opr *opr, } *multi = 1; } - if (pp != NULL) + if (pp != NULL) { *pp_found = pp; + *pp_i = po - ops; + } +} + +static void add_label_ref(struct label_ref *lr, int op_i) +{ + struct label_ref *lr_new; + + if (lr->i == -1) { + lr->i = op_i; + return; + } + + lr_new = calloc(1, sizeof(*lr_new)); + lr_new->i = op_i; + lr_new->next = lr->next; + lr->next = lr_new; +} + +static struct parsed_data *try_resolve_jumptab(int i, int opcnt) +{ + struct parsed_op *po = &ops[i]; + struct parsed_data *pd; + char label[NAMELEN], *p; + int len, j, l; + + p = strchr(po->operand[0].name, '['); + if (p == NULL) + return NULL; + + len = p - po->operand[0].name; + strncpy(label, po->operand[0].name, len); + label[len] = 0; + + for (j = 0, pd = NULL; j < g_func_pd_cnt; j++) { + if (IS(g_func_pd[j].label, label)) { + pd = &g_func_pd[j]; + break; + } + } + if (pd == NULL) + //ferr(po, "label '%s' not parsed?\n", label); + return NULL; + + if (pd->type != OPT_OFFSET) + ferr(po, "label '%s' with non-offset data?\n", label); + + // find all labels, link + for (j = 0; j < pd->count; j++) { + for (l = 0; l < opcnt; l++) { + if (g_labels[l] != NULL && IS(g_labels[l], pd->d[j].u.label)) { + add_label_ref(&g_label_refs[l], i); + pd->d[j].bt_i = l; + break; + } + } + } + + return pd; +} + +static void clear_labels(int count) +{ + int i; + + for (i = 0; i < count; i++) { + if (g_labels[i] != NULL) { + free(g_labels[i]); + g_labels[i] = NULL; + } + } +} + +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; } -// early check for tail call or branch back -static int is_like_tailjmp(int j) +static int get_pp_arg_regmask_dst(const struct parsed_proto *pp) { - if (!(ops[j].flags & OPF_JMP)) + if (strstr(pp->ret_type.name, "int64")) + return (1 << xAX) | (1 << xDX); + if (strcasecmp(pp->ret_type.name, "void") == 0) return 0; - if (ops[j].op == OP_JMP && !ops[j].operand[0].had_ds) - // probably local branch back.. - return 1; - if (ops[j].op == OP_CALL) - // probably noreturn call.. - return 1; + return (1 << xAX); +} - return 0; +static void resolve_branches_parse_calls(int opcnt) +{ + const struct parsed_proto *pp_c; + struct parsed_proto *pp; + struct parsed_data *pd; + struct parsed_op *po; + const char *tmpname; + int i, l; + int ret; + + for (i = 0; i < opcnt; i++) + { + po = &ops[i]; + po->bt_i = -1; + po->btj = NULL; + + if (po->op == OP_CALL) { + pp = NULL; + + if (po->operand[0].type == OPT_LABEL) { + tmpname = opr_name(po, 0); + if (IS_START(tmpname, "loc_")) + ferr(po, "call to loc_*\n"); + 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); + + if (pp_c != NULL) { + pp = proto_clone(pp_c); + 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) + po->flags |= OPF_TAIL; + } + po->pp = pp; + continue; + } + + if (!(po->flags & OPF_JMP) || po->op == OP_RET) + continue; + + if (po->operand[0].type == OPT_REGMEM) { + pd = try_resolve_jumptab(i, opcnt); + if (pd == NULL) + goto tailcall; + + po->btj = pd; + continue; + } + + for (l = 0; l < opcnt; l++) { + if (g_labels[l] != NULL + && IS(po->operand[0].name, g_labels[l])) + { + if (l == i + 1 && po->op == OP_JMP) { + // yet another alignment type.. + po->flags |= OPF_RMD|OPF_DONE; + break; + } + add_label_ref(&g_label_refs[l], i); + po->bt_i = l; + break; + } + } + + if (po->bt_i != -1 || (po->flags & OPF_RMD)) + continue; + + if (po->operand[0].type == OPT_LABEL) + // assume tail call + goto tailcall; + + ferr(po, "unhandled branch\n"); + +tailcall: + po->op = OP_CALL; + po->flags |= OPF_TAIL; + if (i > 0 && ops[i - 1].op == OP_POP) + po->flags |= OPF_ATAIL; + i--; // reprocess + } } static void scan_prologue_epilogue(int opcnt) @@ -2824,13 +3334,13 @@ static void scan_prologue_epilogue(int opcnt) && 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; + ops[0].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS; + ops[1].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS; i = 2; 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; + ops[2].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS; i++; } else { @@ -2838,7 +3348,7 @@ static void scan_prologue_epilogue(int opcnt) 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; + ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS; ecx_push++; i++; } @@ -2849,9 +3359,9 @@ static void scan_prologue_epilogue(int opcnt) && IS(opr_name(&ops[i + 1], 0), "__alloca_probe")) { g_stack_fsz += ops[i].operand[1].val; - ops[i].flags |= OPF_RMD | OPF_DONE; + ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS; i++; - ops[i].flags |= OPF_RMD | OPF_DONE; + ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS; i++; } } @@ -2859,40 +3369,52 @@ static void scan_prologue_epilogue(int opcnt) found = 0; do { for (; i < opcnt; i++) - if (ops[i].op == OP_RET) + if (ops[i].flags & OPF_TAIL) break; j = i - 1; if (i == opcnt && (ops[j].flags & OPF_JMP)) { - if (found && is_like_tailjmp(j)) - break; + if (ops[j].bt_i != -1 || ops[j].btj != NULL) + break; + i--; j--; } if ((ops[j].op == OP_POP && IS(opr_name(&ops[j], 0), "ebp")) || ops[j].op == OP_LEAVE) { - ops[j].flags |= OPF_RMD | OPF_DONE; + ops[j].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS; + } + else if (ops[i].op == OP_CALL && ops[i].pp != NULL + && ops[i].pp->is_noreturn) + { + // on noreturn, msvc sometimes cleans stack, sometimes not + i++; + found = 1; + continue; } else if (!(g_ida_func_attr & IDAFA_NORETURN)) ferr(&ops[j], "'pop ebp' expected\n"); if (g_stack_fsz != 0) { - if (ops[j - 1].op == OP_MOV + 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")) { - ops[j - 1].flags |= OPF_RMD | OPF_DONE; + ops[j - 1].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS; + j -= 2; } - else if (ops[j].op != OP_LEAVE - && !(g_ida_func_attr & IDAFA_NORETURN)) + else if (!(g_ida_func_attr & IDAFA_NORETURN)) { - ferr(&ops[j - 1], "esp restore expected\n"); + ferr(&ops[j], "esp restore expected\n"); } - if (ecx_push && ops[j - 2].op == OP_POP - && IS(opr_name(&ops[j - 2], 0), "ecx")) + if (ecx_push && j >= 0 && ops[j].op == OP_POP + && IS(opr_name(&ops[j], 0), "ecx")) { - ferr(&ops[j - 2], "unexpected ecx pop\n"); + ferr(&ops[j], "unexpected ecx pop\n"); } } @@ -2900,13 +3422,15 @@ static void scan_prologue_epilogue(int opcnt) i++; } while (i < opcnt); + if (!found) + ferr(ops, "missing ebp epilogue\n"); return; } // 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; + ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS; g_stack_fsz += 4; ecx_push++; i++; @@ -2919,7 +3443,7 @@ static void scan_prologue_epilogue(int opcnt) && ops[i].operand[1].type == OPT_CONST) { g_stack_fsz = ops[i].operand[1].val; - ops[i].flags |= OPF_RMD | OPF_DONE; + ops[i].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS; esp_sub = 1; break; } @@ -2938,7 +3462,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--; } } @@ -2965,12 +3489,13 @@ static void scan_prologue_epilogue(int opcnt) i++; do { for (; i < opcnt; i++) - if (ops[i].op == OP_RET) + if (ops[i].flags & OPF_TAIL) break; j = i - 1; if (i == opcnt && (ops[j].flags & OPF_JMP)) { - if (found && is_like_tailjmp(j)) - break; + if (ops[j].bt_i != -1 || ops[j].btj != NULL) + break; + i--; j--; } @@ -2988,7 +3513,7 @@ static void scan_prologue_epilogue(int opcnt) else ferr(&ops[j], "'pop ecx' expected\n"); - ops[j].flags |= OPF_RMD | OPF_DONE; + ops[j].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS; j--; } if (l != ecx_push) @@ -3004,23 +3529,27 @@ static void scan_prologue_epilogue(int opcnt) || ops[j].operand[1].val != g_stack_fsz) ferr(&ops[j], "'add esp' expected\n"); - ops[j].flags |= OPF_RMD | OPF_DONE; + ops[j].flags |= OPF_RMD | OPF_DONE | OPF_NOREGS; ops[j].operand[1].val = 0; // hack for stack arg scanner found = 1; } i++; } while (i < opcnt); + + if (!found) + ferr(ops, "missing esp epilogue\n"); } } static const struct parsed_proto *resolve_icall(int i, int opcnt, - int *multi_src) + 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: @@ -3032,7 +3561,7 @@ static const struct parsed_proto *resolve_icall(int i, int opcnt, // fallthrough default: scan_for_call_type(i, &ops[i].operand[0], i + opcnt * 9, &pp, - multi_src); + pp_i, multi_src); break; } @@ -3040,7 +3569,7 @@ static const struct parsed_proto *resolve_icall(int i, int opcnt, } // find an instruction that changed opr before i op -// *op_i must be set to -1 by caller +// *op_i must be set to -1 by the caller // *entry is set to 1 if one source is determined to be the caller // returns 1 if found, *op_i is then set to origin static int resolve_origin(int i, const struct parsed_opr *opr, @@ -3072,7 +3601,7 @@ static int resolve_origin(int i, const struct parsed_opr *opr, } if (ops[i].cc_scratch == magic) - return 0; + return ret; ops[i].cc_scratch = magic; if (!(ops[i].flags & OPF_DATA)) @@ -3082,26 +3611,131 @@ static int resolve_origin(int i, const struct parsed_opr *opr, if (*op_i >= 0) { if (*op_i == i) - return 1; + return ret | 1; + // XXX: could check if the other op does the same return -1; } *op_i = i; - return 1; + return ret | 1; } } -static int try_resolve_const(int i, const struct parsed_opr *opr, - int magic, unsigned int *val) +// find an instruction that previously referenced 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 +static int resolve_last_ref(int i, const struct parsed_opr *opr, + int magic, int *op_i) { - int s_i = -1; - int ret; + struct label_ref *lr; + int ret = 0; - ret = resolve_origin(i, opr, magic, &s_i, NULL); - if (ret == 1) { - i = s_i; - if (ops[i].op != OP_MOV && ops[i].operand[1].type != OPT_CONST) + 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 |= resolve_last_ref(lr->i, opr, magic, op_i); + } + 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 (!is_opr_referenced(opr, &ops[i])) + continue; + + if (*op_i >= 0) + return -1; + + *op_i = i; + return 1; + } +} + +// find next instruction that reads opr +// *op_i must be set to -1 by the caller +// 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) +{ + 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->flags & OPF_JMP) && po->op != OP_CALL) { + 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_read(po->btj->d[j].bt_i, opcnt, opr, + magic, op_i); + } + return ret; + } + + if (po->flags & OPF_RMD) + continue; + check_i(po, po->bt_i); + if (po->flags & OPF_CJMP) { + ret |= find_next_read(po->bt_i, opcnt, opr, magic, op_i); + if (ret < 0) + return ret; + } + else + i = po->bt_i - 1; + continue; + } + + if (!is_opr_read(opr, po)) { + if (is_opr_modified(opr, po)) + // it's overwritten + return ret; + if (po->flags & OPF_TAIL) + return ret; + continue; + } + + 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) +{ + int s_i = -1; + int ret; + + ret = resolve_origin(i, opr, magic, &s_i, NULL); + if (ret == 1) { + i = s_i; + if (ops[i].op != OP_MOV && ops[i].operand[1].type != OPT_CONST) return -1; *val = ops[i].operand[1].val; @@ -3118,7 +3752,7 @@ static struct parsed_proto *process_call_early(int i, int opcnt, struct parsed_proto *pp; int multipath = 0; int adj = 0; - int ret; + int j, ret; pp = po->pp; if (pp == NULL || pp->is_vararg || pp->argc_reg != 0) @@ -3135,8 +3769,15 @@ static struct parsed_proto *process_call_early(int i, int opcnt, return NULL; if (multipath) return NULL; - if (ops[ret].op == OP_POP && adj != 4) - return NULL; + if (ops[ret].op == OP_POP) { + for (j = 1; j < adj / 4; j++) { + if (ops[ret + j].op != OP_POP + || ops[ret + j].operand[0].reg != xCX) + { + return NULL; + } + } + } } *adj_i = ret; @@ -3149,6 +3790,7 @@ static struct parsed_proto *process_call(int i, int opcnt) const struct parsed_proto *pp_c; struct parsed_proto *pp; const char *tmpname; + int call_i = -1, ref_i = -1; int adj = 0, multipath = 0; int ret, arg; @@ -3157,7 +3799,7 @@ static struct parsed_proto *process_call(int i, int opcnt) if (pp == NULL) { // indirect call - pp_c = resolve_icall(i, opcnt, &multipath); + pp_c = resolve_icall(i, opcnt, &call_i, &multipath); if (pp_c != NULL) { if (!pp_c->is_func && !pp_c->is_fptr) ferr(po, "call to non-func: %s\n", pp_c->name); @@ -3171,6 +3813,23 @@ static struct parsed_proto *process_call(int i, int opcnt) case OPT_REG: // we resolved this call and no longer need the register po->regmask_src &= ~(1 << po->operand[0].reg); + + if (!multipath && i != call_i && ops[call_i].op == OP_MOV + && ops[call_i].operand[1].type == OPT_LABEL) + { + // no other source users? + 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; + 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 | OPF_NOREGS; + } + } break; case OPT_REGMEM: pp->is_fptr = 1; @@ -3185,7 +3844,7 @@ static struct parsed_proto *process_call(int i, int opcnt) pp->is_fptr = 1; ret = scan_for_esp_adjust(i + 1, opcnt, - 32*4, &adj, &multipath, 0); + -1, &adj, &multipath, 0); if (ret < 0 || adj < 0) { if (!g_allow_regfunc) ferr(po, "non-__cdecl indirect call unhandled yet\n"); @@ -3206,9 +3865,11 @@ static struct parsed_proto *process_call(int i, int opcnt) // look for and make use of esp adjust multipath = 0; ret = -1; - if (!pp->is_stdcall && pp->argc_stack > 0) + if (!pp->is_stdcall && pp->argc_stack > 0) { + int adj_expect = pp->is_vararg ? -1 : pp->argc_stack * 4; ret = scan_for_esp_adjust(i + 1, opcnt, - pp->argc_stack * 4, &adj, &multipath, 0); + adj_expect, &adj, &multipath, 0); + } if (ret >= 0) { if (pp->is_vararg) { if (adj / 4 < pp->argc_stack) { @@ -3408,7 +4069,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)) @@ -3416,7 +4078,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) { @@ -3482,7 +4145,9 @@ 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); @@ -3494,8 +4159,8 @@ static int collect_call_args_r(struct parsed_op *po, int i, if (!g_func_pp->is_vararg || strstr(ops[k].operand[1].name, buf)) { - ops[k].flags |= OPF_RMD | OPF_DONE; - ops[j].flags |= OPF_RMD | OPF_VAPUSH; + ops[k].flags |= OPF_RMD | OPF_NOREGS | OPF_DONE; + ops[j].flags |= OPF_RMD | OPF_NOREGS | OPF_VAPUSH; save_args &= ~(1 << arg); reg = -1; } @@ -3601,91 +4266,175 @@ static int collect_call_args(struct parsed_op *po, int i, return ret; } -static void pp_insert_reg_arg(struct parsed_proto *pp, const char *reg) +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) { - int i; + struct parsed_op *po; + int already_saved; + int regmask_new; + int regmask_op; + int flags_set; + int ret, reg; + int j; - for (i = 0; i < pp->argc; i++) - if (pp->arg[i].reg == NULL) - break; + for (; i < opcnt; i++) + { + po = &ops[i]; + if (cbits[i >> 3] & (1 << (i & 7))) + return; + cbits[i >> 3] |= (1 << (i & 7)); - if (pp->argc_stack) - memmove(&pp->arg[i + 1], &pp->arg[i], - sizeof(pp->arg[0]) * pp->argc_stack); - memset(&pp->arg[i], 0, sizeof(pp->arg[i])); - pp->arg[i].reg = strdup(reg); - pp->arg[i].type.name = strdup("int"); - pp->argc++; - pp->argc_reg++; -} + 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; + } -static void add_label_ref(struct label_ref *lr, int op_i) -{ - struct label_ref *lr_new; + 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 (lr->i == -1) { - lr->i = op_i; - return; - } + 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); - lr_new = calloc(1, sizeof(*lr_new)); - lr_new->i = op_i; - lr_new->next = lr->next; - lr->next = lr_new; -} + 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; + } -static struct parsed_data *try_resolve_jumptab(int i, int opcnt) -{ - struct parsed_op *po = &ops[i]; - struct parsed_data *pd; - char label[NAMELEN], *p; - int len, j, l; + ret = scan_for_pop(i + 1, opcnt, i + opcnt * 3, reg, 0, 0); + if (ret == 1) { + scan_for_pop(i + 1, opcnt, i + opcnt * 4, reg, 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; - p = strchr(po->operand[0].name, '['); - if (p == NULL) - return NULL; + 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); - len = p - po->operand[0].name; - strncpy(label, po->operand[0].name, len); - label[len] = 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); + } + } + } - for (j = 0, pd = NULL; j < g_func_pd_cnt; j++) { - if (IS(g_func_pd[j].label, label)) { - pd = &g_func_pd[j]; - break; + if (po->flags & OPF_NOREGS) + continue; + + 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 (po->op == OP_CALL) { + // allow fastcall calls from anywhere, calee may be also sitting + // in some fastcall table even when it's not using reg args + if (regmask_new & po->regmask_src & (1 << xCX)) { + *regmask_init |= (1 << xCX); + regmask_now |= (1 << xCX); + regmask_new &= ~(1 << xCX); + } + if (regmask_new & po->regmask_src & (1 << xDX)) { + *regmask_init |= (1 << xDX); + regmask_now |= (1 << xDX); + regmask_new &= ~(1 << xDX); + } } - } - if (pd == NULL) - //ferr(po, "label '%s' not parsed?\n", label); - return NULL; - if (pd->type != OPT_OFFSET) - ferr(po, "label '%s' with non-offset data?\n", label); + if (regmask_new != 0) + fnote(po, "uninitialized reg mask: %x\n", regmask_new); - // find all labels, link - for (j = 0; j < pd->count; j++) { - for (l = 0; l < opcnt; l++) { - if (g_labels[l] != NULL && IS(g_labels[l], pd->d[j].u.label)) { - add_label_ref(&g_label_refs[l], i); - pd->d[j].bt_i = l; - break; + 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); } } - } - return pd; + regmask_now |= regmask_op; + *regmask |= regmask_now; + + if (po->flags & OPF_TAIL) + return; + } } -static void clear_labels(int count) +static void pp_insert_reg_arg(struct parsed_proto *pp, const char *reg) { int i; - for (i = 0; i < count; i++) { - if (g_labels[i] != NULL) { - free(g_labels[i]); - g_labels[i] = NULL; - } - } + for (i = 0; i < pp->argc; i++) + if (pp->arg[i].reg == NULL) + break; + + if (pp->argc_stack) + memmove(&pp->arg[i + 1], &pp->arg[i], + sizeof(pp->arg[0]) * pp->argc_stack); + memset(&pp->arg[i], 0, sizeof(pp->arg[i])); + pp->arg[i].reg = strdup(reg); + pp->arg[i].type.name = strdup("int"); + pp->argc++; + pp->argc_reg++; } static void output_std_flags(FILE *fout, struct parsed_op *po, @@ -3766,25 +4515,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]; @@ -3804,25 +4534,25 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) struct parsed_op *po, *delayed_flag_op = NULL, *tmp_op; struct parsed_opr *last_arith_dst = NULL; char buf1[256], buf2[256], buf3[256], cast[64]; - const struct parsed_proto *pp_c; struct parsed_proto *pp, *pp_tmp; struct parsed_data *pd; - const char *tmpname; unsigned int uval; int save_arg_vars[MAX_ARG_GRP] = { 0, }; + unsigned char cbits[MAX_OPS / 8]; int cond_vars = 0; int need_tmp_var = 0; int need_tmp64 = 0; int had_decl = 0; int label_pending = 0; - int regmask_save = 0; - int regmask_arg = 0; - int regmask_now = 0; - int regmask_init = 0; - int regmask = 0; + int regmask_save = 0; // 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 = 0; // used regs int pfomask = 0; int found = 0; - int depth = 0; int no_output; int i, j, l; int arg; @@ -3836,106 +4566,32 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) if (g_func_pp == NULL) ferr(ops, "proto_parse failed for '%s'\n", funcn); - regmask_arg = get_pp_arg_regmask(g_func_pp); - - // pass1: - // - handle ebp/esp frame, remove ops related to it - scan_prologue_epilogue(opcnt); + regmask_arg = get_pp_arg_regmask_src(g_func_pp); + regmask_ret = get_pp_arg_regmask_dst(g_func_pp); - // pass2: - // - parse calls with labels - // - resolve all branches - for (i = 0; i < opcnt; i++) - { - po = &ops[i]; - po->bt_i = -1; - po->btj = NULL; - - if (po->flags & (OPF_RMD|OPF_DONE)) - continue; - - if (po->op == OP_CALL) { - pp = NULL; - - if (po->operand[0].type == OPT_LABEL) { - tmpname = opr_name(po, 0); - if (IS_START(tmpname, "loc_")) - ferr(po, "call to loc_*\n"); - pp_c = proto_parse(fhdr, tmpname, 0); - if (pp_c == NULL) - ferr(po, "proto_parse failed for call '%s'\n", tmpname); - - pp = proto_clone(pp_c); - my_assert_not(pp, NULL); + if (g_func_pp->has_retreg) { + for (arg = 0; arg < g_func_pp->argc; arg++) { + if (g_func_pp->arg[arg].type.is_retreg) { + reg = char_array_i(regs_r32, + ARRAY_SIZE(regs_r32), g_func_pp->arg[arg].reg); + ferr_assert(ops, reg >= 0); + regmask_ret |= 1 << reg; } - 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) - po->flags |= OPF_TAIL; - } - po->pp = pp; - continue; } + } - if (!(po->flags & OPF_JMP) || po->op == OP_RET) - continue; - - if (po->operand[0].type == OPT_REGMEM) { - pd = try_resolve_jumptab(i, opcnt); - if (pd == NULL) - goto tailcall; - - po->btj = pd; - continue; - } - - for (l = 0; l < opcnt; l++) { - if (g_labels[l] != NULL - && IS(po->operand[0].name, g_labels[l])) - { - if (l == i + 1 && po->op == OP_JMP) { - // yet another alignment type.. - po->flags |= OPF_RMD|OPF_DONE; - break; - } - add_label_ref(&g_label_refs[l], i); - po->bt_i = l; - break; - } - } - - if (po->bt_i != -1 || (po->flags & OPF_RMD)) - continue; - - if (po->operand[0].type == OPT_LABEL) - // assume tail call - goto tailcall; - - ferr(po, "unhandled branch\n"); + // pass1: + // - resolve all branches + // - parse calls with labels + resolve_branches_parse_calls(opcnt); -tailcall: - po->op = OP_CALL; - po->flags |= OPF_TAIL; - if (i > 0 && ops[i - 1].op == OP_POP) - po->flags |= OPF_ATAIL; - i--; // reprocess - } + // pass2: + // - handle ebp/esp frame, remove ops related to it + scan_prologue_epilogue(opcnt); // pass3: // - remove dead labels - // - process trivial calls + // - set regs needed at ret for (i = 0; i < opcnt; i++) { if (g_labels[i] != NULL && g_label_refs[i].i == -1) { @@ -3943,6 +4599,14 @@ tailcall: g_labels[i] = NULL; } + if (ops[i].op == OP_RET) + ops[i].regmask_src |= regmask_ret; + } + + // pass4: + // - process trivial calls + for (i = 0; i < opcnt; i++) + { po = &ops[i]; if (po->flags & (OPF_RMD|OPF_DONE)) continue; @@ -3960,11 +4624,12 @@ tailcall: if (pp != NULL) { if (j >= 0) { // commit esp adjust - ops[j].flags |= OPF_RMD; if (ops[j].op != OP_POP) patch_esp_adjust(&ops[j], pp->argc_stack * 4); - else - ops[j].flags |= OPF_DONE; + else { + for (l = 0; l < pp->argc_stack; l++) + ops[j + l].flags |= OPF_DONE | OPF_RMD | OPF_NOREGS; + } } if (strstr(pp->ret_type.name, "int64")) @@ -3975,39 +4640,67 @@ tailcall: } } - // pass4: - // - process calls - // - handle push /pop pairs + // pass5: + // - process calls, stage 2 + // - handle some push/pop pairs + // - scan for STD/CLD, propagate DF for (i = 0; i < opcnt; i++) { 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, save_arg_vars, + 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 (strstr(pp->ret_type.name, "int64")) need_tmp64 = 1; + + continue; + } + + if (po->flags & OPF_DONE) + continue; + + 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, i + opcnt * 12); + } + else if (po->op == OP_POP) + scan_pushes_for_pop(i, opcnt, ®mask_pp); + else if (po->op == OP_STD) { + po->flags |= OPF_DF | OPF_RMD | OPF_DONE; + scan_propagate_df(i + 1, opcnt); } - 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); } - // pass5: + // 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, 0, ®mask, + 0, ®mask_save, ®mask_init, regmask_arg); + + // pass7: // - find flag set ops for their users - // - do unreselved calls + // - do unresolved calls // - declare indirect functions for (i = 0; i < opcnt; i++) { @@ -4015,69 +4708,6 @@ tailcall: 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; @@ -4148,8 +4778,7 @@ tailcall: else if (po->op == 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; @@ -4193,19 +4822,6 @@ tailcall: if (pp->argc_stack > 0) pp->is_stdcall = 1; } - - 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; - } - } - } } else if (po->op == OP_MOV && po->operand[0].pp != NULL && po->operand[1].pp != NULL) @@ -4226,8 +4842,6 @@ tailcall: } } } - 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) @@ -4247,21 +4861,6 @@ tailcall: } } - // pass6: - // - 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; - - if (po->op == OP_PUSH && (po->flags & OPF_RSAVE)) - regmask_save |= 1 << po->operand[0].reg; - } - } - // output starts here // define userstack size @@ -4385,6 +4984,7 @@ tailcall: } } + // declare normal registers regmask_now = regmask & ~regmask_arg; regmask_now &= ~(1 << xSP); if (regmask_now & 0x00ff) { @@ -4431,6 +5031,16 @@ tailcall: } } + // declare push-pop temporaries + if (regmask_pp) { + for (reg = 0; reg < 8; reg++) { + if (regmask_pp & (1 << reg)) { + fprintf(fout, " u32 pp_%s;\n", regs_r32[reg]); + had_decl = 1; + } + } + } + if (cond_vars) { for (i = 0; i < 8; i++) { if (cond_vars & (1 << i)) { @@ -4540,10 +5150,7 @@ tailcall: 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; + struct parsed_opr opr = OPR_INIT(OPT_REG, OPLM_DWORD, xCX); ret = try_resolve_const(i, &opr, opcnt * 7 + i, &uval); if (ret != 1 || uval == 0) { @@ -4635,6 +5242,14 @@ tailcall: 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;", @@ -4768,9 +5383,20 @@ tailcall: // arithmetic w/flags case OP_AND: + 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;", @@ -4782,6 +5408,18 @@ tailcall: 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); @@ -4806,8 +5444,11 @@ tailcall: 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; @@ -4824,6 +5465,7 @@ tailcall: delayed_flag_op = NULL; break; + case OP_SHLD: case OP_SHRD: assert_operand_cnt(3); propagate_lmod(po, &po->operand[0], &po->operand[1]); @@ -4831,9 +5473,18 @@ tailcall: 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) + ferr(po, "TODO: masking\n"); + 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; @@ -5142,6 +5793,12 @@ tailcall: 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: assert_operand_cnt(1); last_arith_dst = NULL; @@ -5192,13 +5849,13 @@ tailcall: } 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 & (1 << xAX)) { 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 & (1 << xAX)) { + else if (po->regmask_dst & (1 << xAX)) { fprintf(fout, "eax = "); if (pp->ret_type.is_ptr) fprintf(fout, "(u32)"); @@ -5300,12 +5957,12 @@ tailcall: 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")) { + if (regmask_ret & (1 << xAX)) { ferr(po, "int func -> void func tailcall?\n"); } else { @@ -5340,7 +5997,7 @@ tailcall: g_func_pp->arg[arg].reg, g_func_pp->arg[arg].reg); } - if (IS(g_func_pp->ret_type.name, "void")) { + if (!(regmask_ret & (1 << xAX))) { if (i != opcnt - 1 || label_pending) fprintf(fout, " return;"); } @@ -5370,6 +6027,13 @@ tailcall: fprintf(fout, " s_%s = %s;", buf1, buf1); break; } + else if (po->flags & OPF_PPUSH) { + tmp_op = po->datap; + ferr_assert(po, tmp_op != NULL); + out_dst_opr(buf2, sizeof(buf2), po, &tmp_op->operand[0]); + fprintf(fout, " pp_%s = %s;", buf2, buf1); + break; + } else if (g_func_pp->is_userstack) { fprintf(fout, " *(--esp) = %s;", buf1); break; @@ -5380,15 +6044,20 @@ tailcall: break; case OP_POP: + out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]); if (po->flags & OPF_RSAVE) { - out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]); fprintf(fout, " %s = s_%s;", buf1, buf1); break; } + else if (po->flags & OPF_PPUSH) { + // push/pop graph / non-const + ferr_assert(po, po->datap == NULL); + fprintf(fout, " %s = pp_%s;", buf1, buf1); + break; + } else if (po->datap != NULL) { // push/pop pair tmp_op = po->datap; - out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]); fprintf(fout, " %s = %s;", buf1, out_src_opr(buf2, sizeof(buf2), tmp_op, &tmp_op->operand[0], @@ -5396,8 +6065,7 @@ tailcall: break; } else if (g_func_pp->is_userstack) { - fprintf(fout, " %s = *esp++;", - out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0])); + fprintf(fout, " %s = *esp++;", buf1); break; } else @@ -5530,6 +6198,25 @@ static int hg_var_cnt; static void output_hdr_fp(FILE *fout, const struct func_prototype *fp, int count); +struct func_prototype *hg_fp_add(const char *funcn) +{ + struct func_prototype *fp; + + if ((hg_fp_cnt & 0xff) == 0) { + hg_fp = realloc(hg_fp, sizeof(hg_fp[0]) * (hg_fp_cnt + 0x100)); + my_assert_not(hg_fp, NULL); + memset(hg_fp + hg_fp_cnt, 0, sizeof(hg_fp[0]) * 0x100); + } + + fp = &hg_fp[hg_fp_cnt]; + snprintf(fp->name, sizeof(fp->name), "%s", funcn); + fp->id = hg_fp_cnt; + fp->argc_stack = -1; + hg_fp_cnt++; + + return fp; +} + static struct func_proto_dep *hg_fp_find_dep(struct func_prototype *fp, const char *name) { @@ -5584,7 +6271,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; @@ -5598,20 +6284,20 @@ 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++) { + check_i(po, po->btj->d[j].bt_i); gen_hdr_dep_pass(po->btj->d[j].bt_i, opcnt, cbits, fp, regmask_save, regmask_dst, regmask_dep, has_ret); } return; } - if (po->bt_i < 0) { - ferr(po, "dead branch\n"); - return; - } - + check_i(po, po->bt_i); if (po->flags & OPF_CJMP) { gen_hdr_dep_pass(po->bt_i, opcnt, cbits, fp, regmask_save, regmask_dst, regmask_dep, has_ret); @@ -5627,8 +6313,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; @@ -5637,14 +6322,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); 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, OPF_RMD); continue; } } @@ -5667,27 +6349,27 @@ static void gen_hdr_dep_pass(int i, int opcnt, unsigned char *cbits, } } + // if has_ret is 0, there is uninitialized eax path, + // which means it's most likely void func if (*has_ret != 0 && (po->flags & OPF_TAIL)) { if (po->op == OP_CALL) { j = i; 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); } - if (ret == -1 && from_caller) { + if (ret != 1 && from_caller) { // unresolved eax - probably void func *has_ret = 0; } else { - if (ops[j].op == OP_CALL) { - dep = hg_fp_find_dep(fp, po->operand[0].name); + if (j >= 0 && ops[j].op == OP_CALL) { + dep = hg_fp_find_dep(fp, ops[j].operand[0].name); if (dep != NULL) dep->ret_dep = 1; else @@ -5723,124 +6405,56 @@ static void gen_hdr(const char *funcn, int opcnt) const struct parsed_proto *pp_c; struct parsed_proto *pp; struct func_prototype *fp; - struct parsed_data *pd; struct parsed_op *po; - const char *tmpname; int regmask_dummy = 0; int regmask_dep; int max_bp_offset = 0; int has_ret; - int i, j, l, ret; - - if ((hg_fp_cnt & 0xff) == 0) { - hg_fp = realloc(hg_fp, sizeof(hg_fp[0]) * (hg_fp_cnt + 0x100)); - my_assert_not(hg_fp, NULL); - memset(hg_fp + hg_fp_cnt, 0, sizeof(hg_fp[0]) * 0x100); - } - - fp = &hg_fp[hg_fp_cnt]; - snprintf(fp->name, sizeof(fp->name), "%s", funcn); - fp->id = hg_fp_cnt; - fp->argc_stack = -1; - hg_fp_cnt++; + int i, j, l; + int ret; - // perhaps already in seed header? - fp->pp = proto_parse(g_fhdr, funcn, 1); - if (fp->pp != NULL) { - fp->argc_stack = fp->pp->argc_stack; - fp->is_stdcall = fp->pp->is_stdcall; - fp->regmask_dep = get_pp_arg_regmask(fp->pp); - fp->has_ret = !IS(fp->pp->ret_type.name, "void"); + pp_c = proto_parse(g_fhdr, funcn, 1); + if (pp_c != NULL) + // already in seed, will add to hg_fp later return; - } + + fp = hg_fp_add(funcn); g_bp_frame = g_sp_frame = g_stack_fsz = 0; g_stack_frame_used = 0; // pass1: + // - resolve all branches + // - parse calls with labels + resolve_branches_parse_calls(opcnt); + + // pass2: // - handle ebp/esp frame, remove ops related to it scan_prologue_epilogue(opcnt); - // pass2: + // pass3: + // - remove dead labels // - collect calls - // - resolve all branches for (i = 0; i < opcnt; i++) { - po = &ops[i]; - po->bt_i = -1; - po->btj = NULL; + if (g_labels[i] != NULL && g_label_refs[i].i == -1) { + free(g_labels[i]); + g_labels[i] = NULL; + } + po = &ops[i]; if (po->flags & (OPF_RMD|OPF_DONE)) continue; if (po->op == OP_CALL) { - tmpname = opr_name(po, 0); - pp = NULL; - if (po->operand[0].type == OPT_LABEL) { - hg_fp_add_dep(fp, tmpname); - - // perhaps a call to already known func? - pp_c = proto_parse(g_fhdr, tmpname, 1); - if (pp_c != NULL) - pp = proto_clone(pp_c); - } - 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 && pp->is_noreturn) - po->flags |= OPF_TAIL; - - po->pp = pp; - continue; - } - - if (!(po->flags & OPF_JMP) || po->op == OP_RET) - continue; - - if (po->operand[0].type == OPT_REGMEM) { - pd = try_resolve_jumptab(i, opcnt); - if (pd == NULL) - goto tailcall; - - po->btj = pd; - continue; - } - - for (l = 0; l < opcnt; l++) { - if (g_labels[l] != NULL - && IS(po->operand[0].name, g_labels[l])) - { - add_label_ref(&g_label_refs[l], i); - po->bt_i = l; - break; - } + if (po->operand[0].type == OPT_LABEL) + hg_fp_add_dep(fp, opr_name(po, 0)); + else if (po->pp != NULL) + hg_fp_add_dep(fp, po->pp->name); } - - if (po->bt_i != -1 || (po->flags & OPF_RMD)) - continue; - - if (po->operand[0].type == OPT_LABEL) - // assume tail call - goto tailcall; - - ferr(po, "unhandled branch\n"); - -tailcall: - po->op = OP_CALL; - po->flags |= OPF_TAIL; - if (i > 0 && ops[i - 1].op == OP_POP) - po->flags |= OPF_ATAIL; - i--; // reprocess } - // pass3: + // pass4: // - remove dead labels // - handle push /pop pairs for (i = 0; i < opcnt; i++) @@ -5855,10 +6469,10 @@ tailcall: continue; if (po->op == OP_PUSH && po->operand[0].type == OPT_CONST) - scan_for_pop_const(i, opcnt); + scan_for_pop_const(i, opcnt, i + opcnt * 13); } - // pass4: + // pass5: // - process trivial calls for (i = 0; i < opcnt; i++) { @@ -5879,11 +6493,12 @@ tailcall: if (pp != NULL) { if (j >= 0) { // commit esp adjust - ops[j].flags |= OPF_RMD; if (ops[j].op != OP_POP) patch_esp_adjust(&ops[j], pp->argc_stack * 4); - else - ops[j].flags |= OPF_DONE; + else { + for (l = 0; l < pp->argc_stack; l++) + ops[j + l].flags |= OPF_DONE | OPF_RMD | OPF_NOREGS; + } } po->flags |= OPF_DONE; @@ -5891,7 +6506,7 @@ tailcall: } } - // pass5: + // pass6: // - track saved regs (simple) // - process calls for (i = 0; i < opcnt; i++) @@ -5900,16 +6515,17 @@ tailcall: 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); @@ -5921,7 +6537,7 @@ tailcall: } } - // pass6 + // pass7 memset(cbits, 0, sizeof(cbits)); regmask_dep = 0; has_ret = -1; @@ -5934,13 +6550,17 @@ tailcall: if (cbits[i >> 3] & (1 << (i & 7))) continue; + 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) ferr(&ops[i], "unreachable code\n"); } - if (has_ret == -1 && (regmask_dep & (1 << xAX))) - has_ret = 1; - for (i = 0; i < g_eqcnt; i++) { if (g_eqs[i].offset > max_bp_offset && g_eqs[i].offset < 4*32) max_bp_offset = g_eqs[i].offset; @@ -5959,7 +6579,7 @@ tailcall: printf("// has_ret %d, regmask_dep %x\n", fp->has_ret, fp->regmask_dep); output_hdr_fp(stdout, fp, 1); - if (IS(funcn, "sub_100073FD")) exit(1); + if (IS(funcn, "sub_10007F72")) exit(1); #endif gen_x_cleanup(opcnt); @@ -5988,7 +6608,7 @@ static void hg_fp_resolve_deps(struct func_prototype *fp) // printf("dep %s %s |= %x\n", fp->name, // fp->dep_func[i].name, dep); - if (fp->has_ret == -1) + if (fp->has_ret == -1 && fp->dep_func[i].ret_dep) fp->has_ret = fp->dep_func[i].proto->has_ret; } } @@ -6034,17 +6654,8 @@ static void output_hdr_fp(FILE *fout, const struct func_prototype *fp, continue; if (fp->pp != NULL) { - // prefer fp for common style, - // only use output_pp if args are complex - for (j = 0; j < fp->pp->argc; j++) { - if (fp->pp->arg[j].fptr != NULL) - break; - } - if (j != fp->pp->argc) { - output_pp(fout, fp->pp, OPP_ALIGN); - fprintf(fout, ";\n"); - continue; - } + // part of seed, output later + continue; } regmask_dep = fp->regmask_dep; @@ -6117,9 +6728,25 @@ static void output_hdr(FILE *fout) [OPLM_QWORD] = "uint64_t", }; const struct scanned_var *var; + struct func_prototype *fp; char line[256] = { 0, }; + char name[256]; int i; + // add stuff from headers + for (i = 0; i < pp_cache_size; i++) { + if (pp_cache[i].is_cinc && !pp_cache[i].is_stdcall) + snprintf(name, sizeof(name), "_%s", pp_cache[i].name); + else + snprintf(name, sizeof(name), "%s", pp_cache[i].name); + fp = hg_fp_add(name); + 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_src(fp->pp); + fp->has_ret = !IS(fp->pp->ret_type.name, "void"); + } + // resolve deps qsort(hg_fp, hg_fp_cnt, sizeof(hg_fp[0]), hg_fp_cmp_name); for (i = 0; i < hg_fp_cnt; i++) @@ -6132,11 +6759,9 @@ static void output_hdr(FILE *fout) for (i = 0; i < hg_var_cnt; i++) { var = &hg_vars[i]; - if (var->pp != NULL && var->pp->is_fptr) { - fprintf(fout, "extern "); - output_pp(fout, var->pp, 0); - fprintf(fout, ";"); - } + if (var->pp != NULL) + // part of seed + continue; else if (var->is_c_str) fprintf(fout, "extern %-8s %s[];", "char", var->name); else @@ -6153,38 +6778,12 @@ static void output_hdr(FILE *fout) // output function prototypes output_hdr_fp(fout, hg_fp, hg_fp_cnt); - // include passthrough - fprintf(fout, "\n// for translate\n"); + // seed passthrough + fprintf(fout, "\n// - seed -\n"); rewind(g_fhdr); - while (fgets(line, sizeof(line), g_fhdr)) { - if (IS_START(line, "//#")) - fwrite(line, 1, strlen(line), fout); - } -} - -// read a line, truncating it if it doesn't fit -static char *my_fgets(char *s, size_t size, FILE *stream) -{ - char *ret, *ret2; - char buf[64]; - int p; - - p = size - 2; - if (p >= 0) - s[p] = 0; - - ret = fgets(s, size, stream); - if (ret != NULL && p >= 0 && s[p] != 0 && s[p] != '\n') { - p = sizeof(buf) - 2; - do { - buf[p] = 0; - ret2 = fgets(buf, sizeof(buf), stream); - } - while (ret2 != NULL && buf[p] != 0 && buf[p] != '\n'); - } - - return ret; + while (fgets(line, sizeof(line), g_fhdr)) + fwrite(line, 1, strlen(line), fout); } // '=' needs special treatment @@ -6286,6 +6885,11 @@ static void scan_variables(FILE *fasm) if (wordc < 2) continue; + if (IS_START(words[0], "__IMPORT_DESCRIPTOR_")) { + // when this starts, we don't need anything from this section + break; + } + if ((hg_var_cnt & 0xff) == 0) { hg_vars = realloc(hg_vars, sizeof(hg_vars[0]) * (hg_var_cnt + 0x100)); @@ -6683,8 +7287,8 @@ 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); + //anote("scan_ahead caused by '%s', addr %lx\n", + // g_func, addr); scan_ahead(fasm); scanned_ahead = 1; func_chunks_sorted = 0;