X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Ftranslate.c;h=7493761c7756f0802536b18dd4bd55fef1362c2c;hb=cb090db01ec40b0755fc974dfae3b4c09a4d52bc;hp=f9ac8a8d2a98372bdee4323b54c292ae495c410f;hpb=36595fd27d06b03f1abf320bd511aec325845ed5;p=ia32rtools.git diff --git a/tools/translate.c b/tools/translate.c index f9ac8a8..7493761 100644 --- a/tools/translate.c +++ b/tools/translate.c @@ -32,15 +32,19 @@ enum op_flags { OPF_RMD = (1 << 0), /* removed or optimized out */ OPF_DATA = (1 << 1), /* data processing - writes to dst opr */ OPF_FLAGS = (1 << 2), /* sets flags */ - OPF_JMP = (1 << 3), /* branches, ret and call */ - OPF_CC = (1 << 4), /* uses flags */ - OPF_TAIL = (1 << 5), /* ret or tail call */ - OPF_RSAVE = (1 << 6), /* push/pop is local reg save/load */ - OPF_REP = (1 << 7), /* prefixed by rep */ - OPF_REPZ = (1 << 8), /* rep is repe/repz */ - OPF_REPNZ = (1 << 9), /* rep is repne/repnz */ - OPF_FARG = (1 << 10), /* push collected as func arg (no reuse) */ - OPF_EBP_S = (1 << 11), /* ebp used as scratch, not BP */ + OPF_JMP = (1 << 3), /* branch, call */ + OPF_CJMP = (1 << 4), /* cond. branch (cc or jecxz) */ + 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 */ + OPF_REP = (1 << 8), /* prefixed by rep */ + OPF_REPZ = (1 << 9), /* rep is repe/repz */ + OPF_REPNZ = (1 << 10), /* rep is repne/repnz */ + OPF_FARG = (1 << 11), /* push collected as func arg (no reuse) */ + OPF_EBP_S = (1 << 12), /* ebp used as scratch here, not BP */ + OPF_DF = (1 << 13), /* DF flag set */ + OPF_ATAIL = (1 << 14), /* tail call with reused arg frame */ + OPF_32BIT = (1 << 15), /* 32bit division */ }; enum op_op { @@ -48,15 +52,20 @@ enum op_op { OP_NOP, OP_PUSH, OP_POP, + OP_LEAVE, OP_MOV, OP_LEA, OP_MOVZX, OP_MOVSX, + OP_XCHG, OP_NOT, OP_CDQ, OP_STOS, OP_MOVS, OP_CMPS, + OP_SCAS, + OP_STD, + OP_CLD, OP_RET, OP_ADD, OP_SUB, @@ -68,6 +77,8 @@ enum op_op { OP_SAR, OP_ROL, OP_ROR, + OP_RCL, + OP_RCR, OP_ADC, OP_SBB, OP_INC, @@ -81,6 +92,7 @@ enum op_op { OP_CMP, OP_CALL, OP_JMP, + OP_JECXZ, OP_JO, OP_JNO, OP_JC, @@ -126,6 +138,7 @@ struct parsed_opr { unsigned int type_from_var:1; // .. in header, sometimes wrong unsigned int size_mismatch:1; // type override differs from C unsigned int size_lt:1; // type override is larger than C + unsigned int had_ds:1; // had ds: prefix int reg; unsigned int val; char name[256]; @@ -147,8 +160,9 @@ struct parsed_op { }; // datap: -// OP_CALL - ptr to parsed_proto +// OP_CALL - parser proto hint (str), ptr to struct parsed_proto // (OPF_CC) - point to one of (OPF_FLAGS) that affects cc op +// OP_POP - point to OP_PUSH in push/pop pair struct parsed_equ { char name[64]; @@ -202,6 +216,7 @@ static int g_sp_frame; static int g_stack_frame_used; static int g_stack_fsz; static int g_ida_func_attr; +static int g_allow_regfunc; #define ferr(op_, fmt, ...) do { \ printf("error:%s:#%zd: '%s': " fmt, g_func, (op_) - ops, \ dump_op(op_), ##__VA_ARGS__); \ @@ -396,7 +411,7 @@ static const char *parse_stack_el(const char *name, char *extra_reg) // must be a number after esp+, already converted to 0x.. s = name + 4; if (!('0' <= *s && *s <= '9')) { - aerr("%s nan?\n", __func__); + aerr("%s nan?\n", __func__); return NULL; } if (s[0] == '0' && s[1] == 'x') @@ -443,18 +458,18 @@ static int guess_lmod_from_c_type(enum opr_lenmod *lmod, const struct parsed_type *c_type) { static const char *dword_types[] = { - "int", "_DWORD", "UINT_PTR", - "DWORD", "HANDLE", "HWND", "HMODULE", - "WPARAM", "LPARAM", "UINT", + "int", "_DWORD", "UINT_PTR", "DWORD", + "WPARAM", "LPARAM", "UINT", "__int32", + "LONG", "HIMC", }; static const char *word_types[] = { - "uint16_t", "int16_t", + "uint16_t", "int16_t", "_WORD", "unsigned __int16", "__int16", }; static const char *byte_types[] = { "uint8_t", "int8_t", "char", - "unsigned __int8", "__int8", "BYTE", - "_UNKNOWN", + "unsigned __int8", "__int8", "BYTE", "_BYTE", + "CHAR", "_UNKNOWN", }; const char *n; int i; @@ -522,9 +537,10 @@ static int parse_operand(struct parsed_opr *opr, const struct parsed_proto *pp; enum opr_lenmod tmplmod; unsigned long number; + char buf[256]; int ret, len; int wordc_in; - char *tmp; + char *p; int i; if (w >= wordc) @@ -560,8 +576,10 @@ static int parse_operand(struct parsed_opr *opr, if (label != NULL) { opr->type = OPT_LABEL; - if (IS_START(label, "ds:")) + if (IS_START(label, "ds:")) { + opr->had_ds = 1; label += 3; + } strcpy(opr->name, label); return wordc; } @@ -589,7 +607,7 @@ static int parse_operand(struct parsed_opr *opr, return wordc; } if (IS(words[w], "(offset")) { - char *p = strchr(words[w + 1], ')'); + p = strchr(words[w + 1], ')'); if (p == NULL) aerr("parse of bracketed offset failed\n"); *p = 0; @@ -602,10 +620,11 @@ static int parse_operand(struct parsed_opr *opr, if (wordc_in != 1) aerr("parse_operand 1 word expected\n"); - tmp = words[w]; - if (IS_START(tmp, "ds:")) - tmp += 3; - strcpy(opr->name, tmp); + if (IS_START(words[w], "ds:")) { + opr->had_ds = 1; + memmove(words[w], words[w] + 3, strlen(words[w]) - 2); + } + strcpy(opr->name, words[w]); if (words[w][0] == '[') { opr->type = OPT_REGMEM; @@ -625,11 +644,13 @@ static int parse_operand(struct parsed_opr *opr, } else if (strchr(words[w], '[')) { // label[reg] form + p = strchr(words[w], '['); opr->type = OPT_REGMEM; - if (opr->lmod == OPLM_UNSPEC) - guess_lmod_from_name(opr); - parse_indmode(strchr(words[w], '['), regmask_indirect, 0); - return wordc; + parse_indmode(p, regmask_indirect, 0); + strncpy(buf, words[w], p - words[w]); + buf[p - words[w]] = 0; + pp = proto_parse(g_fhdr, buf, 1); + goto do_label; } else if (('0' <= words[w][0] && words[w][0] <= '9') || words[w][0] == '-') @@ -649,8 +670,9 @@ static int parse_operand(struct parsed_opr *opr, // most likely var in data segment opr->type = OPT_LABEL; - pp = proto_parse(g_fhdr, opr->name, 0); + +do_label: if (pp != NULL) { if (pp->is_fptr || pp->is_func) { opr->lmod = OPLM_DWORD; @@ -692,6 +714,8 @@ static const struct { { "repnz", OPF_REP|OPF_REPNZ }, }; +#define OPF_CJMP_CC (OPF_JMP|OPF_CJMP|OPF_CC) + static const struct { const char *name; enum op_op op; @@ -702,10 +726,12 @@ static const struct { { "nop", OP_NOP, 0, 0, 0 }, { "push", OP_PUSH, 1, 1, 0 }, { "pop", OP_POP, 1, 1, OPF_DATA }, + { "leave",OP_LEAVE, 0, 0, OPF_DATA }, { "mov" , OP_MOV, 2, 2, OPF_DATA }, { "lea", OP_LEA, 2, 2, OPF_DATA }, { "movzx",OP_MOVZX, 2, 2, OPF_DATA }, { "movsx",OP_MOVSX, 2, 2, OPF_DATA }, + { "xchg", OP_XCHG, 2, 2, OPF_DATA }, { "not", OP_NOT, 1, 1, OPF_DATA }, { "cdq", OP_CDQ, 0, 0, OPF_DATA }, { "stosb",OP_STOS, 0, 0, OPF_DATA }, @@ -717,6 +743,11 @@ static const struct { { "cmpsb",OP_CMPS, 0, 0, OPF_DATA|OPF_FLAGS }, { "cmpsw",OP_CMPS, 0, 0, OPF_DATA|OPF_FLAGS }, { "cmpsd",OP_CMPS, 0, 0, OPF_DATA|OPF_FLAGS }, + { "scasb",OP_SCAS, 0, 0, OPF_DATA|OPF_FLAGS }, + { "scasw",OP_SCAS, 0, 0, OPF_DATA|OPF_FLAGS }, + { "scasd",OP_SCAS, 0, 0, OPF_DATA|OPF_FLAGS }, + { "std", OP_STD, 0, 0, OPF_DATA }, // special flag + { "cld", OP_CLD, 0, 0, OPF_DATA }, { "add", OP_ADD, 2, 2, OPF_DATA|OPF_FLAGS }, { "sub", OP_SUB, 2, 2, OPF_DATA|OPF_FLAGS }, { "and", OP_AND, 2, 2, OPF_DATA|OPF_FLAGS }, @@ -728,6 +759,8 @@ static const struct { { "sar", OP_SAR, 2, 2, OPF_DATA|OPF_FLAGS }, { "rol", OP_ROL, 2, 2, OPF_DATA|OPF_FLAGS }, { "ror", OP_ROR, 2, 2, OPF_DATA|OPF_FLAGS }, + { "rcl", OP_RCL, 2, 2, OPF_DATA|OPF_FLAGS|OPF_CC }, + { "rcr", OP_RCR, 2, 2, OPF_DATA|OPF_FLAGS|OPF_CC }, { "adc", OP_ADC, 2, 2, OPF_DATA|OPF_FLAGS|OPF_CC }, { "sbb", OP_SBB, 2, 2, OPF_DATA|OPF_FLAGS|OPF_CC }, { "inc", OP_INC, 1, 1, OPF_DATA|OPF_FLAGS }, @@ -742,35 +775,36 @@ static const struct { { "retn", OP_RET, 0, 1, OPF_TAIL }, { "call", OP_CALL, 1, 1, OPF_JMP|OPF_DATA|OPF_FLAGS }, { "jmp", OP_JMP, 1, 1, OPF_JMP }, - { "jo", OP_JO, 1, 1, OPF_JMP|OPF_CC }, // 70 OF=1 - { "jno", OP_JNO, 1, 1, OPF_JMP|OPF_CC }, // 71 OF=0 - { "jc", OP_JC, 1, 1, OPF_JMP|OPF_CC }, // 72 CF=1 - { "jb", OP_JC, 1, 1, OPF_JMP|OPF_CC }, // 72 - { "jnc", OP_JNC, 1, 1, OPF_JMP|OPF_CC }, // 73 CF=0 - { "jnb", OP_JNC, 1, 1, OPF_JMP|OPF_CC }, // 73 - { "jae", OP_JNC, 1, 1, OPF_JMP|OPF_CC }, // 73 - { "jz", OP_JZ, 1, 1, OPF_JMP|OPF_CC }, // 74 ZF=1 - { "je", OP_JZ, 1, 1, OPF_JMP|OPF_CC }, // 74 - { "jnz", OP_JNZ, 1, 1, OPF_JMP|OPF_CC }, // 75 ZF=0 - { "jne", OP_JNZ, 1, 1, OPF_JMP|OPF_CC }, // 75 - { "jbe", OP_JBE, 1, 1, OPF_JMP|OPF_CC }, // 76 CF=1 || ZF=1 - { "jna", OP_JBE, 1, 1, OPF_JMP|OPF_CC }, // 76 - { "ja", OP_JA, 1, 1, OPF_JMP|OPF_CC }, // 77 CF=0 && ZF=0 - { "jnbe", OP_JA, 1, 1, OPF_JMP|OPF_CC }, // 77 - { "js", OP_JS, 1, 1, OPF_JMP|OPF_CC }, // 78 SF=1 - { "jns", OP_JNS, 1, 1, OPF_JMP|OPF_CC }, // 79 SF=0 - { "jp", OP_JP, 1, 1, OPF_JMP|OPF_CC }, // 7a PF=1 - { "jpe", OP_JP, 1, 1, OPF_JMP|OPF_CC }, // 7a - { "jnp", OP_JNP, 1, 1, OPF_JMP|OPF_CC }, // 7b PF=0 - { "jpo", OP_JNP, 1, 1, OPF_JMP|OPF_CC }, // 7b - { "jl", OP_JL, 1, 1, OPF_JMP|OPF_CC }, // 7c SF!=OF - { "jnge", OP_JL, 1, 1, OPF_JMP|OPF_CC }, // 7c - { "jge", OP_JGE, 1, 1, OPF_JMP|OPF_CC }, // 7d SF=OF - { "jnl", OP_JGE, 1, 1, OPF_JMP|OPF_CC }, // 7d - { "jle", OP_JLE, 1, 1, OPF_JMP|OPF_CC }, // 7e ZF=1 || SF!=OF - { "jng", OP_JLE, 1, 1, OPF_JMP|OPF_CC }, // 7e - { "jg", OP_JG, 1, 1, OPF_JMP|OPF_CC }, // 7f ZF=0 && SF=OF - { "jnle", OP_JG, 1, 1, OPF_JMP|OPF_CC }, // 7f + { "jecxz",OP_JECXZ, 1, 1, OPF_JMP|OPF_CJMP }, + { "jo", OP_JO, 1, 1, OPF_CJMP_CC }, // 70 OF=1 + { "jno", OP_JNO, 1, 1, OPF_CJMP_CC }, // 71 OF=0 + { "jc", OP_JC, 1, 1, OPF_CJMP_CC }, // 72 CF=1 + { "jb", OP_JC, 1, 1, OPF_CJMP_CC }, // 72 + { "jnc", OP_JNC, 1, 1, OPF_CJMP_CC }, // 73 CF=0 + { "jnb", OP_JNC, 1, 1, OPF_CJMP_CC }, // 73 + { "jae", OP_JNC, 1, 1, OPF_CJMP_CC }, // 73 + { "jz", OP_JZ, 1, 1, OPF_CJMP_CC }, // 74 ZF=1 + { "je", OP_JZ, 1, 1, OPF_CJMP_CC }, // 74 + { "jnz", OP_JNZ, 1, 1, OPF_CJMP_CC }, // 75 ZF=0 + { "jne", OP_JNZ, 1, 1, OPF_CJMP_CC }, // 75 + { "jbe", OP_JBE, 1, 1, OPF_CJMP_CC }, // 76 CF=1 || ZF=1 + { "jna", OP_JBE, 1, 1, OPF_CJMP_CC }, // 76 + { "ja", OP_JA, 1, 1, OPF_CJMP_CC }, // 77 CF=0 && ZF=0 + { "jnbe", OP_JA, 1, 1, OPF_CJMP_CC }, // 77 + { "js", OP_JS, 1, 1, OPF_CJMP_CC }, // 78 SF=1 + { "jns", OP_JNS, 1, 1, OPF_CJMP_CC }, // 79 SF=0 + { "jp", OP_JP, 1, 1, OPF_CJMP_CC }, // 7a PF=1 + { "jpe", OP_JP, 1, 1, OPF_CJMP_CC }, // 7a + { "jnp", OP_JNP, 1, 1, OPF_CJMP_CC }, // 7b PF=0 + { "jpo", OP_JNP, 1, 1, OPF_CJMP_CC }, // 7b + { "jl", OP_JL, 1, 1, OPF_CJMP_CC }, // 7c SF!=OF + { "jnge", OP_JL, 1, 1, OPF_CJMP_CC }, // 7c + { "jge", OP_JGE, 1, 1, OPF_CJMP_CC }, // 7d SF=OF + { "jnl", OP_JGE, 1, 1, OPF_CJMP_CC }, // 7d + { "jle", OP_JLE, 1, 1, OPF_CJMP_CC }, // 7e ZF=1 || SF!=OF + { "jng", OP_JLE, 1, 1, OPF_CJMP_CC }, // 7e + { "jg", OP_JG, 1, 1, OPF_CJMP_CC }, // 7f ZF=0 && SF=OF + { "jnle", OP_JG, 1, 1, OPF_CJMP_CC }, // 7f { "seto", OP_JO, 1, 1, OPF_DATA|OPF_CC }, { "setno", OP_JNO, 1, 1, OPF_DATA|OPF_CC }, { "setc", OP_JC, 1, 1, OPF_DATA|OPF_CC }, @@ -874,13 +908,14 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc) break; case OP_STOS: + case OP_SCAS: if (op->operand_cnt != 0) break; - if (IS(words[op_w], "stosb")) + if (words[op_w][4] == 'b') lmod = OPLM_BYTE; - else if (IS(words[op_w], "stosw")) + else if (words[op_w][4] == 'w') lmod = OPLM_WORD; - else if (IS(words[op_w], "stosd")) + 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); @@ -906,6 +941,19 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc) op->regmask_dst = op->regmask_src; break; + case OP_XCHG: + op->regmask_src |= op->regmask_dst; + op->regmask_dst |= op->regmask_src; + break; + + case OP_JECXZ: + op->operand_cnt = 1; + op->regmask_src = 1 << xCX; + op->operand[0].type = OPT_REG; + op->operand[0].reg = xCX; + op->operand[0].lmod = OPLM_DWORD; + break; + case OP_IMUL: if (op->operand_cnt != 1) break; @@ -966,6 +1014,11 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc) } break; + case OP_CALL: + // trashed regs must be explicitly detected later + op->regmask_dst = 0; + break; + default: break; } @@ -1375,8 +1428,10 @@ static void stack_frame_access(struct parsed_op *po, ferr(po, "bp_arg arg%d/w offset %d and type '%s' is too small\n", i + 1, offset, g_func_pp->arg[i].type.name); } - if (popr->is_ptr && popr->lmod != OPLM_DWORD) - ferr(po, "bp_arg arg%d: non-dword ptr access\n", i + 1); + // can't check this because msvc likes to reuse + // arg space for scratch.. + //if (popr->is_ptr && popr->lmod != OPLM_DWORD) + // ferr(po, "bp_arg arg%d: non-dword ptr access\n", i + 1); } else { @@ -1433,6 +1488,22 @@ static void stack_frame_access(struct parsed_op *po, } } +static void check_func_pp(struct parsed_op *po, + const struct parsed_proto *pp, const char *pfx) +{ + char buf[256]; + + if (pp->argc_reg != 0) { + if (/*!g_allow_regfunc &&*/ !pp->is_fastcall) { + pp_print(buf, sizeof(buf), pp); + ferr(po, "%s: unexpected reg arg in icall: %s\n", pfx, buf); + } + if (pp->argc_stack > 0 && pp->argc_reg != 2) + ferr(po, "%s: %d reg arg(s) with %d stack arg(s)\n", + pfx, pp->argc_reg, pp->argc_stack); + } +} + static void check_label_read_ref(struct parsed_op *po, const char *name) { const struct parsed_proto *pp; @@ -1441,13 +1512,12 @@ static void check_label_read_ref(struct parsed_op *po, const char *name) if (pp == NULL) ferr(po, "proto_parse failed for ref '%s'\n", name); - // currently we can take __cdecl and __stdcall - if (pp->is_func && pp->argc_reg != 0) - ferr(po, "reg-arg func reference?\n"); + if (pp->is_func) + check_func_pp(po, pp, "ref"); } static char *out_src_opr(char *buf, size_t buf_size, - struct parsed_op *po, struct parsed_opr *popr, const char *cast, + struct parsed_op *po, struct parsed_opr *popr, const char *cast, int is_lea) { char tmp1[256], tmp2[256]; @@ -1549,8 +1619,11 @@ static char *out_src_opr(char *buf, size_t buf_size, ferr(po, "lea from const?\n"); printf_number(tmp1, sizeof(tmp1), popr->val); - snprintf(buf, buf_size, "%s%s", - simplify_cast_num(cast, popr->val), tmp1); + if (popr->val == 0 && strchr(cast, '*')) + snprintf(buf, buf_size, "NULL"); + else + snprintf(buf, buf_size, "%s%s", + simplify_cast_num(cast, popr->val), tmp1); break; default: @@ -1666,6 +1739,8 @@ static enum parsed_flag_op split_cond(struct parsed_op *po, *is_inv = 1; return PFO_LE; + case OP_RCL: + case OP_RCR: case OP_ADC: case OP_SBB: return PFO_C; @@ -1881,11 +1956,12 @@ static void op_set_clear_flag(struct parsed_op *po, // last op in stream - unconditional branch or ret #define LAST_OP(_i) ((ops[_i].flags & OPF_TAIL) \ - || (ops[_i].flags & (OPF_JMP|OPF_CC)) == OPF_JMP) + || (ops[_i].flags & (OPF_JMP|OPF_CJMP)) == OPF_JMP) static int scan_for_pop(int i, int opcnt, const char *reg, int magic, int depth, int *maxdepth, int do_flags) { + const struct parsed_proto *pp; struct parsed_op *po; int ret = 0; int j; @@ -1896,8 +1972,15 @@ static int scan_for_pop(int i, int opcnt, const char *reg, break; // already checked po->cc_scratch = magic; - if (po->flags & OPF_TAIL) + if (po->flags & OPF_TAIL) { + if (po->op == OP_CALL) { + pp = proto_parse(g_fhdr, po->operand[0].name, 0); + if (pp != NULL && pp->is_noreturn) + // no stack cleanup for noreturn + return ret; + } return -1; // deadend + } if ((po->flags & OPF_RMD) || (po->op == OP_PUSH && po->argnum != 0)) // arg push @@ -1906,15 +1989,13 @@ static int scan_for_pop(int i, int opcnt, const char *reg, if ((po->flags & OPF_JMP) && po->op != OP_CALL) { if (po->btj != NULL) { // jumptable - for (j = 0; j < po->btj->count - 1; j++) { + 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); if (ret < 0) return ret; // dead end } - // follow last jumptable entry - i = po->btj->d[j].bt_i - 1; - continue; + return ret; } if (po->bt_i < 0) { @@ -1922,7 +2003,7 @@ static int scan_for_pop(int i, int opcnt, const char *reg, return -1; } - if (po->flags & OPF_CC) { + if (po->flags & OPF_CJMP) { ret |= scan_for_pop(po->bt_i, opcnt, reg, magic, depth, maxdepth, do_flags); if (ret < 0) @@ -1938,24 +2019,26 @@ static int scan_for_pop(int i, int opcnt, const char *reg, && po->operand[0].type == OPT_REG && IS(po->operand[0].name, reg)) { - if (po->op == OP_PUSH) { + if (po->op == OP_PUSH && !(po->flags & OPF_FARG)) { depth++; if (depth > *maxdepth) *maxdepth = depth; if (do_flags) op_set_clear_flag(po, OPF_RSAVE, OPF_RMD); } - else 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); + 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); + } } } } @@ -1996,18 +2079,76 @@ static int scan_for_pop_ret(int i, int opcnt, const char *reg, return found ? 0 : -1; } +static void scan_propagate_df(int i, int opcnt) +{ + struct parsed_op *po = &ops[i]; + int j; + + for (; i < opcnt; i++) { + po = &ops[i]; + if (po->flags & OPF_DF) + return; // already resolved + po->flags |= OPF_DF; + + if (po->op == OP_CALL) + ferr(po, "call with DF set?\n"); + + if (po->flags & OPF_JMP) { + if (po->btj != NULL) { + // jumptable + for (j = 0; j < po->btj->count; j++) + 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_CJMP) + scan_propagate_df(po->bt_i, opcnt); + else + i = po->bt_i - 1; + continue; + } + + if (po->flags & OPF_TAIL) + break; + + if (po->op == OP_CLD) { + po->flags |= OPF_RMD; + return; + } + } + + ferr(po, "missing DF clear?\n"); +} + // 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 ((po->flags & OPF_RMD) || !(po->flags & OPF_DATA)) return 0; - if (opr->type == OPT_REG && po->operand[0].type == OPT_REG) { - if (po->regmask_dst & (1 << opr->reg)) - return 1; - else - return 0; + if (opr->type == OPT_REG) { + if (po->op == OP_CALL) { + mask = (1 << xAX) | (1 << xCX) | (1 << xDX); + if ((1 << opr->reg) & mask) + return 1; + else + return 0; + } + + if (po->operand[0].type == OPT_REG) { + if (po->regmask_dst & (1 << opr->reg)) + return 1; + else + return 0; + } } return IS(po->operand[0].name, opr->name); @@ -2015,8 +2156,9 @@ static int is_opr_modified(const struct parsed_opr *opr, // is any operand of parsed_op 'po_test' modified by parsed_op 'po'? static int is_any_opr_modified(const struct parsed_op *po_test, - const struct parsed_op *po) + const struct parsed_op *po, int c_mode) { + int mask; int i; if ((po->flags & OPF_RMD) || !(po->flags & OPF_DATA)) @@ -2030,9 +2172,12 @@ static int is_any_opr_modified(const struct parsed_op *po_test, // in reality, it can wreck any register, but in decompiled C // version it can only overwrite eax or edx:eax + mask = (1 << xAX) | (1 << xDX); + if (!c_mode) + mask |= 1 << xCX; + if (po->op == OP_CALL - && ((po_test->regmask_src | po_test->regmask_dst) - & ((1 << xAX)|(1 << xDX)))) + && ((po_test->regmask_src | po_test->regmask_dst) & mask)) return 1; for (i = 0; i < po_test->operand_cnt; i++) @@ -2043,13 +2188,14 @@ static int is_any_opr_modified(const struct parsed_op *po_test, } // scan for any po_test operand modification in range given -static int scan_for_mod(struct parsed_op *po_test, int i, int opcnt) +static int scan_for_mod(struct parsed_op *po_test, int i, int opcnt, + int c_mode) { if (po_test->operand_cnt == 1 && po_test->operand[0].type == OPT_CONST) return -1; for (; i < opcnt; i++) { - if (is_any_opr_modified(po_test, &ops[i])) + if (is_any_opr_modified(po_test, &ops[i], c_mode)) return i; } @@ -2109,7 +2255,7 @@ static int scan_for_flag_set(int i, int magic, int *branched, return 0; } - if ((ops[i].flags & OPF_JMP) && !(ops[i].flags & OPF_CC)) + if ((ops[i].flags & (OPF_JMP|OPF_CJMP)) == OPF_JMP) return -1; } @@ -2136,8 +2282,6 @@ static int scan_for_cdq_edx(int i) if (ops[i].regmask_dst & (1 << xDX)) return -1; - if (g_labels[i][0] != 0) - return -1; } return -1; @@ -2165,25 +2309,26 @@ static int scan_for_reg_clear(int i, int reg) if (ops[i].regmask_dst & (1 << reg)) return -1; - if (g_labels[i][0] != 0) - return -1; } return -1; } // scan for positive, constant esp adjust -static int scan_for_esp_adjust(int i, int opcnt, int *adj) +static int scan_for_esp_adjust(int i, int opcnt, int *adj, + int *multipath) { + const struct parsed_proto *pp; struct parsed_op *po; int first_pop = -1; - *adj = 0; + + *adj = *multipath = 0; for (; i < opcnt; i++) { po = &ops[i]; if (g_labels[i][0] != 0) - break; + *multipath = 1; if (po->op == OP_ADD && po->operand[0].reg == xSP) { if (po->operand[1].type != OPT_CONST) @@ -2193,29 +2338,35 @@ static int scan_for_esp_adjust(int i, int opcnt, int *adj) ferr(&ops[i], "unaligned esp adjust: %x\n", *adj); return i; } - else if (po->op == OP_PUSH) { - if (first_pop == -1) - first_pop = -2; // none + else if (po->op == OP_PUSH && !(po->flags & OPF_RMD)) { + //if (first_pop == -1) + // first_pop = -2; // none *adj -= lmod_bytes(po, po->operand[0].lmod); } - else if (po->op == OP_POP) { - if (first_pop == -1) + else if (po->op == OP_POP && !(po->flags & OPF_RMD)) { + // seems like msvc only uses 'pop ecx' for stack realignment.. + if (po->operand[0].type != OPT_REG || po->operand[0].reg != xCX) + break; + if (first_pop == -1 && *adj >= 0) first_pop = i; *adj += lmod_bytes(po, po->operand[0].lmod); } else if (po->flags & (OPF_JMP|OPF_TAIL)) { + if (po->op == OP_JMP && po->btj == NULL) { + i = po->bt_i - 1; + continue; + } if (po->op != OP_CALL) break; if (po->operand[0].type != OPT_LABEL) break; - // TODO: should only allow combining __cdecl calls.. + pp = po->datap; + if (pp != NULL && pp->is_stdcall) + break; } } - if (*adj == 4 && first_pop >= 0 && ops[first_pop].op == OP_POP - && ops[first_pop].operand[0].type == OPT_REG - && ops[first_pop].operand[0].reg == xCX) - { + if (first_pop >= 0) { // probably 'pop ecx' was used.. return first_pop; } @@ -2247,7 +2398,7 @@ static void scan_fwd_set_flags(int i, int opcnt, int magic, int flags) } scan_fwd_set_flags(po->bt_i, opcnt, magic, flags); - if (!(po->flags & OPF_CC)) + if (!(po->flags & OPF_CJMP)) return; } if (po->flags & OPF_TAIL) @@ -2256,9 +2407,11 @@ 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) + struct parsed_op *po, const struct parsed_opr *opr, int *search_instead) { const struct parsed_proto *pp = NULL; + char buf[256]; + char *p; // maybe an arg of g_func? if (opr->type == OPT_REGMEM && is_stack_access(po, opr)) @@ -2272,8 +2425,12 @@ static const struct parsed_proto *try_recover_pp( &offset, &stack_ra, NULL); if (ofs_reg[0] != 0) ferr(po, "offset reg on arg access?\n"); - if (offset <= stack_ra) - ferr(po, "stack var call unhandled yet\n"); + if (offset <= stack_ra) { + // search who set the stack var instead + if (search_instead != NULL) + *search_instead = 1; + return NULL; + } arg_i = (offset - stack_ra - 4) / 4; for (arg = arg_s = 0; arg < g_func_pp->argc; arg++) { @@ -2289,22 +2446,27 @@ static const struct parsed_proto *try_recover_pp( pp = g_func_pp->arg[arg].fptr; if (pp == NULL) ferr(po, "icall sa: arg%d is not a fptr?\n", arg + 1); - if (pp->argc_reg != 0) - ferr(po, "icall sa: reg arg in arg-call unhandled yet\n"); + check_func_pp(po, pp, "icall arg"); + } + else if (opr->type == OPT_REGMEM && strchr(opr->name + 1, '[')) { + // label[index] + p = strchr(opr->name + 1, '['); + memcpy(buf, opr->name, p - opr->name); + buf[p - opr->name] = 0; + pp = proto_parse(g_fhdr, buf, 0); } else if (opr->type == OPT_OFFSET || opr->type == OPT_LABEL) { pp = proto_parse(g_fhdr, opr->name, 0); if (pp == NULL) ferr(po, "proto_parse failed for icall from '%s'\n", opr->name); - if (pp->argc_reg != 0) - ferr(po, "arg-call unhandled yet for '%s'\n", opr->name); + check_func_pp(po, pp, "reg-fptr ref"); } return pp; } -static void scan_for_call_type(int i, struct parsed_opr *opr, - int magic, const struct parsed_proto **pp_found) +static void scan_for_call_type(int i, const struct parsed_opr *opr, + int magic, const struct parsed_proto **pp_found, int *multi) { const struct parsed_proto *pp = NULL; struct parsed_op *po; @@ -2318,7 +2480,7 @@ static void scan_for_call_type(int i, struct parsed_opr *opr, if (g_labels[i][0] != 0) { lr = &g_label_refs[i]; for (; lr != NULL; lr = lr->next) - scan_for_call_type(lr->i, opr, magic, pp_found); + scan_for_call_type(lr->i, opr, magic, pp_found, multi); if (i > 0 && LAST_OP(i - 1)) return; } @@ -2358,46 +2520,54 @@ static void scan_for_call_type(int i, struct parsed_opr *opr, if (pp == NULL) ferr(po, "icall: arg%d (%s) is not a fptr?\n", i + 1, g_func_pp->arg[i].reg); - if (pp->argc_reg != 0) - ferr(po, "icall: reg arg in arg-call unhandled yet\n"); + check_func_pp(po, pp, "icall reg-arg"); } else - pp = try_recover_pp(po, opr); + pp = try_recover_pp(po, opr, NULL); - if (*pp_found != NULL && pp != 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)->argc != pp->argc || (*pp_found)->argc_reg != pp->argc_reg || (*pp_found)->argc_stack != pp->argc_stack) { ferr(po, "icall: parsed_proto mismatch\n"); } + *multi = 1; } if (pp != NULL) *pp_found = pp; } -static const struct parsed_proto *resolve_call(int i, int opcnt) +static const struct parsed_proto *resolve_icall(int i, int opcnt, + int *multi_src) { const struct parsed_proto *pp = NULL; + int search_advice = 0; + + *multi_src = 0; 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]); - break; + 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); + scan_for_call_type(i, &ops[i].operand[0], i + opcnt * 9, &pp, + multi_src); break; } return pp; } -static int collect_call_args(struct parsed_op *po, int i, - struct parsed_proto *pp, int *save_arg_vars, int arg, +static int collect_call_args_r(struct parsed_op *po, int i, + struct parsed_proto *pp, int *regmask, int *save_arg_vars, int arg, int magic, int need_op_saving, int may_reuse) { struct parsed_proto *pp_tmp; @@ -2416,7 +2586,7 @@ static int collect_call_args(struct parsed_op *po, int i, break; magic = (magic & 0xffffff) | (arg << 24); - for (j = i; j >= 0 && arg < pp->argc; ) + for (j = i; j >= 0 && (arg < pp->argc || pp->is_unresolved); ) { if (((ops[j].cc_scratch ^ magic) & 0xffffff) == 0) { if (ops[j].cc_scratch != magic) { @@ -2434,15 +2604,15 @@ static int collect_call_args(struct parsed_op *po, int i, if (lr->next != NULL) need_op_saving = 1; for (; lr->next; lr = lr->next) { - if ((ops[lr->i].flags & (OPF_JMP|OPF_CC)) != OPF_JMP) + if ((ops[lr->i].flags & (OPF_JMP|OPF_CJMP)) != OPF_JMP) may_reuse = 1; - ret = collect_call_args(po, lr->i, pp, save_arg_vars, + ret = collect_call_args_r(po, lr->i, pp, regmask, save_arg_vars, arg, magic, need_op_saving, may_reuse); if (ret < 0) return ret; } - if ((ops[lr->i].flags & (OPF_JMP|OPF_CC)) != OPF_JMP) + if ((ops[lr->i].flags & (OPF_JMP|OPF_CJMP)) != OPF_JMP) may_reuse = 1; if (j > 0 && LAST_OP(j - 1)) { // follow last branch in reverse @@ -2450,7 +2620,7 @@ static int collect_call_args(struct parsed_op *po, int i, continue; } need_op_saving = 1; - ret = collect_call_args(po, lr->i, pp, save_arg_vars, + ret = collect_call_args_r(po, lr->i, pp, regmask, save_arg_vars, arg, magic, need_op_saving, may_reuse); if (ret < 0) return ret; @@ -2459,6 +2629,9 @@ static int collect_call_args(struct parsed_op *po, int i, if (ops[j].op == OP_CALL) { + if (pp->is_unresolved) + break; + pp_tmp = ops[j].datap; if (pp_tmp == NULL) ferr(po, "arg collect hit unparsed call '%s'\n", @@ -2468,22 +2641,34 @@ static int collect_call_args(struct parsed_op *po, int i, arg, pp->argc, opr_name(&ops[j], 0), pp_tmp->argc_stack); } else if (ops[j].op == OP_ADD && ops[j].operand[0].reg == xSP) { + if (pp->is_unresolved) + break; + ferr(po, "arg collect %d/%d hit esp adjust\n", arg, pp->argc); } else if (ops[j].op == OP_POP) { + if (pp->is_unresolved) + break; + ferr(po, "arg collect %d/%d hit pop\n", arg, pp->argc); } - else if ((ops[j].flags & (OPF_JMP|OPF_CC)) == (OPF_JMP|OPF_CC)) + else if (ops[j].flags & OPF_CJMP) { + if (pp->is_unresolved) + break; + may_reuse = 1; } else if (ops[j].op == OP_PUSH && !(ops[j].flags & OPF_FARG)) { + if (pp->is_unresolved && (ops[j].flags & OPF_RMD)) + break; + pp->arg[arg].datap = &ops[j]; need_to_save_current = 0; if (!need_op_saving) { - ret = scan_for_mod(&ops[j], j + 1, i); + ret = scan_for_mod(&ops[j], j + 1, i, 1); need_to_save_current = (ret >= 0); } if (need_op_saving || need_to_save_current) { @@ -2506,22 +2691,73 @@ static int collect_call_args(struct parsed_op *po, int i, if (!may_reuse) ops[j].flags |= OPF_FARG; - // next arg - for (arg++; arg < pp->argc; arg++) - if (pp->arg[arg].reg == NULL) - break; + ops[j].flags &= ~OPF_RSAVE; + + arg++; + if (!pp->is_unresolved) { + // next arg + for (; arg < pp->argc; arg++) + if (pp->arg[arg].reg == NULL) + break; + } magic = (magic & 0xffffff) | (arg << 24); + + // tracking reg usage + if (ops[j].operand[0].type == OPT_REG) + *regmask |= 1 << ops[j].operand[0].reg; } } if (arg < pp->argc) { ferr(po, "arg collect failed for '%s': %d/%d\n", pp->name, arg, pp->argc); - ret = -1; + return -1; } + + return arg; +} + +static int collect_call_args(struct parsed_op *po, int i, + struct parsed_proto *pp, int *regmask, int *save_arg_vars, + int magic) +{ + int ret; + int a; + + ret = collect_call_args_r(po, i, pp, regmask, save_arg_vars, + 0, magic, 0, 0); + if (ret < 0) + return ret; + + if (pp->is_unresolved) { + pp->argc += ret; + pp->argc_stack += ret; + for (a = 0; a < pp->argc; a++) + if (pp->arg[a].type.name == NULL) + pp->arg[a].type.name = strdup("int"); + } + return ret; } +static void pp_insert_reg_arg(struct parsed_proto *pp, const char *reg) +{ + int i; + + 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 add_label_ref(struct label_ref *lr, int op_i) { struct label_ref *lr_new; @@ -2552,6 +2788,17 @@ static void output_std_flags(FILE *fout, struct parsed_op *po, } } +static void output_pp_attrs(FILE *fout, const struct parsed_proto *pp, + int is_noreturn) +{ + if (pp->is_fastcall) + fprintf(fout, "__fastcall "); + else if (pp->is_stdcall && pp->argc_reg == 0) + fprintf(fout, "__stdcall "); + if (pp->is_noreturn || is_noreturn) + fprintf(fout, "noreturn "); +} + static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) { struct parsed_op *po, *delayed_flag_op = NULL, *tmp_op; @@ -2563,15 +2810,15 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) const char *tmpname; enum parsed_flag_op pfo; int save_arg_vars = 0; - int cmp_result_vars = 0; - int need_mul_var = 0; - int have_func_ret = 0; - int have_normal_ret = 0; + 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 pfomask = 0; int found = 0; @@ -2591,11 +2838,8 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) ferr(ops, "proto_parse failed for '%s'\n", funcn); fprintf(fout, "%s ", g_func_pp->ret_type.name); - if (g_func_pp->is_stdcall && g_func_pp->argc_reg == 0) - fprintf(fout, "__stdcall "); - if (g_ida_func_attr & IDAFA_NORETURN) - fprintf(fout, "noreturn "); - fprintf(fout, "%s(", funcn); + output_pp_attrs(fout, g_func_pp, g_ida_func_attr & IDAFA_NORETURN); + fprintf(fout, "%s(", g_func_pp->name); for (i = 0; i < g_func_pp->argc; i++) { if (i > 0) @@ -2604,8 +2848,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) // func pointer.. pp = g_func_pp->arg[i].fptr; fprintf(fout, "%s (", pp->ret_type.name); - if (pp->is_stdcall && pp->argc_reg == 0) - fprintf(fout, "__stdcall "); + output_pp_attrs(fout, pp, 0); fprintf(fout, "*a%d)(", i + 1); for (j = 0; j < pp->argc; j++) { if (j > 0) @@ -2619,6 +2862,13 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) else { fprintf(fout, "%s a%d", g_func_pp->arg[i].type.name, i + 1); } + if (g_func_pp->arg[i].reg != NULL) { + reg = char_array_i(regs_r32, + ARRAY_SIZE(regs_r32), g_func_pp->arg[i].reg); + if (reg < 0) + ferr(ops, "arg '%s' is not a reg?\n", g_func_pp->arg[i].reg); + regmask_arg |= 1 << reg; + } } if (g_func_pp->is_vararg) { if (i > 0) @@ -2675,28 +2925,44 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) for (; i < opcnt; i++) if (ops[i].op == OP_RET) break; - if (i == opcnt && (ops[i - 1].flags & OPF_JMP) && found) - break; + j = i - 1; + if (i == opcnt && (ops[j].flags & OPF_JMP)) { + if (found) { + if (ops[j].op == OP_JMP && !ops[j].operand[0].had_ds) + // probably local branch back.. + break; + if (ops[j].op == OP_CALL) + // probably noreturn call.. + break; + } + j--; + } - if (ops[i - 1].op == OP_POP && IS(opr_name(&ops[i - 1], 0), "ebp")) - ops[i - 1].flags |= OPF_RMD; + if ((ops[j].op == OP_POP && IS(opr_name(&ops[j], 0), "ebp")) + || ops[j].op == OP_LEAVE) + { + ops[j].flags |= OPF_RMD; + } else if (!(g_ida_func_attr & IDAFA_NORETURN)) - ferr(&ops[i - 1], "'pop ebp' expected\n"); + ferr(&ops[j], "'pop ebp' expected\n"); if (g_stack_fsz != 0) { - if (ops[i - 2].op == OP_MOV - && IS(opr_name(&ops[i - 2], 0), "esp") - && IS(opr_name(&ops[i - 2], 1), "ebp")) + if (ops[j - 1].op == OP_MOV + && IS(opr_name(&ops[j - 1], 0), "esp") + && IS(opr_name(&ops[j - 1], 1), "ebp")) { - ops[i - 2].flags |= OPF_RMD; + ops[j - 1].flags |= OPF_RMD; + } + else if (ops[j].op != OP_LEAVE + && !(g_ida_func_attr & IDAFA_NORETURN)) + { + ferr(&ops[j - 1], "esp restore expected\n"); } - else if (!(g_ida_func_attr & IDAFA_NORETURN)) - ferr(&ops[i - 2], "esp restore expected\n"); - if (ecx_push && ops[i - 3].op == OP_POP - && IS(opr_name(&ops[i - 3], 0), "ecx")) + if (ecx_push && ops[j - 2].op == OP_POP + && IS(opr_name(&ops[j - 2], 0), "ecx")) { - ferr(&ops[i - 3], "unexpected ecx pop\n"); + ferr(&ops[j - 2], "unexpected ecx pop\n"); } } @@ -2751,6 +3017,8 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) 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_")) @@ -2758,10 +3026,26 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) pp_c = proto_parse(fhdr, tmpname, 0); if (pp_c == NULL) ferr(po, "proto_parse failed for call '%s'\n", tmpname); - if (pp_c->is_fptr && pp_c->argc_reg != 0) - ferr(po, "fptr call with reg arg\n"); + 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->datap = pp; } continue; @@ -2773,7 +3057,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) if (po->operand[0].type == OPT_REGMEM) { char *p = strchr(po->operand[0].name, '['); if (p == NULL) - ferr(po, "unhandled indirect branch\n"); + goto tailcall; ret = p - po->operand[0].name; strncpy(buf1, po->operand[0].name, ret); buf1[ret] = 0; @@ -2825,6 +3109,8 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int 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 } @@ -2847,18 +3133,28 @@ tailcall: if (pp == NULL) { // indirect call - pp_c = resolve_call(i, opcnt); - if (pp_c != NULL) + pp_c = resolve_icall(i, opcnt, &l); + if (pp_c != NULL) { pp = proto_clone(pp_c); + my_assert_not(pp, NULL); + if (l) + // not resolved just to single func + pp->is_fptr = 1; + } if (pp == NULL) { pp = calloc(1, sizeof(*pp)); my_assert_not(pp, NULL); - ret = scan_for_esp_adjust(i + 1, opcnt, &j); - if (ret < 0) - ferr(po, "non-__cdecl indirect call unhandled yet\n"); + pp->is_fptr = 1; + ret = scan_for_esp_adjust(i + 1, opcnt, &j, &l); + if (ret < 0) { + if (!g_allow_regfunc) + ferr(po, "non-__cdecl indirect call unhandled yet\n"); + pp->is_unresolved = 1; + j = 0; + } j /= 4; if (j > ARRAY_SIZE(pp->arg)) - ferr(po, "esp adjust too large?\n"); + ferr(po, "esp adjust too large: %d\n", j); pp->ret_type.name = strdup("int"); pp->argc = pp->argc_stack = j; for (arg = 0; arg < pp->argc; arg++) @@ -2870,7 +3166,7 @@ tailcall: // look for and make use of esp adjust ret = -1; if (!pp->is_stdcall && pp->argc_stack > 0) - ret = scan_for_esp_adjust(i + 1, opcnt, &j); + ret = scan_for_esp_adjust(i + 1, opcnt, &j, &l); if (ret >= 0) { if (pp->is_vararg) { if (j / 4 < pp->argc_stack) @@ -2891,37 +3187,42 @@ tailcall: tmpname, pp->argc_stack * 4, j); ops[ret].flags |= OPF_RMD; - // a bit of a hack, but deals with use of - // single adj for multiple calls - ops[ret].operand[1].val -= j; + if (ops[ret].op == OP_POP && j > 4) { + // deal with multi-pop stack adjust + j = pp->argc_stack; + while (ops[ret].op == OP_POP && j > 0 && ret < opcnt) { + ops[ret].flags |= OPF_RMD; + j--; + ret++; + } + } + else if (!l) { + // a bit of a hack, but deals with use of + // single adj for multiple calls + ops[ret].operand[1].val -= j; + } } else if (pp->is_vararg) ferr(po, "missing esp_adjust for vararg func '%s'\n", pp->name); - // can't call functions with non-__cdecl callbacks yet - for (arg = 0; arg < pp->argc; arg++) { - if (pp->arg[arg].fptr != NULL) { - pp_tmp = pp->arg[arg].fptr; - if (pp_tmp->argc_reg != 0) - ferr(po, "'%s' has a callback with reg-args\n", tmpname); - } + if (!pp->is_unresolved && !(po->flags & OPF_ATAIL)) { + // since we know the args, collect them + collect_call_args(po, i, pp, ®mask, &save_arg_vars, + i + opcnt * 2); } - collect_call_args(po, i, pp, &save_arg_vars, - 0, i + opcnt * 2, 0, 0); - if (strstr(pp->ret_type.name, "int64")) - need_mul_var = 1; - if (!(po->flags & OPF_TAIL) && !IS(pp->ret_type.name, "void")) - have_func_ret = 1; + need_tmp64 = 1; } } // pass4: // - find POPs for PUSHes, rm both + // - scan for STD/CLD, propagate DF // - scan for all used registers // - find flag set ops for their users + // - do unreselved calls // - declare indirect functions for (i = 0; i < opcnt; i++) { po = &ops[i]; @@ -2937,40 +3238,63 @@ tailcall: regmask_save |= 1 << reg; } - if (po->op == OP_PUSH - && po->argnum == 0 && !(po->flags & OPF_RSAVE) - && po->operand[0].type == OPT_REG) + if (po->op == OP_PUSH && po->argnum == 0 + && !(po->flags & OPF_RSAVE)) { - 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; + 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; + } } - 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; + else if (po->operand[0].type == OPT_CONST) { + 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][0] != 0) + { + break; + } + + if (!(ops[j].flags & OPF_RMD) && ops[j].op == OP_POP) + { + po->flags |= OPF_RMD; + ops[j].datap = po; + break; + } } - 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; + 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)) { @@ -3003,13 +3327,14 @@ tailcall: // to get nicer code, we try to delay test and cmp; // if we can't because of operand modification, or if we - // have math op, or branch, make it calculate flags explicitly - if (tmp_op->op == OP_TEST || tmp_op->op == OP_CMP) { - if (branched || scan_for_mod(tmp_op, setters[j] + 1, i) >= 0) + // have arith op, or branch, make it calculate flags explicitly + if (tmp_op->op == OP_TEST || tmp_op->op == OP_CMP) + { + if (branched || scan_for_mod(tmp_op, setters[j] + 1, i, 0) >= 0) pfomask = 1 << pfo; } - else if (tmp_op->op == OP_CMPS) { - pfomask = 1 << PFO_Z; + else if (tmp_op->op == OP_CMPS || tmp_op->op == OP_SCAS) { + pfomask = 1 << pfo; } else { // see if we'll be able to handle based on op result @@ -3018,41 +3343,158 @@ tailcall: || branched || scan_for_mod_opr0(tmp_op, setters[j] + 1, i) >= 0) pfomask = 1 << pfo; + + if (tmp_op->op == OP_ADD && pfo == PFO_C) + need_tmp64 = 1; } if (pfomask) { tmp_op->pfomask |= pfomask; - cmp_result_vars |= pfomask; + cond_vars |= pfomask; } // note: may overwrite, currently not a problem po->datap = tmp_op; } - if (po->op == OP_ADC || po->op == OP_SBB) - cmp_result_vars |= 1 << PFO_C; + if (po->op == OP_RCL || po->op == OP_RCR + || po->op == OP_ADC || po->op == OP_SBB) + cond_vars |= 1 << PFO_C; + } + else if (po->op == OP_CMPS || po->op == OP_SCAS) { + cond_vars |= 1 << PFO_Z; } else if (po->op == OP_MUL || (po->op == OP_IMUL && po->operand_cnt == 1)) { - need_mul_var = 1; + need_tmp64 = 1; } - else if (po->op == OP_CALL && po->operand[0].type != OPT_LABEL) { + else if (po->op == OP_CALL) { pp = po->datap; - my_assert_not(pp, NULL); - fprintf(fout, " %s (", pp->ret_type.name); - if (pp->is_stdcall && pp->argc_reg == 0) - fprintf(fout, "__stdcall "); - fprintf(fout, "*icall%d)(", i); - for (j = 0; j < pp->argc; j++) { - if (j > 0) - fprintf(fout, ", "); - fprintf(fout, "%s a%d", pp->arg[j].type.name, j + 1); + if (pp == NULL) + ferr(po, "NULL pp\n"); + + if (pp->is_unresolved) { + int regmask_stack = 0; + collect_call_args(po, i, pp, ®mask, &save_arg_vars, + 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) + continue; + + tmp_op = pp->arg[arg].datap; + if (tmp_op == NULL) + ferr(po, "parsed_op missing for arg%d\n", arg); + if (tmp_op->argnum == 0 && tmp_op->operand[0].type == OPT_REG) + regmask_stack |= 1 << tmp_op->operand[0].reg; + } + + if (!((regmask_stack & (1 << xCX)) + && (regmask_stack & (1 << xDX)))) + { + if (pp->argc_stack != 0 + || ((regmask | regmask_arg) & ((1 << xCX)|(1 << xDX)))) + { + pp_insert_reg_arg(pp, "ecx"); + pp->is_fastcall = 1; + regmask_init |= 1 << xCX; + regmask |= 1 << xCX; + } + if (pp->argc_stack != 0 + || ((regmask | regmask_arg) & (1 << xDX))) + { + pp_insert_reg_arg(pp, "edx"); + regmask_init |= 1 << xDX; + regmask |= 1 << xDX; + } + } + + // note: __cdecl doesn't fall into is_unresolved category + 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; + } + } + } + + if (pp->is_fptr) { + if (pp->name[0] != 0) { + memmove(pp->name + 2, pp->name, strlen(pp->name) + 1); + memcpy(pp->name, "i_", 2); + + // might be declared already + found = 0; + for (j = 0; j < i; j++) { + if (ops[j].op == OP_CALL && (pp_tmp = ops[j].datap)) { + if (pp_tmp->is_fptr && IS(pp->name, pp_tmp->name)) { + found = 1; + break; + } + } + } + if (found) + continue; + } + else + snprintf(pp->name, sizeof(pp->name), "icall%d", i); + + fprintf(fout, " %s (", pp->ret_type.name); + output_pp_attrs(fout, pp, 0); + fprintf(fout, "*%s)(", pp->name); + for (j = 0; j < pp->argc; j++) { + if (j > 0) + fprintf(fout, ", "); + fprintf(fout, "%s a%d", pp->arg[j].type.name, j + 1); + } + fprintf(fout, ");\n"); } - fprintf(fout, ");\n"); } - else if (po->op == OP_RET) - have_normal_ret = 1; + 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; + else + need_tmp64 = 1; + } + + if (po->op == OP_RCL || po->op == OP_RCR || po->op == OP_XCHG) { + need_tmp_var = 1; + } } + // pass4: + // - 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 LUTs/jumptables for (i = 0; i < g_func_pd_cnt; i++) { pd = &g_func_pd[i]; @@ -3092,31 +3534,26 @@ tailcall: if (g_func_pp->arg[i].reg != NULL) { reg = char_array_i(regs_r32, ARRAY_SIZE(regs_r32), g_func_pp->arg[i].reg); - if (reg < 0) - ferr(ops, "arg '%s' is not a reg?\n", g_func_pp->arg[i].reg); - - regmask_arg |= 1 << reg; - fprintf(fout, " u32 %s = (u32)a%d;\n", - g_func_pp->arg[i].reg, i + 1); + if (regmask & (1 << reg)) { + fprintf(fout, " u32 %s = (u32)a%d;\n", + g_func_pp->arg[i].reg, i + 1); + } + else + fprintf(fout, " // %s = a%d; // unused\n", + g_func_pp->arg[i].reg, i + 1); had_decl = 1; } } - // declare other regs - special case for eax - if (!((regmask | regmask_arg) & 1) - && (have_func_ret || have_normal_ret) - && !IS(g_func_pp->ret_type.name, "void")) - { - fprintf(fout, " u32 eax = 0;\n"); - had_decl = 1; - } - - regmask &= ~regmask_arg; - regmask &= ~(1 << xSP); - if (regmask) { + regmask_now = regmask & ~regmask_arg; + regmask_now &= ~(1 << xSP); + if (regmask_now) { for (reg = 0; reg < 8; reg++) { - if (regmask & (1 << reg)) { - fprintf(fout, " u32 %s;\n", regs_r32[reg]); + if (regmask_now & (1 << reg)) { + fprintf(fout, " u32 %s", regs_r32[reg]); + if (regmask_init & (1 << reg)) + fprintf(fout, " = 0"); + fprintf(fout, ";\n"); had_decl = 1; } } @@ -3140,17 +3577,22 @@ tailcall: } } - if (cmp_result_vars) { + if (cond_vars) { for (i = 0; i < 8; i++) { - if (cmp_result_vars & (1 << i)) { + if (cond_vars & (1 << i)) { fprintf(fout, " u32 cond_%s;\n", parsed_flag_op_names[i]); had_decl = 1; } } } - if (need_mul_var) { - fprintf(fout, " u64 mul_tmp;\n"); + if (need_tmp_var) { + fprintf(fout, " u32 tmp;\n"); + had_decl = 1; + } + + if (need_tmp64) { + fprintf(fout, " u64 tmp64;\n"); had_decl = 1; } @@ -3226,7 +3668,9 @@ tailcall: if (po->flags & OPF_JMP) { fprintf(fout, " if %s\n", buf1); } - else if (po->op == OP_ADC || po->op == OP_SBB) { + else if (po->op == OP_RCL || po->op == OP_RCR + || po->op == OP_ADC || po->op == OP_SBB) + { if (is_delayed) fprintf(fout, " cond_%s = %s;\n", parsed_flag_op_names[pfo], buf1); @@ -3242,6 +3686,27 @@ tailcall: pfomask = po->pfomask; + if (po->flags & (OPF_REPZ|OPF_REPNZ)) { + // 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: @@ -3287,6 +3752,19 @@ tailcall: buf3, 0)); break; + case OP_XCHG: + assert_operand_cnt(2); + propagate_lmod(po, &po->operand[0], &po->operand[1]); + fprintf(fout, " tmp = %s;", + out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], "", 0)); + fprintf(fout, " %s = %s;", + out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]), + out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], "", 0)); + fprintf(fout, " %s = tmp;", + out_dst_opr(buf1, sizeof(buf1), po, &po->operand[1])); + snprintf(g_comment, sizeof(g_comment), "xchg"); + break; + case OP_NOT: assert_operand_cnt(1); out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]); @@ -3302,65 +3780,73 @@ tailcall: break; case OP_STOS: - // assumes DF=0 assert_operand_cnt(3); if (po->flags & OPF_REP) { - fprintf(fout, " for (; ecx != 0; ecx--, edi += %d)\n", + fprintf(fout, " for (; ecx != 0; ecx--, edi %c= %d)\n", + (po->flags & OPF_DF) ? '-' : '+', lmod_bytes(po, po->operand[0].lmod)); fprintf(fout, " %sedi = eax;", lmod_cast_u_ptr(po, po->operand[0].lmod)); strcpy(g_comment, "rep stos"); } else { - fprintf(fout, " %sedi = eax; edi += %d;", + fprintf(fout, " %sedi = eax; edi %c= %d;", lmod_cast_u_ptr(po, po->operand[0].lmod), + (po->flags & OPF_DF) ? '-' : '+', lmod_bytes(po, po->operand[0].lmod)); strcpy(g_comment, "stos"); } break; case OP_MOVS: - // assumes DF=0 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) { fprintf(fout, - " for (; ecx != 0; ecx--, edi += %d, esi += %d)\n", - j, j); + " for (; ecx != 0; ecx--, edi %c= %d, esi %c= %d)\n", + l, j, l, j); fprintf(fout, " %sedi = %sesi;", buf1, buf1); strcpy(g_comment, "rep movs"); } else { - fprintf(fout, " %sedi = %sesi; edi += %d; esi += %d;", - buf1, buf1, j, j); + fprintf(fout, " %sedi = %sesi; edi %c= %d; esi %c= %d;", + buf1, buf1, l, j, l, j); strcpy(g_comment, "movs"); } break; case OP_CMPS: - // assumes DF=0 // 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) { fprintf(fout, - " for (; ecx != 0; ecx--, edi += %d, esi += %d)\n", - j, j); + " for (; ecx != 0; ecx--, edi %c= %d, esi %c= %d) {\n", + l, j, l, j); + if (pfomask & (1 << PFO_C)) { + // ugh.. + fprintf(fout, + " cond_c = %sedi < %sesi;\n", buf1, buf1); + pfomask &= ~(1 << PFO_C); + } fprintf(fout, " if ((cond_z = (%sedi == %sesi)) %s 0)\n", buf1, buf1, (po->flags & OPF_REPZ) ? "==" : "!="); fprintf(fout, - " break;"); + " break;\n" + " }"); snprintf(g_comment, sizeof(g_comment), "rep%s cmps", (po->flags & OPF_REPZ) ? "e" : "ne"); } else { fprintf(fout, - " cond_z = (%sedi = %sesi); edi += %d; esi += %d;", - buf1, buf1, j, j); + " cond_z = (%sedi = %sesi); edi %c= %d; esi %c= %d;", + buf1, buf1, l, j, l, j); strcpy(g_comment, "cmps"); } pfomask &= ~(1 << PFO_Z); @@ -3368,9 +3854,37 @@ tailcall: delayed_flag_op = NULL; break; + 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); + l = (po->flags & OPF_DF) ? '-' : '+'; + if (po->flags & OPF_REP) { + fprintf(fout, + " for (; ecx != 0; ecx--, edi %c= %d)\n", l, j); + fprintf(fout, + " if ((cond_z = (%seax == %sedi)) %s 0)\n", + lmod_cast_u(po, po->operand[0].lmod), + lmod_cast_u_ptr(po, po->operand[0].lmod), + (po->flags & OPF_REPZ) ? "==" : "!="); + fprintf(fout, + " break;"); + snprintf(g_comment, sizeof(g_comment), "rep%s scas", + (po->flags & OPF_REPZ) ? "e" : "ne"); + } + else { + 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); + strcpy(g_comment, "scas"); + } + pfomask &= ~(1 << PFO_Z); + last_arith_dst = NULL; + delayed_flag_op = NULL; + break; + // arithmetic w/flags - case OP_ADD: - case OP_SUB: case OP_AND: case OP_OR: propagate_lmod(po, &po->operand[0], &po->operand[1]); @@ -3400,8 +3914,8 @@ tailcall: j = l - j; else j -= 1; - fprintf(fout, " cond_c = (%s & 0x%02x) ? 1 : 0;\n", - buf1, 1 << j); + fprintf(fout, " cond_c = (%s >> %d) & 1;\n", + buf1, j); } else ferr(po, "zero shift?\n"); @@ -3448,11 +3962,51 @@ tailcall: delayed_flag_op = NULL; break; + case OP_RCL: + case OP_RCR: + assert_operand_cnt(2); + out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]); + l = lmod_bytes(po, po->operand[0].lmod) * 8; + if (po->operand[1].type == OPT_CONST) { + j = po->operand[1].val % l; + if (j == 0) + ferr(po, "zero rotate\n"); + fprintf(fout, " tmp = (%s >> %d) & 1;\n", + buf1, (po->op == OP_RCL) ? (l - j) : (j - 1)); + if (po->op == OP_RCL) { + fprintf(fout, + " %s = (%s << %d) | (cond_c << %d)", + buf1, buf1, j, j - 1); + if (j != 1) + fprintf(fout, " | (%s >> %d)", buf1, l + 1 - j); + } + else { + fprintf(fout, + " %s = (%s >> %d) | (cond_c << %d)", + buf1, buf1, j, l - j); + if (j != 1) + fprintf(fout, " | (%s << %d)", buf1, l + 1 - j); + } + fprintf(fout, ";\n"); + fprintf(fout, " cond_c = tmp;"); + } + else + ferr(po, "TODO\n"); + strcpy(g_comment, (po->op == OP_RCL) ? "rcl" : "rcr"); + output_std_flags(fout, po, &pfomask, buf1); + last_arith_dst = &po->operand[0]; + delayed_flag_op = NULL; + break; + case OP_XOR: assert_operand_cnt(2); 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); + } fprintf(fout, " %s = 0;", out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0])); last_arith_dst = &po->operand[0]; @@ -3461,6 +4015,36 @@ tailcall: } goto dualop_arith; + case OP_ADD: + assert_operand_cnt(2); + propagate_lmod(po, &po->operand[0], &po->operand[1]); + if (pfomask & (1 << PFO_C)) { + fprintf(fout, " tmp64 = (u64)%s + %s;\n", + out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]), + out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1])); + 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"); + pfomask &= ~(1 << PFO_C); + output_std_flags(fout, po, &pfomask, buf1); + last_arith_dst = &po->operand[0]; + delayed_flag_op = NULL; + break; + } + goto dualop_arith; + + case OP_SUB: + assert_operand_cnt(2); + propagate_lmod(po, &po->operand[0], &po->operand[1]); + if (pfomask & (1 << PFO_C)) { + fprintf(fout, " cond_c = %s < %s;\n", + out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]), + out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1])); + pfomask &= ~(1 << PFO_C); + } + goto dualop_arith; + case OP_ADC: case OP_SBB: assert_operand_cnt(2); @@ -3523,10 +4107,10 @@ tailcall: case OP_MUL: assert_operand_cnt(1); strcpy(buf1, po->op == OP_IMUL ? "(s64)(s32)" : "(u64)"); - fprintf(fout, " mul_tmp = %seax * %s%s;\n", buf1, buf1, + fprintf(fout, " tmp64 = %seax * %s%s;\n", buf1, buf1, out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[0])); - fprintf(fout, " edx = mul_tmp >> 32;\n"); - fprintf(fout, " eax = mul_tmp;"); + fprintf(fout, " edx = tmp64 >> 32;\n"); + fprintf(fout, " eax = tmp64;"); last_arith_dst = NULL; delayed_flag_op = NULL; break; @@ -3537,20 +4121,32 @@ tailcall: if (po->operand[0].lmod != OPLM_DWORD) ferr(po, "unhandled lmod %d\n", po->operand[0].lmod); - // 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) { - out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]); - strcpy(buf2, lmod_cast(po, po->operand[0].lmod, - po->op == OP_IDIV)); - fprintf(fout, " edx = %seax %% %s%s;\n", buf2, buf2, buf1); - fprintf(fout, " eax = %seax / %s%s;", buf2, buf2, buf1); + out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]); + strcpy(buf2, 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); + else { + fprintf(fout, " tmp64 = ((u64)edx << 32) | eax;\n"); + snprintf(buf3, sizeof(buf3), "%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); + } + else { + fprintf(fout, " edx = %s %% %s%s;\n", buf3, buf2, buf1); + fprintf(fout, " eax = %s / %s%s;", buf3, buf2, buf1); + } + break; + default: + ferr(po, "unhandled division type\n"); } - else - ferr(po, "TODO 64bit divident\n"); last_arith_dst = NULL; delayed_flag_op = NULL; break; @@ -3581,6 +4177,12 @@ tailcall: // else SETcc - should already be handled break; + case OP_JECXZ: + fprintf(fout, " if (ecx == 0)\n"); + fprintf(fout, " goto %s;", po->operand[0].name); + strcat(g_comment, "jecxz"); + break; + case OP_JMP: assert_operand_cnt(1); last_arith_dst = NULL; @@ -3604,11 +4206,10 @@ tailcall: case OP_CALL: assert_operand_cnt(1); pp = po->datap; - if (pp == NULL) - ferr(po, "NULL pp\n"); + my_assert_not(pp, NULL); - if (po->operand[0].type != OPT_LABEL) - fprintf(fout, " icall%d = %s;\n", i, + if (pp->is_fptr) + fprintf(fout, " %s = %s;\n", pp->name, out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], "(void *)", 0)); @@ -3616,7 +4217,7 @@ tailcall: if (strstr(pp->ret_type.name, "int64")) { if (po->flags & OPF_TAIL) ferr(po, "int64 and tail?\n"); - fprintf(fout, "mul_tmp = "); + fprintf(fout, "tmp64 = "); } else if (!IS(pp->ret_type.name, "void")) { if (po->flags & OPF_TAIL) { @@ -3626,61 +4227,91 @@ tailcall: fprintf(fout, "(%s)", g_func_pp->ret_type.name); } } - else { + else if (regmask & (1 << xAX)) { fprintf(fout, "eax = "); if (pp->ret_type.is_ptr) fprintf(fout, "(u32)"); } } - if (po->operand[0].type != OPT_LABEL) { - fprintf(fout, "icall%d(", i); + if (pp->name[0] == 0) + ferr(po, "missing pp->name\n"); + fprintf(fout, "%s%s(", pp->name, + 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"); + + for (arg = j = 0; arg < pp->argc; arg++) { + if (arg > 0) + fprintf(fout, ", "); + + cast[0] = 0; + if (pp->arg[arg].type.is_ptr) + snprintf(cast, sizeof(cast), "(%s)", + pp->arg[arg].type.name); + + if (pp->arg[arg].reg != NULL) { + fprintf(fout, "%s%s", cast, pp->arg[arg].reg); + continue; + } + // stack arg + for (; j < g_func_pp->argc; j++) + if (g_func_pp->arg[j].reg == NULL) + break; + fprintf(fout, "%sa%d", cast, j + 1); + j++; + } } else { - if (pp->name[0] == 0) - ferr(po, "missing pp->name\n"); - fprintf(fout, "%s%s(", pp->name, - pp->has_structarg ? "_sa" : ""); - } - - for (arg = 0; arg < pp->argc; arg++) { - if (arg > 0) - fprintf(fout, ", "); - - cast[0] = 0; - if (pp->arg[arg].type.is_ptr) - snprintf(cast, sizeof(cast), "(%s)", pp->arg[arg].type.name); - - if (pp->arg[arg].reg != NULL) { - fprintf(fout, "%s%s", cast, pp->arg[arg].reg); - continue; - } + for (arg = 0; arg < pp->argc; arg++) { + if (arg > 0) + fprintf(fout, ", "); + + cast[0] = 0; + if (pp->arg[arg].type.is_ptr) + snprintf(cast, sizeof(cast), "(%s)", + pp->arg[arg].type.name); + + if (pp->arg[arg].reg != NULL) { + fprintf(fout, "%s%s", cast, pp->arg[arg].reg); + continue; + } - // stack arg - tmp_op = pp->arg[arg].datap; - if (tmp_op == NULL) - ferr(po, "parsed_op missing for arg%d\n", arg); - if (tmp_op->argnum != 0) { - fprintf(fout, "%ss_a%d", cast, tmp_op->argnum); - } - else { - fprintf(fout, "%s", - out_src_opr(buf1, sizeof(buf1), - tmp_op, &tmp_op->operand[0], cast, 0)); + // stack arg + tmp_op = pp->arg[arg].datap; + if (tmp_op == NULL) + ferr(po, "parsed_op missing for arg%d\n", arg); + if (tmp_op->argnum != 0) { + fprintf(fout, "%ss_a%d", cast, tmp_op->argnum); + } + else { + fprintf(fout, "%s", + out_src_opr(buf1, sizeof(buf1), + tmp_op, &tmp_op->operand[0], cast, 0)); + } } } fprintf(fout, ");"); if (strstr(pp->ret_type.name, "int64")) { fprintf(fout, "\n"); - fprintf(fout, " edx = mul_tmp >> 32;\n"); - fprintf(fout, " eax = mul_tmp;"); + fprintf(fout, " edx = tmp64 >> 32;\n"); + fprintf(fout, " eax = tmp64;"); + } + + if (pp->is_unresolved) { + snprintf(buf3, sizeof(buf3), " unresoved %dreg", + pp->argc_reg); + strcat(g_comment, buf3); } if (po->flags & OPF_TAIL) { - strcpy(g_comment, "tailcall"); ret = 0; - if (i == opcnt - 1) + if (i == opcnt - 1 || pp->is_noreturn) ret = 0; else if (IS(pp->ret_type.name, "void")) ret = 1; @@ -3689,12 +4320,21 @@ tailcall: // else already handled as 'return f()' if (ret) { - if (!IS(g_func_pp->ret_type.name, "void")) + if (!IS(g_func_pp->ret_type.name, "void")) { ferr(po, "int func -> void func tailcall?\n"); - fprintf(fout, "\n return;"); - strcpy(g_comment, "^ tailcall"); + } + else { + fprintf(fout, "\n return;"); + strcat(g_comment, " ^ tailcall"); + } } + else + strcat(g_comment, " tailcall"); } + if (pp->is_noreturn) + strcat(g_comment, " noreturn"); + if ((po->flags & OPF_ATAIL) && pp->argc_stack > 0) + strcat(g_comment, " argframe"); delayed_flag_op = NULL; last_arith_dst = NULL; break; @@ -3711,6 +4351,8 @@ tailcall: fprintf(fout, " return (%s)eax;", g_func_pp->ret_type.name); } + else if (IS(g_func_pp->ret_type.name, "__int64")) + fprintf(fout, " return ((u64)edx << 32) | eax;"); else fprintf(fout, " return eax;"); @@ -3741,6 +4383,16 @@ tailcall: fprintf(fout, " %s = s_%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], + po->operand[0].is_ptr ? "(void *)" : "", 0)); + break; + } ferr(po, "stray pop encountered\n"); break; @@ -3756,7 +4408,10 @@ tailcall: } if (g_comment[0] != 0) { - fprintf(fout, " // %s", g_comment); + char *p = g_comment; + while (my_isblank(*p)) + p++; + fprintf(fout, " // %s", p); g_comment[0] = 0; no_output = 0; } @@ -3764,10 +4419,16 @@ tailcall: fprintf(fout, "\n"); // some sanity checking - if ((po->flags & OPF_REP) && po->op != OP_STOS - && po->op != OP_MOVS && po->op != OP_CMPS) - ferr(po, "unexpected rep\n"); - if ((po->flags & (OPF_REPZ|OPF_REPNZ)) && po->op != OP_CMPS) + if (po->flags & OPF_REP) { + if (po->op != OP_STOS && po->op != OP_MOVS + && po->op != OP_CMPS && po->op != OP_SCAS) + ferr(po, "unexpected rep\n"); + if (!(po->flags & (OPF_REPZ|OPF_REPNZ)) + && (po->op == OP_CMPS || po->op == OP_SCAS)) + ferr(po, "cmps/scas with plain rep\n"); + } + if ((po->flags & (OPF_REPZ|OPF_REPNZ)) + && po->op != OP_CMPS && po->op != OP_SCAS) ferr(po, "unexpected repz/repnz\n"); if (pfomask != 0) @@ -3775,7 +4436,7 @@ tailcall: // see is delayed flag stuff is still valid if (delayed_flag_op != NULL && delayed_flag_op != po) { - if (is_any_opr_modified(delayed_flag_op, po)) + if (is_any_opr_modified(delayed_flag_op, po, 0)) delayed_flag_op = NULL; } @@ -3962,6 +4623,7 @@ int main(int argc, char *argv[]) char line[256]; char words[20][256]; enum opr_lenmod lmod; + char *sctproto = NULL; int in_func = 0; int pending_endp = 0; int skip_func = 0; @@ -3969,20 +4631,24 @@ int main(int argc, char *argv[]) int eq_alloc; int verbose = 0; int arg_out; - int arg = 1; + int arg; int pi = 0; int i, j; int ret, len; char *p; int wordc; - if (argv[1] && IS(argv[1], "-v")) { - verbose = 1; - arg++; + for (arg = 1; arg < argc; arg++) { + if (IS(argv[arg], "-v")) + verbose = 1; + else if (IS(argv[arg], "-rf")) + g_allow_regfunc = 1; + else + break; } if (argc < arg + 3) { - printf("usage:\n%s [-v] <.c> <.asm> [rlist]*\n", + printf("usage:\n%s [-v] [-rf] <.c> <.asm> [rlist]*\n", argv[0]); return 1; } @@ -4018,8 +4684,11 @@ int main(int argc, char *argv[]) if (*p == 0 || *p == ';') continue; if (*p == '#') { - if (IS_START(p, "#if 0")) + if (IS_START(p, "#if 0") + || (g_allow_regfunc && IS_START(p, "#if NO_REGFUNC"))) + { skip_func = 1; + } else if (IS_START(p, "#endif")) skip_func = 0; continue; @@ -4179,11 +4848,16 @@ parse_words: aerr("too many words\n"); // alow asm patches in comments - if (*p == ';' && IS_START(p, "; sctpatch:")) { - p = sskip(p + 11); - if (*p == 0 || *p == ';') - continue; - goto parse_words; // lame + if (*p == ';') { + if (IS_START(p, "; sctpatch:")) { + p = sskip(p + 11); + if (*p == 0 || *p == ';') + continue; + goto parse_words; // lame + } + if (IS_START(p, "; sctproto:")) { + sctproto = strdup(p + 11); + } } if (wordc == 0) { @@ -4226,6 +4900,11 @@ do_pending_endp: i = 2; } else { + if (pd == NULL) { + if (verbose) + anote("skipping alignment byte?\n"); + continue; + } lmod = lmod_from_directive(words[0]); if (lmod != pd->lmod) aerr("lmod change? %d->%d\n", pd->lmod, lmod); @@ -4291,8 +4970,7 @@ do_pending_endp: aerr("proc '%s' while in_func '%s'?\n", words[0], g_func); p = words[0]; - if ((g_ida_func_attr & IDAFA_THUNK) - || bsearch(&p, rlist, rlist_len, sizeof(rlist[0]), cmpstringp)) + if (bsearch(&p, rlist, rlist_len, sizeof(rlist[0]), cmpstringp)) skip_func = 1; strcpy(g_func, words[0]); set_label(0, words[0]); @@ -4308,6 +4986,13 @@ do_pending_endp: aerr("endp '%s' while in_func '%s'?\n", words[0], g_func); + if ((g_ida_func_attr & IDAFA_THUNK) && pi == 1 + && ops[0].op == OP_JMP && ops[0].operand[0].had_ds) + { + // import jump + skip_func = 1; + } + if (!skip_func && func_chunks_used) { // start processing chunks struct chunk_item *ci, key = { g_func, 0 }; @@ -4358,7 +5043,8 @@ do_pending_endp: continue; } - if (wordc > 1 && IS(words[1], "=")) { + if (wordc > 1 && IS(words[1], "=")) + { if (wordc != 5) aerr("unhandled equ, wc=%d\n", wordc); if (g_eqcnt >= eq_alloc) { @@ -4392,6 +5078,12 @@ do_pending_endp: aerr("too many ops\n"); parse_op(&ops[pi], words, wordc); + + if (sctproto != NULL) { + if (ops[pi].op == OP_CALL) + ops[pi].datap = sctproto; + sctproto = NULL; + } pi++; }