X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Ftranslate.c;h=8c52603f69532d20f444698087bb35e60e5fe206;hb=63df67be95c2bf23c14dc83d82cb38f871c4d544;hp=22fe560f8c1c47bf48f1c5a9c6360f5c899a872f;hpb=bfa4a6ee2ef942b4eaf30eb20153ad5404bb2951;p=ia32rtools.git diff --git a/tools/translate.c b/tools/translate.c index 22fe560..8c52603 100644 --- a/tools/translate.c +++ b/tools/translate.c @@ -8,11 +8,13 @@ #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) #define IS(w, y) !strcmp(w, y) +#define IS_START(w, y) !strncmp(w, y, strlen(y)) #include "protoparse.h" -const char *asmfn; +static const char *asmfn; static int asmln; +static FILE *g_fhdr; #define anote(fmt, ...) \ printf("%s:%d: note: " fmt, asmfn, asmln, ##__VA_ARGS__) @@ -31,7 +33,10 @@ enum op_flags { OPF_JMP = (1 << 3), /* branches, ret and call */ OPF_CC = (1 << 4), /* uses flags */ OPF_TAIL = (1 << 5), /* ret or tail call */ - OPF_REP = (1 << 6), /* prefixed by rep */ + OPF_RSAVE = (1 << 6), /* push/pop is local reg save/load */ + OPF_REP = (1 << 7), /* prefixed by rep */ + OPF_REPZ = (1 << 8), /* rep is repe/repz */ + OPF_REPNZ = (1 << 9), /* rep is repne/repnz */ }; enum op_op { @@ -46,6 +51,8 @@ enum op_op { OP_NOT, OP_CDQ, OP_STOS, + OP_MOVS, + OP_CMPS, OP_RET, OP_ADD, OP_SUB, @@ -55,6 +62,8 @@ enum op_op { OP_SHL, OP_SHR, OP_SAR, + OP_ROL, + OP_ROR, OP_ADC, OP_SBB, OP_INC, @@ -107,6 +116,8 @@ enum opr_lenmod { struct parsed_opr { enum opr_type type; enum opr_lenmod lmod; + unsigned int is_ptr:1; // pointer in C + unsigned int is_array:1; // array in C int reg; unsigned int val; char name[256]; @@ -122,8 +133,8 @@ struct parsed_op { int pfomask; // flagop: parsed_flag_op that can't be delayed int argmask; // push: args that are altered before call int cc_scratch; // scratch storage during analysis - int bt_i; // branch target (for branches) - struct parsed_op *lrl; // label reference list entry + int bt_i; // branch target for branches + struct parsed_data *btj;// branch targets for jumptables void *datap; }; @@ -137,20 +148,53 @@ struct parsed_equ { int offset; }; -#define MAX_OPS 1024 +struct parsed_data { + char label[256]; + enum opr_type type; + enum opr_lenmod lmod; + int count; + int count_alloc; + struct { + union { + char *label; + unsigned int val; + } u; + int bt_i; + } *d; +}; + +struct label_ref { + int i; + struct label_ref *next; +}; + +enum ida_func_attr { + IDAFA_BP_FRAME = (1 << 0), + IDAFA_LIB_FUNC = (1 << 1), + IDAFA_STATIC = (1 << 2), + IDAFA_NORETURN = (1 << 3), + IDAFA_THUNK = (1 << 4), + IDAFA_FPD = (1 << 5), +}; + +#define MAX_OPS 4096 static struct parsed_op ops[MAX_OPS]; static struct parsed_equ *g_eqs; static int g_eqcnt; static char g_labels[MAX_OPS][32]; -static struct parsed_op *g_label_refs[MAX_OPS]; +static struct label_ref g_label_refs[MAX_OPS]; static struct parsed_proto g_func_pp; +static struct parsed_data *g_func_pd; +static int g_func_pd_cnt; static char g_func[256]; static char g_comment[256]; static int g_bp_frame; -static int g_bp_stack; +static int g_sp_frame; +static int g_stack_fsz; +static int g_ida_func_attr; #define ferr(op_, fmt, ...) do { \ - printf("error:%s:#%ld: '%s': " fmt, g_func, (op_) - ops, \ + printf("error:%s:#%zd: '%s': " fmt, g_func, (op_) - ops, \ dump_op(op_), ##__VA_ARGS__); \ fcloseall(); \ exit(1); \ @@ -192,7 +236,8 @@ static int char_array_i(const char *array[], size_t len, const char *s) return -1; } -static void printf_number(char *buf, size_t buf_size, long number) +static void printf_number(char *buf, size_t buf_size, + unsigned long number) { // output in C-friendly form snprintf(buf, buf_size, number < 10 ? "%lu" : "0x%02lx", number); @@ -226,14 +271,14 @@ static int parse_reg(enum opr_lenmod *reg_lmod, const char *s) return -1; } -static long parse_number(const char *number) +static unsigned long parse_number(const char *number) { int len = strlen(number); const char *p = number; char *endp = NULL; + unsigned long ret; int neg = 0; int bad; - long ret; if (*p == '-') { neg = 1; @@ -242,11 +287,11 @@ static long parse_number(const char *number) if (len > 1 && *p == '0') p++; if (number[len - 1] == 'h') { - ret = strtol(p, &endp, 16); + ret = strtoul(p, &endp, 16); bad = (*endp != 'h'); } else { - ret = strtol(p, &endp, 10); + ret = strtoul(p, &endp, 10); bad = (*endp != 0); } if (bad) @@ -280,7 +325,7 @@ static int parse_indmode(char *name, int *regmask, int need_c_cvt) *d = 0; // skip 'ds:' prefix - if (!strncmp(s, "ds:", 3)) + if (IS_START(s, "ds:")) s += 3; s = next_idt(w, sizeof(w), s); @@ -312,6 +357,89 @@ pass: return c; } +static int is_reg_in_str(const char *s) +{ + int i; + + if (strlen(s) < 3 || (s[3] && !my_issep(s[3]) && !my_isblank(s[3]))) + return 0; + + for (i = 0; i < ARRAY_SIZE(regs_r32); i++) + if (!strncmp(s, regs_r32[i], 3)) + return 1; + + return 0; +} + +static const char *parse_stack_el(const char *name, char *extra_reg) +{ + const char *p, *p2, *s; + char *endp = NULL; + char buf[32]; + 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 (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; + } + p = p2 + 1; + } + + if (!('0' <= *p && *p <= '9')) + return p; + + return NULL; + } + + if (!IS_START(name, "esp+")) + return NULL; + + p = strchr(name + 4, '+'); + if (p) { + // must be a number after esp+, already converted to 0x.. + s = name + 4; + if (!('0' <= *s && *s <= '9')) { + aerr("%s nan?\n", __func__); + return NULL; + } + if (s[0] == '0' && s[1] == 'x') + s += 2; + len = p - s; + if (len < sizeof(buf) - 1) { + strncpy(buf, s, len); + buf[len] = 0; + val = strtol(buf, &endp, 16); + if (val == 0 || *endp != 0) { + aerr("%s num parse fail for '%s'\n", __func__, buf); + return NULL; + } + } + p++; + } + else + p = name + 4; + + if ('0' <= *p && *p <= '9') + return NULL; + + return p; +} + static int guess_lmod_from_name(struct parsed_opr *opr) { if (!strncmp(opr->name, "dword_", 6)) { @@ -329,6 +457,74 @@ static int guess_lmod_from_name(struct parsed_opr *opr) return 0; } +static int guess_lmod_from_c_type(struct parsed_opr *opr, const char *c_type) +{ + static const char *ptr_types[] = { + "LPCSTR", + }; + static const char *dword_types[] = { + "int", "_DWORD", "DWORD", "HANDLE", "HWND", "HMODULE", + }; + static const char *word_types[] = { + "__int16", "unsigned __int16", + }; + static const char *byte_types[] = { + "char", "__int8", "unsigned __int8", "BYTE", + }; + int i; + + if (strchr(c_type, '*')) { + opr->lmod = OPLM_DWORD; + opr->is_ptr = 1; + return 1; + } + + for (i = 0; i < ARRAY_SIZE(dword_types); i++) { + if (IS(c_type, dword_types[i])) { + opr->lmod = OPLM_DWORD; + return 1; + } + } + + for (i = 0; i < ARRAY_SIZE(ptr_types); i++) { + if (IS(c_type, ptr_types[i])) { + opr->lmod = OPLM_DWORD; + opr->is_ptr = 1; + return 1; + } + } + + for (i = 0; i < ARRAY_SIZE(word_types); i++) { + if (IS(c_type, word_types[i])) { + opr->lmod = OPLM_WORD; + return 1; + } + } + + for (i = 0; i < ARRAY_SIZE(byte_types); i++) { + if (IS(c_type, byte_types[i])) { + opr->lmod = OPLM_BYTE; + return 1; + } + } + + anote("unhandled C type '%s' for '%s'\n", c_type, opr->name); + return 0; +} + +static enum opr_type lmod_from_directive(const char *d) +{ + if (IS(d, "dd")) + return OPLM_DWORD; + else if (IS(d, "dw")) + return OPLM_WORD; + else if (IS(d, "db")) + return OPLM_BYTE; + + aerr("unhandled directive: '%s'\n", d); + return OPLM_UNSPEC; +} + static void setup_reg_opr(struct parsed_opr *opr, int reg, enum opr_lenmod lmod, int *regmask) { @@ -338,72 +534,100 @@ static void setup_reg_opr(struct parsed_opr *opr, int reg, enum opr_lenmod lmod, *regmask |= 1 << reg; } -static struct parsed_equ *equ_find(struct parsed_op *po, const char *name); +static struct parsed_equ *equ_find(struct parsed_op *po, const char *name, + int *extra_offs); static int parse_operand(struct parsed_opr *opr, int *regmask, int *regmask_indirect, - char words[16][256], int wordc, int w, unsigned int op_flags) + char words[16][256], int wordc, int w, unsigned int op_flags) { + struct parsed_proto pp; enum opr_lenmod tmplmod; + unsigned long number; int ret, len; - long number; + int wordc_in; + char *tmp; int i; - if (w >= wordc) - aerr("parse_operand w %d, wordc %d\n", w, wordc); + if (w >= wordc) + aerr("parse_operand w %d, wordc %d\n", w, wordc); - opr->reg = xUNSPEC; + opr->reg = xUNSPEC; - for (i = w; i < wordc; i++) { - len = strlen(words[i]); - if (words[i][len - 1] == ',') { - words[i][len - 1] = 0; - wordc = i + 1; - break; - } - } + for (i = w; i < wordc; i++) { + len = strlen(words[i]); + if (words[i][len - 1] == ',') { + words[i][len - 1] = 0; + wordc = i + 1; + break; + } + } - if (op_flags & OPF_JMP) { - const char *label; - - if (wordc - w == 3 && IS(words[w + 1], "ptr")) - label = words[w + 2]; - else if (wordc - w == 2 && IS(words[w], "short")) - label = words[w + 1]; - else if (wordc - w == 1) - label = words[w]; - else - aerr("jump parse error"); - - opr->type = OPT_LABEL; - strcpy(opr->name, label); - return wordc; - } + wordc_in = wordc - w; - if (wordc - w >= 3) { - if (IS(words[w + 1], "ptr")) { - if (IS(words[w], "dword")) - opr->lmod = OPLM_DWORD; - else if (IS(words[w], "word")) - opr->lmod = OPLM_WORD; - else if (IS(words[w], "byte")) - opr->lmod = OPLM_BYTE; - else - aerr("type parsing failed\n"); - w += 2; - } - } + if ((op_flags & OPF_JMP) && wordc_in > 0 + && !('0' <= words[w][0] && words[w][0] <= '9')) + { + const char *label = NULL; + + if (wordc_in == 3 && !strncmp(words[w], "near", 4) + && IS(words[w + 1], "ptr")) + label = words[w + 2]; + else if (wordc_in == 2 && IS(words[w], "short")) + label = words[w + 1]; + else if (wordc_in == 1 + && strchr(words[w], '[') == NULL + && parse_reg(&tmplmod, words[w]) < 0) + label = words[w]; + + if (label != NULL) { + opr->type = OPT_LABEL; + if (IS_START(label, "ds:")) + label += 3; + strcpy(opr->name, label); + return wordc; + } + } - if (wordc - w == 2 && IS(words[w], "offset")) { - opr->type = OPT_OFFSET; - strcpy(opr->name, words[w + 1]); - return wordc; - } + if (wordc_in >= 3) { + if (IS(words[w + 1], "ptr")) { + if (IS(words[w], "dword")) + opr->lmod = OPLM_DWORD; + else if (IS(words[w], "word")) + opr->lmod = OPLM_WORD; + else if (IS(words[w], "byte")) + opr->lmod = OPLM_BYTE; + else + aerr("type parsing failed\n"); + w += 2; + wordc_in = wordc - w; + } + } + + if (wordc_in == 2) { + if (IS(words[w], "offset")) { + opr->type = OPT_OFFSET; + strcpy(opr->name, words[w + 1]); + return wordc; + } + if (IS(words[w], "(offset")) { + char *p = strchr(words[w + 1], ')'); + if (p == NULL) + aerr("parse of bracketed offset failed\n"); + *p = 0; + opr->type = OPT_OFFSET; + strcpy(opr->name, words[w + 1]); + return wordc; + } + } - if (wordc - w != 1) + if (wordc_in != 1) aerr("parse_operand 1 word expected\n"); - strcpy(opr->name, words[w]); + tmp = words[w]; + if (IS_START(tmp, "ds:")) + tmp += 3; + strcpy(opr->name, tmp); if (words[w][0] == '[') { opr->type = OPT_REGMEM; @@ -412,11 +636,10 @@ static int parse_operand(struct parsed_opr *opr, aerr("[] parse failure\n"); parse_indmode(opr->name, regmask_indirect, 1); - if (opr->lmod == OPLM_UNSPEC && !strncmp(opr->name, "ebp+", 4) - && !('0' <= opr->name[4] && opr->name[4] <= '9')) - { + if (opr->lmod == OPLM_UNSPEC && parse_stack_el(opr->name, NULL)) { // might be an equ - struct parsed_equ *eq = equ_find(NULL, opr->name + 4); + struct parsed_equ *eq = + equ_find(NULL, parse_stack_el(opr->name, NULL), &i); if (eq) opr->lmod = eq->lmod; } @@ -448,12 +671,21 @@ static int parse_operand(struct parsed_opr *opr, // most likely var in data segment opr->type = OPT_LABEL; + + ret = proto_parse(g_fhdr, opr->name, &pp); + if (ret == 0) { + if (pp.is_fptr) { + opr->lmod = OPLM_DWORD; + opr->is_ptr = 1; + } + else if (opr->lmod == OPLM_UNSPEC) + guess_lmod_from_c_type(opr, pp.ret_type); + opr->is_array = pp.is_array; + } + proto_release(&pp); + if (opr->lmod == OPLM_UNSPEC) guess_lmod_from_name(opr); - if (opr->lmod != OPLM_UNSPEC) - return wordc; - - // TODO: scan data seg to determine type? return wordc; } @@ -462,6 +694,10 @@ static const struct { unsigned int flags; } pref_table[] = { { "rep", OPF_REP }, + { "repe", OPF_REP|OPF_REPZ }, + { "repz", OPF_REP|OPF_REPZ }, + { "repne", OPF_REP|OPF_REPNZ }, + { "repnz", OPF_REP|OPF_REPNZ }, }; static const struct { @@ -483,6 +719,12 @@ static const struct { { "stosb",OP_STOS, 0, 0, OPF_DATA }, { "stosw",OP_STOS, 0, 0, OPF_DATA }, { "stosd",OP_STOS, 0, 0, OPF_DATA }, + { "movsb",OP_MOVS, 0, 0, OPF_DATA }, + { "movsw",OP_MOVS, 0, 0, OPF_DATA }, + { "movsd",OP_MOVS, 0, 0, OPF_DATA }, + { "cmpsb",OP_CMPS, 0, 0, OPF_DATA|OPF_FLAGS }, + { "cmpsw",OP_CMPS, 0, 0, OPF_DATA|OPF_FLAGS }, + { "cmpsd",OP_CMPS, 0, 0, OPF_DATA|OPF_FLAGS }, { "add", OP_ADD, 2, 2, OPF_DATA|OPF_FLAGS }, { "sub", OP_SUB, 2, 2, OPF_DATA|OPF_FLAGS }, { "and", OP_AND, 2, 2, OPF_DATA|OPF_FLAGS }, @@ -492,6 +734,8 @@ static const struct { { "shr", OP_SHR, 2, 2, OPF_DATA|OPF_FLAGS }, { "sal", OP_SHL, 2, 2, OPF_DATA|OPF_FLAGS }, { "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 }, { "adc", OP_ADC, 2, 2, OPF_DATA|OPF_FLAGS|OPF_CC }, { "sbb", OP_SBB, 2, 2, OPF_DATA|OPF_FLAGS|OPF_CC }, { "inc", OP_INC, 1, 1, OPF_DATA|OPF_FLAGS }, @@ -647,11 +891,29 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc) else if (IS(words[op_w], "stosd")) lmod = OPLM_DWORD; op->operand_cnt = 3; - setup_reg_opr(&op->operand[0], xDI, lmod, &op->regmask_dst); - setup_reg_opr(&op->operand[1], xCX, OPLM_DWORD, &op->regmask_dst); + setup_reg_opr(&op->operand[0], 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); break; + case OP_MOVS: + case OP_CMPS: + if (op->operand_cnt != 0) + break; + if (words[op_w][4] == 'b') + lmod = OPLM_BYTE; + else if (words[op_w][4] == 'w') + lmod = OPLM_WORD; + 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[1], xSI, OPLM_DWORD, &op->regmask_src); + setup_reg_opr(&op->operand[2], xCX, OPLM_DWORD, &op->regmask_src); + op->regmask_dst = op->regmask_src; + break; + case OP_IMUL: if (op->operand_cnt != 1) break; @@ -678,10 +940,20 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc) case OP_SHL: case OP_SHR: case OP_SAR: + case OP_ROL: + case OP_ROR: if (op->operand[1].lmod == OPLM_UNSPEC) op->operand[1].lmod = OPLM_BYTE; break; + case OP_PUSH: + if (op->operand[0].lmod == OPLM_UNSPEC + && (op->operand[0].type == OPT_CONST + || op->operand[0].type == OPT_OFFSET + || op->operand[0].type == OPT_LABEL)) + op->operand[0].lmod = OPLM_DWORD; + break; + default: break; } @@ -705,6 +977,9 @@ static const char *dump_op(struct parsed_op *po) char *p = out; int i; + if (po == NULL) + return "???"; + snprintf(out, sizeof(out), "%s", op_name(po->op)); for (i = 0; i < po->operand_cnt; i++) { p += strlen(p); @@ -718,6 +993,93 @@ static const char *dump_op(struct parsed_op *po) return out; } +static const char *lmod_type_u(struct parsed_op *po, + enum opr_lenmod lmod) +{ + switch (lmod) { + case OPLM_DWORD: + return "u32"; + case OPLM_WORD: + return "u16"; + case OPLM_BYTE: + return "u8"; + default: + ferr(po, "invalid lmod: %d\n", lmod); + return "(_invalid_)"; + } +} + +static const char *lmod_cast_u(struct parsed_op *po, + enum opr_lenmod lmod) +{ + switch (lmod) { + case OPLM_DWORD: + return ""; + case OPLM_WORD: + return "(u16)"; + case OPLM_BYTE: + return "(u8)"; + default: + ferr(po, "invalid lmod: %d\n", lmod); + return "(_invalid_)"; + } +} + +static const char *lmod_cast_u_ptr(struct parsed_op *po, + enum opr_lenmod lmod) +{ + switch (lmod) { + case OPLM_DWORD: + return "*(u32 *)"; + case OPLM_WORD: + return "*(u16 *)"; + case OPLM_BYTE: + return "*(u8 *)"; + default: + ferr(po, "invalid lmod: %d\n", lmod); + return "(_invalid_)"; + } +} + +static const char *lmod_cast_s(struct parsed_op *po, + enum opr_lenmod lmod) +{ + switch (lmod) { + case OPLM_DWORD: + return "(s32)"; + case OPLM_WORD: + return "(s16)"; + case OPLM_BYTE: + return "(s8)"; + default: + ferr(po, "%s: invalid lmod: %d\n", __func__, lmod); + return "(_invalid_)"; + } +} + +static const char *lmod_cast(struct parsed_op *po, + enum opr_lenmod lmod, int is_signed) +{ + return is_signed ? + lmod_cast_s(po, lmod) : + lmod_cast_u(po, lmod); +} + +static int lmod_bytes(struct parsed_op *po, enum opr_lenmod lmod) +{ + switch (lmod) { + case OPLM_DWORD: + return 4; + case OPLM_WORD: + return 2; + case OPLM_BYTE: + return 1; + default: + ferr(po, "%s: invalid lmod: %d\n", __func__, lmod); + return 0; + } +} + static const char *opr_name(struct parsed_op *po, int opr_num) { if (opr_num >= po->operand_cnt) @@ -741,12 +1103,33 @@ static const char *opr_reg_p(struct parsed_op *po, struct parsed_opr *popr) return regs_r32[popr->reg]; } -static struct parsed_equ *equ_find(struct parsed_op *po, const char *name) +static struct parsed_equ *equ_find(struct parsed_op *po, const char *name, + int *extra_offs) { + const char *p; + char *endp; + int namelen; int i; + *extra_offs = 0; + namelen = strlen(name); + + p = strchr(name, '+'); + if (p != NULL) { + namelen = p - name; + if (namelen <= 0) + ferr(po, "equ parse failed for '%s'\n", name); + + if (IS_START(p, "0x")) + p += 2; + *extra_offs = strtol(p, &endp, 16); + if (*endp != 0) + ferr(po, "equ parse failed for '%s'\n", name); + } + for (i = 0; i < g_eqcnt; i++) - if (IS(g_eqs[i].name, name)) + if (strncmp(g_eqs[i].name, name, namelen) == 0 + && g_eqs[i].name[namelen] == 0) break; if (i >= g_eqcnt) { if (po != NULL) @@ -757,23 +1140,40 @@ static struct parsed_equ *equ_find(struct parsed_op *po, const char *name) return &g_eqs[i]; } -static void bg_frame_access(struct parsed_op *po, enum opr_lenmod lmod, - char *buf, size_t buf_size, const char *bp_arg, - int is_src, int is_lea) +static void stack_frame_access(struct parsed_op *po, + enum opr_lenmod lmod, char *buf, size_t buf_size, + const char *name, int is_src, int is_lea) { const char *prefix = ""; + char ofs_reg[16] = { 0, }; struct parsed_equ *eq; int i, arg_i, arg_s; + const char *bp_arg; + int stack_ra = 0; + int offset = 0; int sf_ofs; + bp_arg = parse_stack_el(name, ofs_reg); snprintf(g_comment, sizeof(g_comment), "%s", bp_arg); + eq = equ_find(po, bp_arg, &offset); + if (eq == NULL) + ferr(po, "detected but missing eq\n"); + + offset += eq->offset; - eq = equ_find(po, bp_arg); + if (!strncmp(name, "ebp", 3)) + stack_ra = 4; - if (eq->offset >= 0) { - arg_i = eq->offset / 4 - 2; + if (stack_ra <= offset && offset < stack_ra + 4) + ferr(po, "reference to ra? %d %d\n", offset, stack_ra); + + if (offset > stack_ra) { + arg_i = (offset - stack_ra - 4) / 4; if (arg_i < 0 || arg_i >= g_func_pp.argc_stack) - ferr(po, "offset %d doesn't map to any arg\n", eq->offset); + ferr(po, "offset %d (%s) doesn't map to any arg\n", + offset, bp_arg); + if (ofs_reg[0] != 0) + ferr(po, "offset reg on arg access?\n"); for (i = arg_s = 0; i < g_func_pp.argc; i++) { if (g_func_pp.arg[i].reg != NULL) @@ -787,15 +1187,51 @@ static void bg_frame_access(struct parsed_op *po, enum opr_lenmod lmod, if (is_lea) ferr(po, "lea to arg?\n"); - snprintf(buf, buf_size, "%sa%d", is_src ? "(u32)" : "", i + 1); + switch (lmod) + { + case OPLM_BYTE: + if (is_src && (offset & 3) == 0) + snprintf(buf, buf_size, "(u8)a%d", i + 1); + else + snprintf(buf, buf_size, "BYTE%d(a%d)", offset & 3, i + 1); + break; + + case OPLM_WORD: + if (offset & 1) + ferr(po, "unaligned arg access\n"); + if (is_src && (offset & 2) == 0) + snprintf(buf, buf_size, "(u16)a%d", i + 1); + else + snprintf(buf, buf_size, "%sWORD(a%d)", + (offset & 2) ? "HI" : "LO", i + 1); + break; + + case OPLM_DWORD: + if (offset & 3) + ferr(po, "unaligned arg access\n"); + snprintf(buf, buf_size, "%sa%d", is_src ? "(u32)" : "", i + 1); + break; + + default: + ferr(po, "bp_arg bad lmod: %d\n", lmod); + } + + // common problem + if ((offset & 3) + && (strstr(g_func_pp.arg[i].type, "int8") + || strstr(g_func_pp.arg[i].type, "int16"))) + { + ferr(po, "bp_arg arg/w offset %d and type '%s'\n", + offset, g_func_pp.arg[i].type); + } } else { - if (g_bp_stack == 0) - ferr(po, "bp_stack access after it was not detected\n"); + if (g_stack_fsz == 0) + ferr(po, "stack var access without stackframe\n"); - sf_ofs = g_bp_stack + eq->offset; + sf_ofs = g_stack_fsz + offset; if (sf_ofs < 0) - ferr(po, "bp_stack offset %d/%d\n", eq->offset, g_bp_stack); + ferr(po, "bp_stack offset %d/%d\n", offset, g_stack_fsz); if (is_lea) prefix = "(u32)&"; @@ -803,14 +1239,36 @@ static void bg_frame_access(struct parsed_op *po, enum opr_lenmod lmod, switch (lmod) { case OPLM_BYTE: - snprintf(buf, buf_size, "%ssf.b[%d]", prefix, sf_ofs); + snprintf(buf, buf_size, "%ssf.b[%d%s%s]", + prefix, sf_ofs, ofs_reg[0] ? "+" : "", ofs_reg); break; + case OPLM_WORD: + if ((sf_ofs & 1) || ofs_reg[0] != 0) { + // known unaligned or possibly unaligned + strcat(g_comment, " unaligned"); + if (prefix[0] == 0) + prefix = "*(u16 *)&"; + snprintf(buf, buf_size, "%ssf.b[%d%s%s]", + prefix, sf_ofs, ofs_reg[0] ? "+" : "", ofs_reg); + break; + } snprintf(buf, buf_size, "%ssf.w[%d]", prefix, sf_ofs / 2); break; + case OPLM_DWORD: + if ((sf_ofs & 3) || ofs_reg[0] != 0) { + // known unaligned or possibly unaligned + strcat(g_comment, " unaligned"); + if (prefix[0] == 0) + prefix = "*(u32 *)&"; + snprintf(buf, buf_size, "%ssf.b[%d%s%s]", + prefix, sf_ofs, ofs_reg[0] ? "+" : "", ofs_reg); + break; + } snprintf(buf, buf_size, "%ssf.d[%d]", prefix, sf_ofs / 4); break; + default: ferr(po, "bp_stack bad lmod: %d\n", lmod); } @@ -820,7 +1278,6 @@ static void bg_frame_access(struct parsed_op *po, enum opr_lenmod lmod, static char *out_src_opr(char *buf, size_t buf_size, struct parsed_op *po, struct parsed_opr *popr, int is_lea) { - const char *cast = ""; char tmp1[256], tmp2[256]; char expr[256]; int ret; @@ -849,11 +1306,9 @@ static char *out_src_opr(char *buf, size_t buf_size, break; case OPT_REGMEM: - if (g_bp_frame && !strncmp(popr->name, "ebp+", 4) - && !('0' <= popr->name[4] && popr->name[4] <= '9')) - { - bg_frame_access(po, popr->lmod, buf, buf_size, - popr->name + 4, 1, is_lea); + if (parse_stack_el(popr->name, NULL)) { + stack_frame_access(po, popr->lmod, buf, buf_size, + popr->name, 1, is_lea); break; } @@ -872,27 +1327,18 @@ static char *out_src_opr(char *buf, size_t buf_size, break; } - switch (popr->lmod) { - case OPLM_DWORD: - cast = "*(u32 *)"; - break; - case OPLM_WORD: - cast = "*(u16 *)"; - break; - case OPLM_BYTE: - cast = "*(u8 *)"; - break; - default: - ferr(po, "invalid lmod: %d\n", popr->lmod); - } - snprintf(buf, buf_size, "%s(%s)", cast, expr); + snprintf(buf, buf_size, "%s(%s)", + lmod_cast_u_ptr(po, popr->lmod), expr); break; case OPT_LABEL: if (is_lea) snprintf(buf, buf_size, "(u32)&%s", popr->name); else - snprintf(buf, buf_size, "(u32)%s", popr->name); + snprintf(buf, buf_size, "%s%s%s", + popr->is_ptr ? "(u32)" : "", + popr->name, + popr->is_array ? "[0]" : ""); break; case OPT_OFFSET: @@ -941,18 +1387,17 @@ static char *out_dst_opr(char *buf, size_t buf_size, break; case OPT_REGMEM: - if (g_bp_frame && !strncmp(popr->name, "ebp+", 4) - && !('0' <= popr->name[4] && popr->name[4] <= '9')) - { - bg_frame_access(po, popr->lmod, buf, buf_size, - popr->name + 4, 0, 0); + if (parse_stack_el(popr->name, NULL)) { + stack_frame_access(po, popr->lmod, buf, buf_size, + popr->name, 0, 0); break; } return out_src_opr(buf, buf_size, po, popr, 0); case OPT_LABEL: - snprintf(buf, buf_size, "%s", popr->name); + snprintf(buf, buf_size, "%s%s", popr->name, + popr->is_array ? "[0]" : ""); break; default: @@ -962,65 +1407,10 @@ static char *out_dst_opr(char *buf, size_t buf_size, return buf; } -static const char *lmod_cast_u(struct parsed_op *po, - enum opr_lenmod lmod) +static enum parsed_flag_op split_cond(struct parsed_op *po, + enum op_op op, int *is_inv) { - switch (lmod) { - case OPLM_DWORD: - return ""; - case OPLM_WORD: - return "(u16)"; - case OPLM_BYTE: - return "(u8)"; - default: - ferr(po, "invalid lmod: %d\n", lmod); - return "(_invalid_)"; - } -} - -static const char *lmod_cast_s(struct parsed_op *po, - enum opr_lenmod lmod) -{ - switch (lmod) { - case OPLM_DWORD: - return "(s32)"; - case OPLM_WORD: - return "(s16)"; - case OPLM_BYTE: - return "(s8)"; - default: - ferr(po, "%s: invalid lmod: %d\n", __func__, lmod); - return "(_invalid_)"; - } -} - -static const char *lmod_cast(struct parsed_op *po, - enum opr_lenmod lmod, int is_signed) -{ - return is_signed ? - lmod_cast_s(po, lmod) : - lmod_cast_u(po, lmod); -} - -static int lmod_bytes(struct parsed_op *po, enum opr_lenmod lmod) -{ - switch (lmod) { - case OPLM_DWORD: - return 4; - case OPLM_WORD: - return 2; - case OPLM_BYTE: - return 1; - default: - ferr(po, "%s: invalid lmod: %d\n", __func__, lmod); - return 0; - } -} - -static enum parsed_flag_op split_cond(struct parsed_op *po, - enum op_op op, int *is_inv) -{ - *is_inv = 0; + *is_inv = 0; switch (op) { case OP_JO: @@ -1224,11 +1614,23 @@ 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) +{ + 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; +} + static int scan_for_pop(int i, int opcnt, const char *reg, - int magic, int do_patch) + int magic, int depth, int *maxdepth, int do_flags) { struct parsed_op *po; int ret = 0; + int j; for (; i < opcnt; i++) { po = &ops[i]; @@ -1239,17 +1641,32 @@ static int scan_for_pop(int i, int opcnt, const char *reg, if (po->flags & OPF_TAIL) return -1; // deadend - if (po->flags & OPF_RMD) + if ((po->flags & OPF_RMD) + || (po->op == OP_PUSH && po->argmask)) // arg push continue; if ((po->flags & OPF_JMP) && po->op != OP_CALL) { + if (po->btj != NULL) { + // jumptable + for (j = 0; j < po->btj->count - 1; 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; + } + if (po->bt_i < 0) { ferr(po, "dead branch\n"); return -1; } if (po->flags & OPF_CC) { - ret |= scan_for_pop(po->bt_i, opcnt, reg, magic, do_patch); + ret |= scan_for_pop(po->bt_i, opcnt, reg, magic, + depth, maxdepth, do_flags); if (ret < 0) return ret; // dead end } @@ -1259,12 +1676,29 @@ static int scan_for_pop(int i, int opcnt, const char *reg, continue; } - if (po->op == OP_POP && po->operand[0].type == OPT_REG + if ((po->op == OP_POP || po->op == OP_PUSH) + && po->operand[0].type == OPT_REG && IS(po->operand[0].name, reg)) { - if (do_patch) - po->flags |= OPF_RMD; - return 1; + if (po->op == OP_PUSH) { + depth++; + if (depth > *maxdepth) + *maxdepth = depth; + if (do_flags) + set_flag_no_dup(po, OPF_RSAVE, OPF_RMD); + } + else if (depth == 0) { + if (do_flags) + set_flag_no_dup(po, OPF_RMD, OPF_RSAVE); + return 1; + } + else { + depth--; + if (depth < 0) // should not happen + ferr(po, "fail with depth\n"); + if (do_flags) + set_flag_no_dup(po, OPF_RSAVE, OPF_RMD); + } } } @@ -1272,7 +1706,8 @@ static int scan_for_pop(int i, int opcnt, const char *reg, } // scan for pop starting from 'ret' op (all paths) -static int scan_for_pop_ret(int i, int opcnt, const char *reg, int do_patch) +static int scan_for_pop_ret(int i, int opcnt, const char *reg, + int flag_set) { int found = 0; int j; @@ -1291,8 +1726,7 @@ static int scan_for_pop_ret(int i, int opcnt, const char *reg, int do_patch) && IS(ops[j].operand[0].name, reg)) { found = 1; - if (do_patch) - ops[j].flags |= OPF_RMD; + ops[j].flags |= flag_set; break; } @@ -1394,29 +1828,96 @@ static int scan_for_cdq_edx(int i) return -1; } +static int scan_for_reg_clear(int i, int reg) +{ + for (; i >= 0; i--) { + if (ops[i].op == OP_XOR + && ops[i].operand[0].lmod == OPLM_DWORD + && ops[i].operand[0].reg == ops[i].operand[1].reg + && ops[i].operand[0].reg == reg) + return i; + + if (ops[i].regmask_dst & (1 << reg)) + return -1; + if (g_labels[i][0] != 0) + return -1; + } + + return -1; +} + +// scan for positive, constant esp adjust +static int scan_for_esp_adjust(int i, int opcnt, int *adj) +{ + struct parsed_op *po; + *adj = 0; + + for (; i < opcnt; i++) { + po = &ops[i]; + + if (po->op == OP_ADD && po->operand[0].reg == xSP) { + if (po->operand[1].type != OPT_CONST) + ferr(&ops[i], "non-const esp adjust?\n"); + *adj += po->operand[1].val; + if (*adj & 3) + ferr(&ops[i], "unaligned esp adjust: %x\n", *adj); + return i; + } + else if (po->op == OP_PUSH) + *adj -= lmod_bytes(po, po->operand[0].lmod); + else if (po->op == OP_POP) + *adj += lmod_bytes(po, po->operand[0].lmod); + else if ((po->flags & (OPF_JMP|OPF_TAIL)) && po->op != OP_CALL) + return -1; + + if (g_labels[i][0] != 0) + return -1; + } + + return -1; +} + +static void add_label_ref(struct label_ref *lr, int op_i) +{ + struct label_ref *lr_new; + + if (lr->i == -1) { + lr->i = op_i; + return; + } + + lr_new = calloc(1, sizeof(*lr_new)); + lr_new->i = op_i; + lr->next = lr_new; +} + 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]; struct parsed_proto *pp, *pp_tmp; + struct parsed_data *pd; const char *tmpname; enum parsed_flag_op pfo; int save_arg_vars = 0; int cmp_result_vars = 0; int need_mul_var = 0; int had_decl = 0; + int regmask_save = 0; int regmask_arg = 0; int regmask = 0; int pfomask = 0; + int found = 0; + int depth = 0; int no_output; + int i, j, l; int dummy; int arg; - int i, j; int reg; int ret; - g_bp_frame = g_bp_stack = 0; + g_bp_frame = g_sp_frame = g_stack_fsz = 0; ret = proto_parse(fhdr, funcn, &g_func_pp); if (ret) @@ -1431,7 +1932,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) fprintf(fout, ")\n{\n"); // pass1: - // - handle ebp frame, remove ops related to it + // - handle ebp/esp frame, remove ops related to it if (ops[0].op == OP_PUSH && IS(opr_name(&ops[0], 0), "ebp") && ops[1].op == OP_MOV && IS(opr_name(&ops[1], 0), "ebp") @@ -1442,32 +1943,49 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) g_bp_frame = 1; ops[0].flags |= OPF_RMD; ops[1].flags |= OPF_RMD; + i = 2; if (ops[2].op == OP_SUB && IS(opr_name(&ops[2], 0), "esp")) { - g_bp_stack = opr_const(&ops[2], 1); + g_stack_fsz = opr_const(&ops[2], 1); ops[2].flags |= OPF_RMD; + i++; } else { // another way msvc builds stack frame.. i = 2; while (ops[i].op == OP_PUSH && IS(opr_name(&ops[i], 0), "ecx")) { - g_bp_stack += 4; + g_stack_fsz += 4; ops[i].flags |= OPF_RMD; ecx_push++; i++; } + // and another way.. + if (i == 2 && ops[i].op == OP_MOV && ops[i].operand[0].reg == xAX + && ops[i].operand[1].type == OPT_CONST + && ops[i + 1].op == OP_CALL + && IS(opr_name(&ops[i + 1], 0), "__alloca_probe")) + { + g_stack_fsz += ops[i].operand[1].val; + ops[i].flags |= OPF_RMD; + i++; + ops[i].flags |= OPF_RMD; + i++; + } } - i = 2; + found = 0; do { for (; i < opcnt; i++) if (ops[i].op == OP_RET) break; + if (i == opcnt && (ops[i - 1].flags & OPF_JMP) && found) + break; + if (ops[i - 1].op != OP_POP || !IS(opr_name(&ops[i - 1], 0), "ebp")) ferr(&ops[i - 1], "'pop ebp' expected\n"); ops[i - 1].flags |= OPF_RMD; - if (g_bp_stack != 0) { + if (g_stack_fsz != 0) { if (ops[i - 2].op != OP_MOV || !IS(opr_name(&ops[i - 2], 0), "esp") || !IS(opr_name(&ops[i - 2], 1), "ebp")) @@ -1483,64 +2001,289 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) } } + found = 1; i++; } while (i < opcnt); } + else { + for (i = 0; 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; + break; + } + } + + if (g_sp_frame) + { + g_stack_fsz = ops[i].operand[1].val; + ops[i].flags |= OPF_RMD; + + i++; + do { + for (; i < opcnt; i++) + if (ops[i].op == OP_RET) + break; + if (ops[i - 1].op != OP_ADD + || !IS(opr_name(&ops[i - 1], 0), "esp") + || ops[i - 1].operand[1].type != OPT_CONST + || ops[i - 1].operand[1].val != g_stack_fsz) + ferr(&ops[i - 1], "'add esp' expected\n"); + ops[i - 1].flags |= OPF_RMD; + + i++; + } while (i < opcnt); + } + } // pass2: // - resolve all branches for (i = 0; i < opcnt; i++) { po = &ops[i]; po->bt_i = -1; + po->btj = NULL; if ((po->flags & OPF_RMD) || !(po->flags & OPF_JMP) || po->op == OP_CALL || po->op == OP_RET) continue; - for (j = 0; j < opcnt; j++) { - if (g_labels[j][0] && IS(po->operand[0].name, g_labels[j])) { - po->bt_i = j; - po->lrl = g_label_refs[j]; - g_label_refs[j] = po; + if (po->operand[0].type == OPT_REGMEM) { + char *p = strchr(po->operand[0].name, '['); + if (p == NULL) + ferr(po, "unhandled indirect branch\n"); + ret = p - po->operand[0].name; + strncpy(buf1, po->operand[0].name, ret); + buf1[ret] = 0; + + for (j = 0, pd = NULL; j < g_func_pd_cnt; j++) { + if (IS(g_func_pd[j].label, buf1)) { + pd = &g_func_pd[j]; + break; + } + } + if (pd == NULL) + ferr(po, "label '%s' not parsed?\n", buf1); + if (pd->type != OPT_OFFSET) + ferr(po, "label '%s' with non-offset data?\n", buf1); + + // find all labels, link + for (j = 0; j < pd->count; j++) { + for (l = 0; l < opcnt; l++) { + if (g_labels[l][0] && IS(g_labels[l], pd->d[j].u.label)) { + add_label_ref(&g_label_refs[l], i); + pd->d[j].bt_i = l; + break; + } + } + } + + po->btj = pd; + continue; + } + + for (l = 0; l < opcnt; l++) { + if (g_labels[l][0] && IS(po->operand[0].name, g_labels[l])) { + add_label_ref(&g_label_refs[l], i); + po->bt_i = l; break; } } - if (po->bt_i == -1) { + if (po->bt_i != -1) + continue; + + if (po->operand[0].type == OPT_LABEL) { // assume tail call po->op = OP_CALL; po->flags |= OPF_TAIL; + continue; } + + ferr(po, "unhandled branch\n"); } // pass3: + // - process calls + for (i = 0; i < opcnt; i++) + { + po = &ops[i]; + if (po->flags & OPF_RMD) + continue; + + 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) + { + ret = scan_for_esp_adjust(i + 1, opcnt, &j); + if (ret < 0) + ferr(po, "non-__cdecl indirect call unhandled yet\n"); + j /= 4; + if (j > ARRAY_SIZE(pp->arg)) + ferr(po, "esp adjust too large?\n"); + pp->ret_type = strdup("int"); + pp->argc = pp->argc_stack = j; + for (arg = 0; arg < pp->argc; arg++) + pp->arg[arg].type = strdup("int"); + } + else { + ret = proto_parse(fhdr, tmpname, pp); + if (ret) + ferr(po, "proto_parse failed for call '%s'\n", tmpname); + } + + // look for and make use of esp adjust + ret = -1; + if (!pp->is_stdcall) + ret = scan_for_esp_adjust(i + 1, opcnt, &j); + if (ret >= 0) { + if (pp->is_vararg) { + if (j / 4 < pp->argc_stack) + ferr(po, "esp adjust is too small: %x < %x\n", + j, pp->argc_stack * 4); + // modify pp to make it have varargs as normal args + arg = pp->argc; + pp->argc += j / 4 - pp->argc_stack; + for (; arg < pp->argc; arg++) { + pp->arg[arg].type = strdup("int"); + pp->argc_stack++; + } + if (pp->argc > ARRAY_SIZE(pp->arg)) + ferr(po, "too many args\n"); + } + if (pp->argc_stack != j / 4) + ferr(po, "stack tracking failed: %x %x\n", + pp->argc_stack * 4, j); + + ops[ret].flags |= OPF_RMD; + // a bit of a hack, but deals with use of + // single adj for multiple calls + ops[ret].operand[1].val -= j; + } + else if (pp->is_vararg) + ferr(po, "missing esp_adjust for vararg func '%s'\n", + pp->name); + + // can't call functions with non-__cdecl callbacks yet + for (arg = 0; arg < pp->argc; arg++) { + if (pp->arg[arg].fptr != NULL) { + pp_tmp = pp->arg[arg].fptr; + if (pp_tmp->is_stdcall || pp_tmp->argc != pp_tmp->argc_stack) + ferr(po, "'%s' has a non-__cdecl callback\n", tmpname); + } + } + + // collect all stack args + for (arg = 0; arg < pp->argc; arg++) + if (pp->arg[arg].reg == NULL) + break; + + for (j = i; j >= 0 && arg < pp->argc; ) + { + if (g_labels[j][0] != 0) { + if (j > 0 && ((ops[j - 1].flags & OPF_TAIL) + || (ops[j - 1].flags & (OPF_JMP|OPF_CC)) == OPF_JMP)) + { + // follow the branch in reverse + if (g_label_refs[j].i == -1) + ferr(po, "no refs for '%s'?\n", g_labels[j]); + if (g_label_refs[j].next != NULL) + ferr(po, "unhandled multiple refs to '%s'\n", g_labels[j]); + j = g_label_refs[j].i + 1; + continue; + } + break; + } + j--; + + if (ops[j].op == OP_CALL) + { + pp_tmp = ops[j].datap; + if (pp_tmp == NULL) + ferr(po, "arg collect hit unparsed call\n"); + if (pp_tmp->argc_stack > 0) + ferr(po, "arg collect hit '%s' with %d stack args\n", + opr_name(&ops[j], 0), pp_tmp->argc_stack); + } + else if ((ops[j].flags & OPF_TAIL) + || (ops[j].flags & (OPF_JMP|OPF_CC)) == OPF_JMP) + { + break; + } + else if (ops[j].op == OP_PUSH) + { + pp->arg[arg].datap = &ops[j]; + ret = scan_for_mod(&ops[j], j + 1, i); + if (ret >= 0) { + // mark this push as one that needs operand saving + ops[j].flags &= ~OPF_RMD; + ops[j].argmask |= 1 << arg; + save_arg_vars |= 1 << arg; + } + else + ops[j].flags |= OPF_RMD; + + // next arg + for (arg++; arg < pp->argc; arg++) + if (pp->arg[arg].reg == NULL) + break; + } + } + if (arg < pp->argc) + ferr(po, "arg collect failed for '%s': %d/%d\n", + tmpname, arg, pp->argc); + po->datap = pp; + } + } + + // pass4: // - find POPs for PUSHes, rm both // - scan for all used registers // - find flag set ops for their users - // - process calls + // - declare indirect functions for (i = 0; i < opcnt; i++) { po = &ops[i]; if (po->flags & OPF_RMD) continue; - if (po->op == OP_PUSH && po->operand[0].type == OPT_REG) { - if (po->operand[0].reg < 0) + if (po->op == OP_PUSH + && po->argmask == 0 && !(po->flags & OPF_RSAVE) + && po->operand[0].type == OPT_REG) + { + reg = po->operand[0].reg; + if (reg < 0) ferr(po, "reg not set for push?\n"); - if (!(regmask & (1 << po->operand[0].reg))) { // reg save - ret = scan_for_pop(i + 1, opcnt, - po->operand[0].name, i + opcnt, 0); - if (ret == 1) { - po->flags |= OPF_RMD; - scan_for_pop(i + 1, opcnt, po->operand[0].name, - i + opcnt * 2, 1); - continue; - } - ret = scan_for_pop_ret(i + 1, opcnt, po->operand[0].name, 0); - if (ret == 0) { - po->flags |= OPF_RMD; - scan_for_pop_ret(i + 1, opcnt, po->operand[0].name, 1); - continue; + + depth = 0; + ret = scan_for_pop(i + 1, opcnt, + po->operand[0].name, i + opcnt, 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); + continue; + } + ret = scan_for_pop_ret(i + 1, opcnt, po->operand[0].name, 0); + if (ret == 0) { + arg = OPF_RMD; + if (regmask & (1 << reg)) { + if (regmask_save & (1 << reg)) + ferr(po, "%s already saved?\n", po->operand[0].name); + arg = OPF_RSAVE; } + po->flags |= arg; + scan_for_pop_ret(i + 1, opcnt, po->operand[0].name, arg); + continue; } } @@ -1563,6 +2306,9 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) if (scan_for_mod(tmp_op, ret + 1, i) >= 0) pfomask = 1 << pfo; } + else if (tmp_op->op == OP_CMPS) { + pfomask = 1 << PFO_Z; + } else { if ((pfo != PFO_Z && pfo != PFO_S && pfo != PFO_P) || scan_for_mod_opr0(tmp_op, ret + 1, i) >= 0) @@ -1577,81 +2323,54 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) if (po->op == OP_ADC || po->op == OP_SBB) cmp_result_vars |= 1 << PFO_C; } - else if (po->op == OP_CALL) + else if (po->op == OP_MUL + || (po->op == OP_IMUL && po->operand_cnt == 1)) { - pp = malloc(sizeof(*pp)); + need_mul_var = 1; + } + else if (po->op == OP_CALL && po->operand[0].type != OPT_LABEL) { + pp = po->datap; my_assert_not(pp, NULL); - tmpname = opr_name(&ops[i], 0); - ret = proto_parse(fhdr, tmpname, pp); - if (ret) - ferr(po, "proto_parse failed for '%s'\n", tmpname); - - for (arg = 0; arg < pp->argc; arg++) - if (pp->arg[arg].reg == NULL) - break; - - for (j = i - 1; j >= 0 && arg < pp->argc; j--) { - if (ops[j].op == OP_CALL) { - pp_tmp = ops[j].datap; - if (pp_tmp == NULL) - ferr(po, "arg collect hit unparsed call\n"); - if (pp_tmp->argc_stack > 0) - ferr(po, "arg collect hit '%s' with %d stack args\n", - opr_name(&ops[j], 0), pp_tmp->argc_stack); - } - else if ((ops[j].flags & OPF_TAIL) - || (ops[j].flags & (OPF_JMP|OPF_CC)) == OPF_JMP) - { - break; - } - - if (ops[j].op == OP_PUSH) { - pp->arg[arg].datap = &ops[j]; - ret = scan_for_mod(&ops[j], j + 1, i); - if (ret >= 0) { - // mark this push as one that needs operand saving - ops[j].argmask |= 1 << arg; - save_arg_vars |= 1 << arg; - } - else - ops[j].flags |= OPF_RMD; - - // next arg - for (arg++; arg < pp->argc; arg++) - if (pp->arg[arg].reg == NULL) - break; - } + fprintf(fout, " %s (*icall%d)(", pp->ret_type, i); + for (j = 0; j < pp->argc; j++) { + if (j > 0) + fprintf(fout, ", "); + fprintf(fout, "%s a%d", pp->arg[j].type, j + 1); + } + fprintf(fout, ");\n"); + } + } - if (g_labels[j][0] != 0) { - if (j > 0 && ((ops[j - 1].flags & OPF_TAIL) - || (ops[j - 1].flags & (OPF_JMP|OPF_CC)) == OPF_JMP)) - { - // follow the branch in reverse - if (g_label_refs[j] == NULL) - ferr(po, "no refs for '%s'?\n", g_labels[j]); - if (g_label_refs[j]->lrl != NULL) - ferr(po, "unhandled multiple fefs to '%s'\n", g_labels[j]); - j = (g_label_refs[j] - ops) + 1; - continue; - } - break; - } + // output LUTs/jumptables + for (i = 0; i < g_func_pd_cnt; i++) { + pd = &g_func_pd[i]; + fprintf(fout, " static const "); + if (pd->type == OPT_OFFSET) { + fprintf(fout, "void *jt_%s[] =\n { ", pd->label); + + for (j = 0; j < pd->count; j++) { + if (j > 0) + fprintf(fout, ", "); + fprintf(fout, "&&%s", pd->d[j].u.label); } - if (arg < pp->argc) - ferr(po, "arg collect failed for '%s'\n", tmpname); - po->datap = pp; } - else if (po->op == OP_MUL - || (po->op == OP_IMUL && po->operand_cnt == 1)) - { - need_mul_var = 1; + else { + fprintf(fout, "%s %s[] =\n { ", + lmod_type_u(ops, pd->lmod), pd->label); + + for (j = 0; j < pd->count; j++) { + if (j > 0) + fprintf(fout, ", "); + fprintf(fout, "%u", pd->d[j].u.val); + } } + fprintf(fout, " };\n"); } // declare stack frame - if (g_bp_stack) + if (g_stack_fsz) fprintf(fout, " union { u32 d[%d]; u16 w[%d]; u8 b[%d]; } sf;\n", - (g_bp_stack + 3) / 4, (g_bp_stack + 1) / 2, g_bp_stack); + (g_stack_fsz + 3) / 4, (g_stack_fsz + 1) / 2, g_stack_fsz); // declare arg-registers for (i = 0; i < g_func_pp.argc; i++) { @@ -1675,6 +2394,7 @@ 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) { @@ -1686,6 +2406,15 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) } } + if (regmask_save) { + for (reg = 0; reg < 8; reg++) { + if (regmask_save & (1 << reg)) { + fprintf(fout, " u32 s_%s;\n", regs_r32[reg]); + had_decl = 1; + } + } + } + if (save_arg_vars) { for (reg = 0; reg < 32; reg++) { if (save_arg_vars & (1 << reg)) { @@ -1715,7 +2444,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) // output ops for (i = 0; i < opcnt; i++) { - if (g_labels[i][0] != 0) + if (g_labels[i][0] != 0 && g_label_refs[i].i != -1) fprintf(fout, "\n%s:\n", g_labels[i]); po = &ops[i]; @@ -1752,7 +2481,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) is_delayed = 1; } else if (po->datap != NULL) { - // use preprocessed results + // use preprocessed flag calc results tmp_op = po->datap; if (!tmp_op || !(tmp_op->pfomask & (1 << pfo))) ferr(po, "not prepared for pfo %d\n", pfo); @@ -1789,8 +2518,9 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) case OP_MOV: assert_operand_cnt(2); propagate_lmod(po, &po->operand[0], &po->operand[1]); - fprintf(fout, " %s = %s;", + fprintf(fout, " %s = %s%s;", out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]), + po->operand[0].is_ptr ? "(void *)" : "", out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], 0)); break; @@ -1847,16 +2577,67 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) if (po->flags & OPF_REP) { fprintf(fout, " for (; ecx != 0; ecx--, edi += %d)\n", lmod_bytes(po, po->operand[0].lmod)); - fprintf(fout, " *(u32 *)edi = eax;"); + fprintf(fout, " %sedi = eax;", + lmod_cast_u_ptr(po, po->operand[0].lmod)); strcpy(g_comment, "rep stos"); } else { - fprintf(fout, " *(u32 *)edi = eax; edi += %d;", + fprintf(fout, " %sedi = eax; edi += %d;", + lmod_cast_u_ptr(po, po->operand[0].lmod), lmod_bytes(po, po->operand[0].lmod)); strcpy(g_comment, "stos"); } break; + case OP_MOVS: + // assumes DF=0 + assert_operand_cnt(3); + j = lmod_bytes(po, po->operand[0].lmod); + strcpy(buf1, lmod_cast_u_ptr(po, po->operand[0].lmod)); + if (po->flags & OPF_REP) { + fprintf(fout, + " for (; ecx != 0; ecx--, edi += %d, esi += %d)\n", + j, j); + fprintf(fout, + " %sedi = %sesi;", buf1, buf1); + strcpy(g_comment, "rep movs"); + } + else { + fprintf(fout, " %sedi = %sesi; edi += %d; esi += %d;", + buf1, buf1, j, j); + strcpy(g_comment, "movs"); + } + break; + + case OP_CMPS: + // assumes DF=0 + // repe ~ repeat while ZF=1 + assert_operand_cnt(3); + j = lmod_bytes(po, po->operand[0].lmod); + strcpy(buf1, lmod_cast_u_ptr(po, po->operand[0].lmod)); + if (po->flags & OPF_REP) { + fprintf(fout, + " for (; ecx != 0; ecx--, edi += %d, esi += %d)\n", + j, j); + fprintf(fout, + " if ((cond_z = (%sedi == %sesi)) %s 0)\n", + buf1, buf1, (po->flags & OPF_REPZ) ? "==" : "!="); + fprintf(fout, + " break;"); + snprintf(g_comment, sizeof(g_comment), "rep%s cmps", + (po->flags & OPF_REPZ) ? "e" : "ne"); + } + else { + fprintf(fout, + " cond_z = (%sedi = %sesi); edi += %d; esi += %d;", + buf1, buf1, j, j); + strcpy(g_comment, "cmps"); + } + pfomask &= ~(1 << PFO_Z); + last_arith_dst = NULL; + delayed_flag_op = NULL; + break; + // arithmetic w/flags case OP_ADD: case OP_SUB: @@ -1876,6 +2657,35 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) delayed_flag_op = NULL; break; + case OP_SAR: + assert_operand_cnt(2); + out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]); + fprintf(fout, " %s = %s%s >> %s;", buf1, + lmod_cast_s(po, po->operand[0].lmod), buf1, + out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], 0)); + last_arith_dst = &po->operand[0]; + delayed_flag_op = NULL; + break; + + case OP_ROL: + case OP_ROR: + assert_operand_cnt(2); + out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]); + if (po->operand[1].type == OPT_CONST) { + j = po->operand[1].val; + j %= lmod_bytes(po, po->operand[0].lmod) * 8; + fprintf(fout, po->op == OP_ROL ? + " %s = (%s << %d) | (%s >> %d);" : + " %s = (%s >> %d) | (%s << %d);", + buf1, buf1, j, buf1, + lmod_bytes(po, po->operand[0].lmod) * 8 - j); + } + else + ferr(po, "TODO\n"); + last_arith_dst = &po->operand[0]; + delayed_flag_op = NULL; + break; + case OP_XOR: assert_operand_cnt(2); propagate_lmod(po, &po->operand[0], &po->operand[1]); @@ -1889,16 +2699,6 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) } goto dualop_arith; - case OP_SAR: - assert_operand_cnt(2); - out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]); - fprintf(fout, " %s = %s%s >> %s;", buf1, - lmod_cast_s(po, po->operand[0].lmod), buf1, - out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], 0)); - last_arith_dst = &po->operand[0]; - delayed_flag_op = NULL; - break; - case OP_ADC: case OP_SBB: assert_operand_cnt(2); @@ -1914,8 +2714,14 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) case OP_INC: case OP_DEC: out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]); - strcpy(buf2, po->op == OP_INC ? "++" : "--"); - fprintf(fout, " %s%s;", buf1, buf2); + if (po->operand[0].type == OPT_REG) { + strcpy(buf2, po->op == OP_INC ? "++" : "--"); + fprintf(fout, " %s%s;", buf1, buf2); + } + else { + strcpy(buf2, po->op == OP_INC ? "+" : "-"); + fprintf(fout, " %s %s= 1;", buf1, buf2); + } last_arith_dst = &po->operand[0]; delayed_flag_op = NULL; break; @@ -1957,7 +2763,11 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) ferr(po, "unhandled lmod %d\n", po->operand[0].lmod); // 32bit division is common, look for it - if (scan_for_cdq_edx(i - 1) >= 0) { + if (po->op == OP_DIV) + ret = scan_for_reg_clear(i - 1, xDX); + else + ret = scan_for_cdq_edx(i - 1); + if (ret >= 0) { out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], 0); strcpy(buf2, lmod_cast(po, po->operand[0].lmod, po->op == OP_IDIV)); @@ -1985,6 +2795,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) } else no_output = 1; + last_arith_dst = NULL; delayed_flag_op = po; break; @@ -1997,21 +2808,31 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) case OP_JMP: assert_operand_cnt(1); - if (po->operand[0].type != OPT_LABEL) - ferr(po, "unhandled call type\n"); + if (po->operand[0].type == OPT_REGMEM) { + ret = sscanf(po->operand[0].name, "%[^[][%[^*]*4]", + buf1, buf2); + if (ret != 2) + ferr(po, "parse failure for jmp '%s'\n", + po->operand[0].name); + fprintf(fout, " goto *jt_%s[%s];", buf1, buf2); + break; + } + else if (po->operand[0].type != OPT_LABEL) + ferr(po, "unhandled jmp type\n"); fprintf(fout, " goto %s;", po->operand[0].name); break; case OP_CALL: assert_operand_cnt(1); - if (po->operand[0].type != OPT_LABEL) - ferr(po, "unhandled call type\n"); - pp = po->datap; if (pp == NULL) ferr(po, "NULL pp\n"); + if (po->operand[0].type != OPT_LABEL) + fprintf(fout, " icall%d = (void *)%s;\n", i, + out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], 0)); + fprintf(fout, " "); if (!IS(pp->ret_type, "void")) { if (po->flags & OPF_TAIL) @@ -2022,7 +2843,15 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) fprintf(fout, "(u32)"); } - fprintf(fout, "%s(", opr_name(po, 0)); + if (po->operand[0].type != OPT_LABEL) { + fprintf(fout, "icall%d(", i); + } + else { + if (pp->name[0] == 0) + ferr(po, "missing pp->name\n"); + fprintf(fout, "%s(", pp->name); + } + for (arg = 0; arg < pp->argc; arg++) { if (arg > 0) fprintf(fout, ", "); @@ -2062,6 +2891,9 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) case OP_RET: if (IS(g_func_pp.ret_type, "void")) fprintf(fout, " return;"); + else if (strchr(g_func_pp.ret_type, '*')) + fprintf(fout, " return (%s)eax;", + g_func_pp.ret_type); else fprintf(fout, " return eax;"); break; @@ -2069,19 +2901,28 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) case OP_PUSH: if (po->argmask) { // special case - saved func arg + out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], 0); for (j = 0; j < 32; j++) { - if (po->argmask & (1 << j)) { - fprintf(fout, " s_a%d = %s;", j + 1, - out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], 0)); - } + if (po->argmask & (1 << j)) + fprintf(fout, " s_a%d = %s;", j + 1, buf1); } break; } - ferr(po, "push encountered\n"); + else if (po->flags & OPF_RSAVE) { + out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], 0); + fprintf(fout, " s_%s = %s;", buf1, buf1); + break; + } + ferr(po, "stray push encountered\n"); break; case OP_POP: - ferr(po, "pop encountered\n"); + if (po->flags & OPF_RSAVE) { + out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], 0); + fprintf(fout, " %s = s_%s;", buf1, buf1); + break; + } + ferr(po, "stray pop encountered\n"); break; case OP_NOP: @@ -2094,6 +2935,13 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) break; } + // some sanity checking + if ((po->flags & OPF_REP) && po->op != OP_STOS + && po->op != OP_MOVS && po->op != OP_CMPS) + ferr(po, "unexpected rep\n"); + if ((po->flags & (OPF_REPZ|OPF_REPNZ)) && po->op != OP_CMPS) + ferr(po, "unexpected repz/repnz\n"); + if (g_comment[0] != 0) { fprintf(fout, " // %s", g_comment); g_comment[0] = 0; @@ -2103,7 +2951,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) fprintf(fout, "\n"); if (pfomask != 0) - ferr(po, "missed flag calc, pfomask=%x\n", pfomask); + ferr(po, "missed flag calc, pfomask=%x\n", pfomask); // see is delayed flag stuff is still valid if (delayed_flag_op != NULL && delayed_flag_op != po) { @@ -2121,6 +2969,17 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) // cleanup for (i = 0; i < opcnt; i++) { + struct label_ref *lr, *lr_del; + + lr = g_label_refs[i].next; + while (lr != NULL) { + lr_del = lr; + lr = lr->next; + free(lr_del); + } + g_label_refs[i].i = -1; + g_label_refs[i].next = NULL; + if (ops[i].op == OP_CALL) { pp = ops[i].datap; if (pp) { @@ -2132,6 +2991,24 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt) proto_release(&g_func_pp); } +static void set_label(int i, const char *name) +{ + const char *p; + int len; + + len = strlen(name); + p = strchr(name, ':'); + if (p != NULL) + len = p - name; + + if (len > sizeof(g_labels[0]) - 1) + aerr("label '%s' too long: %d\n", name, len); + if (g_labels[i][0] != 0) + aerr("dupe label '%s'?\n", name); + memcpy(g_labels[i], name, len); + g_labels[i][len] = 0; +} + // '=' needs special treatment.. static char *next_word_s(char *w, size_t wsize, char *s) { @@ -2159,21 +3036,25 @@ static int cmpstringp(const void *p1, const void *p2) int main(int argc, char *argv[]) { - FILE *fout, *fasm, *fhdr, *frlist; + FILE *fout, *fasm, *frlist; + struct parsed_data *pd = NULL; + int pd_alloc = 0; + char **rlist = NULL; + int rlist_len = 0; + int rlist_alloc = 0; char line[256]; char words[16][256]; + enum opr_lenmod lmod; int in_func = 0; + int pending_endp = 0; int skip_func = 0; int skip_warned = 0; int eq_alloc; - char **rlist = NULL; - int rlist_len = 0; - int rlist_alloc = 0; int verbose = 0; int arg_out; int arg = 1; int pi = 0; - int len; + int i, j, len; char *p; int wordc; @@ -2195,8 +3076,8 @@ int main(int argc, char *argv[]) my_assert_not(fasm, NULL); hdrfn = argv[arg++]; - fhdr = fopen(hdrfn, "r"); - my_assert_not(fhdr, NULL); + g_fhdr = fopen(hdrfn, "r"); + my_assert_not(g_fhdr, NULL); rlist_alloc = 64; rlist = malloc(rlist_alloc * sizeof(rlist[0])); @@ -2239,14 +3120,64 @@ int main(int argc, char *argv[]) g_eqs = malloc(eq_alloc * sizeof(g_eqs[0])); my_assert_not(g_eqs, NULL); + for (i = 0; i < ARRAY_SIZE(g_label_refs); i++) { + g_label_refs[i].i = -1; + g_label_refs[i].next = NULL; + } + while (fgets(line, sizeof(line), fasm)) { + wordc = 0; asmln++; p = sskip(line); - if (*p == 0 || *p == ';') + if (*p == 0) + continue; + + if (*p == ';') { + static const char *attrs[] = { + "bp-based frame", + "library function", + "static", + "noreturn", + "thunk", + "fpd=", + }; + if (p[2] == '=' && IS_START(p, "; =============== S U B")) + goto do_pending_endp; // eww.. + + if (p[2] != 'A' || !IS_START(p, "; Attributes:")) + continue; + + // parse IDA's attribute-list comment + g_ida_func_attr = 0; + p = sskip(p + 13); + // get rid of random tabs + for (i = 0; p[i] != 0; i++) + if (p[i] == '\t') + p[i] = ' '; + + for (; *p != 0; p = sskip(p)) { + for (i = 0; i < ARRAY_SIZE(attrs); i++) { + if (!strncmp(p, attrs[i], strlen(attrs[i]))) { + g_ida_func_attr |= 1 << i; + p += strlen(attrs[i]); + break; + } + } + if (i == ARRAY_SIZE(attrs)) { + anote("unparsed IDA attr: %s\n", p); + break; + } + if (IS(attrs[i], "fpd=")) { + p = next_word(words[0], sizeof(words[0]), p); + // ignore for now.. + } + } continue; + } +parse_words: memset(words, 0, sizeof(words)); for (wordc = 0; wordc < 16; wordc++) { p = sskip(next_word_s(words[wordc], sizeof(words[0]), p)); @@ -2256,6 +3187,14 @@ int main(int argc, char *argv[]) } } + // alow asm patches in comments + if (*p == ';' && IS_START(p, "; sctpatch: ")) { + p = sskip(p + 12); + if (*p == 0 || *p == ';') + continue; + goto parse_words; // lame + } + if (wordc == 0) { // shouldn't happen awarn("wordc == 0?\n"); @@ -2271,14 +3210,99 @@ int main(int argc, char *argv[]) continue; } +do_pending_endp: + // do delayed endp processing to collect switch jumptables + if (pending_endp) { + if (in_func && !skip_func && wordc >= 2 + && ((words[0][0] == 'd' && words[0][2] == 0) + || (words[1][0] == 'd' && words[1][2] == 0))) + { + i = 1; + if (words[1][0] == 'd' && words[1][2] == 0) { + // label + if (g_func_pd_cnt >= pd_alloc) { + pd_alloc = pd_alloc * 2 + 16; + g_func_pd = realloc(g_func_pd, + sizeof(g_func_pd[0]) * pd_alloc); + my_assert_not(g_func_pd, NULL); + } + pd = &g_func_pd[g_func_pd_cnt]; + g_func_pd_cnt++; + memset(pd, 0, sizeof(*pd)); + strcpy(pd->label, words[0]); + pd->type = OPT_CONST; + pd->lmod = lmod_from_directive(words[1]); + i = 2; + } + else { + lmod = lmod_from_directive(words[0]); + if (lmod != pd->lmod) + aerr("lmod change? %d->%d\n", pd->lmod, lmod); + } + + if (pd->count_alloc < pd->count + wordc) { + pd->count_alloc = pd->count_alloc * 2 + 14 + wordc; + pd->d = realloc(pd->d, sizeof(pd->d[0]) * pd->count_alloc); + my_assert_not(pd->d, NULL); + } + for (; i < wordc; i++) { + if (IS(words[i], "offset")) { + pd->type = OPT_OFFSET; + i++; + } + p = strchr(words[i], ','); + if (p != NULL) + *p = 0; + if (pd->type == OPT_OFFSET) + pd->d[pd->count].u.label = strdup(words[i]); + else + pd->d[pd->count].u.val = parse_number(words[i]); + pd->d[pd->count].bt_i = -1; + pd->count++; + } + continue; + } + + if (in_func && !skip_func) + gen_func(fout, g_fhdr, g_func, pi); + + pending_endp = 0; + in_func = 0; + g_ida_func_attr = 0; + skip_warned = 0; + skip_func = 0; + g_func[0] = 0; + if (pi != 0) { + memset(&ops, 0, pi * sizeof(ops[0])); + memset(g_labels, 0, pi * sizeof(g_labels[0])); + pi = 0; + } + g_eqcnt = 0; + for (i = 0; i < g_func_pd_cnt; i++) { + pd = &g_func_pd[i]; + if (pd->type == OPT_OFFSET) { + for (j = 0; j < pd->count; j++) + free(pd->d[j].u.label); + } + free(pd->d); + pd->d = NULL; + } + g_func_pd_cnt = 0; + pd = NULL; + if (wordc == 0) + continue; + } + if (IS(words[1], "proc")) { if (in_func) aerr("proc '%s' while in_func '%s'?\n", words[0], g_func); p = words[0]; - if (bsearch(&p, rlist, rlist_len, sizeof(rlist[0]), cmpstringp)) + if ((g_ida_func_attr & IDAFA_THUNK) + || bsearch(&p, rlist, rlist_len, sizeof(rlist[0]), cmpstringp)) skip_func = 1; strcpy(g_func, words[0]); + set_label(0, words[0]); in_func = 1; continue; } @@ -2290,32 +3314,13 @@ int main(int argc, char *argv[]) aerr("endp '%s' while in_func '%s'?\n", words[0], g_func); - if (in_func && !skip_func) - gen_func(fout, fhdr, g_func, pi); - - in_func = 0; - skip_warned = 0; - skip_func = 0; - g_func[0] = 0; - if (pi != 0) { - memset(&ops, 0, pi * sizeof(ops[0])); - memset(g_labels, 0, pi * sizeof(g_labels[0])); - memset(g_label_refs, 0, pi * sizeof(g_label_refs[0])); - pi = 0; - } - g_eqcnt = 0; + pending_endp = 1; continue; } p = strchr(words[0], ':'); if (p != NULL) { - len = p - words[0]; - if (len > sizeof(g_labels[0]) - 1) - aerr("label too long: %d\n", len); - if (g_labels[pi][0] != 0) - aerr("dupe label?\n"); - memcpy(g_labels[pi], words[0], len); - g_labels[pi][len] = 0; + set_label(pi, words[0]); continue; } @@ -2329,7 +3334,7 @@ int main(int argc, char *argv[]) continue; } - if (IS(words[1], "=")) { + if (wordc > 1 && IS(words[1], "=")) { if (wordc != 5) aerr("unhandled equ, wc=%d\n", wordc); if (g_eqcnt >= eq_alloc) { @@ -2368,7 +3373,7 @@ int main(int argc, char *argv[]) fclose(fout); fclose(fasm); - fclose(fhdr); + fclose(g_fhdr); return 0; }