#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__)
struct parsed_opr {
enum opr_type type;
enum opr_lenmod lmod;
+ unsigned int is_ptr:1; // pointer in C
int reg;
unsigned int val;
char name[256];
int offset;
};
-#define MAX_OPS 1024
+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 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;
#define ferr(op_, fmt, ...) do { \
printf("error:%s:#%ld: '%s': " fmt, g_func, (op_) - ops, \
dump_op(op_), ##__VA_ARGS__); \
*d = 0;
// skip 'ds:' prefix
- if (!strncmp(s, "ds:", 3))
+ if (IS_START(s, "ds:"))
s += 3;
s = next_idt(w, sizeof(w), s);
static const char *parse_stack_el(const char *name)
{
- const char *p;
+ const char *p, *s;
+ char *endp = NULL;
char buf[32];
+ long val;
int len;
- if (!strncmp(name, "ebp+", 4)
+ if (IS_START(name, "ebp+")
&& !('0' <= name[4] && name[4] <= '9'))
{
return name + 4;
}
- if (strncmp(name, "esp+", 4) != 0)
+ if (!IS_START(name, "esp+"))
return NULL;
p = strchr(name + 4, '+');
if (p) {
- // must be a number after esp+
- if (!('0' <= name[4] && name[4] <= '9'))
+ // 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;
- len = p - (name + 4);
+ }
+ if (s[0] == '0' && s[1] == 'x')
+ s += 2;
+ len = p - s;
if (len < sizeof(buf) - 1) {
- strncpy(buf, name + 4, len);
+ strncpy(buf, s, len);
buf[len] = 0;
- parse_number(buf);
+ val = strtol(buf, &endp, 16);
+ if (val == 0 || *endp != 0) {
+ aerr("%s num parse fail for '%s'\n", __func__, buf);
+ return NULL;
+ }
}
p++;
}
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 void setup_reg_opr(struct parsed_opr *opr, int reg, enum opr_lenmod lmod,
int *regmask)
{
*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;
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 - w != 1)
+ 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_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;
if (opr->lmod == OPLM_UNSPEC && parse_stack_el(opr->name)) {
// might be an equ
struct parsed_equ *eq =
- equ_find(NULL, parse_stack_el(opr->name));
+ equ_find(NULL, parse_stack_el(opr->name), &i);
if (eq)
opr->lmod = eq->lmod;
}
// 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);
+ }
+
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;
}
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)
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 *name,
- 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 = "";
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);
snprintf(g_comment, sizeof(g_comment), "%s", bp_arg);
- eq = equ_find(po, bp_arg);
+ eq = equ_find(po, bp_arg, &offset);
if (eq == NULL)
ferr(po, "detected but missing eq\n");
+ offset += eq->offset;
+
if (!strncmp(name, "ebp", 3))
stack_ra = 4;
- if (stack_ra <= eq->offset && eq->offset < stack_ra + 4)
- ferr(po, "reference to ra? %d %d\n", eq->offset, stack_ra);
+ if (stack_ra <= offset && offset < stack_ra + 4)
+ ferr(po, "reference to ra? %d %d\n", offset, stack_ra);
- if (eq->offset > stack_ra) {
- arg_i = (eq->offset - stack_ra - 4) / 4;
+ 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);
for (i = arg_s = 0; i < g_func_pp.argc; i++) {
if (g_func_pp.arg[i].reg != NULL)
snprintf(buf, buf_size, "%sa%d", is_src ? "(u32)" : "", i + 1);
}
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)&";
case OPT_REGMEM:
if (parse_stack_el(popr->name)) {
- bg_frame_access(po, popr->lmod, buf, buf_size,
+ stack_frame_access(po, popr->lmod, buf, buf_size,
popr->name, 1, is_lea);
break;
}
case OPT_REGMEM:
if (parse_stack_el(popr->name)) {
- bg_frame_access(po, popr->lmod, buf, buf_size,
+ stack_frame_access(po, popr->lmod, buf, buf_size,
popr->name, 0, 0);
break;
}
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) {
return -1;
}
+// scan for positive, constant esp adjust
+static int scan_for_esp_adjust(int i, int opcnt, int *adj)
+{
+ for (; i < opcnt; i++) {
+ if (ops[i].op == OP_ADD && ops[i].operand[0].reg == xSP) {
+ if (ops[i].operand[1].type != OPT_CONST)
+ ferr(&ops[i], "non-const esp adjust?\n");
+ *adj = ops[i].operand[1].val;
+ if (*adj & 3)
+ ferr(&ops[i], "unaligned esp adjust: %x\n", *adj);
+ return i;
+ }
+
+ if ((ops[i].flags & (OPF_JMP|OPF_TAIL))
+ || ops[i].op == OP_PUSH || ops[i].op == OP_POP)
+ return -1;
+ if (g_labels[i][0] != 0)
+ return -1;
+ }
+
+ return -1;
+}
+
static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
{
struct parsed_op *po, *delayed_flag_op = NULL, *tmp_op;
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)
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")
ops[1].flags |= OPF_RMD;
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;
}
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++;
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"))
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
// pass3:
// - process calls
- for (i = 0; i < opcnt; i++) {
+ for (i = 0; i < opcnt; i++)
+ {
po = &ops[i];
if (po->flags & OPF_RMD)
continue;
if (po->op == OP_CALL)
{
- pp = malloc(sizeof(*pp));
+ pp = calloc(1, sizeof(*pp));
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);
+ 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 = "int";
+ pp->argc = pp->argc_stack = j;
+ for (arg = 0; arg < pp->argc; arg++)
+ pp->arg[arg].type = "int";
+ }
+ else {
+ ret = proto_parse(fhdr, tmpname, pp);
+ if (ret)
+ ferr(po, "proto_parse failed for call '%s'\n", tmpname);
+ }
+
+ ret = scan_for_esp_adjust(i + 1, opcnt, &j);
+ if (ret >= 0) {
+ if (pp->argc_stack != j / 4)
+ ferr(po, "stack tracking failed: %x %x\n",
+ pp->argc_stack, j);
+ ops[ret].flags |= OPF_RMD;
+ }
+
+ // 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);
+ }
+ }
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) {
+ 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] == 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;
+ }
+ j--;
+
+ if (ops[j].op == OP_CALL)
+ {
pp_tmp = ops[j].datap;
if (pp_tmp == NULL)
ferr(po, "arg collect hit unparsed call\n");
{
break;
}
-
- if (ops[j].op == OP_PUSH) {
+ 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;
}
if (pp->arg[arg].reg == NULL)
break;
}
-
- 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;
- }
}
if (arg < pp->argc)
ferr(po, "arg collect failed for '%s'\n", tmpname);
// - find POPs for PUSHes, rm both
// - scan for all used registers
// - find flag set ops for their users
+ // - declare indirect functions
for (i = 0; i < opcnt; i++) {
po = &ops[i];
if (po->flags & OPF_RMD)
{
need_mul_var = 1;
}
+ else if (po->op == OP_CALL && po->operand[0].type != OPT_LABEL) {
+ pp = po->datap;
+ my_assert_not(pp, NULL);
+ 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");
+ }
}
// 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++) {
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;
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;
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)
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, ", ");
int main(int argc, char *argv[])
{
- FILE *fout, *fasm, *fhdr, *frlist;
+ FILE *fout, *fasm, *frlist;
char line[256];
char words[16][256];
+ int ida_func_attr = 0;
int in_func = 0;
int skip_func = 0;
int skip_warned = 0;
int arg_out;
int arg = 1;
int pi = 0;
- int len;
+ int i, len;
char *p;
int wordc;
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]));
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] != 'A' || strncmp(p, "; Attributes:", 13) != 0)
+ continue;
+
+ // parse IDA's attribute-list comment
+ 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]))) {
+ 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));
}
}
+ // 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");
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 ((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]);
words[0], g_func);
if (in_func && !skip_func)
- gen_func(fout, fhdr, g_func, pi);
+ gen_func(fout, g_fhdr, g_func, pi);
in_func = 0;
skip_warned = 0;
pi = 0;
}
g_eqcnt = 0;
+ ida_func_attr = 0;
continue;
}
fclose(fout);
fclose(fasm);
- fclose(fhdr);
+ fclose(g_fhdr);
return 0;
}
notaz.gp2x.de / ia32rtools.git / blobdiff