X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Ftranslate.c;h=8d2fb6fd376ea0a06a289b2c8432bf826903d2e1;hb=fdd5548ad19cb8fb0e7f3ae46d201c6bc9d264c9;hp=14babd86f0f8b107b1b9737c29ddb271f7a7d63a;hpb=1f84f6b3a3aa6ddbdcd8428b311e6049aeec4385;p=ia32rtools.git diff --git a/tools/translate.c b/tools/translate.c index 14babd8..8d2fb6f 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 @@ -46,6 +54,7 @@ enum op_flags { 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 { @@ -61,6 +70,7 @@ enum op_op { OP_XCHG, OP_NOT, OP_CDQ, + OP_LODS, OP_STOS, OP_MOVS, OP_CMPS, @@ -95,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 { @@ -141,28 +137,35 @@ 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 p_argnum; // push: altered before call arg # + unsigned char p_argpass;// push: arg of host func + unsigned char pad[3]; int regmask_src; // all referensed regs int regmask_dst; int pfomask; // flagop: parsed_flag_op that can't be delayed - int argnum; // push: altered before call arg # 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 @@ -220,13 +223,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 @@ -272,6 +275,22 @@ static void printf_number(char *buf, size_t buf_size, snprintf(buf, buf_size, number < 10 ? "%lu" : "0x%02lx", number); } +static int check_segment_prefix(const char *s) +{ + if (s[0] == 0 || s[1] != 's' || s[2] != ':') + return 0; + + switch (s[0]) { + case 'c': return 1; + case 'd': return 2; + case 's': return 3; + case 'e': return 4; + case 'f': return 5; + case 'g': return 6; + default: return 0; + } +} + static int parse_reg(enum opr_lenmod *reg_lmod, const char *s) { int reg; @@ -323,8 +342,8 @@ static int parse_indmode(char *name, int *regmask, int need_c_cvt) s++; *d = 0; - // skip 'ds:' prefix - if (IS_START(s, "ds:")) + // skip '?s:' prefixes + if (check_segment_prefix(s)) s += 3; s = next_idt(w, sizeof(w), s); @@ -370,7 +389,8 @@ static int is_reg_in_str(const char *s) return 0; } -static const char *parse_stack_el(const char *name, char *extra_reg) +static const char *parse_stack_el(const char *name, char *extra_reg, + int early_try) { const char *p, *p2, *s; char *endp = NULL; @@ -378,31 +398,34 @@ static const char *parse_stack_el(const char *name, char *extra_reg) long val; int len; - p = name; - if (IS_START(p + 3, "+ebp+") && is_reg_in_str(p)) { - p += 4; - if (extra_reg != NULL) { - strncpy(extra_reg, name, 3); - extra_reg[4] = 0; + if (g_bp_frame || early_try) + { + p = name; + if (IS_START(p + 3, "+ebp+") && is_reg_in_str(p)) { + p += 4; + if (extra_reg != NULL) { + strncpy(extra_reg, name, 3); + extra_reg[4] = 0; + } } - } - if (IS_START(p, "ebp+")) { - p += 4; + if (IS_START(p, "ebp+")) { + p += 4; - p2 = strchr(p, '+'); - if (p2 != NULL && is_reg_in_str(p)) { - if (extra_reg != NULL) { - strncpy(extra_reg, p, p2 - p); - extra_reg[p2 - p] = 0; + p2 = strchr(p, '+'); + if (p2 != NULL && is_reg_in_str(p)) { + if (extra_reg != NULL) { + strncpy(extra_reg, p, p2 - p); + extra_reg[p2 - p] = 0; + } + p = p2 + 1; } - p = p2 + 1; - } - if (!('0' <= *p && *p <= '9')) - return p; + if (!('0' <= *p && *p <= '9')) + return p; - return NULL; + return NULL; + } } if (!IS_START(name, "esp+")) @@ -471,16 +494,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", "size_t", }; 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; @@ -516,6 +541,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")) @@ -587,7 +630,10 @@ static int parse_operand(struct parsed_opr *opr, if (label != NULL) { opr->type = OPT_LABEL; - if (IS_START(label, "ds:")) { + ret = check_segment_prefix(label); + if (ret != 0) { + if (ret >= 5) + aerr("fs/gs used\n"); opr->had_ds = 1; label += 3; } @@ -614,8 +660,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], ')'); @@ -631,7 +679,10 @@ static int parse_operand(struct parsed_opr *opr, if (wordc_in != 1) aerr("parse_operand 1 word expected\n"); - if (IS_START(words[w], "ds:")) { + ret = check_segment_prefix(words[w]); + if (ret != 0) { + if (ret >= 5) + aerr("fs/gs used\n"); opr->had_ds = 1; memmove(words[w], words[w] + 3, strlen(words[w]) - 2); } @@ -644,10 +695,11 @@ static int parse_operand(struct parsed_opr *opr, aerr("[] parse failure\n"); parse_indmode(opr->name, regmask_indirect, 1); - if (opr->lmod == OPLM_UNSPEC && parse_stack_el(opr->name, NULL)) { + if (opr->lmod == OPLM_UNSPEC && parse_stack_el(opr->name, NULL, 1)) + { // might be an equ struct parsed_equ *eq = - equ_find(NULL, parse_stack_el(opr->name, NULL), &i); + equ_find(NULL, parse_stack_el(opr->name, NULL, 1), &i); if (eq) opr->lmod = eq->lmod; } @@ -708,6 +760,7 @@ do_label: } opr->is_array = pp->type.is_array; } + opr->pp = pp; if (opr->lmod == OPLM_UNSPEC) guess_lmod_from_name(opr); @@ -731,9 +784,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 }, @@ -746,6 +801,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 }, @@ -771,10 +829,10 @@ 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 }, @@ -789,63 +847,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) @@ -884,7 +943,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; @@ -920,6 +982,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) @@ -931,10 +994,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: @@ -957,7 +1022,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; @@ -1009,10 +1074,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; @@ -1037,12 +1106,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 "???"; @@ -1058,7 +1138,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) @@ -1263,7 +1343,7 @@ static struct parsed_equ *equ_find(struct parsed_op *po, const char *name, static int is_stack_access(struct parsed_op *po, const struct parsed_opr *popr) { - return (parse_stack_el(popr->name, NULL) + return (parse_stack_el(popr->name, NULL, 0) || (g_bp_frame && !(po->flags & OPF_EBP_S) && IS_START(popr->name, "ebp"))); } @@ -1294,7 +1374,7 @@ static void parse_stack_access(struct parsed_op *po, ferr(po, "ebp- parse of '%s' failed\n", name); } else { - bp_arg = parse_stack_el(name, ofs_reg); + bp_arg = parse_stack_el(name, ofs_reg, 0); snprintf(g_comment, sizeof(g_comment), "%s", bp_arg); eq = equ_find(po, bp_arg, &offset); if (eq == NULL) @@ -1318,7 +1398,7 @@ static void parse_stack_access(struct parsed_op *po, *bp_arg_out = bp_arg; } -static void stack_frame_access(struct parsed_op *po, +static int stack_frame_access(struct parsed_op *po, struct parsed_opr *popr, char *buf, size_t buf_size, const char *name, const char *cast, int is_src, int is_lea) { @@ -1330,6 +1410,7 @@ static void stack_frame_access(struct parsed_op *po, int unaligned = 0; int stack_ra = 0; int offset = 0; + int retval = -1; int sf_ofs; int lim; @@ -1351,7 +1432,7 @@ static void stack_frame_access(struct parsed_op *po, if (cast[0] == 0) cast = "(u32)"; snprintf(buf, buf_size, "%sap", cast); - return; + return -1; } ferr(po, "offset %d (%s,%d) doesn't map to any arg\n", offset, bp_arg, arg_i); @@ -1370,6 +1451,7 @@ static void stack_frame_access(struct parsed_op *po, ferr(po, "arg %d not in prototype?\n", arg_i); popr->is_ptr = g_func_pp->arg[i].type.is_ptr; + retval = i; switch (popr->lmod) { @@ -1441,7 +1523,8 @@ static void stack_frame_access(struct parsed_op *po, // common problem guess_lmod_from_c_type(&tmp_lmod, &g_func_pp->arg[i].type); if (tmp_lmod != OPLM_DWORD - && (unaligned || (!is_src && tmp_lmod < popr->lmod))) + && (unaligned || (!is_src && lmod_bytes(po, tmp_lmod) + < lmod_bytes(po, popr->lmod) + (offset & 3)))) { 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); @@ -1504,12 +1587,16 @@ static void stack_frame_access(struct parsed_op *po, ferr(po, "bp_stack bad lmod: %d\n", popr->lmod); } } + + return retval; } 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) { @@ -1520,6 +1607,18 @@ 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 const char *check_label_read_ref(struct parsed_op *po, @@ -1712,66 +1811,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) @@ -1977,7 +2016,7 @@ 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, @@ -2005,7 +2044,7 @@ static int scan_for_pop(int i, int opcnt, const char *reg, } if ((po->flags & OPF_RMD) - || (po->op == OP_PUSH && po->argnum != 0)) // arg push + || (po->op == OP_PUSH && po->p_argnum != 0)) // arg push continue; if ((po->flags & OPF_JMP) && po->op != OP_CALL) { @@ -2340,7 +2379,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; @@ -2382,8 +2420,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; } } @@ -2593,8 +2630,10 @@ static const struct parsed_proto *resolve_icall(int i, int opcnt, return pp; } -static int try_resolve_const(int i, const struct parsed_opr *opr, - int magic, unsigned int *val) +// 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; @@ -2605,7 +2644,7 @@ static int try_resolve_const(int i, const struct parsed_opr *opr, if (g_labels[i][0] != 0) { lr = &g_label_refs[i]; for (; lr != NULL; lr = lr->next) - ret |= try_resolve_const(lr->i, opr, magic, val); + ret |= resolve_origin(lr->i, opr, magic, op_i); if (i > 0 && LAST_OP(i - 1)) return ret; } @@ -2622,12 +2661,36 @@ static int try_resolve_const(int i, const struct parsed_opr *opr, 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, @@ -2637,8 +2700,11 @@ 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; + int reg; + char buf[32]; + int j, k; if (i < 0) { ferr(po, "dead label encountered\n"); @@ -2696,7 +2762,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); @@ -2704,12 +2770,16 @@ static int collect_call_args_r(struct parsed_op *po, int i, ferr(po, "arg collect %d/%d hit '%s' with %d stack args\n", arg, pp->argc, opr_name(&ops[j], 0), pp_tmp->argc_stack); } - else if (ops[j].op == OP_ADD && ops[j].operand[0].reg == xSP) { + // esp adjust of 0 means we collected it before + else if (ops[j].op == OP_ADD && ops[j].operand[0].reg == xSP + && (ops[j].operand[1].type != OPT_CONST + || ops[j].operand[1].val != 0)) + { if (pp->is_unresolved) break; - ferr(po, "arg collect %d/%d hit esp adjust\n", - arg, pp->argc); + ferr(po, "arg collect %d/%d hit esp adjust of %d\n", + arg, pp->argc, ops[j].operand[1].val); } else if (ops[j].op == OP_POP) { if (pp->is_unresolved) @@ -2731,6 +2801,11 @@ 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; + reg = -1; + if (ops[j].operand[0].type == OPT_REG) + reg = ops[j].operand[0].reg; + if (!need_op_saving) { ret = scan_for_mod(&ops[j], j + 1, i, 1); need_to_save_current = (ret >= 0); @@ -2738,15 +2813,18 @@ static int collect_call_args_r(struct parsed_op *po, int i, if (need_op_saving || need_to_save_current) { // mark this push as one that needs operand saving ops[j].flags &= ~OPF_RMD; - if (ops[j].argnum == 0) { - ops[j].argnum = arg + 1; - *save_arg_vars |= 1 << arg; + if (ops[j].p_argnum == 0) { + ops[j].p_argnum = arg + 1; + save_args |= 1 << arg; + } + else if (ops[j].p_argnum < arg + 1) { + // XXX: might kill valid var.. + //*save_arg_vars &= ~(1 << (ops[j].p_argnum - 1)); + ops[j].p_argnum = arg + 1; + save_args |= 1 << arg; } - else if (ops[j].argnum < arg + 1) - ferr(&ops[j], "argnum conflict (%d<%d) for '%s'\n", - ops[j].argnum, arg + 1, pp->name); } - else if (ops[j].argnum == 0) + else if (ops[j].p_argnum == 0) ops[j].flags |= OPF_RMD; // some PUSHes are reused by different calls on other branches, @@ -2757,6 +2835,49 @@ static int collect_call_args_r(struct parsed_op *po, int i, ops[j].flags &= ~OPF_RSAVE; + // check for __VALIST + if (!pp->is_unresolved && pp->arg[arg].type.is_va_list) { + k = -1; + ret = resolve_origin(j, &ops[j].operand[0], magic + 1, &k); + if (ret == 1 && k >= 0) + { + if (ops[k].op == OP_LEA) { + snprintf(buf, sizeof(buf), "arg_%X", + g_func_pp->argc_stack * 4); + if (!g_func_pp->is_vararg + || strstr(ops[k].operand[1].name, buf)) + { + ops[k].flags |= OPF_RMD; + ops[j].flags |= OPF_RMD | OPF_VAPUSH; + save_args &= ~(1 << arg); + reg = -1; + } + else + ferr(&ops[j], "lea va_list used, but no vararg?\n"); + } + // check for va_list from g_func_pp arg too + else if (ops[k].op == OP_MOV + && is_stack_access(&ops[k], &ops[k].operand[1])) + { + ret = stack_frame_access(&ops[k], &ops[k].operand[1], + buf, sizeof(buf), ops[k].operand[1].name, "", 1, 0); + if (ret >= 0) { + ops[k].flags |= OPF_RMD; + ops[j].flags |= OPF_RMD; + ops[j].p_argpass = ret + 1; + save_args &= ~(1 << arg); + reg = -1; + } + } + } + } + + *save_arg_vars |= save_args; + + // tracking reg usage + if (reg >= 0) + *regmask |= 1 << reg; + arg++; if (!pp->is_unresolved) { // next arg @@ -2765,10 +2886,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; } } @@ -2888,7 +3005,6 @@ 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; @@ -2906,7 +3022,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; @@ -2918,39 +3033,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 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->arg[i].reg != NULL) { reg = char_array_i(regs_r32, ARRAY_SIZE(regs_r32), g_func_pp->arg[i].reg); @@ -2959,13 +3042,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 @@ -3054,22 +3130,33 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) } while (i < opcnt); } else { - for (i = 0; i < opcnt; i++) { + int ecx_push = 0, esp_sub = 0; + + i = 0; + while (ops[i].op == OP_PUSH && IS(opr_name(&ops[i], 0), "ecx")) { + ops[i].flags |= OPF_RMD; + g_stack_fsz += 4; + ecx_push++; + i++; + } + + for (; i < opcnt; i++) { if (ops[i].op == OP_PUSH || (ops[i].flags & (OPF_JMP|OPF_TAIL))) break; if (ops[i].op == OP_SUB && ops[i].operand[0].reg == xSP && ops[i].operand[1].type == OPT_CONST) { - g_sp_frame = 1; + g_stack_fsz = ops[i].operand[1].val; + ops[i].flags |= OPF_RMD; + esp_sub = 1; break; } } found = 0; - if (g_sp_frame) + if (ecx_push || esp_sub) { - g_stack_fsz = ops[i].operand[1].val; - ops[i].flags |= OPF_RMD; + g_sp_frame = 1; i++; do { @@ -3083,14 +3170,31 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) 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; + if (ecx_push > 0) { + for (l = 0; l < ecx_push; l++) { + if (ops[j].op != OP_POP + || !IS(opr_name(&ops[j], 0), "ecx")) + { + ferr(&ops[j], "'pop ecx' expected\n"); + } + ops[j].flags |= OPF_RMD; + j--; + } + + found = 1; + } + + if (esp_sub) { + if (ops[j].op != OP_ADD + || !IS(opr_name(&ops[j], 0), "esp") + || ops[j].operand[1].type != OPT_CONST + || ops[j].operand[1].val != g_stack_fsz) + ferr(&ops[j], "'add esp' expected\n"); + ops[j].flags |= OPF_RMD; + + found = 1; + } - found = 1; i++; } while (i < opcnt); } @@ -3138,8 +3242,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; } @@ -3183,13 +3287,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) @@ -3221,12 +3330,14 @@ 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) @@ -3264,7 +3375,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 @@ -3342,7 +3453,7 @@ tailcall: regmask_save |= 1 << reg; } - if (po->op == OP_PUSH && po->argnum == 0 + if (po->op == OP_PUSH && po->p_argnum == 0 && !(po->flags & OPF_RSAVE) && !g_func_pp->is_userstack) { if (po->operand[0].type == OPT_REG) @@ -3423,7 +3534,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 @@ -3435,21 +3545,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; @@ -3463,16 +3580,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"); @@ -3490,7 +3609,7 @@ 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 && tmp_op->operand[0].type == OPT_REG) + if (tmp_op->p_argnum == 0 && tmp_op->operand[0].type == OPT_REG) regmask_stack |= 1 << tmp_op->operand[0].reg; } @@ -3531,38 +3650,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")) @@ -3601,6 +3706,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++) { @@ -3637,8 +3838,8 @@ tailcall: } if (g_func_pp->is_userstack) { - fprintf(fout, " u32 fake_sf[1024];\n"); - fprintf(fout, " u32 *esp = &fake_sf[1024];\n"); + 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; } @@ -3756,50 +3957,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]); @@ -3847,9 +4047,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: @@ -3893,9 +4094,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; @@ -3913,6 +4116,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) { @@ -3924,7 +4142,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)); @@ -3946,7 +4164,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"); } @@ -3964,11 +4182,11 @@ tailcall: 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, - " cond_z = (%sedi == %sesi); edi %c= %d, esi %c= %d;\n", + " 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", @@ -3980,7 +4198,7 @@ tailcall: } 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"); } @@ -4011,7 +4229,7 @@ tailcall: (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"); @@ -4156,13 +4374,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]; @@ -4255,11 +4482,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; @@ -4319,11 +4559,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: @@ -4354,15 +4596,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"); @@ -4439,8 +4693,15 @@ 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) { - fprintf(fout, "%ss_a%d", cast, tmp_op->argnum); + + if (tmp_op->flags & OPF_VAPUSH) { + fprintf(fout, "ap"); + } + else if (tmp_op->p_argpass != 0) { + fprintf(fout, "a%d", tmp_op->p_argpass); + } + else if (tmp_op->p_argnum != 0) { + fprintf(fout, "%ss_a%d", cast, tmp_op->p_argnum); } else { fprintf(fout, "%s", @@ -4453,14 +4714,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) { @@ -4478,7 +4739,7 @@ tailcall: ferr(po, "int func -> void func tailcall?\n"); } else { - fprintf(fout, "\n return;"); + fprintf(fout, "\n%sreturn;", buf3); strcat(g_comment, " ^ tailcall"); } } @@ -4489,6 +4750,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; @@ -4522,9 +4789,9 @@ tailcall: case OP_PUSH: out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]); - if (po->argnum != 0) { + if (po->p_argnum != 0) { // special case - saved func arg - fprintf(fout, " s_a%d = %s;", po->argnum, buf1); + fprintf(fout, " s_a%d = %s;", po->p_argnum, buf1); break; } else if (po->flags & OPF_RSAVE) { @@ -4553,7 +4820,7 @@ 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) { @@ -4636,9 +4903,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; @@ -4755,6 +5021,9 @@ static void scan_ahead(FILE *fasm) add_func_chunk(fasm, words[0], asmln); } + else if (IS_START(p, "; sctend")) + break; + continue; } // *p == ';' @@ -4800,6 +5069,7 @@ int main(int argc, char *argv[]) int eq_alloc; int verbose = 0; int multi_seg = 0; + int end = 0; int arg_out; int arg; int pi = 0; @@ -5030,6 +5300,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) { @@ -5050,7 +5325,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))) { @@ -5133,6 +5408,9 @@ do_pending_endp: } g_func_pd_cnt = 0; pd = NULL; + + if (end) + break; if (wordc == 0) continue; } @@ -5197,8 +5475,12 @@ do_pending_endp: } if (wordc == 2 && IS(words[1], "ends")) { - if (!multi_seg) + if (!multi_seg) { + end = 1; + if (pending_endp) + goto do_pending_endp; break; + } // scan for next text segment while (fgets(line, sizeof(line), fasm)) { @@ -5267,7 +5549,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; }