X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Ftranslate.c;h=d34d4905af6b0131054ff9cce9dc2530b18fce7e;hb=94d447fbb6ab6c7c01b3734457920a648292ddc5;hp=7cbf8b7832d82af1138b0b41caf357f34699a227;hpb=bd96f6564765a72d647fbf31de3120ad7f363653;p=ia32rtools.git diff --git a/tools/translate.c b/tools/translate.c index 7cbf8b7..d34d490 100644 --- a/tools/translate.c +++ b/tools/translate.c @@ -38,6 +38,7 @@ enum op_flags { OPF_REPZ = (1 << 8), /* rep is repe/repz */ OPF_REPNZ = (1 << 9), /* rep is repne/repnz */ OPF_FARG = (1 << 10), /* push collected as func arg (no reuse) */ + OPF_EBP_S = (1 << 11), /* ebp used as scratch, not BP */ }; enum op_op { @@ -120,6 +121,7 @@ struct parsed_opr { enum opr_lenmod lmod; unsigned int is_ptr:1; // pointer in C unsigned int is_array:1; // array in C + unsigned int type_from_var:1; // .. in header, sometimes wrong unsigned int size_mismatch:1; // type override differs from C unsigned int size_lt:1; // type override is larger than C int reg; @@ -468,8 +470,9 @@ static int guess_lmod_from_c_type(enum opr_lenmod *lmod, const struct parsed_type *c_type) { static const char *dword_types[] = { - "int", "_DWORD", "DWORD", "HANDLE", "HWND", "HMODULE", - "WPARAM", "UINT", + "int", "_DWORD", "UINT_PTR", + "DWORD", "HANDLE", "HWND", "HMODULE", + "WPARAM", "LPARAM", "UINT", }; static const char *word_types[] = { "uint16_t", "int16_t", @@ -478,6 +481,7 @@ static int guess_lmod_from_c_type(enum opr_lenmod *lmod, static const char *byte_types[] = { "uint8_t", "int8_t", "char", "unsigned __int8", "__int8", "BYTE", + "_UNKNOWN", }; const char *n; int i; @@ -680,19 +684,22 @@ static int parse_operand(struct parsed_opr *opr, opr->is_ptr = 1; } else { + tmplmod = OPLM_UNSPEC; if (!guess_lmod_from_c_type(&tmplmod, &pp->type)) anote("unhandled C type '%s' for '%s'\n", pp->type.name, opr->name); - if (opr->lmod == OPLM_UNSPEC) + if (opr->lmod == OPLM_UNSPEC) { opr->lmod = tmplmod; + opr->type_from_var = 1; + } else if (opr->lmod != tmplmod) { opr->size_mismatch = 1; if (tmplmod < opr->lmod) opr->size_lt = 1; } + opr->is_ptr = pp->type.is_ptr; } - opr->is_ptr = pp->type.is_ptr; opr->is_array = pp->type.is_array; } @@ -759,7 +766,7 @@ static const struct { { "idiv", OP_IDIV, 1, 1, OPF_DATA|OPF_FLAGS }, { "test", OP_TEST, 2, 2, OPF_FLAGS }, { "cmp", OP_CMP, 2, 2, OPF_FLAGS }, - { "retn", OP_RET, 0, 1, OPF_JMP|OPF_TAIL }, + { "retn", OP_RET, 0, 1, OPF_TAIL }, { "call", OP_CALL, 1, 1, OPF_JMP|OPF_DATA|OPF_FLAGS }, { "jmp", OP_JMP, 1, 1, OPF_JMP }, { "jo", OP_JO, 1, 1, OPF_JMP|OPF_CC }, // 70 OF=1 @@ -1184,12 +1191,28 @@ static void stack_frame_access(struct parsed_op *po, const char *p; char *endp = NULL; int i, arg_i, arg_s; + int unaligned = 0; int stack_ra = 0; int offset = 0; int sf_ofs; int lim; - if (!IS_START(name, "ebp-")) { + if (po->flags & OPF_EBP_S) + ferr(po, "stack_frame_access while ebp is scratch\n"); + + if (IS_START(name, "ebp-") + || (IS_START(name, "ebp+") && '0' <= name[4] && name[4] <= '9')) + { + p = name + 4; + if (IS_START(p, "0x")) + p += 2; + offset = strtoul(p, &endp, 16); + if (name[3] == '-') + offset = -offset; + if (*endp != 0) + ferr(po, "ebp- parse of '%s' failed\n", name); + } + else { bp_arg = parse_stack_el(name, ofs_reg); snprintf(g_comment, sizeof(g_comment), "%s", bp_arg); eq = equ_find(po, bp_arg, &offset); @@ -1197,19 +1220,11 @@ static void stack_frame_access(struct parsed_op *po, ferr(po, "detected but missing eq\n"); offset += eq->offset; } - else { - p = name + 4; - if (IS_START(p, "0x")) - p += 2; - offset = -strtoul(p, &endp, 16); - if (*endp != 0) - ferr(po, "ebp- parse of '%s' failed\n", name); - } if (!strncmp(name, "ebp", 3)) stack_ra = 4; - if (stack_ra <= offset && offset < stack_ra + 4) + if (ofs_reg[0] == 0 && stack_ra <= offset && offset < stack_ra + 4) ferr(po, "reference to ra? %d %d\n", offset, stack_ra); if (offset > stack_ra) @@ -1258,9 +1273,17 @@ static void stack_frame_access(struct parsed_op *po, case OPLM_WORD: if (is_lea) ferr(po, "lea/word to arg?\n"); - if (offset & 1) - ferr(po, "unaligned arg access\n"); - if (is_src && (offset & 2) == 0) + if (offset & 1) { + unaligned = 1; + if (!is_src) { + if (offset & 2) + ferr(po, "problematic arg store\n"); + snprintf(buf, buf_size, "*(u16 *)((char *)&a%d + 1)", i + 1); + } + else + ferr(po, "unaligned arg word load\n"); + } + else if (is_src && (offset & 2) == 0) snprintf(buf, buf_size, "(u16)a%d", i + 1); else snprintf(buf, buf_size, "%sWORD(a%d)", @@ -1272,14 +1295,19 @@ static void stack_frame_access(struct parsed_op *po, prefix = cast; else if (is_src) prefix = "(u32)"; + if (offset & 3) { - snprintf(g_comment, sizeof(g_comment), "%s unaligned", bp_arg); + unaligned = 1; if (is_lea) snprintf(buf, buf_size, "(u32)&a%d + %d", i + 1, offset & 3); - else + else if (!is_src) + ferr(po, "unaligned arg store\n"); + else { + // mov edx, [ebp+arg_4+2]; movsx ecx, dx snprintf(buf, buf_size, "%s(a%d >> %d)", prefix, i + 1, (offset & 3) * 8); + } } else { snprintf(buf, buf_size, "%s%sa%d", @@ -1291,9 +1319,12 @@ static void stack_frame_access(struct parsed_op *po, ferr(po, "bp_arg bad lmod: %d\n", popr->lmod); } + if (unaligned) + snprintf(g_comment, sizeof(g_comment), "%s unaligned", bp_arg); + // common problem guess_lmod_from_c_type(&tmp_lmod, &g_func_pp->arg[i].type); - if ((offset & 3) && tmp_lmod != OPLM_DWORD) + if (unaligned && tmp_lmod != OPLM_DWORD) ferr(po, "bp_arg arg/w offset %d and type '%s'\n", offset, g_func_pp->arg[i].type.name); } @@ -1353,8 +1384,15 @@ static void stack_frame_access(struct parsed_op *po, static void check_label_read_ref(struct parsed_op *po, const char *name) { - if (IS_START(name, "sub_")) - ferr(po, "func reference?\n"); + const struct parsed_proto *pp; + + pp = proto_parse(g_fhdr, name); + if (pp == NULL) + ferr(po, "proto_parse failed for ref '%s'\n", name); + + // currently we can take __cdecl and __stdcall + if (pp->is_func && pp->argc_reg != 0) + ferr(po, "reg-arg func reference?\n"); } static char *out_src_opr(char *buf, size_t buf_size, @@ -1393,7 +1431,8 @@ static char *out_src_opr(char *buf, size_t buf_size, case OPT_REGMEM: if (parse_stack_el(popr->name, NULL) - || (g_bp_frame && IS_START(popr->name, "ebp-"))) + || (g_bp_frame && !(po->flags & OPF_EBP_S) + && IS_START(popr->name, "ebp"))) { stack_frame_access(po, popr, buf, buf_size, popr->name, cast, 1, is_lea); @@ -1490,7 +1529,8 @@ static char *out_dst_opr(char *buf, size_t buf_size, case OPT_REGMEM: if (parse_stack_el(popr->name, NULL) - || (g_bp_frame && IS_START(popr->name, "ebp-"))) + || (g_bp_frame && !(po->flags & OPF_EBP_S) + && IS_START(popr->name, "ebp"))) { stack_frame_access(po, popr, buf, buf_size, popr->name, "", 0, 0); @@ -1697,8 +1737,23 @@ static void propagate_lmod(struct parsed_op *po, struct parsed_opr *popr1, popr1->lmod = popr2->lmod; else if (popr2->lmod == OPLM_UNSPEC) popr2->lmod = popr1->lmod; - else if (popr1->lmod != popr2->lmod) - ferr(po, "conflicting lmods: %d vs %d\n", popr1->lmod, popr2->lmod); + else if (popr1->lmod != popr2->lmod) { + if (popr1->type_from_var) { + popr1->size_mismatch = 1; + if (popr1->lmod < popr2->lmod) + popr1->size_lt = 1; + popr1->lmod = popr2->lmod; + } + else if (popr2->type_from_var) { + popr2->size_mismatch = 1; + if (popr2->lmod < popr1->lmod) + popr2->size_lt = 1; + popr2->lmod = popr1->lmod; + } + else + ferr(po, "conflicting lmods: %d vs %d\n", + popr1->lmod, popr2->lmod); + } } static const char *op_to_c(struct parsed_op *po) @@ -1729,15 +1784,11 @@ static const char *op_to_c(struct parsed_op *po) } } -static void set_flag_no_dup(struct parsed_op *po, enum op_flags flag, - enum op_flags flag_check) +static void op_set_clear_flag(struct parsed_op *po, + enum op_flags flag_set, enum op_flags flag_clear) { - if (po->flags & flag) - ferr(po, "flag %x already set\n", flag); - if (po->flags & flag_check) - ferr(po, "flag_check %x already set\n", flag_check); - - po->flags |= flag; + po->flags |= flag_set; + po->flags &= ~flag_clear; } // last op in stream - unconditional branch or ret @@ -1804,11 +1855,11 @@ static int scan_for_pop(int i, int opcnt, const char *reg, if (depth > *maxdepth) *maxdepth = depth; if (do_flags) - set_flag_no_dup(po, OPF_RSAVE, OPF_RMD); + op_set_clear_flag(po, OPF_RSAVE, OPF_RMD); } else if (depth == 0) { if (do_flags) - set_flag_no_dup(po, OPF_RMD, OPF_RSAVE); + op_set_clear_flag(po, OPF_RMD, OPF_RSAVE); return 1; } else { @@ -1816,7 +1867,7 @@ static int scan_for_pop(int i, int opcnt, const char *reg, if (depth < 0) // should not happen ferr(po, "fail with depth\n"); if (do_flags) - set_flag_no_dup(po, OPF_RSAVE, OPF_RMD); + op_set_clear_flag(po, OPF_RSAVE, OPF_RMD); } } } @@ -1929,22 +1980,36 @@ static int scan_for_mod_opr0(struct parsed_op *po_test, return -1; } -static int scan_for_flag_set(int i, int *branched, int *setters, - int *setter_cnt) +static int scan_for_flag_set(int i, int magic, int *branched, + int *setters, int *setter_cnt) { + struct label_ref *lr; int ret; while (i >= 0) { + if (ops[i].cc_scratch == magic) { + ferr(&ops[i], "%s looped\n", __func__); + return -1; + } + ops[i].cc_scratch = magic; + if (g_labels[i][0] != 0) { *branched = 1; - if (g_label_refs[i].next != NULL) - return -1; + + lr = &g_label_refs[i]; + for (; lr->next; lr = lr->next) { + ret = scan_for_flag_set(lr->i, magic, + branched, setters, setter_cnt); + if (ret < 0) + return ret; + } + if (i > 0 && LAST_OP(i - 1)) { - i = g_label_refs[i].i; + i = lr->i; continue; } - ret = scan_for_flag_set(g_label_refs[i].i, branched, - setters, setter_cnt); + ret = scan_for_flag_set(lr->i, magic, + branched, setters, setter_cnt); if (ret < 0) return ret; } @@ -1966,7 +2031,18 @@ static int scan_for_flag_set(int i, int *branched, int *setters, // scan back for cdq, if anything modifies edx, fail static int scan_for_cdq_edx(int i) { - for (; i >= 0; i--) { + while (i >= 0) { + if (g_labels[i][0] != 0) { + if (g_label_refs[i].next != NULL) + return -1; + if (i > 0 && LAST_OP(i - 1)) { + i = g_label_refs[i].i; + continue; + } + return -1; + } + i--; + if (ops[i].op == OP_CDQ) return i; @@ -1981,7 +2057,18 @@ static int scan_for_cdq_edx(int i) static int scan_for_reg_clear(int i, int reg) { - for (; i >= 0; i--) { + while (i >= 0) { + if (g_labels[i][0] != 0) { + if (g_label_refs[i].next != NULL) + return -1; + if (i > 0 && LAST_OP(i - 1)) { + i = g_label_refs[i].i; + continue; + } + return -1; + } + i--; + if (ops[i].op == OP_XOR && ops[i].operand[0].lmod == OPLM_DWORD && ops[i].operand[0].reg == ops[i].operand[1].reg @@ -2033,9 +2120,41 @@ static int scan_for_esp_adjust(int i, int opcnt, int *adj) return -1; } +static void scan_fwd_set_flags(int i, int opcnt, int magic, int flags) +{ + struct parsed_op *po; + int j; + + if (i < 0) + ferr(ops, "%s: followed bad branch?\n", __func__); + + for (; i < opcnt; i++) { + po = &ops[i]; + if (po->cc_scratch == magic) + return; + po->cc_scratch = magic; + po->flags |= flags; + + if ((po->flags & OPF_JMP) && po->op != OP_CALL) { + if (po->btj != NULL) { + // jumptable + for (j = 0; j < po->btj->count; j++) + scan_fwd_set_flags(po->btj->d[j].bt_i, opcnt, magic, flags); + return; + } + + scan_fwd_set_flags(po->bt_i, opcnt, magic, flags); + if (!(po->flags & OPF_CC)) + return; + } + if (po->flags & OPF_TAIL) + return; + } +} + static int collect_call_args(struct parsed_op *po, int i, struct parsed_proto *pp, int *save_arg_vars, int arg, - int need_op_saving, int branched) + int magic, int need_op_saving, int may_reuse) { struct parsed_proto *pp_tmp; struct label_ref *lr; @@ -2043,32 +2162,54 @@ static int collect_call_args(struct parsed_op *po, int i, int ret = 0; int j; - if (i < 0) + if (i < 0) { ferr(po, "no refs for '%s'?\n", g_labels[i]); + return -1; + } for (; arg < pp->argc; arg++) if (pp->arg[arg].reg == NULL) break; + magic = (magic & 0xffffff) | (arg << 24); for (j = i; j >= 0 && arg < pp->argc; ) { + if (((ops[j].cc_scratch ^ magic) & 0xffffff) == 0) { + if (ops[j].cc_scratch != magic) { + ferr(&ops[j], "arg collect hit same path with diff args for %s\n", + pp->name); + return -1; + } + // ok: have already been here + return 0; + } + ops[j].cc_scratch = magic; + if (g_labels[j][0] != 0) { - branched = 1; lr = &g_label_refs[j]; if (lr->next != NULL) need_op_saving = 1; - for (; lr->next; lr = lr->next) - ret |= collect_call_args(po, lr->i, pp, save_arg_vars, - arg, need_op_saving, branched); + for (; lr->next; lr = lr->next) { + if ((ops[lr->i].flags & (OPF_JMP|OPF_CC)) != OPF_JMP) + may_reuse = 1; + ret = collect_call_args(po, lr->i, pp, save_arg_vars, + arg, magic, need_op_saving, may_reuse); + if (ret < 0) + return ret; + } + if ((ops[lr->i].flags & (OPF_JMP|OPF_CC)) != OPF_JMP) + may_reuse = 1; if (j > 0 && LAST_OP(j - 1)) { // follow last branch in reverse j = lr->i; continue; } need_op_saving = 1; - ret |= collect_call_args(po, lr->i, pp, save_arg_vars, - arg, need_op_saving, branched); + ret = collect_call_args(po, lr->i, pp, save_arg_vars, + arg, magic, need_op_saving, may_reuse); + if (ret < 0) + return ret; } j--; @@ -2076,8 +2217,9 @@ static int collect_call_args(struct parsed_op *po, int i, { pp_tmp = ops[j].datap; if (pp_tmp == NULL) - ferr(po, "arg collect hit unparsed call\n"); - if (branched && pp_tmp->argc_stack > 0) + ferr(po, "arg collect hit unparsed call '%s'\n", + ops[j].operand[0].name); + if (may_reuse && pp_tmp->argc_stack > 0) ferr(po, "arg collect %d/%d hit '%s' with %d stack args\n", arg, pp->argc, opr_name(&ops[j], 0), pp_tmp->argc_stack); } @@ -2088,12 +2230,9 @@ static int collect_call_args(struct parsed_op *po, int i, else if (ops[j].op == OP_POP) { ferr(po, "arg collect %d/%d hit pop\n", arg, pp->argc); } - else if (LAST_OP(j)) { - break; - } else if ((ops[j].flags & (OPF_JMP|OPF_CC)) == (OPF_JMP|OPF_CC)) { - branched = 1; + may_reuse = 1; } else if (ops[j].op == OP_PUSH && !(ops[j].flags & OPF_FARG)) { @@ -2117,16 +2256,17 @@ static int collect_call_args(struct parsed_op *po, int i, else if (ops[j].argnum == 0) ops[j].flags |= OPF_RMD; - // some PUSHes are reused by calls on multiple branches, + // some PUSHes are reused by different calls on other branches, // but that can't happen if we didn't branch, so they // can be removed from future searches (handles nested calls) - if (!branched) + if (!may_reuse) ops[j].flags |= OPF_FARG; // next arg for (arg++; arg < pp->argc; arg++) if (pp->arg[arg].reg == NULL) break; + magic = (magic & 0xffffff) | (arg << 24); } } @@ -2149,9 +2289,25 @@ static void add_label_ref(struct label_ref *lr, int op_i) lr_new = calloc(1, sizeof(*lr_new)); lr_new->i = op_i; + lr_new->next = lr->next; lr->next = lr_new; } +static void output_std_flags(FILE *fout, struct parsed_op *po, + int *pfomask, const char *dst_opr_text) +{ + if (*pfomask & (1 << PFO_Z)) { + fprintf(fout, "\n cond_z = (%s%s == 0);", + lmod_cast_u(po, po->operand[0].lmod), dst_opr_text); + *pfomask &= ~(1 << PFO_Z); + } + if (*pfomask & (1 << PFO_S)) { + fprintf(fout, "\n cond_s = (%s%s < 0);", + lmod_cast_s(po, po->operand[0].lmod), dst_opr_text); + *pfomask &= ~(1 << PFO_S); + } +} + static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) { struct parsed_op *po, *delayed_flag_op = NULL, *tmp_op; @@ -2165,10 +2321,12 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) int save_arg_vars = 0; int cmp_result_vars = 0; int need_mul_var = 0; + int have_func_ret = 0; int had_decl = 0; int label_pending = 0; int regmask_save = 0; int regmask_arg = 0; + int regmask_now = 0; int regmask = 0; int pfomask = 0; int found = 0; @@ -2187,19 +2345,41 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) ferr(ops, "proto_parse failed for '%s'\n", funcn); fprintf(fout, "%s ", g_func_pp->ret_type.name); + if (g_func_pp->is_stdcall && g_func_pp->argc_reg == 0) + fprintf(fout, "__stdcall "); if (g_ida_func_attr & IDAFA_NORETURN) fprintf(fout, "noreturn "); fprintf(fout, "%s(", funcn); + for (i = 0; i < g_func_pp->argc; i++) { if (i > 0) fprintf(fout, ", "); - fprintf(fout, "%s a%d", g_func_pp->arg[i].type.name, i + 1); + if (g_func_pp->arg[i].fptr != NULL) { + // func pointer.. + pp = g_func_pp->arg[i].fptr; + fprintf(fout, "%s (", pp->ret_type.name); + if (pp->is_stdcall && pp->argc_reg == 0) + fprintf(fout, "__stdcall "); + 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); + } + fprintf(fout, ")"); + } + 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"); // pass1: @@ -2313,6 +2493,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) } // pass2: + // - parse calls with labels // - resolve all branches for (i = 0; i < opcnt; i++) { @@ -2320,8 +2501,25 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) po->bt_i = -1; po->btj = NULL; - if ((po->flags & OPF_RMD) || !(po->flags & OPF_JMP) - || po->op == OP_CALL || po->op == OP_RET) + if (po->flags & OPF_RMD) + continue; + + if (po->op == OP_CALL) { + if (po->operand[0].type == OPT_LABEL) { + tmpname = opr_name(po, 0); + pp_c = proto_parse(fhdr, tmpname); + if (pp_c == NULL) + ferr(po, "proto_parse failed for call '%s'\n", tmpname); + if (pp_c->is_fptr && pp_c->argc_reg != 0) + ferr(po, "fptr call with reg arg\n"); + pp = proto_clone(pp_c); + my_assert_not(pp, NULL); + po->datap = pp; + } + continue; + } + + if (!(po->flags & OPF_JMP) || po->op == OP_RET) continue; if (po->operand[0].type == OPT_REGMEM) { @@ -2339,7 +2537,8 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) } } if (pd == NULL) - ferr(po, "label '%s' not parsed?\n", buf1); + //ferr(po, "label '%s' not parsed?\n", buf1); + goto tailcall; if (pd->type != OPT_OFFSET) ferr(po, "label '%s' with non-offset data?\n", buf1); @@ -2369,14 +2568,16 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) if (po->bt_i != -1) continue; - if (po->operand[0].type == OPT_LABEL) { + if (po->operand[0].type == OPT_LABEL) // assume tail call - po->op = OP_CALL; - po->flags |= OPF_TAIL; - continue; - } + goto tailcall; ferr(po, "unhandled branch\n"); + +tailcall: + po->op = OP_CALL; + po->flags |= OPF_TAIL; + i--; // reprocess } // pass3: @@ -2389,11 +2590,13 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) if (po->op == OP_CALL) { - pp = calloc(1, sizeof(*pp)); - my_assert_not(pp, NULL); tmpname = opr_name(po, 0); - if (po->operand[0].type != OPT_LABEL) + pp = po->datap; + if (pp == NULL) { + // indirect call + pp = calloc(1, sizeof(*pp)); + my_assert_not(pp, NULL); ret = scan_for_esp_adjust(i + 1, opcnt, &j); if (ret < 0) ferr(po, "non-__cdecl indirect call unhandled yet\n"); @@ -2404,12 +2607,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) pp->argc = pp->argc_stack = j; for (arg = 0; arg < pp->argc; arg++) pp->arg[arg].type.name = strdup("int"); - } - else { - pp_c = proto_parse(fhdr, tmpname); - if (pp_c == NULL) - ferr(po, "proto_parse failed for call '%s'\n", tmpname); - pp = proto_clone(pp_c); + po->datap = pp; } // look for and make use of esp adjust @@ -2453,11 +2651,13 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) } } - collect_call_args(po, i, pp, &save_arg_vars, 0, 0, 0); + collect_call_args(po, i, pp, &save_arg_vars, + 0, i + opcnt * 2, 0, 0); if (strstr(pp->ret_type.name, "int64")) need_mul_var = 1; - po->datap = pp; + if (!(po->flags & OPF_TAIL) && !IS(pp->ret_type.name, "void")) + have_func_ret = 1; } } @@ -2471,6 +2671,15 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) if (po->flags & OPF_RMD) continue; + if (po->op == OP_PUSH && (po->flags & OPF_RSAVE)) { + reg = po->operand[0].reg; + if (!(regmask & (1 << reg))) + // not a reg save after all, rerun scan_for_pop + po->flags &= ~OPF_RSAVE; + else + regmask_save |= 1 << reg; + } + if (po->op == OP_PUSH && po->argnum == 0 && !(po->flags & OPF_RSAVE) && po->operand[0].type == OPT_REG) @@ -2481,16 +2690,14 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) depth = 0; ret = scan_for_pop(i + 1, opcnt, - po->operand[0].name, i + opcnt, 0, &depth, 0); + po->operand[0].name, i + opcnt * 3, 0, &depth, 0); if (ret == 1) { if (depth > 1) ferr(po, "too much depth: %d\n", depth); - if (depth > 0) - regmask_save |= 1 << reg; po->flags |= OPF_RMD; scan_for_pop(i + 1, opcnt, po->operand[0].name, - i + opcnt * 2, 0, &depth, 1); + i + opcnt * 4, 0, &depth, 1); continue; } ret = scan_for_pop_ret(i + 1, opcnt, po->operand[0].name, 0); @@ -2507,13 +2714,25 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) } } - regmask |= po->regmask_src | po->regmask_dst; + regmask_now = po->regmask_src | po->regmask_dst; + if (regmask_now & (1 << xBP)) { + if (g_bp_frame && !(po->flags & OPF_EBP_S)) { + if (po->regmask_dst & (1 << xBP)) + // compiler decided to drop bp frame and use ebp as scratch + scan_fwd_set_flags(i, opcnt, i + opcnt * 5, OPF_EBP_S); + else + regmask_now &= ~(1 << xBP); + } + } + + regmask |= regmask_now; if (po->flags & OPF_CC) { int setters[16], cnt = 0, branched = 0; - ret = scan_for_flag_set(i, &branched, setters, &cnt); + ret = scan_for_flag_set(i, i + opcnt * 6, + &branched, setters, &cnt); if (ret < 0 || cnt <= 0) ferr(po, "unable to trace flag setter(s)\n"); if (cnt > ARRAY_SIZE(setters)) @@ -2536,16 +2755,19 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) pfomask = 1 << PFO_Z; } else { - if ((pfo != PFO_Z && pfo != PFO_S && pfo != PFO_P) + // 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) + || branched || scan_for_mod_opr0(tmp_op, setters[j] + 1, i) >= 0) pfomask = 1 << pfo; } if (pfomask) { tmp_op->pfomask |= pfomask; cmp_result_vars |= pfomask; - // note: may overwrite, currently not a problem - po->datap = tmp_op; } + // note: may overwrite, currently not a problem + po->datap = tmp_op; } if (po->op == OP_ADC || po->op == OP_SBB) @@ -2619,7 +2841,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) } // declare other regs - special case for eax - if (!((regmask | regmask_arg) & 1) + if (!((regmask | regmask_arg) & 1) && have_func_ret && !IS(g_func_pp->ret_type.name, "void")) { fprintf(fout, " u32 eax = 0;\n"); @@ -2628,8 +2850,6 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) regmask &= ~regmask_arg; regmask &= ~(1 << xSP); - if (g_bp_frame) - regmask &= ~(1 << xBP); if (regmask) { for (reg = 0; reg < 8; reg++) { if (regmask & (1 << reg)) { @@ -2708,6 +2928,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) 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 @@ -2717,17 +2938,18 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) is_delayed = 1; } else if (last_arith_dst != NULL - && (pfo == PFO_Z || pfo == PFO_S || pfo == PFO_P)) + && (pfo == PFO_Z || pfo == PFO_S || 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, last_arith_dst->lmod, buf3); is_delayed = 1; } - else if (po->datap != NULL) { + else if (tmp_op != NULL) { // use preprocessed flag calc results - tmp_op = po->datap; - if (!tmp_op || !(tmp_op->pfomask & (1 << pfo))) + if (!(tmp_op->pfomask & (1 << pfo))) ferr(po, "not prepared for pfo %d\n", pfo); // note: is_inv was not yet applied @@ -2890,14 +3112,44 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) case OP_OR: propagate_lmod(po, &po->operand[0], &po->operand[1]); // fallthrough - case OP_SHL: - case OP_SHR: dualop_arith: assert_operand_cnt(2); fprintf(fout, " %s %s= %s;", out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]), op_to_c(po), out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1])); + output_std_flags(fout, po, &pfomask, buf1); + last_arith_dst = &po->operand[0]; + delayed_flag_op = NULL; + break; + + case OP_SHL: + case OP_SHR: + assert_operand_cnt(2); + out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]); + if (pfomask & (1 << PFO_C)) { + if (po->operand[1].type == OPT_CONST) { + l = lmod_bytes(po, po->operand[0].lmod) * 8; + j = po->operand[1].val; + j %= l; + if (j != 0) { + if (po->op == OP_SHL) + j = l - j; + else + j -= 1; + fprintf(fout, " cond_c = (%s & 0x%02x) ? 1 : 0;\n", + buf1, 1 << j); + } + else + ferr(po, "zero shift?\n"); + } + else + ferr(po, "TODO\n"); + pfomask &= ~(1 << PFO_C); + } + fprintf(fout, " %s %s= %s;", buf1, op_to_c(po), + out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1])); + output_std_flags(fout, po, &pfomask, buf1); last_arith_dst = &po->operand[0]; delayed_flag_op = NULL; break; @@ -2908,6 +3160,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) fprintf(fout, " %s = %s%s >> %s;", buf1, lmod_cast_s(po, po->operand[0].lmod), buf1, out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1])); + output_std_flags(fout, po, &pfomask, buf1); last_arith_dst = &po->operand[0]; delayed_flag_op = NULL; break; @@ -2927,6 +3180,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) } else ferr(po, "TODO\n"); + output_std_flags(fout, po, &pfomask, buf1); last_arith_dst = &po->operand[0]; delayed_flag_op = NULL; break; @@ -2948,10 +3202,21 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) case OP_SBB: assert_operand_cnt(2); propagate_lmod(po, &po->operand[0], &po->operand[1]); - fprintf(fout, " %s %s= %s + cond_c;", + if (po->op == OP_SBB + && IS(po->operand[0].name, po->operand[1].name)) + { + // avoid use of unitialized var + fprintf(fout, " %s = -cond_c;", + out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0])); + // carry remains what it was + pfomask &= ~(1 << PFO_C); + } + else { + fprintf(fout, " %s %s= %s + cond_c;", out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]), op_to_c(po), out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1])); + } last_arith_dst = &po->operand[0]; delayed_flag_op = NULL; break; @@ -3011,9 +3276,9 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) // 32bit division is common, look for it if (po->op == OP_DIV) - ret = scan_for_reg_clear(i - 1, xDX); + ret = scan_for_reg_clear(i, xDX); else - ret = scan_for_cdq_edx(i - 1); + ret = scan_for_cdq_edx(i); if (ret >= 0) { out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]); strcpy(buf2, lmod_cast(po, po->operand[0].lmod, @@ -3091,9 +3356,11 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) } else if (!IS(pp->ret_type.name, "void")) { if (po->flags & OPF_TAIL) { - fprintf(fout, "return "); - if (g_func_pp->ret_type.is_ptr != pp->ret_type.is_ptr) - fprintf(fout, "(%s)", g_func_pp->ret_type.name); + if (!IS(g_func_pp->ret_type.name, "void")) { + fprintf(fout, "return "); + if (g_func_pp->ret_type.is_ptr != pp->ret_type.is_ptr) + fprintf(fout, "(%s)", g_func_pp->ret_type.name); + } } else { fprintf(fout, "eax = "); @@ -3108,7 +3375,8 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) else { if (pp->name[0] == 0) ferr(po, "missing pp->name\n"); - fprintf(fout, "%s(", pp->name); + fprintf(fout, "%s%s(", pp->name, + pp->has_structarg ? "_sa" : ""); } for (arg = 0; arg < pp->argc; arg++) { @@ -3147,9 +3415,16 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) if (po->flags & OPF_TAIL) { strcpy(g_comment, "tailcall"); - if (IS(pp->ret_type.name, "void") - && !(g_ida_func_attr & IDAFA_NORETURN)) - { + ret = 0; + if (i == opcnt - 1) + ret = 0; + else if (IS(pp->ret_type.name, "void")) + ret = 1; + else if (IS(g_func_pp->ret_type.name, "void")) + ret = 1; + // else already handled as 'return f()' + + if (ret) { fprintf(fout, "\n return;"); strcpy(g_comment, "^ tailcall"); } @@ -3314,6 +3589,24 @@ struct chunk_item { int asmln; }; +static struct chunk_item *func_chunks; +static int func_chunk_cnt; +static int func_chunk_alloc; + +static void add_func_chunk(FILE *fasm, const char *name, int line) +{ + if (func_chunk_cnt >= func_chunk_alloc) { + func_chunk_alloc *= 2; + func_chunks = realloc(func_chunks, + func_chunk_alloc * sizeof(func_chunks[0])); + my_assert_not(func_chunks, NULL); + } + func_chunks[func_chunk_cnt].fptr = ftell(fasm); + func_chunks[func_chunk_cnt].name = strdup(name); + func_chunks[func_chunk_cnt].asmln = line; + func_chunk_cnt++; +} + static int cmp_chunks(const void *p1, const void *p2) { const struct chunk_item *c1 = p1, *c2 = p2; @@ -3325,6 +3618,64 @@ static int cmpstringp(const void *p1, const void *p2) return strcmp(*(char * const *)p1, *(char * const *)p2); } +static void scan_ahead(FILE *fasm) +{ + char words[2][256]; + char line[256]; + long oldpos; + int oldasmln; + int wordc; + char *p; + int i; + + oldpos = ftell(fasm); + oldasmln = asmln; + + while (fgets(line, sizeof(line), fasm)) + { + wordc = 0; + asmln++; + + p = sskip(line); + if (*p == 0) + continue; + + if (*p == ';') + { + // get rid of random tabs + for (i = 0; line[i] != 0; i++) + if (line[i] == '\t') + line[i] = ' '; + + if (p[2] == 'S' && IS_START(p, "; START OF FUNCTION CHUNK FOR ")) + { + p += 30; + next_word(words[0], sizeof(words[0]), p); + if (words[0][0] == 0) + aerr("missing name for func chunk?\n"); + + add_func_chunk(fasm, words[0], asmln); + } + continue; + } // *p == ';' + + for (wordc = 0; wordc < ARRAY_SIZE(words); wordc++) { + words[wordc][0] = 0; + p = sskip(next_word_s(words[wordc], sizeof(words[0]), p)); + if (*p == 0 || *p == ';') { + wordc++; + break; + } + } + + if (wordc == 2 && IS(words[1], "ends")) + break; + } + + fseek(fasm, oldpos, SEEK_SET); + asmln = oldasmln; +} + int main(int argc, char *argv[]) { FILE *fout, *fasm, *frlist; @@ -3333,14 +3684,12 @@ int main(int argc, char *argv[]) char **rlist = NULL; int rlist_len = 0; int rlist_alloc = 0; - struct chunk_item *func_chunks; int func_chunks_used = 0; int func_chunks_sorted = 0; - int func_chunk_cnt = 0; - int func_chunk_alloc; int func_chunk_i = -1; long func_chunk_ret = 0; int func_chunk_ret_ln = 0; + int scanned_ahead = 0; char line[256]; char words[16][256]; enum opr_lenmod lmod; @@ -3486,18 +3835,12 @@ int main(int argc, char *argv[]) p += 30; next_word(words[0], sizeof(words[0]), p); if (words[0][0] == 0) - aerr("missing nam for func chunk?\n"); - if (func_chunk_cnt >= func_chunk_alloc) { - func_chunk_alloc *= 2; - func_chunks = realloc(func_chunks, - func_chunk_alloc * sizeof(func_chunks[0])); - my_assert_not(func_chunks, NULL); + aerr("missing name for func chunk?\n"); + + if (!scanned_ahead) { + add_func_chunk(fasm, words[0], asmln); + func_chunks_sorted = 0; } - func_chunks[func_chunk_cnt].fptr = ftell(fasm); - func_chunks[func_chunk_cnt].name = strdup(words[0]); - func_chunks[func_chunk_cnt].asmln = asmln; - func_chunk_cnt++; - func_chunks_sorted = 0; } else if (p[2] == 'E' && IS_START(p, "; END OF FUNCTION CHUNK")) { @@ -3529,8 +3872,13 @@ int main(int argc, char *argv[]) if (IS_START(g_func, "sub_")) { unsigned long addr = strtoul(p, NULL, 16); unsigned long f_addr = strtoul(g_func + 4, NULL, 16); - if (addr > f_addr) - aerr("need a chunk %lX that is after %s\n", addr, g_func); + if (addr > f_addr && !scanned_ahead) { + anote("scan_ahead caused by '%s', addr %lx\n", + g_func, addr); + scan_ahead(fasm); + scanned_ahead = 1; + func_chunks_sorted = 0; + } } } continue; @@ -3538,7 +3886,7 @@ int main(int argc, char *argv[]) parse_words: memset(words, 0, sizeof(words)); - for (wordc = 0; wordc < 16; wordc++) { + for (wordc = 0; wordc < ARRAY_SIZE(words); wordc++) { p = sskip(next_word_s(words[wordc], sizeof(words[0]), p)); if (*p == 0 || *p == ';') { wordc++;