X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Ftranslate.c;h=c697f328bd8bb4d38c703b64362243adc8398ff7;hb=179b79a987ed0f464f47f724032aff6c90bc50c0;hp=f5674ca192a6b04f67a01c9b4075b0a8bf393d00;hpb=efea2951f8ca2f939ea9297ea4a035e7e99ef714;p=ia32rtools.git diff --git a/tools/translate.c b/tools/translate.c index f5674ca..c697f32 100644 --- a/tools/translate.c +++ b/tools/translate.c @@ -1,3 +1,11 @@ +/* + * ia32rtools + * (C) notaz, 2013,2014 + * + * This work is licensed under the terms of 3-clause BSD license. + * See COPYING file in the top-level directory. + */ + #define _GNU_SOURCE #include #include @@ -45,6 +53,8 @@ enum op_flags { OPF_DF = (1 << 13), /* DF flag set */ OPF_ATAIL = (1 << 14), /* tail call with reused arg frame */ OPF_32BIT = (1 << 15), /* 32bit division */ + OPF_LOCK = (1 << 16), /* op has lock prefix */ + OPF_VAPUSH = (1 << 17), /* vararg ptr push (as call arg) */ }; enum op_op { @@ -60,6 +70,7 @@ enum op_op { OP_XCHG, OP_NOT, OP_CDQ, + OP_LODS, OP_STOS, OP_MOVS, OP_CMPS, @@ -81,6 +92,7 @@ enum op_op { OP_RCR, OP_ADC, OP_SBB, + OP_BSF, OP_INC, OP_DEC, OP_NEG, @@ -93,22 +105,8 @@ enum op_op { OP_CALL, OP_JMP, OP_JECXZ, - OP_JO, - OP_JNO, - OP_JC, - OP_JNC, - OP_JZ, - OP_JNZ, - OP_JBE, - OP_JA, - OP_JS, - OP_JNS, - OP_JP, - OP_JNP, - OP_JL, - OP_JGE, - OP_JLE, - OP_JG, + OP_JCC, + OP_SCC, }; enum opr_type { @@ -139,16 +137,20 @@ struct parsed_opr { 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 + const struct parsed_proto *pp; // for OPT_LABEL int reg; unsigned int val; - char name[256]; + char name[112]; }; struct parsed_op { enum op_op op; struct parsed_opr operand[MAX_OPERANDS]; unsigned int flags; - int operand_cnt; + unsigned char pfo; + unsigned char pfo_inv; + unsigned char operand_cnt; + unsigned char pad; int regmask_src; // all referensed regs int regmask_dst; int pfomask; // flagop: parsed_flag_op that can't be delayed @@ -156,11 +158,13 @@ struct parsed_op { int cc_scratch; // scratch storage during analysis int bt_i; // branch target for branches struct parsed_data *btj;// branch targets for jumptables + struct parsed_proto *pp;// parsed_proto for OP_CALL void *datap; + int asmln; }; // datap: -// OP_CALL - parser proto hint (str), ptr to struct parsed_proto +// OP_CALL - parser proto hint (str) // (OPF_CC) - point to one of (OPF_FLAGS) that affects cc op // OP_POP - point to OP_PUSH in push/pop pair @@ -204,7 +208,7 @@ enum ida_func_attr { static struct parsed_op ops[MAX_OPS]; static struct parsed_equ *g_eqs; static int g_eqcnt; -static char g_labels[MAX_OPS][32]; +static char g_labels[MAX_OPS][48]; static struct label_ref g_label_refs[MAX_OPS]; static const struct parsed_proto *g_func_pp; static struct parsed_data *g_func_pd; @@ -218,13 +222,13 @@ 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, \ + printf("%s:%d: error: [%s] '%s': " fmt, asmfn, (op_)->asmln, g_func, \ dump_op(op_), ##__VA_ARGS__); \ fcloseall(); \ exit(1); \ } while (0) #define fnote(op_, fmt, ...) \ - printf("error:%s:#%zd: '%s': " fmt, g_func, (op_) - ops, \ + printf("%s:%d: note: [%s] '%s': " fmt, asmfn, (op_)->asmln, g_func, \ dump_op(op_), ##__VA_ARGS__) #define MAX_REGS 8 @@ -406,12 +410,21 @@ static const char *parse_stack_el(const char *name, char *extra_reg) if (!IS_START(name, "esp+")) return NULL; - p = strchr(name + 4, '+'); + s = name + 4; + p = strchr(s, '+'); if (p) { - // must be a number after esp+, already converted to 0x.. - s = name + 4; + if (is_reg_in_str(s)) { + if (extra_reg != NULL) { + strncpy(extra_reg, s, p - s); + extra_reg[p - s] = 0; + } + s = p + 1; + p = strchr(s, '+'); + if (p == NULL) + aerr("%s IDA stackvar not set?\n", __func__); + } if (!('0' <= *s && *s <= '9')) { - aerr("%s nan?\n", __func__); + aerr("%s IDA stackvar offset not set?\n", __func__); return NULL; } if (s[0] == '0' && s[1] == 'x') @@ -460,16 +473,18 @@ static int guess_lmod_from_c_type(enum opr_lenmod *lmod, static const char *dword_types[] = { "int", "_DWORD", "UINT_PTR", "DWORD", "WPARAM", "LPARAM", "UINT", "__int32", - "LONG", "HIMC", + "LONG", "HIMC", "BOOL", }; static const char *word_types[] = { - "uint16_t", "int16_t", "_WORD", + "uint16_t", "int16_t", "_WORD", "WORD", "unsigned __int16", "__int16", }; static const char *byte_types[] = { "uint8_t", "int8_t", "char", "unsigned __int8", "__int8", "BYTE", "_BYTE", "CHAR", "_UNKNOWN", + // structures.. deal the same as with _UNKNOWN for now + "CRITICAL_SECTION", }; const char *n; int i; @@ -505,6 +520,24 @@ static int guess_lmod_from_c_type(enum opr_lenmod *lmod, return 0; } +static char *default_cast_to(char *buf, size_t buf_size, + struct parsed_opr *opr) +{ + buf[0] = 0; + + if (!opr->is_ptr) + return buf; + if (opr->pp == NULL || opr->pp->type.name == NULL + || opr->pp->is_fptr) + { + snprintf(buf, buf_size, "%s", "(void *)"); + return buf; + } + + snprintf(buf, buf_size, "(%s)", opr->pp->type.name); + return buf; +} + static enum opr_type lmod_from_directive(const char *d) { if (IS(d, "dd")) @@ -603,8 +636,10 @@ static int parse_operand(struct parsed_opr *opr, if (wordc_in == 2) { if (IS(words[w], "offset")) { opr->type = OPT_OFFSET; + opr->lmod = OPLM_DWORD; strcpy(opr->name, words[w + 1]); - return wordc; + pp = proto_parse(g_fhdr, opr->name, 1); + goto do_label; } if (IS(words[w], "(offset")) { p = strchr(words[w + 1], ')'); @@ -697,6 +732,7 @@ do_label: } opr->is_array = pp->type.is_array; } + opr->pp = pp; if (opr->lmod == OPLM_UNSPEC) guess_lmod_from_name(opr); @@ -712,6 +748,7 @@ static const struct { { "repz", OPF_REP|OPF_REPZ }, { "repne", OPF_REP|OPF_REPNZ }, { "repnz", OPF_REP|OPF_REPNZ }, + { "lock", OPF_LOCK }, // ignored for now.. }; #define OPF_CJMP_CC (OPF_JMP|OPF_CJMP|OPF_CC) @@ -719,9 +756,11 @@ static const struct { static const struct { const char *name; enum op_op op; - unsigned int minopr; - unsigned int maxopr; + unsigned short minopr; + unsigned short maxopr; unsigned int flags; + unsigned char pfo; + unsigned char pfo_inv; } op_table[] = { { "nop", OP_NOP, 0, 0, 0 }, { "push", OP_PUSH, 1, 1, 0 }, @@ -734,6 +773,9 @@ static const struct { { "xchg", OP_XCHG, 2, 2, OPF_DATA }, { "not", OP_NOT, 1, 1, OPF_DATA }, { "cdq", OP_CDQ, 0, 0, OPF_DATA }, + { "lodsb",OP_LODS, 0, 0, OPF_DATA }, + { "lodsw",OP_LODS, 0, 0, OPF_DATA }, + { "lodsd",OP_LODS, 0, 0, OPF_DATA }, { "stosb",OP_STOS, 0, 0, OPF_DATA }, { "stosw",OP_STOS, 0, 0, OPF_DATA }, { "stosd",OP_STOS, 0, 0, OPF_DATA }, @@ -759,10 +801,11 @@ 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 }, + { "rcl", OP_RCL, 2, 2, OPF_DATA|OPF_FLAGS|OPF_CC, PFO_C }, + { "rcr", OP_RCR, 2, 2, OPF_DATA|OPF_FLAGS|OPF_CC, PFO_C }, + { "adc", OP_ADC, 2, 2, OPF_DATA|OPF_FLAGS|OPF_CC, PFO_C }, + { "sbb", OP_SBB, 2, 2, OPF_DATA|OPF_FLAGS|OPF_CC, PFO_C }, + { "bsf", OP_BSF, 2, 2, OPF_DATA|OPF_FLAGS }, { "inc", OP_INC, 1, 1, OPF_DATA|OPF_FLAGS }, { "dec", OP_DEC, 1, 1, OPF_DATA|OPF_FLAGS }, { "neg", OP_NEG, 1, 1, OPF_DATA|OPF_FLAGS }, @@ -776,63 +819,64 @@ 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 }, - { "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 }, - { "setb", OP_JC, 1, 1, OPF_DATA|OPF_CC }, - { "setnc", OP_JNC, 1, 1, OPF_DATA|OPF_CC }, - { "setae", OP_JNC, 1, 1, OPF_DATA|OPF_CC }, - { "setz", OP_JZ, 1, 1, OPF_DATA|OPF_CC }, - { "sete", OP_JZ, 1, 1, OPF_DATA|OPF_CC }, - { "setnz", OP_JNZ, 1, 1, OPF_DATA|OPF_CC }, - { "setne", OP_JNZ, 1, 1, OPF_DATA|OPF_CC }, - { "setbe", OP_JBE, 1, 1, OPF_DATA|OPF_CC }, - { "setna", OP_JBE, 1, 1, OPF_DATA|OPF_CC }, - { "seta", OP_JA, 1, 1, OPF_DATA|OPF_CC }, - { "setnbe", OP_JA, 1, 1, OPF_DATA|OPF_CC }, - { "sets", OP_JS, 1, 1, OPF_DATA|OPF_CC }, - { "setns", OP_JNS, 1, 1, OPF_DATA|OPF_CC }, - { "setp", OP_JP, 1, 1, OPF_DATA|OPF_CC }, - { "setpe", OP_JP, 1, 1, OPF_DATA|OPF_CC }, - { "setnp", OP_JNP, 1, 1, OPF_DATA|OPF_CC }, - { "setpo", OP_JNP, 1, 1, OPF_DATA|OPF_CC }, - { "setl", OP_JL, 1, 1, OPF_DATA|OPF_CC }, - { "setnge", OP_JL, 1, 1, OPF_DATA|OPF_CC }, - { "setge", OP_JGE, 1, 1, OPF_DATA|OPF_CC }, - { "setnl", OP_JGE, 1, 1, OPF_DATA|OPF_CC }, - { "setle", OP_JLE, 1, 1, OPF_DATA|OPF_CC }, - { "setng", OP_JLE, 1, 1, OPF_DATA|OPF_CC }, - { "setg", OP_JG, 1, 1, OPF_DATA|OPF_CC }, - { "setnle", OP_JG, 1, 1, OPF_DATA|OPF_CC }, + { "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 + { "jb", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_C, 0 }, // 72 + { "jnc", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_C, 1 }, // 73 CF=0 + { "jnb", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_C, 1 }, // 73 + { "jae", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_C, 1 }, // 73 + { "jz", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_Z, 0 }, // 74 ZF=1 + { "je", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_Z, 0 }, // 74 + { "jnz", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_Z, 1 }, // 75 ZF=0 + { "jne", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_Z, 1 }, // 75 + { "jbe", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_BE, 0 }, // 76 CF=1||ZF=1 + { "jna", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_BE, 0 }, // 76 + { "ja", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_BE, 1 }, // 77 CF=0&&ZF=0 + { "jnbe", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_BE, 1 }, // 77 + { "js", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_S, 0 }, // 78 SF=1 + { "jns", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_S, 1 }, // 79 SF=0 + { "jp", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_P, 0 }, // 7a PF=1 + { "jpe", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_P, 0 }, // 7a + { "jnp", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_P, 1 }, // 7b PF=0 + { "jpo", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_P, 1 }, // 7b + { "jl", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_L, 0 }, // 7c SF!=OF + { "jnge", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_L, 0 }, // 7c + { "jge", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_L, 1 }, // 7d SF=OF + { "jnl", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_L, 1 }, // 7d + { "jle", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_LE, 0 }, // 7e ZF=1||SF!=OF + { "jng", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_LE, 0 }, // 7e + { "jg", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_LE, 1 }, // 7f ZF=0&&SF=OF + { "jnle", OP_JCC, 1, 1, OPF_CJMP_CC, PFO_LE, 1 }, // 7f + { "seto", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_O, 0 }, + { "setno", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_O, 1 }, + { "setc", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_C, 0 }, + { "setb", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_C, 0 }, + { "setnc", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_C, 1 }, + { "setae", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_C, 1 }, + { "setnb", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_C, 1 }, + { "setz", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_Z, 0 }, + { "sete", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_Z, 0 }, + { "setnz", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_Z, 1 }, + { "setne", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_Z, 1 }, + { "setbe", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_BE, 0 }, + { "setna", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_BE, 0 }, + { "seta", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_BE, 1 }, + { "setnbe", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_BE, 1 }, + { "sets", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_S, 0 }, + { "setns", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_S, 1 }, + { "setp", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_P, 0 }, + { "setpe", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_P, 0 }, + { "setnp", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_P, 1 }, + { "setpo", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_P, 1 }, + { "setl", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_L, 0 }, + { "setnge", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_L, 0 }, + { "setge", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_L, 1 }, + { "setnl", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_L, 1 }, + { "setle", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_LE, 0 }, + { "setng", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_LE, 0 }, + { "setg", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_LE, 1 }, + { "setnle", OP_SCC, 1, 1, OPF_DATA|OPF_CC, PFO_LE, 1 }, }; static void parse_op(struct parsed_op *op, char words[16][256], int wordc) @@ -871,7 +915,10 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc) op->op = op_table[i].op; op->flags = op_table[i].flags | prefix_flags; + op->pfo = op_table[i].pfo; + op->pfo_inv = op_table[i].pfo_inv; op->regmask_src = op->regmask_dst = 0; + op->asmln = asmln; for (opr = 0; opr < op_table[i].minopr; opr++) { regmask = regmask_ind = 0; @@ -907,6 +954,7 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc) setup_reg_opr(&op->operand[1], xAX, OPLM_DWORD, &op->regmask_src); break; + case OP_LODS: case OP_STOS: case OP_SCAS: if (op->operand_cnt != 0) @@ -918,10 +966,12 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc) else if (words[op_w][4] == 'd') lmod = OPLM_DWORD; op->operand_cnt = 3; - setup_reg_opr(&op->operand[0], xDI, lmod, &op->regmask_src); + setup_reg_opr(&op->operand[0], op->op == OP_LODS ? xSI : xDI, + lmod, &op->regmask_src); setup_reg_opr(&op->operand[1], xCX, OPLM_DWORD, &op->regmask_src); op->regmask_dst = op->regmask_src; - setup_reg_opr(&op->operand[2], xAX, OPLM_DWORD, &op->regmask_src); + setup_reg_opr(&op->operand[2], xAX, OPLM_DWORD, + op->op == OP_LODS ? &op->regmask_dst : &op->regmask_src); break; case OP_MOVS: @@ -944,7 +994,7 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc) case OP_XCHG: op->regmask_src |= op->regmask_dst; op->regmask_dst |= op->regmask_src; - break; + goto check_align; case OP_JECXZ: op->operand_cnt = 1; @@ -996,10 +1046,14 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc) // alignment case OP_MOV: + check_align: if (op->operand[0].type == OPT_REG && op->operand[1].type == OPT_REG - && op->operand[0].reg == xDI && op->operand[1].reg == xDI) + && op->operand[0].lmod == op->operand[1].lmod + && op->operand[0].reg == op->operand[1].reg + && IS(op->operand[0].name, op->operand[1].name)) // ah, al.. { op->flags |= OPF_RMD; + op->regmask_src = op->regmask_dst = 0; } break; @@ -1024,12 +1078,23 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc) } } -static const char *op_name(enum op_op op) +static const char *op_name(struct parsed_op *po) { + static char buf[16]; + char *p; int i; + if (po->op == OP_JCC || po->op == OP_SCC) { + p = buf; + *p++ = (po->op == OP_JCC) ? 'j' : 's'; + if (po->pfo_inv) + *p++ = 'n'; + strcpy(p, parsed_flag_op_names[po->pfo]); + return buf; + } + for (i = 0; i < ARRAY_SIZE(op_table); i++) - if (op_table[i].op == op) + if (op_table[i].op == po->op) return op_table[i].name; return "???"; @@ -1045,7 +1110,7 @@ static const char *dump_op(struct parsed_op *po) if (po == NULL) return "???"; - snprintf(out, sizeof(out), "%s", op_name(po->op)); + snprintf(out, sizeof(out), "%s", op_name(po)); for (i = 0; i < po->operand_cnt; i++) { p += strlen(p); if (i > 0) @@ -1257,7 +1322,7 @@ static int is_stack_access(struct parsed_op *po, static void parse_stack_access(struct parsed_op *po, const char *name, char *ofs_reg, int *offset_out, - int *stack_ra_out, const char **bp_arg_out) + int *stack_ra_out, const char **bp_arg_out, int is_lea) { const char *bp_arg = ""; const char *p = NULL; @@ -1292,8 +1357,12 @@ static void parse_stack_access(struct parsed_op *po, if (!strncmp(name, "ebp", 3)) stack_ra = 4; - if (ofs_reg[0] == 0 && stack_ra <= offset && offset < stack_ra + 4) + // yes it sometimes LEAs ra for compares.. + if (!is_lea && ofs_reg[0] == 0 + && stack_ra <= offset && offset < stack_ra + 4) + { ferr(po, "reference to ra? %d %d\n", offset, stack_ra); + } *offset_out = offset; *stack_ra_out = stack_ra; @@ -1319,7 +1388,8 @@ static void stack_frame_access(struct parsed_op *po, if (po->flags & OPF_EBP_S) ferr(po, "stack_frame_access while ebp is scratch\n"); - parse_stack_access(po, name, ofs_reg, &offset, &stack_ra, &bp_arg); + parse_stack_access(po, name, ofs_reg, &offset, + &stack_ra, &bp_arg, is_lea); if (offset > stack_ra) { @@ -1491,7 +1561,9 @@ 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) { + enum opr_lenmod tmp_lmod; char buf[256]; + int ret, i; if (pp->argc_reg != 0) { if (/*!g_allow_regfunc &&*/ !pp->is_fastcall) { @@ -1502,9 +1574,22 @@ static void check_func_pp(struct parsed_op *po, ferr(po, "%s: %d reg arg(s) with %d stack arg(s)\n", pfx, pp->argc_reg, pp->argc_stack); } + + // fptrs must use 32bit args, callsite might have no information and + // lack a cast to smaller types, which results in incorrectly masked + // args passed (callee may assume masked args, it does on ARM) + if (!pp->is_oslib) { + for (i = 0; i < pp->argc; i++) { + ret = guess_lmod_from_c_type(&tmp_lmod, &pp->arg[i].type); + if (ret && tmp_lmod != OPLM_DWORD) + ferr(po, "reference to %s with arg%d '%s'\n", pp->name, + i + 1, pp->arg[i].type.name); + } + } } -static void check_label_read_ref(struct parsed_op *po, const char *name) +static const char *check_label_read_ref(struct parsed_op *po, + const char *name) { const struct parsed_proto *pp; @@ -1514,6 +1599,8 @@ static void check_label_read_ref(struct parsed_op *po, const char *name) if (pp->is_func) check_func_pp(po, pp, "ref"); + + return pp->name; } static char *out_src_opr(char *buf, size_t buf_size, @@ -1522,6 +1609,7 @@ static char *out_src_opr(char *buf, size_t buf_size, { char tmp1[256], tmp2[256]; char expr[256]; + const char *name; char *p; int ret; @@ -1589,29 +1677,28 @@ static char *out_src_opr(char *buf, size_t buf_size, break; case OPT_LABEL: - check_label_read_ref(po, popr->name); + name = check_label_read_ref(po, popr->name); if (cast[0] == 0 && popr->is_ptr) cast = "(u32)"; if (is_lea) - snprintf(buf, buf_size, "(u32)&%s", popr->name); + snprintf(buf, buf_size, "(u32)&%s", name); else if (popr->size_lt) snprintf(buf, buf_size, "%s%s%s%s", cast, lmod_cast_u_ptr(po, popr->lmod), - popr->is_array ? "" : "&", - popr->name); + popr->is_array ? "" : "&", name); else - snprintf(buf, buf_size, "%s%s%s", cast, popr->name, + snprintf(buf, buf_size, "%s%s%s", cast, name, popr->is_array ? "[0]" : ""); break; case OPT_OFFSET: - check_label_read_ref(po, popr->name); + name = check_label_read_ref(po, popr->name); if (cast[0] == 0) cast = "(u32)"; if (is_lea) ferr(po, "lea an offset?\n"); - snprintf(buf, buf_size, "%s&%s", cast, popr->name); + snprintf(buf, buf_size, "%s&%s", cast, name); break; case OPT_CONST: @@ -1691,66 +1778,6 @@ static char *out_src_opr_u32(char *buf, size_t buf_size, return out_src_opr(buf, buf_size, po, popr, NULL, 0); } -static enum parsed_flag_op split_cond(struct parsed_op *po, - enum op_op op, int *is_inv) -{ - *is_inv = 0; - - switch (op) { - case OP_JO: - return PFO_O; - case OP_JC: - return PFO_C; - case OP_JZ: - return PFO_Z; - case OP_JBE: - return PFO_BE; - case OP_JS: - return PFO_S; - case OP_JP: - return PFO_P; - case OP_JL: - return PFO_L; - case OP_JLE: - return PFO_LE; - - case OP_JNO: - *is_inv = 1; - return PFO_O; - case OP_JNC: - *is_inv = 1; - return PFO_C; - case OP_JNZ: - *is_inv = 1; - return PFO_Z; - case OP_JA: - *is_inv = 1; - return PFO_BE; - case OP_JNS: - *is_inv = 1; - return PFO_S; - case OP_JNP: - *is_inv = 1; - return PFO_P; - case OP_JGE: - *is_inv = 1; - return PFO_L; - case OP_JG: - *is_inv = 1; - return PFO_LE; - - case OP_RCL: - case OP_RCR: - case OP_ADC: - case OP_SBB: - return PFO_C; - - default: - ferr(po, "split_cond: bad op %d\n", op); - return -1; - } -} - static void out_test_for_cc(char *buf, size_t buf_size, struct parsed_op *po, enum parsed_flag_op pfo, int is_inv, enum opr_lenmod lmod, const char *expr) @@ -1956,7 +1983,8 @@ 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_CJMP)) == OPF_JMP) + || ((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) @@ -2318,7 +2346,6 @@ static int scan_for_reg_clear(int i, int reg) 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; @@ -2360,8 +2387,7 @@ static int scan_for_esp_adjust(int i, int opcnt, int *adj, break; if (po->operand[0].type != OPT_LABEL) break; - pp = po->datap; - if (pp != NULL && pp->is_stdcall) + if (po->pp != NULL && po->pp->is_stdcall) break; } } @@ -2422,7 +2448,7 @@ static const struct parsed_proto *try_recover_pp( int offset = 0; parse_stack_access(po, opr->name, ofs_reg, - &offset, &stack_ra, NULL); + &offset, &stack_ra, NULL, 0); if (ofs_reg[0] != 0) ferr(po, "offset reg on arg access?\n"); if (offset <= stack_ra) { @@ -2472,11 +2498,9 @@ static void scan_for_call_type(int i, const struct parsed_opr *opr, struct parsed_op *po; struct label_ref *lr; - while (i >= 0) { - if (ops[i].cc_scratch == magic) - return; - ops[i].cc_scratch = magic; + ops[i].cc_scratch = magic; + while (1) { if (g_labels[i][0] != 0) { lr = &g_label_refs[i]; for (; lr != NULL; lr = lr->next) @@ -2484,7 +2508,14 @@ static void scan_for_call_type(int i, const struct parsed_opr *opr, if (i > 0 && LAST_OP(i - 1)) return; } + i--; + if (i < 0) + break; + + if (ops[i].cc_scratch == magic) + return; + ops[i].cc_scratch = magic; if (!(ops[i].flags & OPF_DATA)) continue; @@ -2566,6 +2597,69 @@ static const struct parsed_proto *resolve_icall(int i, int opcnt, return pp; } +// find an instruction that changed opr before i op +// *op_i must be set to -1 +static int resolve_origin(int i, const struct parsed_opr *opr, + int magic, int *op_i) +{ + struct label_ref *lr; + int ret = 0; + + ops[i].cc_scratch = magic; + + while (1) { + if (g_labels[i][0] != 0) { + lr = &g_label_refs[i]; + for (; lr != NULL; lr = lr->next) + ret |= resolve_origin(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 (!(ops[i].flags & OPF_DATA)) + continue; + if (!is_opr_modified(opr, &ops[i])) + continue; + + if (*op_i >= 0) { + if (*op_i == i) + return 1; + // XXX: could check if the other op does the same + return -1; + } + + *op_i = i; + return 1; + } +} + +static int try_resolve_const(int i, const struct parsed_opr *opr, + int magic, unsigned int *val) +{ + int s_i = -1; + int ret = 0; + + ret = resolve_origin(i, opr, magic, &s_i); + 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; + return 1; + } + + return -1; +} + 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) @@ -2573,8 +2667,10 @@ static int collect_call_args_r(struct parsed_op *po, int i, struct parsed_proto *pp_tmp; struct label_ref *lr; int need_to_save_current; + int save_args; int ret = 0; - int j; + char buf[32]; + int j, k; if (i < 0) { ferr(po, "dead label encountered\n"); @@ -2632,7 +2728,7 @@ static int collect_call_args_r(struct parsed_op *po, int i, if (pp->is_unresolved) break; - pp_tmp = ops[j].datap; + pp_tmp = ops[j].pp; if (pp_tmp == NULL) ferr(po, "arg collect hit unparsed call '%s'\n", ops[j].operand[0].name); @@ -2667,6 +2763,7 @@ static int collect_call_args_r(struct parsed_op *po, int i, pp->arg[arg].datap = &ops[j]; need_to_save_current = 0; + save_args = 0; if (!need_op_saving) { ret = scan_for_mod(&ops[j], j + 1, i, 1); need_to_save_current = (ret >= 0); @@ -2676,7 +2773,7 @@ static int collect_call_args_r(struct parsed_op *po, int i, ops[j].flags &= ~OPF_RMD; if (ops[j].argnum == 0) { ops[j].argnum = arg + 1; - *save_arg_vars |= 1 << arg; + save_args |= 1 << arg; } else if (ops[j].argnum < arg + 1) ferr(&ops[j], "argnum conflict (%d<%d) for '%s'\n", @@ -2693,6 +2790,32 @@ static int collect_call_args_r(struct parsed_op *po, int i, ops[j].flags &= ~OPF_RSAVE; + // check for __VALIST + if (!pp->is_unresolved && g_func_pp->is_vararg + && IS(pp->arg[arg].type.name, "__VALIST")) + { + snprintf(buf, sizeof(buf), "arg_%X", + g_func_pp->argc_stack * 4); + k = -1; + ret = resolve_origin(j, &ops[j].operand[0], magic + 1, &k); + if (ret == 1 && k >= 0 && ops[k].op == OP_LEA + && strstr(ops[k].operand[1].name, buf)) + { + ops[k].flags |= OPF_RMD; + ops[j].flags |= OPF_RMD | OPF_VAPUSH; + save_args &= ~(1 << arg); + } + } + + *save_arg_vars |= save_args; + + // tracking reg usage + if (!(ops[j].flags & OPF_VAPUSH) + && ops[j].operand[0].type == OPT_REG) + { + *regmask |= 1 << ops[j].operand[0].reg; + } + arg++; if (!pp->is_unresolved) { // next arg @@ -2701,10 +2824,6 @@ static int collect_call_args_r(struct parsed_op *po, int i, break; } magic = (magic & 0xffffff) | (arg << 24); - - // tracking reg usage - if (ops[j].operand[0].type == OPT_REG) - *regmask |= 1 << ops[j].operand[0].reg; } } @@ -2740,6 +2859,22 @@ static int collect_call_args(struct parsed_op *po, int i, return ret; } +// early check for tail call or branch back +static int is_like_tailjmp(int j) +{ + if (!(ops[j].flags & OPF_JMP)) + 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 0; +} + static void pp_insert_reg_arg(struct parsed_proto *pp, const char *reg) { int i; @@ -2808,7 +2943,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) struct parsed_proto *pp, *pp_tmp; struct parsed_data *pd; const char *tmpname; - enum parsed_flag_op pfo; + unsigned int uval; int save_arg_vars = 0; int cond_vars = 0; int need_tmp_var = 0; @@ -2825,7 +2960,6 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) int depth = 0; int no_output; int i, j, l; - int dummy; int arg; int reg; int ret; @@ -2837,36 +2971,7 @@ 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); - fprintf(fout, "%s ", g_func_pp->ret_type.name); - 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) - fprintf(fout, ", "); - if (g_func_pp->arg[i].fptr != NULL) { - // func pointer.. - pp = g_func_pp->arg[i].fptr; - fprintf(fout, "%s (", pp->ret_type.name); - output_pp_attrs(fout, pp, 0); - fprintf(fout, "*a%d)(", i + 1); - for (j = 0; j < pp->argc; j++) { - if (j > 0) - fprintf(fout, ", "); - if (pp->arg[j].fptr) - ferr(ops, "nested fptr\n"); - fprintf(fout, "%s", pp->arg[j].type.name); - } - if (pp->is_vararg) { - if (j > 0) - fprintf(fout, ", "); - fprintf(fout, "..."); - } - fprintf(fout, ")"); - } - 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); @@ -2875,13 +2980,6 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) regmask_arg |= 1 << reg; } } - if (g_func_pp->is_vararg) { - if (i > 0) - fprintf(fout, ", "); - fprintf(fout, "..."); - } - - fprintf(fout, ")\n{\n"); // pass1: // - handle ebp/esp frame, remove ops related to it @@ -2932,14 +3030,8 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) 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.. + if (found && is_like_tailjmp(j)) break; - } j--; } @@ -2987,6 +3079,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) } } + found = 0; if (g_sp_frame) { g_stack_fsz = ops[i].operand[1].val; @@ -2997,13 +3090,21 @@ 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 (ops[i - 1].op != OP_ADD - || !IS(opr_name(&ops[i - 1], 0), "esp") - || ops[i - 1].operand[1].type != OPT_CONST - || ops[i - 1].operand[1].val != g_stack_fsz) - ferr(&ops[i - 1], "'add esp' expected\n"); - ops[i - 1].flags |= OPF_RMD; + j = i - 1; + if (i == opcnt && (ops[j].flags & OPF_JMP)) { + if (found && is_like_tailjmp(j)) + break; + j--; + } + if (ops[j].op != OP_ADD + || !IS(opr_name(&ops[j], 0), "esp") + || ops[j].operand[1].type != OPT_CONST + || ops[j].operand[1].val != g_stack_fsz) + ferr(&ops[j], "'add esp' expected\n"); + ops[j].flags |= OPF_RMD; + + found = 1; i++; } while (i < opcnt); } @@ -3051,8 +3152,8 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) check_func_pp(po, pp, "fptr var call"); if (pp->is_noreturn) po->flags |= OPF_TAIL; - po->datap = pp; } + po->pp = pp; continue; } @@ -3096,13 +3197,18 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) for (l = 0; l < opcnt; l++) { if (g_labels[l][0] && IS(po->operand[0].name, g_labels[l])) { + if (l == i + 1 && po->op == OP_JMP) { + // yet another alignment type.. + po->flags |= OPF_RMD; + break; + } add_label_ref(&g_label_refs[l], i); po->bt_i = l; break; } } - if (po->bt_i != -1) + if (po->bt_i != -1 || (po->flags & OPF_RMD)) continue; if (po->operand[0].type == OPT_LABEL) @@ -3134,17 +3240,31 @@ tailcall: if (po->op == OP_CALL) { tmpname = opr_name(po, 0); - pp = po->datap; + pp = po->pp; if (pp == NULL) { // indirect call pp_c = resolve_icall(i, opcnt, &l); if (pp_c != NULL) { + if (!pp_c->is_func && !pp_c->is_fptr) + ferr(po, "call to non-func: %s\n", pp_c->name); pp = proto_clone(pp_c); my_assert_not(pp, NULL); if (l) // not resolved just to single func pp->is_fptr = 1; + + switch (po->operand[0].type) { + case OPT_REG: + // we resolved this call and no longer need the register + po->regmask_src &= ~(1 << po->operand[0].reg); + break; + case OPT_REGMEM: + pp->is_fptr = 1; + break; + default: + break; + } } if (pp == NULL) { pp = calloc(1, sizeof(*pp)); @@ -3165,7 +3285,7 @@ tailcall: for (arg = 0; arg < pp->argc; arg++) pp->arg[arg].type.name = strdup("int"); } - po->datap = pp; + po->pp = pp; } // look for and make use of esp adjust @@ -3244,7 +3364,7 @@ tailcall: } if (po->op == OP_PUSH && po->argnum == 0 - && !(po->flags & OPF_RSAVE)) + && !(po->flags & OPF_RSAVE) && !g_func_pp->is_userstack) { if (po->operand[0].type == OPT_REG) { @@ -3305,7 +3425,7 @@ tailcall: 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, opcnt, i + opcnt * 5, OPF_EBP_S); + scan_fwd_set_flags(i + 1, opcnt, i + opcnt * 5, OPF_EBP_S); else regmask_now &= ~(1 << xBP); } @@ -3324,7 +3444,6 @@ tailcall: if (cnt > ARRAY_SIZE(setters)) ferr(po, "too many flag setters\n"); - pfo = split_cond(po, po->op, &dummy); for (j = 0; j < cnt; j++) { tmp_op = &ops[setters[j]]; // flag setter @@ -3336,21 +3455,28 @@ tailcall: 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; + pfomask = 1 << po->pfo; } else if (tmp_op->op == OP_CMPS || tmp_op->op == OP_SCAS) { - pfomask = 1 << pfo; + pfomask = 1 << po->pfo; } else { // see if we'll be able to handle based on op result if ((tmp_op->op != OP_AND && tmp_op->op != OP_OR - && pfo != PFO_Z && pfo != PFO_S && pfo != PFO_P) + && po->pfo != PFO_Z && po->pfo != PFO_S + && po->pfo != PFO_P) || branched || scan_for_mod_opr0(tmp_op, setters[j] + 1, i) >= 0) - pfomask = 1 << pfo; + { + pfomask = 1 << po->pfo; + } - if (tmp_op->op == OP_ADD && pfo == PFO_C) - need_tmp64 = 1; + if (tmp_op->op == OP_ADD && po->pfo == PFO_C) { + propagate_lmod(tmp_op, &tmp_op->operand[0], + &tmp_op->operand[1]); + if (tmp_op->operand[0].lmod == OPLM_DWORD) + need_tmp64 = 1; + } } if (pfomask) { tmp_op->pfomask |= pfomask; @@ -3364,16 +3490,18 @@ tailcall: || po->op == OP_ADC || po->op == OP_SBB) cond_vars |= 1 << PFO_C; } - else if (po->op == OP_CMPS || po->op == OP_SCAS) { + + 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_tmp64 = 1; + if (po->operand[0].lmod == OPLM_DWORD) + need_tmp64 = 1; } else if (po->op == OP_CALL) { - pp = po->datap; + pp = po->pp; if (pp == NULL) ferr(po, "NULL pp\n"); @@ -3432,38 +3560,24 @@ tailcall: } } } - - // declare indirect funcs - if (pp->is_fptr && !(pp->name[0] != 0 && pp->is_arg)) { - 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); + } + else if (po->op == OP_MOV && po->operand[0].pp != NULL + && po->operand[1].pp != NULL) + { + // = offset + if ((po->operand[1].pp->is_func || po->operand[1].pp->is_fptr) + && !IS_START(po->operand[1].name, "off_")) + { + if (!po->operand[0].pp->is_fptr) + ferr(po, "%s not declared as fptr when it should be\n", + po->operand[0].name); + if (pp_cmp_func(po->operand[0].pp, po->operand[1].pp)) { + pp_print(buf1, sizeof(buf1), po->operand[0].pp); + pp_print(buf2, sizeof(buf2), po->operand[1].pp); + fnote(po, "var: %s\n", buf1); + fnote(po, "func: %s\n", buf2); + ferr(po, "^ mismatch\n"); } - fprintf(fout, ");\n"); } } else if (po->op == OP_RET && !IS(g_func_pp->ret_type.name, "void")) @@ -3479,6 +3593,8 @@ tailcall: else need_tmp64 = 1; } + else if (po->op == OP_CLD) + po->flags |= OPF_RMD; if (po->op == OP_RCL || po->op == OP_RCR || po->op == OP_XCHG) { need_tmp_var = 1; @@ -3500,6 +3616,102 @@ tailcall: } } + // output starts here + + // define userstack size + if (g_func_pp->is_userstack) { + fprintf(fout, "#ifndef US_SZ_%s\n", g_func_pp->name); + fprintf(fout, "#define US_SZ_%s USERSTACK_SIZE\n", g_func_pp->name); + fprintf(fout, "#endif\n"); + } + + // the function itself + fprintf(fout, "%s ", g_func_pp->ret_type.name); + 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) + fprintf(fout, ", "); + if (g_func_pp->arg[i].fptr != NULL) { + // func pointer.. + pp = g_func_pp->arg[i].fptr; + fprintf(fout, "%s (", pp->ret_type.name); + output_pp_attrs(fout, pp, 0); + fprintf(fout, "*a%d)(", i + 1); + for (j = 0; j < pp->argc; j++) { + if (j > 0) + fprintf(fout, ", "); + if (pp->arg[j].fptr) + ferr(ops, "nested fptr\n"); + fprintf(fout, "%s", pp->arg[j].type.name); + } + if (pp->is_vararg) { + if (j > 0) + fprintf(fout, ", "); + fprintf(fout, "..."); + } + fprintf(fout, ")"); + } + else if (g_func_pp->arg[i].type.is_retreg) { + fprintf(fout, "u32 *r_%s", g_func_pp->arg[i].reg); + } + else { + fprintf(fout, "%s a%d", g_func_pp->arg[i].type.name, i + 1); + } + } + if (g_func_pp->is_vararg) { + if (i > 0) + fprintf(fout, ", "); + fprintf(fout, "..."); + } + + fprintf(fout, ")\n{\n"); + + // declare indirect functions + for (i = 0; i < opcnt; i++) { + po = &ops[i]; + if (po->flags & OPF_RMD) + continue; + + if (po->op == OP_CALL) { + pp = po->pp; + if (pp == NULL) + ferr(po, "NULL pp\n"); + + if (pp->is_fptr && !(pp->name[0] != 0 && pp->is_arg)) { + 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].pp)) { + 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"); + } + } + } // output LUTs/jumptables for (i = 0; i < g_func_pd_cnt; i++) { @@ -3525,15 +3737,26 @@ tailcall: } } fprintf(fout, " };\n"); + had_decl = 1; } // declare stack frame, va_arg - if (g_stack_fsz) + if (g_stack_fsz) { fprintf(fout, " union { u32 d[%d]; u16 w[%d]; u8 b[%d]; } sf;\n", (g_stack_fsz + 3) / 4, (g_stack_fsz + 1) / 2, g_stack_fsz); + had_decl = 1; + } + + if (g_func_pp->is_userstack) { + fprintf(fout, " u32 fake_sf[US_SZ_%s / 4];\n", g_func_pp->name); + fprintf(fout, " u32 *esp = &fake_sf[sizeof(fake_sf) / 4];\n"); + had_decl = 1; + } - if (g_func_pp->is_vararg) + if (g_func_pp->is_vararg) { fprintf(fout, " va_list ap;\n"); + had_decl = 1; + } // declare arg-registers for (i = 0; i < g_func_pp->argc; i++) { @@ -3541,12 +3764,20 @@ tailcall: reg = char_array_i(regs_r32, ARRAY_SIZE(regs_r32), g_func_pp->arg[i].reg); if (regmask & (1 << reg)) { - fprintf(fout, " u32 %s = (u32)a%d;\n", - g_func_pp->arg[i].reg, i + 1); + if (g_func_pp->arg[i].type.is_retreg) + fprintf(fout, " u32 %s = *r_%s;\n", + g_func_pp->arg[i].reg, g_func_pp->arg[i].reg); + else + fprintf(fout, " u32 %s = (u32)a%d;\n", + g_func_pp->arg[i].reg, i + 1); } - else + else { + if (g_func_pp->arg[i].type.is_retreg) + ferr(ops, "retreg '%s' is unused?\n", + g_func_pp->arg[i].reg); fprintf(fout, " // %s = a%d; // unused\n", g_func_pp->arg[i].reg, i + 1); + } had_decl = 1; } } @@ -3636,50 +3867,49 @@ tailcall: if (po->flags & OPF_CC) { int is_delayed = 0; - int is_inv = 0; - pfo = split_cond(po, po->op, &is_inv); tmp_op = po->datap; // we go through all this trouble to avoid using parsed_flag_op, // which makes generated code much nicer if (delayed_flag_op != NULL) { - out_cmp_test(buf1, sizeof(buf1), delayed_flag_op, pfo, is_inv); + out_cmp_test(buf1, sizeof(buf1), delayed_flag_op, + po->pfo, po->pfo_inv); is_delayed = 1; } else if (last_arith_dst != NULL - && (pfo == PFO_Z || pfo == PFO_S || pfo == PFO_P + && (po->pfo == PFO_Z || po->pfo == PFO_S || po->pfo == PFO_P || (tmp_op && (tmp_op->op == OP_AND || tmp_op->op == OP_OR)) )) { out_src_opr_u32(buf3, sizeof(buf3), po, last_arith_dst); - out_test_for_cc(buf1, sizeof(buf1), po, pfo, is_inv, + out_test_for_cc(buf1, sizeof(buf1), po, po->pfo, po->pfo_inv, last_arith_dst->lmod, buf3); is_delayed = 1; } else if (tmp_op != NULL) { // use preprocessed flag calc results - if (!(tmp_op->pfomask & (1 << pfo))) - ferr(po, "not prepared for pfo %d\n", pfo); + if (!(tmp_op->pfomask & (1 << po->pfo))) + ferr(po, "not prepared for pfo %d\n", po->pfo); - // note: is_inv was not yet applied + // note: pfo_inv was not yet applied snprintf(buf1, sizeof(buf1), "(%scond_%s)", - is_inv ? "!" : "", parsed_flag_op_names[pfo]); + po->pfo_inv ? "!" : "", parsed_flag_op_names[po->pfo]); } else { ferr(po, "all methods of finding comparison failed\n"); } if (po->flags & OPF_JMP) { - fprintf(fout, " if %s\n", buf1); + fprintf(fout, " if %s", buf1); } 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); + parsed_flag_op_names[po->pfo], buf1); } else if (po->flags & OPF_DATA) { // SETcc out_dst_opr(buf2, sizeof(buf2), po, &po->operand[0]); @@ -3693,24 +3923,32 @@ 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); + struct parsed_opr opr = {0,}; + opr.type = OPT_REG; + opr.reg = xCX; + opr.lmod = OPLM_DWORD; + ret = try_resolve_const(i, &opr, opcnt * 7 + i, &uval); + + if (ret != 1 || uval == 0) { + // we need initial flags for ecx=0 case.. + if (i > 0 && ops[i - 1].op == OP_XOR + && IS(ops[i - 1].operand[0].name, + ops[i - 1].operand[1].name)) + { + fprintf(fout, " cond_z = "); + if (pfomask & (1 << PFO_C)) + fprintf(fout, "cond_c = "); + fprintf(fout, "0;\n"); + } + else if (last_arith_dst != NULL) { + out_src_opr_u32(buf3, sizeof(buf3), po, last_arith_dst); + out_test_for_cc(buf1, sizeof(buf1), po, PFO_Z, 0, + last_arith_dst->lmod, buf3); + fprintf(fout, " cond_z = %s;\n", buf1); + } + else + ferr(po, "missing initial ZF\n"); } - else - ferr(po, "missing initial ZF\n"); } switch (po->op) @@ -3719,9 +3957,10 @@ tailcall: assert_operand_cnt(2); propagate_lmod(po, &po->operand[0], &po->operand[1]); out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]); + default_cast_to(buf3, sizeof(buf3), &po->operand[0]); fprintf(fout, " %s = %s;", buf1, out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], - po->operand[0].is_ptr ? "(void *)" : "", 0)); + buf3, 0)); break; case OP_LEA: @@ -3765,9 +4004,11 @@ tailcall: 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])); + out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], + default_cast_to(buf3, sizeof(buf3), &po->operand[0]), 0)); + fprintf(fout, " %s = %stmp;", + out_dst_opr(buf1, sizeof(buf1), po, &po->operand[1]), + default_cast_to(buf3, sizeof(buf3), &po->operand[1])); snprintf(g_comment, sizeof(g_comment), "xchg"); break; @@ -3785,6 +4026,21 @@ tailcall: strcpy(g_comment, "cdq"); break; + case OP_LODS: + assert_operand_cnt(3); + if (po->flags & OPF_REP) { + // hmh.. + ferr(po, "TODO\n"); + } + else { + fprintf(fout, " eax = %sesi; esi %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, "lods"); + } + break; + case OP_STOS: assert_operand_cnt(3); if (po->flags & OPF_REP) { @@ -3796,7 +4052,7 @@ tailcall: strcpy(g_comment, "rep stos"); } else { - fprintf(fout, " %sedi = eax; edi %c= %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)); @@ -3818,7 +4074,7 @@ tailcall: strcpy(g_comment, "rep movs"); } else { - fprintf(fout, " %sedi = %sesi; edi %c= %d; esi %c= %d;", + fprintf(fout, " %sedi = %sesi; edi %c= %d; esi %c= %d;", buf1, buf1, l, j, l, j); strcpy(g_comment, "movs"); } @@ -3832,26 +4088,27 @@ tailcall: l = (po->flags & OPF_DF) ? '-' : '+'; if (po->flags & OPF_REP) { fprintf(fout, - " for (; ecx != 0; ecx--, edi %c= %d, esi %c= %d) {\n", - l, j, l, j); + " for (; ecx != 0; ecx--) {\n"); if (pfomask & (1 << PFO_C)) { // ugh.. fprintf(fout, - " cond_c = %sedi < %sesi;\n", buf1, buf1); + " cond_c = %sesi < %sedi;\n", buf1, buf1); pfomask &= ~(1 << PFO_C); } fprintf(fout, - " if ((cond_z = (%sedi == %sesi)) %s 0)\n", - buf1, buf1, (po->flags & OPF_REPZ) ? "==" : "!="); + " cond_z = (%sesi == %sedi); esi %c= %d, edi %c= %d;\n", + buf1, buf1, l, j, l, j); + fprintf(fout, + " if (cond_z %s 0) break;\n", + (po->flags & OPF_REPZ) ? "==" : "!="); fprintf(fout, - " 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 %c= %d; esi %c= %d;", + " cond_z = (%sesi == %sedi); esi %c= %d; edi %c= %d;", buf1, buf1, l, j, l, j); strcpy(g_comment, "cmps"); } @@ -3868,19 +4125,21 @@ tailcall: l = (po->flags & OPF_DF) ? '-' : '+'; if (po->flags & OPF_REP) { fprintf(fout, - " for (; ecx != 0; ecx--, edi %c= %d)\n", l, j); + " for (; ecx != 0; ecx--) {\n"); fprintf(fout, - " if ((cond_z = (%seax == %sedi)) %s 0)\n", + " cond_z = (%seax == %sedi); edi %c= %d;\n", lmod_cast_u(po, po->operand[0].lmod), - lmod_cast_u_ptr(po, po->operand[0].lmod), + lmod_cast_u_ptr(po, po->operand[0].lmod), l, j); + fprintf(fout, + " if (cond_z %s 0) break;\n", (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;", + 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"); @@ -4025,13 +4284,22 @@ tailcall: 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"); + out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]); + out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1]); + if (po->operand[0].lmod == OPLM_DWORD) { + fprintf(fout, " tmp64 = (u64)%s + %s;\n", buf1, buf2); + 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"); + } + else { + fprintf(fout, " cond_c = ((u32)%s + %s) >> %d;\n", + buf1, buf2, lmod_bytes(po, po->operand[0].lmod) * 8); + fprintf(fout, " %s += %s;", + out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]), + buf2); + } pfomask &= ~(1 << PFO_C); output_std_flags(fout, po, &pfomask, buf1); last_arith_dst = &po->operand[0]; @@ -4073,6 +4341,18 @@ tailcall: delayed_flag_op = NULL; break; + case OP_BSF: + assert_operand_cnt(2); + out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1]); + fprintf(fout, " %s = %s ? __builtin_ffs(%s) - 1 : 0;", + out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]), + buf2, buf2); + output_std_flags(fout, po, &pfomask, buf1); + last_arith_dst = &po->operand[0]; + delayed_flag_op = NULL; + strcat(g_comment, "bsf"); + break; + case OP_INC: case OP_DEC: out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]); @@ -4112,11 +4392,24 @@ tailcall: // fallthrough case OP_MUL: assert_operand_cnt(1); - strcpy(buf1, po->op == OP_IMUL ? "(s64)(s32)" : "(u64)"); - fprintf(fout, " tmp64 = %seax * %s%s;\n", buf1, buf1, - out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[0])); - fprintf(fout, " edx = tmp64 >> 32;\n"); - fprintf(fout, " eax = tmp64;"); + switch (po->operand[0].lmod) { + case OPLM_DWORD: + strcpy(buf1, po->op == OP_IMUL ? "(s64)(s32)" : "(u64)"); + fprintf(fout, " tmp64 = %seax * %s%s;\n", buf1, buf1, + out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[0])); + fprintf(fout, " edx = tmp64 >> 32;\n"); + fprintf(fout, " eax = tmp64;"); + break; + case OPLM_BYTE: + strcpy(buf1, po->op == OP_IMUL ? "(s16)(s8)" : "(u16)(u8)"); + fprintf(fout, " LOWORD(eax) = %seax * %s;", buf1, + out_src_opr(buf2, sizeof(buf2), po, &po->operand[0], + buf1, 0)); + break; + default: + ferr(po, "TODO: unhandled mul type\n"); + break; + } last_arith_dst = NULL; delayed_flag_op = NULL; break; @@ -4176,11 +4469,13 @@ tailcall: delayed_flag_op = po; break; + case OP_SCC: + // SETcc - should already be handled + break; + // note: we reuse OP_Jcc for SETcc, only flags differ - case OP_JO ... OP_JG: - if (po->flags & OPF_JMP) - fprintf(fout, " goto %s;", po->operand[0].name); - // else SETcc - should already be handled + case OP_JCC: + fprintf(fout, "\n goto %s;", po->operand[0].name); break; case OP_JECXZ: @@ -4211,15 +4506,27 @@ tailcall: case OP_CALL: assert_operand_cnt(1); - pp = po->datap; + pp = po->pp; my_assert_not(pp, NULL); - if (pp->is_fptr && !pp->is_arg) - fprintf(fout, " %s = %s;\n", pp->name, + strcpy(buf3, " "); + if (po->flags & OPF_CC) { + // we treat conditional branch to another func + // (yes such code exists..) as conditional tailcall + strcat(buf3, " "); + fprintf(fout, " {\n"); + } + + if (pp->is_fptr && !pp->is_arg) { + fprintf(fout, "%s%s = %s;\n", buf3, pp->name, out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], "(void *)", 0)); + if (pp->is_unresolved) + fprintf(fout, "%sunresolved_call(\"%s:%d\", %s);\n", + buf3, asmfn, po->asmln, pp->name); + } - fprintf(fout, " "); + fprintf(fout, "%s", buf3); if (strstr(pp->ret_type.name, "int64")) { if (po->flags & OPF_TAIL) ferr(po, "int64 and tail?\n"); @@ -4250,6 +4557,8 @@ tailcall: || (pp->argc_stack > 0 && pp->is_stdcall != g_func_pp->is_stdcall)) ferr(po, "incompatible tailcall\n"); + if (g_func_pp->has_retreg) + ferr(po, "TODO: retreg+tailcall\n"); for (arg = j = 0; arg < pp->argc; arg++) { if (arg > 0) @@ -4283,7 +4592,10 @@ tailcall: pp->arg[arg].type.name); if (pp->arg[arg].reg != NULL) { - fprintf(fout, "%s%s", cast, pp->arg[arg].reg); + if (pp->arg[arg].type.is_retreg) + fprintf(fout, "&%s", pp->arg[arg].reg); + else + fprintf(fout, "%s%s", cast, pp->arg[arg].reg); continue; } @@ -4291,7 +4603,11 @@ tailcall: 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) { + + if (tmp_op->flags & OPF_VAPUSH) { + fprintf(fout, "ap"); + } + else if (tmp_op->argnum != 0) { fprintf(fout, "%ss_a%d", cast, tmp_op->argnum); } else { @@ -4305,14 +4621,14 @@ tailcall: if (strstr(pp->ret_type.name, "int64")) { fprintf(fout, "\n"); - fprintf(fout, " edx = tmp64 >> 32;\n"); - fprintf(fout, " eax = tmp64;"); + fprintf(fout, "%sedx = tmp64 >> 32;\n", buf3); + fprintf(fout, "%seax = tmp64;", buf3); } if (pp->is_unresolved) { - snprintf(buf3, sizeof(buf3), " unresoved %dreg", + snprintf(buf2, sizeof(buf2), " unresolved %dreg", pp->argc_reg); - strcat(g_comment, buf3); + strcat(g_comment, buf2); } if (po->flags & OPF_TAIL) { @@ -4330,7 +4646,7 @@ tailcall: ferr(po, "int func -> void func tailcall?\n"); } else { - fprintf(fout, "\n return;"); + fprintf(fout, "\n%sreturn;", buf3); strcat(g_comment, " ^ tailcall"); } } @@ -4341,6 +4657,12 @@ tailcall: strcat(g_comment, " noreturn"); if ((po->flags & OPF_ATAIL) && pp->argc_stack > 0) strcat(g_comment, " argframe"); + if (po->flags & OPF_CC) + strcat(g_comment, " cond"); + + if (po->flags & OPF_CC) + fprintf(fout, "\n }"); + delayed_flag_op = NULL; last_arith_dst = NULL; break; @@ -4348,6 +4670,12 @@ tailcall: case OP_RET: if (g_func_pp->is_vararg) fprintf(fout, " va_end(ap);\n"); + if (g_func_pp->has_retreg) { + for (arg = 0; arg < g_func_pp->argc; arg++) + if (g_func_pp->arg[arg].type.is_retreg) + fprintf(fout, " *r_%s = %s;\n", + g_func_pp->arg[arg].reg, g_func_pp->arg[arg].reg); + } if (IS(g_func_pp->ret_type.name, "void")) { if (i != opcnt - 1 || label_pending) @@ -4367,17 +4695,20 @@ tailcall: break; case OP_PUSH: + out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]); if (po->argnum != 0) { // special case - saved func arg - out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]); fprintf(fout, " s_a%d = %s;", po->argnum, buf1); break; } else if (po->flags & OPF_RSAVE) { - out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]); fprintf(fout, " s_%s = %s;", buf1, buf1); break; } + else if (g_func_pp->is_userstack) { + fprintf(fout, " *(--esp) = %s;", buf1); + break; + } if (!(g_ida_func_attr & IDAFA_NORETURN)) ferr(po, "stray push encountered\n"); no_output = 1; @@ -4396,10 +4727,16 @@ tailcall: fprintf(fout, " %s = %s;", buf1, out_src_opr(buf2, sizeof(buf2), tmp_op, &tmp_op->operand[0], - po->operand[0].is_ptr ? "(void *)" : "", 0)); + default_cast_to(buf3, sizeof(buf3), &po->operand[0]), 0)); + break; + } + else if (g_func_pp->is_userstack) { + fprintf(fout, " %s = *esp++;", + out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0])); break; } - ferr(po, "stray pop encountered\n"); + else + ferr(po, "stray pop encountered\n"); break; case OP_NOP: @@ -4473,9 +4810,8 @@ tailcall: g_label_refs[i].next = NULL; if (ops[i].op == OP_CALL) { - pp = ops[i].datap; - if (pp) - proto_release(pp); + if (ops[i].pp) + proto_release(ops[i].pp); } } g_func_pp = NULL; @@ -4592,6 +4928,9 @@ static void scan_ahead(FILE *fasm) add_func_chunk(fasm, words[0], asmln); } + else if (IS_START(p, "; sctend")) + break; + continue; } // *p == ';' @@ -4636,6 +4975,8 @@ int main(int argc, char *argv[]) int skip_warned = 0; int eq_alloc; int verbose = 0; + int multi_seg = 0; + int end = 0; int arg_out; int arg; int pi = 0; @@ -4649,12 +4990,14 @@ int main(int argc, char *argv[]) verbose = 1; else if (IS(argv[arg], "-rf")) g_allow_regfunc = 1; + else if (IS(argv[arg], "-m")) + multi_seg = 1; else break; } if (argc < arg + 3) { - printf("usage:\n%s [-v] [-rf] <.c> <.asm> [rlist]*\n", + printf("usage:\n%s [-v] [-rf] [-m] <.c> <.asm> [rlist]*\n", argv[0]); return 1; } @@ -4864,6 +5207,11 @@ parse_words: if (IS_START(p, "; sctproto:")) { sctproto = strdup(p + 11); } + else if (IS_START(p, "; sctend")) { + end = 1; + if (!pending_endp) + break; + } } if (wordc == 0) { @@ -4884,7 +5232,7 @@ parse_words: do_pending_endp: // do delayed endp processing to collect switch jumptables if (pending_endp) { - if (in_func && !skip_func && wordc >= 2 + if (in_func && !skip_func && !end && wordc >= 2 && ((words[0][0] == 'd' && words[0][2] == 0) || (words[1][0] == 'd' && words[1][2] == 0))) { @@ -4967,6 +5315,9 @@ do_pending_endp: } g_func_pd_cnt = 0; pd = NULL; + + if (end) + break; if (wordc == 0) continue; } @@ -5030,8 +5381,27 @@ do_pending_endp: continue; } - if (wordc == 2 && IS(words[1], "ends")) - break; + if (wordc == 2 && IS(words[1], "ends")) { + if (!multi_seg) { + end = 1; + if (pending_endp) + goto do_pending_endp; + break; + } + + // scan for next text segment + while (fgets(line, sizeof(line), fasm)) { + asmln++; + p = sskip(line); + if (*p == 0 || *p == ';') + continue; + + if (strstr(p, "segment para public 'CODE' use32")) + break; + } + + continue; + } p = strchr(words[0], ':'); if (p != NULL) { @@ -5086,7 +5456,7 @@ do_pending_endp: parse_op(&ops[pi], words, wordc); if (sctproto != NULL) { - if (ops[pi].op == OP_CALL) + if (ops[pi].op == OP_CALL || ops[pi].op == OP_JMP) ops[pi].datap = sctproto; sctproto = NULL; }