X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Ftranslate.c;h=e2b6d209044287f698adcfb08617a4f913db351e;hb=c0050df6e9d6eb81afacb0fa2d1910293dd2165e;hp=43d6997655706bdb8bd4352a176587123725cb19;hpb=89ff3147d22160eb8345fd0475b93d5343a3303d;p=ia32rtools.git diff --git a/tools/translate.c b/tools/translate.c index 43d6997..e2b6d20 100644 --- a/tools/translate.c +++ b/tools/translate.c @@ -40,7 +40,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 */ + OPF_EBP_S = (1 << 11), /* ebp used as scratch here, not BP */ }; enum op_op { @@ -126,6 +126,7 @@ struct parsed_opr { unsigned int type_from_var:1; // .. in header, sometimes wrong unsigned int size_mismatch:1; // type override differs from C unsigned int size_lt:1; // type override is larger than C + unsigned int had_ds:1; // had ds: prefix int reg; unsigned int val; char name[256]; @@ -147,7 +148,7 @@ struct parsed_op { }; // datap: -// OP_CALL - ptr to parsed_proto +// OP_CALL - parser proto hint (str), ptr to struct parsed_proto // (OPF_CC) - point to one of (OPF_FLAGS) that affects cc op struct parsed_equ { @@ -444,9 +445,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", "UINT_PTR", - "DWORD", "HANDLE", "HWND", "HMODULE", + "int", "_DWORD", "UINT_PTR", "DWORD", "WPARAM", "LPARAM", "UINT", + "HIMC", }; static const char *word_types[] = { "uint16_t", "int16_t", "_WORD", @@ -562,8 +563,10 @@ static int parse_operand(struct parsed_opr *opr, if (label != NULL) { opr->type = OPT_LABEL; - if (IS_START(label, "ds:")) + if (IS_START(label, "ds:")) { + opr->had_ds = 1; label += 3; + } strcpy(opr->name, label); return wordc; } @@ -604,8 +607,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:")) + if (IS_START(words[w], "ds:")) { + opr->had_ds = 1; memmove(words[w], words[w] + 3, strlen(words[w]) - 2); + } strcpy(opr->name, words[w]); if (words[w][0] == '[') { @@ -1446,7 +1451,7 @@ static void check_func_pp(struct parsed_op *po, const struct parsed_proto *pp, const char *pfx) { if (pp->argc_reg != 0) { - if (!g_allow_regfunc) + if (!g_allow_regfunc && !pp->is_fastcall) ferr(po, "%s: reg arg in arg-call unhandled yet\n", pfx); if (pp->argc_stack > 0 && pp->argc_reg != 2) ferr(po, "%s: %d reg arg(s) with %d stack arg(s)\n", @@ -1569,8 +1574,11 @@ static char *out_src_opr(char *buf, size_t buf_size, ferr(po, "lea from const?\n"); printf_number(tmp1, sizeof(tmp1), popr->val); - snprintf(buf, buf_size, "%s%s", - simplify_cast_num(cast, popr->val), tmp1); + if (popr->val == 0 && strchr(cast, '*')) + snprintf(buf, buf_size, "NULL"); + else + snprintf(buf, buf_size, "%s%s", + simplify_cast_num(cast, popr->val), tmp1); break; default: @@ -1934,15 +1942,13 @@ static int scan_for_pop(int i, int opcnt, const char *reg, if ((po->flags & OPF_JMP) && po->op != OP_CALL) { if (po->btj != NULL) { // jumptable - for (j = 0; j < po->btj->count - 1; j++) { + for (j = 0; j < po->btj->count; j++) { ret |= scan_for_pop(po->btj->d[j].bt_i, opcnt, reg, magic, depth, maxdepth, do_flags); if (ret < 0) return ret; // dead end } - // follow last jumptable entry - i = po->btj->d[j].bt_i - 1; - continue; + return ret; } if (po->bt_i < 0) { @@ -1966,24 +1972,26 @@ static int scan_for_pop(int i, int opcnt, const char *reg, && po->operand[0].type == OPT_REG && IS(po->operand[0].name, reg)) { - if (po->op == OP_PUSH) { + if (po->op == OP_PUSH && !(po->flags & OPF_FARG)) { depth++; if (depth > *maxdepth) *maxdepth = depth; if (do_flags) op_set_clear_flag(po, OPF_RSAVE, OPF_RMD); } - else if (depth == 0) { - if (do_flags) - op_set_clear_flag(po, OPF_RMD, OPF_RSAVE); - return 1; - } - else { - depth--; - if (depth < 0) // should not happen - ferr(po, "fail with depth\n"); - if (do_flags) - op_set_clear_flag(po, OPF_RSAVE, OPF_RMD); + else if (po->op == OP_POP) { + if (depth == 0) { + if (do_flags) + op_set_clear_flag(po, OPF_RMD, OPF_RSAVE); + return 1; + } + else { + depth--; + if (depth < 0) // should not happen + ferr(po, "fail with depth\n"); + if (do_flags) + op_set_clear_flag(po, OPF_RSAVE, OPF_RMD); + } } } } @@ -2181,8 +2189,6 @@ static int scan_for_cdq_edx(int i) if (ops[i].regmask_dst & (1 << xDX)) return -1; - if (g_labels[i][0] != 0) - return -1; } return -1; @@ -2210,8 +2216,6 @@ static int scan_for_reg_clear(int i, int reg) if (ops[i].regmask_dst & (1 << reg)) return -1; - if (g_labels[i][0] != 0) - return -1; } return -1; @@ -2304,7 +2308,7 @@ static void scan_fwd_set_flags(int i, int opcnt, int magic, int flags) } static const struct parsed_proto *try_recover_pp( - struct parsed_op *po, const struct parsed_opr *opr) + struct parsed_op *po, const struct parsed_opr *opr, int *search_instead) { const struct parsed_proto *pp = NULL; char buf[256]; @@ -2322,8 +2326,12 @@ static const struct parsed_proto *try_recover_pp( &offset, &stack_ra, NULL); if (ofs_reg[0] != 0) ferr(po, "offset reg on arg access?\n"); - if (offset <= stack_ra) - ferr(po, "stack var call unhandled yet\n"); + if (offset <= stack_ra) { + // search who set the stack var instead + if (search_instead != NULL) + *search_instead = 1; + return NULL; + } arg_i = (offset - stack_ra - 4) / 4; for (arg = arg_s = 0; arg < g_func_pp->argc; arg++) { @@ -2358,7 +2366,7 @@ static const struct parsed_proto *try_recover_pp( return pp; } -static void scan_for_call_type(int i, struct parsed_opr *opr, +static void scan_for_call_type(int i, const struct parsed_opr *opr, int magic, const struct parsed_proto **pp_found, int *multi) { const struct parsed_proto *pp = NULL; @@ -2416,7 +2424,7 @@ static void scan_for_call_type(int i, struct parsed_opr *opr, check_func_pp(po, pp, "icall reg-arg"); } else - pp = try_recover_pp(po, opr); + pp = try_recover_pp(po, opr, NULL); if (*pp_found != NULL && pp != NULL && *pp_found != pp) { if (!IS((*pp_found)->ret_type.name, pp->ret_type.name) @@ -2438,6 +2446,7 @@ static const struct parsed_proto *resolve_icall(int i, int opcnt, int *multi_src) { const struct parsed_proto *pp = NULL; + int search_advice = 0; *multi_src = 0; @@ -2445,8 +2454,10 @@ static const struct parsed_proto *resolve_icall(int i, int opcnt, case OPT_REGMEM: case OPT_LABEL: case OPT_OFFSET: - pp = try_recover_pp(&ops[i], &ops[i].operand[0]); - break; + pp = try_recover_pp(&ops[i], &ops[i].operand[0], &search_advice); + if (!search_advice) + break; + // fallthrough default: scan_for_call_type(i, &ops[i].operand[0], i + opcnt * 9, &pp, multi_src); @@ -2581,6 +2592,8 @@ static int collect_call_args_r(struct parsed_op *po, int i, if (!may_reuse) ops[j].flags |= OPF_FARG; + ops[j].flags &= ~OPF_RSAVE; + arg++; if (!pp->is_unresolved) { // next arg @@ -2676,13 +2689,24 @@ static void output_std_flags(FILE *fout, struct parsed_op *po, } } +static void output_pp_attrs(FILE *fout, const struct parsed_proto *pp, + int is_noreturn) +{ + if (pp->is_fastcall) + fprintf(fout, "__fastcall "); + else if (pp->is_stdcall && pp->argc_reg == 0) + fprintf(fout, "__stdcall "); + if (pp->is_noreturn || is_noreturn) + fprintf(fout, "noreturn "); +} + static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) { struct parsed_op *po, *delayed_flag_op = NULL, *tmp_op; struct parsed_opr *last_arith_dst = NULL; char buf1[256], buf2[256], buf3[256], cast[64]; const struct parsed_proto *pp_c; - struct parsed_proto *pp; + struct parsed_proto *pp, *pp_tmp; struct parsed_data *pd; const char *tmpname; enum parsed_flag_op pfo; @@ -2694,6 +2718,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) int regmask_save = 0; int regmask_arg = 0; int regmask_now = 0; + int regmask_init = 0; int regmask = 0; int pfomask = 0; int found = 0; @@ -2713,10 +2738,7 @@ 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 "); + output_pp_attrs(fout, g_func_pp, g_ida_func_attr & IDAFA_NORETURN); fprintf(fout, "%s(", funcn); for (i = 0; i < g_func_pp->argc; i++) { @@ -2726,8 +2748,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) // func pointer.. pp = g_func_pp->arg[i].fptr; fprintf(fout, "%s (", pp->ret_type.name); - if (pp->is_stdcall && pp->argc_reg == 0) - fprintf(fout, "__stdcall "); + output_pp_attrs(fout, pp, 0); fprintf(fout, "*a%d)(", i + 1); for (j = 0; j < pp->argc; j++) { if (j > 0) @@ -2880,6 +2901,8 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) continue; if (po->op == OP_CALL) { + pp = NULL; + if (po->operand[0].type == OPT_LABEL) { tmpname = opr_name(po, 0); if (IS_START(tmpname, "loc_")) @@ -2887,10 +2910,26 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) pp_c = proto_parse(fhdr, tmpname, 0); if (pp_c == NULL) ferr(po, "proto_parse failed for call '%s'\n", tmpname); - if (pp_c->is_fptr && pp_c->argc_reg != 0) - ferr(po, "fptr call with reg arg\n"); + pp = proto_clone(pp_c); my_assert_not(pp, NULL); + } + else if (po->datap != NULL) { + pp = calloc(1, sizeof(*pp)); + my_assert_not(pp, NULL); + + ret = parse_protostr(po->datap, pp); + if (ret < 0) + ferr(po, "bad protostr supplied: %s\n", (char *)po->datap); + free(po->datap); + po->datap = NULL; + } + + if (pp != NULL) { + if (pp->is_fptr) + check_func_pp(po, pp, "fptr var call"); + if (pp->is_noreturn) + po->flags |= OPF_TAIL; po->datap = pp; } continue; @@ -3038,25 +3077,6 @@ tailcall: ferr(po, "missing esp_adjust for vararg func '%s'\n", pp->name); - for (arg = 0; arg < pp->argc; arg++) { - if (pp->arg[arg].reg != NULL) { - reg = char_array_i(regs_r32, - ARRAY_SIZE(regs_r32), pp->arg[arg].reg); - if (reg < 0) - ferr(ops, "arg '%s' is not a reg?\n", pp->arg[arg].reg); - regmask |= 1 << reg; - } -#if 0 - if (pp->arg[arg].fptr != NULL) { - // can't call functions with non-__cdecl callbacks yet - struct parsed_proto *pp_tmp; - pp_tmp = pp->arg[arg].fptr; - if (pp_tmp->argc_reg != 0) - ferr(po, "'%s' has a callback with reg-args\n", tmpname); - } -#endif - } - if (!pp->is_unresolved) { // since we know the args, collect them collect_call_args(po, i, pp, ®mask, &save_arg_vars, @@ -3192,34 +3212,73 @@ tailcall: ferr(po, "NULL pp\n"); if (pp->is_unresolved) { - int regmask_push = 0; - collect_call_args(po, i, pp, ®mask_push, &save_arg_vars, + int regmask_stack = 0; + collect_call_args(po, i, pp, ®mask_stack, &save_arg_vars, i + opcnt * 2); - if (!((regmask_push & (1 << xCX)) - && (regmask_push & (1 << xDX)))) + if (!((regmask_stack & (1 << xCX)) + && (regmask_stack & (1 << xDX)))) { if (pp->argc_stack != 0 - || ((regmask | regmask_arg) & (1 << xCX))) + || ((regmask | regmask_arg) & ((1 << xCX)|(1 << xDX)))) { pp_insert_reg_arg(pp, "ecx"); + pp->is_fastcall = 1; + regmask_init |= 1 << xCX; regmask |= 1 << xCX; } if (pp->argc_stack != 0 || ((regmask | regmask_arg) & (1 << xDX))) { pp_insert_reg_arg(pp, "edx"); + regmask_init |= 1 << xDX; regmask |= 1 << xDX; } } - regmask |= regmask_push; + regmask |= regmask_stack; + + // note: __cdecl doesn't fall into is_unresolved category + if (pp->argc_stack > 0) + pp->is_stdcall = 1; + } + + for (arg = 0; arg < pp->argc; arg++) { + if (pp->arg[arg].reg != NULL) { + reg = char_array_i(regs_r32, + ARRAY_SIZE(regs_r32), pp->arg[arg].reg); + if (reg < 0) + ferr(ops, "arg '%s' is not a reg?\n", pp->arg[arg].reg); + if (!(regmask & (1 << reg))) { + regmask_init |= 1 << reg; + regmask |= 1 << reg; + } + } } if (pp->is_fptr) { + if (pp->name[0] != 0) { + memmove(pp->name + 2, pp->name, strlen(pp->name) + 1); + memcpy(pp->name, "i_", 2); + + // might be declared already + found = 0; + for (j = 0; j < i; j++) { + if (ops[j].op == OP_CALL && (pp_tmp = ops[j].datap)) { + if (pp_tmp->is_fptr && IS(pp->name, pp_tmp->name)) { + found = 1; + break; + } + } + } + if (found) + continue; + } + else + snprintf(pp->name, sizeof(pp->name), "icall%d", i); + fprintf(fout, " %s (", pp->ret_type.name); - if (pp->is_stdcall && pp->argc_reg == 0) - fprintf(fout, "__stdcall "); - fprintf(fout, "*icall%d)(", i); + output_pp_attrs(fout, pp, 0); + fprintf(fout, "*%s)(", pp->name); for (j = 0; j < pp->argc; j++) { if (j > 0) fprintf(fout, ", "); @@ -3232,6 +3291,22 @@ tailcall: regmask |= 1 << xAX; } + // pass4: + // - confirm regmask_save, it might have been reduced + if (regmask_save != 0) + { + regmask_save = 0; + for (i = 0; i < opcnt; i++) { + po = &ops[i]; + if (po->flags & OPF_RMD) + continue; + + if (po->op == OP_PUSH && (po->flags & OPF_RSAVE)) + regmask_save |= 1 << po->operand[0].reg; + } + } + + // output LUTs/jumptables for (i = 0; i < g_func_pd_cnt; i++) { pd = &g_func_pd[i]; @@ -3287,7 +3362,10 @@ tailcall: if (regmask_now) { for (reg = 0; reg < 8; reg++) { if (regmask_now & (1 << reg)) { - fprintf(fout, " u32 %s;\n", regs_r32[reg]); + fprintf(fout, " u32 %s", regs_r32[reg]); + if (regmask_init & (1 << reg)) + fprintf(fout, " = 0"); + fprintf(fout, ";\n"); had_decl = 1; } } @@ -3778,7 +3856,7 @@ tailcall: my_assert_not(pp, NULL); if (pp->is_fptr) - fprintf(fout, " icall%d = %s;\n", i, + fprintf(fout, " %s = %s;\n", pp->name, out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], "(void *)", 0)); @@ -3803,15 +3881,10 @@ tailcall: } } - if (pp->is_fptr) { - fprintf(fout, "icall%d(", i); - } - else { - if (pp->name[0] == 0) - ferr(po, "missing pp->name\n"); - fprintf(fout, "%s%s(", pp->name, - pp->has_structarg ? "_sa" : ""); - } + if (pp->name[0] == 0) + ferr(po, "missing pp->name\n"); + fprintf(fout, "%s%s(", pp->name, + pp->has_structarg ? "_sa" : ""); for (arg = 0; arg < pp->argc; arg++) { if (arg > 0) @@ -3848,14 +3921,14 @@ tailcall: } if (pp->is_unresolved) { - snprintf(buf3, sizeof(buf3), "unresoved %dreg ", + snprintf(buf3, sizeof(buf3), " unresoved %dreg", pp->argc_reg); strcat(g_comment, buf3); } if (po->flags & OPF_TAIL) { ret = 0; - if (i == opcnt - 1) + if (i == opcnt - 1 || pp->is_noreturn) ret = 0; else if (IS(pp->ret_type.name, "void")) ret = 1; @@ -3864,14 +3937,19 @@ tailcall: // else already handled as 'return f()' if (ret) { - if (!IS(g_func_pp->ret_type.name, "void")) + if (!IS(g_func_pp->ret_type.name, "void")) { ferr(po, "int func -> void func tailcall?\n"); - fprintf(fout, "\n return;"); - strcat(g_comment, "^ tailcall"); + } + else { + fprintf(fout, "\n return;"); + strcat(g_comment, " ^ tailcall"); + } } else - strcat(g_comment, "tailcall"); + strcat(g_comment, " tailcall"); } + if (pp->is_noreturn) + strcat(g_comment, " noreturn"); delayed_flag_op = NULL; last_arith_dst = NULL; break; @@ -3933,7 +4011,10 @@ tailcall: } if (g_comment[0] != 0) { - fprintf(fout, " // %s", g_comment); + char *p = g_comment; + while (my_isblank(*p)) + p++; + fprintf(fout, " // %s", p); g_comment[0] = 0; no_output = 0; } @@ -4139,6 +4220,7 @@ int main(int argc, char *argv[]) char line[256]; char words[20][256]; enum opr_lenmod lmod; + char *sctproto = NULL; int in_func = 0; int pending_endp = 0; int skip_func = 0; @@ -4363,11 +4445,16 @@ parse_words: aerr("too many words\n"); // alow asm patches in comments - if (*p == ';' && IS_START(p, "; sctpatch:")) { - p = sskip(p + 11); - if (*p == 0 || *p == ';') - continue; - goto parse_words; // lame + if (*p == ';') { + if (IS_START(p, "; sctpatch:")) { + p = sskip(p + 11); + if (*p == 0 || *p == ';') + continue; + goto parse_words; // lame + } + if (IS_START(p, "; sctproto:")) { + sctproto = strdup(p + 11); + } } if (wordc == 0) { @@ -4410,6 +4497,11 @@ do_pending_endp: i = 2; } else { + if (pd == NULL) { + if (verbose) + anote("skipping alignment byte?\n"); + continue; + } lmod = lmod_from_directive(words[0]); if (lmod != pd->lmod) aerr("lmod change? %d->%d\n", pd->lmod, lmod); @@ -4475,8 +4567,7 @@ do_pending_endp: aerr("proc '%s' while in_func '%s'?\n", words[0], g_func); p = words[0]; - if ((g_ida_func_attr & IDAFA_THUNK) - || bsearch(&p, rlist, rlist_len, sizeof(rlist[0]), cmpstringp)) + if (bsearch(&p, rlist, rlist_len, sizeof(rlist[0]), cmpstringp)) skip_func = 1; strcpy(g_func, words[0]); set_label(0, words[0]); @@ -4492,6 +4583,13 @@ do_pending_endp: aerr("endp '%s' while in_func '%s'?\n", words[0], g_func); + if ((g_ida_func_attr & IDAFA_THUNK) && pi == 1 + && ops[0].op == OP_JMP && ops[0].operand[0].had_ds) + { + // import jump + skip_func = 1; + } + if (!skip_func && func_chunks_used) { // start processing chunks struct chunk_item *ci, key = { g_func, 0 }; @@ -4542,7 +4640,8 @@ do_pending_endp: continue; } - if (wordc > 1 && IS(words[1], "=")) { + if (wordc > 1 && IS(words[1], "=")) + { if (wordc != 5) aerr("unhandled equ, wc=%d\n", wordc); if (g_eqcnt >= eq_alloc) { @@ -4576,6 +4675,12 @@ do_pending_endp: aerr("too many ops\n"); parse_op(&ops[pi], words, wordc); + + if (sctproto != NULL) { + if (ops[pi].op == OP_CALL) + ops[pi].datap = sctproto; + sctproto = NULL; + } pi++; }