X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Ftranslate.c;h=503468d76e92fbd2dc47b1415b97e73125627fff;hb=bfacdc83cf1cd04fdc3b92c4640733791363decb;hp=6c432dde9aa699e5bb1f5318dd8e531f8e0f76cb;hpb=66bdb2b07a1f50833ad79ea71a378dafd79030e6;p=ia32rtools.git diff --git a/tools/translate.c b/tools/translate.c index 6c432dd..503468d 100644 --- a/tools/translate.c +++ b/tools/translate.c @@ -13,6 +13,7 @@ #include "my_assert.h" #include "my_str.h" +#include "common.h" #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) #define IS(w, y) !strcmp(w, y) @@ -242,8 +243,8 @@ static int g_quiet_pp; static int g_header_mode; #define ferr(op_, fmt, ...) do { \ - printf("%s:%d: error: [%s] '%s': " fmt, asmfn, (op_)->asmln, g_func, \ - dump_op(op_), ##__VA_ARGS__); \ + printf("%s:%d: error %u: [%s] '%s': " fmt, asmfn, (op_)->asmln, \ + __LINE__, g_func, dump_op(op_), ##__VA_ARGS__); \ fcloseall(); \ exit(1); \ } while (0) @@ -2606,10 +2607,16 @@ static void patch_esp_adjust(struct parsed_op *po, int adj) static int scan_for_esp_adjust(int i, int opcnt, int adj_expect, int *adj, int *is_multipath, int do_update) { + int adj_expect_unknown = 0; struct parsed_op *po; int first_pop = -1; + int adj_best = 0; *adj = *is_multipath = 0; + if (adj_expect < 0) { + adj_expect_unknown = 1; + adj_expect = 32 * 4; // enough? + } for (; i < opcnt && *adj < adj_expect; i++) { if (g_labels[i] != NULL) @@ -2653,6 +2660,8 @@ static int scan_for_esp_adjust(int i, int opcnt, } *adj += lmod_bytes(po, po->operand[0].lmod); + if (*adj > adj_best) + adj_best = *adj; } else if (po->flags & (OPF_JMP|OPF_TAIL)) { if (po->op == OP_JMP && po->btj == NULL) { @@ -2667,12 +2676,15 @@ static int scan_for_esp_adjust(int i, int opcnt, break; if (po->pp != NULL && po->pp->is_stdcall) break; + if (adj_expect_unknown && first_pop >= 0) + break; // assume it's another cdecl call } } if (first_pop >= 0) { - // probably 'pop ecx' was used.. + // probably only 'pop ecx' was used + *adj = adj_best; return first_pop; } @@ -3102,22 +3114,25 @@ static void scan_prologue_epilogue(int opcnt) ferr(&ops[j], "'pop ebp' expected\n"); if (g_stack_fsz != 0) { - if (ops[j - 1].op == OP_MOV + if (ops[j].op == OP_LEAVE) + j--; + else if (ops[j].op == OP_POP + && ops[j - 1].op == OP_MOV && IS(opr_name(&ops[j - 1], 0), "esp") && IS(opr_name(&ops[j - 1], 1), "ebp")) { ops[j - 1].flags |= OPF_RMD | OPF_DONE; + j -= 2; } - else if (ops[j].op != OP_LEAVE - && !(g_ida_func_attr & IDAFA_NORETURN)) + else if (!(g_ida_func_attr & IDAFA_NORETURN)) { - ferr(&ops[j - 1], "esp restore expected\n"); + ferr(&ops[j], "esp restore expected\n"); } - if (ecx_push && ops[j - 2].op == OP_POP - && IS(opr_name(&ops[j - 2], 0), "ecx")) + if (ecx_push && j >= 0 && ops[j].op == OP_POP + && IS(opr_name(&ops[j], 0), "ecx")) { - ferr(&ops[j - 2], "unexpected ecx pop\n"); + ferr(&ops[j], "unexpected ecx pop\n"); } } @@ -3304,7 +3319,7 @@ static int resolve_origin(int i, const struct parsed_opr *opr, } if (ops[i].cc_scratch == magic) - return 0; + return ret; ops[i].cc_scratch = magic; if (!(ops[i].flags & OPF_DATA)) @@ -3314,13 +3329,14 @@ static int resolve_origin(int i, const struct parsed_opr *opr, if (*op_i >= 0) { if (*op_i == i) - return 1; + return ret | 1; + // XXX: could check if the other op does the same return -1; } *op_i = i; - return 1; + return ret | 1; } } @@ -3454,7 +3470,7 @@ static struct parsed_proto *process_call_early(int i, int opcnt, struct parsed_proto *pp; int multipath = 0; int adj = 0; - int ret; + int j, ret; pp = po->pp; if (pp == NULL || pp->is_vararg || pp->argc_reg != 0) @@ -3471,8 +3487,15 @@ static struct parsed_proto *process_call_early(int i, int opcnt, return NULL; if (multipath) return NULL; - if (ops[ret].op == OP_POP && adj != 4) - return NULL; + if (ops[ret].op == OP_POP) { + for (j = 1; j < adj / 4; j++) { + if (ops[ret + j].op != OP_POP + || ops[ret + j].operand[0].reg != xCX) + { + return NULL; + } + } + } } *adj_i = ret; @@ -3539,7 +3562,7 @@ static struct parsed_proto *process_call(int i, int opcnt) pp->is_fptr = 1; ret = scan_for_esp_adjust(i + 1, opcnt, - 32*4, &adj, &multipath, 0); + -1, &adj, &multipath, 0); if (ret < 0 || adj < 0) { if (!g_allow_regfunc) ferr(po, "non-__cdecl indirect call unhandled yet\n"); @@ -3560,9 +3583,11 @@ static struct parsed_proto *process_call(int i, int opcnt) // look for and make use of esp adjust multipath = 0; ret = -1; - if (!pp->is_stdcall && pp->argc_stack > 0) + if (!pp->is_stdcall && pp->argc_stack > 0) { + int adj_expect = pp->is_vararg ? -1 : pp->argc_stack * 4; ret = scan_for_esp_adjust(i + 1, opcnt, - pp->argc_stack * 4, &adj, &multipath, 0); + adj_expect, &adj, &multipath, 0); + } if (ret >= 0) { if (pp->is_vararg) { if (adj / 4 < pp->argc_stack) { @@ -4162,11 +4187,12 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) if (pp != NULL) { if (j >= 0) { // commit esp adjust - ops[j].flags |= OPF_RMD; if (ops[j].op != OP_POP) patch_esp_adjust(&ops[j], pp->argc_stack * 4); - else - ops[j].flags |= OPF_DONE; + else { + for (l = 0; l < pp->argc_stack; l++) + ops[j + l].flags |= OPF_DONE | OPF_RMD; + } } if (strstr(pp->ret_type.name, "int64")) @@ -5767,6 +5793,25 @@ static int hg_var_cnt; static void output_hdr_fp(FILE *fout, const struct func_prototype *fp, int count); +struct func_prototype *hg_fp_add(const char *funcn) +{ + struct func_prototype *fp; + + if ((hg_fp_cnt & 0xff) == 0) { + hg_fp = realloc(hg_fp, sizeof(hg_fp[0]) * (hg_fp_cnt + 0x100)); + my_assert_not(hg_fp, NULL); + memset(hg_fp + hg_fp_cnt, 0, sizeof(hg_fp[0]) * 0x100); + } + + fp = &hg_fp[hg_fp_cnt]; + snprintf(fp->name, sizeof(fp->name), "%s", funcn); + fp->id = hg_fp_cnt; + fp->argc_stack = -1; + hg_fp_cnt++; + + return fp; +} + static struct func_proto_dep *hg_fp_find_dep(struct func_prototype *fp, const char *name) { @@ -5901,6 +5946,8 @@ static void gen_hdr_dep_pass(int i, int opcnt, unsigned char *cbits, } } + // if has_ret is 0, there is uninitialized eax path, + // which means it's most likely void func if (*has_ret != 0 && (po->flags & OPF_TAIL)) { if (po->op == OP_CALL) { j = i; @@ -5915,13 +5962,13 @@ static void gen_hdr_dep_pass(int i, int opcnt, unsigned char *cbits, ret = resolve_origin(i, &opr, i + opcnt * 4, &j, &from_caller); } - if (ret == -1 && from_caller) { + if (ret != 1 && from_caller) { // unresolved eax - probably void func *has_ret = 0; } else { - if (ops[j].op == OP_CALL) { - dep = hg_fp_find_dep(fp, po->operand[0].name); + if (j >= 0 && ops[j].op == OP_CALL) { + dep = hg_fp_find_dep(fp, ops[j].operand[0].name); if (dep != NULL) dep->ret_dep = 1; else @@ -5954,6 +6001,7 @@ static void gen_hdr(const char *funcn, int opcnt) { int save_arg_vars[MAX_ARG_GRP] = { 0, }; unsigned char cbits[MAX_OPS / 8]; + const struct parsed_proto *pp_c; struct parsed_proto *pp; struct func_prototype *fp; struct parsed_op *po; @@ -5961,29 +6009,15 @@ static void gen_hdr(const char *funcn, int opcnt) int regmask_dep; int max_bp_offset = 0; int has_ret; - int i, j, ret; - - if ((hg_fp_cnt & 0xff) == 0) { - hg_fp = realloc(hg_fp, sizeof(hg_fp[0]) * (hg_fp_cnt + 0x100)); - my_assert_not(hg_fp, NULL); - memset(hg_fp + hg_fp_cnt, 0, sizeof(hg_fp[0]) * 0x100); - } - - fp = &hg_fp[hg_fp_cnt]; - snprintf(fp->name, sizeof(fp->name), "%s", funcn); - fp->id = hg_fp_cnt; - fp->argc_stack = -1; - hg_fp_cnt++; + int i, j, l; + int ret; - // perhaps already in seed header? - fp->pp = proto_parse(g_fhdr, funcn, 1); - if (fp->pp != NULL) { - fp->argc_stack = fp->pp->argc_stack; - fp->is_stdcall = fp->pp->is_stdcall; - fp->regmask_dep = get_pp_arg_regmask(fp->pp); - fp->has_ret = !IS(fp->pp->ret_type.name, "void"); + pp_c = proto_parse(g_fhdr, funcn, 1); + if (pp_c != NULL) + // already in seed, will add to hg_fp later return; - } + + fp = hg_fp_add(funcn); g_bp_frame = g_sp_frame = g_stack_fsz = 0; g_stack_frame_used = 0; @@ -6058,11 +6092,12 @@ static void gen_hdr(const char *funcn, int opcnt) if (pp != NULL) { if (j >= 0) { // commit esp adjust - ops[j].flags |= OPF_RMD; if (ops[j].op != OP_POP) patch_esp_adjust(&ops[j], pp->argc_stack * 4); - else - ops[j].flags |= OPF_DONE; + else { + for (l = 0; l < pp->argc_stack; l++) + ops[j + l].flags |= OPF_DONE | OPF_RMD; + } } po->flags |= OPF_DONE; @@ -6117,9 +6152,6 @@ static void gen_hdr(const char *funcn, int opcnt) ferr(&ops[i], "unreachable code\n"); } - if (has_ret == -1 && (regmask_dep & (1 << xAX))) - has_ret = 1; - for (i = 0; i < g_eqcnt; i++) { if (g_eqs[i].offset > max_bp_offset && g_eqs[i].offset < 4*32) max_bp_offset = g_eqs[i].offset; @@ -6138,7 +6170,7 @@ static void gen_hdr(const char *funcn, int opcnt) printf("// has_ret %d, regmask_dep %x\n", fp->has_ret, fp->regmask_dep); output_hdr_fp(stdout, fp, 1); - if (IS(funcn, "sub_100073FD")) exit(1); + if (IS(funcn, "sub_10007F72")) exit(1); #endif gen_x_cleanup(opcnt); @@ -6167,7 +6199,7 @@ static void hg_fp_resolve_deps(struct func_prototype *fp) // printf("dep %s %s |= %x\n", fp->name, // fp->dep_func[i].name, dep); - if (fp->has_ret == -1) + if (fp->has_ret == -1 && fp->dep_func[i].ret_dep) fp->has_ret = fp->dep_func[i].proto->has_ret; } } @@ -6287,9 +6319,25 @@ static void output_hdr(FILE *fout) [OPLM_QWORD] = "uint64_t", }; const struct scanned_var *var; + struct func_prototype *fp; char line[256] = { 0, }; + char name[256]; int i; + // add stuff from headers + for (i = 0; i < pp_cache_size; i++) { + if (pp_cache[i].is_cinc && !pp_cache[i].is_stdcall) + snprintf(name, sizeof(name), "_%s", pp_cache[i].name); + else + snprintf(name, sizeof(name), "%s", pp_cache[i].name); + fp = hg_fp_add(name); + fp->pp = &pp_cache[i]; + fp->argc_stack = fp->pp->argc_stack; + fp->is_stdcall = fp->pp->is_stdcall; + fp->regmask_dep = get_pp_arg_regmask(fp->pp); + fp->has_ret = !IS(fp->pp->ret_type.name, "void"); + } + // resolve deps qsort(hg_fp, hg_fp_cnt, sizeof(hg_fp[0]), hg_fp_cmp_name); for (i = 0; i < hg_fp_cnt; i++) @@ -6329,30 +6377,6 @@ static void output_hdr(FILE *fout) fwrite(line, 1, strlen(line), fout); } -// read a line, truncating it if it doesn't fit -static char *my_fgets(char *s, size_t size, FILE *stream) -{ - char *ret, *ret2; - char buf[64]; - int p; - - p = size - 2; - if (p >= 0) - s[p] = 0; - - ret = fgets(s, size, stream); - if (ret != NULL && p >= 0 && s[p] != 0 && s[p] != '\n') { - p = sizeof(buf) - 2; - do { - buf[p] = 0; - ret2 = fgets(buf, sizeof(buf), stream); - } - while (ret2 != NULL && buf[p] != 0 && buf[p] != '\n'); - } - - return ret; -} - // '=' needs special treatment // also ' quote static char *next_word_s(char *w, size_t wsize, char *s) @@ -6452,6 +6476,11 @@ static void scan_variables(FILE *fasm) if (wordc < 2) continue; + if (IS_START(words[0], "__IMPORT_DESCRIPTOR_")) { + // when this starts, we don't need anything from this section + break; + } + if ((hg_var_cnt & 0xff) == 0) { hg_vars = realloc(hg_vars, sizeof(hg_vars[0]) * (hg_var_cnt + 0x100));