const char *asmfn;
static int asmln;
+#define anote(fmt, ...) \
+ printf("%s:%d: note: " fmt, asmfn, asmln, ##__VA_ARGS__)
#define awarn(fmt, ...) \
- printf("warning:%s:%d: " fmt, asmfn, asmln, ##__VA_ARGS__)
+ printf("%s:%d: warning: " fmt, asmfn, asmln, ##__VA_ARGS__)
#define aerr(fmt, ...) do { \
- printf("error:%s:%d: " fmt, asmfn, asmln, ##__VA_ARGS__); \
+ printf("%s:%d: error: " fmt, asmfn, asmln, ##__VA_ARGS__); \
exit(1); \
} while (0)
enum op_flags {
- OPF_RMD = (1 << 0), /* removed or optimized out */
- OPF_DATA = (1 << 1), /* data processing - writes to dst opr */
- OPF_FLAGS = (1 << 2), /* sets flags */
- OPF_JMP = (1 << 3), /* branches, ret and call */
- OPF_CC = (1 << 4), /* uses flags */
+ OPF_RMD = (1 << 0), /* removed or optimized out */
+ OPF_DATA = (1 << 1), /* data processing - writes to dst opr */
+ OPF_FLAGS = (1 << 2), /* sets flags */
+ OPF_JMP = (1 << 3), /* branches, ret and call */
+ OPF_CC = (1 << 4), /* uses flags */
+ OPF_TAIL = (1 << 5), /* ret or tail call */
};
enum op_op {
OP_MOVZX,
OP_MOVSX,
OP_NOT,
+ OP_CDQ,
OP_RET,
OP_ADD,
OP_SUB,
OP_SBB,
OP_INC,
OP_DEC,
+ OP_NEG,
OP_MUL,
OP_IMUL,
+ OP_DIV,
+ OP_IDIV,
OP_TEST,
OP_CMP,
OP_CALL,
};
enum opr_type {
- OPT_UNSPEC,
- OPT_REG,
- OPT_REGMEM,
- OPT_LABEL,
+ OPT_UNSPEC,
+ OPT_REG,
+ OPT_REGMEM,
+ OPT_LABEL,
OPT_OFFSET,
- OPT_CONST,
+ OPT_CONST,
};
enum opr_lenmod {
int operand_cnt;
int regmask_src; // all referensed regs
int regmask_dst;
- int pfomask; // parsed_flag_op that can't be delayed
+ 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
void *datap;
};
// datap:
-// OP_PUSH - arg number if arg is altered before call
// OP_CALL - ptr to parsed_proto
// (OPF_CC) - point to corresponding (OPF_FLAGS)
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 parsed_proto g_func_pp;
static char g_func[256];
static char g_comment[256];
return -1;
}
-static int parse_reg(int *reg_out, enum opr_lenmod *reg_lmod,
- int *regmask, char *s)
+static void printf_number(char *buf, size_t buf_size, long number)
{
- char w[16];
- int reg = xUNSPEC;
- int c = 0;
+ // output in C-friendly form
+ snprintf(buf, buf_size, number < 10 ? "%lu" : "0x%02lx", number);
+}
- while (*s != 0) {
- while (my_isblank(*s) || my_issep(*s))
- s++;
- s = next_idt(w, sizeof(w), s);
- if (w[0] == 0)
- break;
- c++;
- reg = char_array_i(regs_r32, ARRAY_SIZE(regs_r32), w);
- if (reg >= 0) {
- *reg_lmod = OPLM_DWORD;
- *regmask |= 1 << reg;
- continue;
- }
- reg = char_array_i(regs_r16, ARRAY_SIZE(regs_r16), w);
- if (reg >= 0) {
- *reg_lmod = OPLM_WORD;
- *regmask |= 1 << reg;
- continue;
- }
- reg = char_array_i(regs_r8h, ARRAY_SIZE(regs_r8h), w);
- if (reg >= 0) {
- *reg_lmod = OPLM_BYTE;
- *regmask |= 1 << reg;
- continue;
- }
- reg = char_array_i(regs_r8l, ARRAY_SIZE(regs_r8l), w);
- if (reg >= 0) {
- *reg_lmod = OPLM_BYTE;
- *regmask |= 1 << reg;
- continue;
- }
+static int parse_reg(enum opr_lenmod *reg_lmod, const char *s)
+{
+ int reg;
- return -1;
+ reg = char_array_i(regs_r32, ARRAY_SIZE(regs_r32), s);
+ if (reg >= 0) {
+ *reg_lmod = OPLM_DWORD;
+ return reg;
}
-
- if (c == 1) {
- *reg_out = reg;
- return 0;
+ reg = char_array_i(regs_r16, ARRAY_SIZE(regs_r16), s);
+ if (reg >= 0) {
+ *reg_lmod = OPLM_WORD;
+ return reg;
+ }
+ reg = char_array_i(regs_r8h, ARRAY_SIZE(regs_r8h), s);
+ if (reg >= 0) {
+ *reg_lmod = OPLM_BYTE;
+ return reg;
+ }
+ reg = char_array_i(regs_r8l, ARRAY_SIZE(regs_r8l), s);
+ if (reg >= 0) {
+ *reg_lmod = OPLM_BYTE;
+ return reg;
}
return -1;
return ret;
}
+static int parse_indmode(char *name, int *regmask, int need_c_cvt)
+{
+ enum opr_lenmod lmod;
+ char cvtbuf[256];
+ char *d = cvtbuf;
+ char *s = name;
+ char w[64];
+ long number;
+ int reg;
+ int c = 0;
+
+ *d = 0;
+
+ while (*s != 0) {
+ d += strlen(d);
+ while (my_isblank(*s))
+ s++;
+ for (; my_issep(*s); d++, s++)
+ *d = *s;
+ while (my_isblank(*s))
+ s++;
+ *d = 0;
+
+ // skip 'ds:' prefix
+ if (!strncmp(s, "ds:", 3))
+ s += 3;
+
+ s = next_idt(w, sizeof(w), s);
+ if (w[0] == 0)
+ break;
+ c++;
+
+ reg = parse_reg(&lmod, w);
+ if (reg >= 0) {
+ *regmask |= 1 << reg;
+ goto pass;
+ }
+
+ if ('0' <= w[0] && w[0] <= '9') {
+ number = parse_number(w);
+ printf_number(d, sizeof(cvtbuf) - (d - cvtbuf), number);
+ continue;
+ }
+
+ // probably some label/identifier - pass
+
+pass:
+ snprintf(d, sizeof(cvtbuf) - (d - cvtbuf), "%s", w);
+ }
+
+ if (need_c_cvt)
+ strcpy(name, cvtbuf);
+
+ return c;
+}
+
static int guess_lmod_from_name(struct parsed_opr *opr)
{
if (!strncmp(opr->name, "dword_", 6)) {
return 0;
}
+static void setup_reg_opr(struct parsed_opr *opr, int reg, enum opr_lenmod lmod,
+ int *regmask)
+{
+ opr->type = OPT_REG;
+ opr->reg = reg;
+ opr->lmod = lmod;
+ *regmask |= 1 << reg;
+}
+
+static struct parsed_equ *equ_find(struct parsed_op *po, const char *name);
+
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)
{
enum opr_lenmod tmplmod;
- int tmpreg;
int ret, len;
+ long number;
int i;
if (w >= wordc)
ret = sscanf(words[w], "[%[^]]]", opr->name);
if (ret != 1)
aerr("[] parse failure\n");
- // only need the regmask
- parse_reg(&tmpreg, &tmplmod, regmask_indirect, opr->name);
+
+ parse_indmode(opr->name, regmask_indirect, 1);
+ if (opr->lmod == OPLM_UNSPEC && !strncmp(opr->name, "ebp+", 4)) {
+ // might be an equ
+ struct parsed_equ *eq = equ_find(NULL, opr->name + 4);
+ if (eq)
+ opr->lmod = eq->lmod;
+ }
return wordc;
}
else if (strchr(words[w], '[')) {
opr->type = OPT_REGMEM;
if (opr->lmod == OPLM_UNSPEC)
guess_lmod_from_name(opr);
- parse_reg(&tmpreg, &tmplmod, regmask_indirect,
- strchr(words[w], '['));
+ parse_indmode(strchr(words[w], '['), regmask_indirect, 0);
return wordc;
}
else if (('0' <= words[w][0] && words[w][0] <= '9')
|| words[w][0] == '-')
{
+ number = parse_number(words[w]);
opr->type = OPT_CONST;
- opr->val = (unsigned int)parse_number(words[w]);
+ opr->val = number;
+ printf_number(opr->name, sizeof(opr->name), number);
return wordc;
}
- ret = parse_reg(&opr->reg, &tmplmod, regmask, opr->name);
- if (ret == 0) {
- opr->type = OPT_REG;
- opr->lmod = tmplmod;
+ ret = parse_reg(&tmplmod, opr->name);
+ if (ret >= 0) {
+ setup_reg_opr(opr, ret, tmplmod, regmask);
return wordc;
}
{ "movzx",OP_MOVZX, 2, 2, OPF_DATA },
{ "movsx",OP_MOVSX, 2, 2, OPF_DATA },
{ "not", OP_NOT, 1, 1, OPF_DATA },
+ { "cdq", OP_CDQ, 0, 0, OPF_DATA },
{ "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 },
{ "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 },
-// { "adc", OP_ADC, 2, 2, OPF_DATA|OPF_FLAGS|OPF_CC },
+ { "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 },
{ "dec", OP_DEC, 1, 1, OPF_DATA|OPF_FLAGS },
-// { "mul", OP_MUL, 1, 1, OPF_DATA|OPF_FLAGS },
+ { "neg", OP_NEG, 1, 1, OPF_DATA|OPF_FLAGS },
+ { "mul", OP_MUL, 1, 1, OPF_DATA|OPF_FLAGS },
{ "imul", OP_IMUL, 1, 3, OPF_DATA|OPF_FLAGS },
+ { "div", OP_DIV, 1, 1, OPF_DATA|OPF_FLAGS },
+ { "idiv", OP_IDIV, 1, 1, OPF_DATA|OPF_FLAGS },
{ "test", OP_TEST, 2, 2, OPF_FLAGS },
{ "cmp", OP_CMP, 2, 2, OPF_FLAGS },
- { "retn", OP_RET, 0, 1, OPF_JMP },
- { "call", OP_CALL, 1, 1, OPF_JMP },
+ { "retn", OP_RET, 0, 1, OPF_JMP|OPF_TAIL },
+ { "call", OP_CALL, 1, 1, OPF_JMP|OPF_FLAGS },
{ "jmp", OP_JMP, 1, 1, OPF_JMP },
{ "jo", OP_JO, 1, 1, OPF_JMP|OPF_CC }, // 70 OF=1
{ "jno", OP_JNO, 1, 1, OPF_JMP|OPF_CC }, // 71 OF=0
{ "jng", OP_JLE, 1, 1, OPF_JMP|OPF_CC }, // 7e
{ "jg", OP_JG, 1, 1, OPF_JMP|OPF_CC }, // 7f ZF=0 && SF=OF
{ "jnle", OP_JG, 1, 1, OPF_JMP|OPF_CC }, // 7f
+ { "seto", OP_JO, 1, 1, OPF_DATA|OPF_CC },
+ { "setno", OP_JNO, 1, 1, OPF_DATA|OPF_CC },
+ { "setc", OP_JC, 1, 1, OPF_DATA|OPF_CC },
+ { "setb", OP_JC, 1, 1, OPF_DATA|OPF_CC },
+ { "setnc", OP_JNC, 1, 1, OPF_DATA|OPF_CC },
+ { "setae", OP_JNC, 1, 1, OPF_DATA|OPF_CC },
+ { "setz", OP_JZ, 1, 1, OPF_DATA|OPF_CC },
+ { "sete", OP_JZ, 1, 1, OPF_DATA|OPF_CC },
+ { "setnz", OP_JNZ, 1, 1, OPF_DATA|OPF_CC },
+ { "setne", OP_JNZ, 1, 1, OPF_DATA|OPF_CC },
+ { "setbe", OP_JBE, 1, 1, OPF_DATA|OPF_CC },
+ { "setna", OP_JBE, 1, 1, OPF_DATA|OPF_CC },
+ { "seta", OP_JA, 1, 1, OPF_DATA|OPF_CC },
+ { "setnbe", OP_JA, 1, 1, OPF_DATA|OPF_CC },
+ { "sets", OP_JS, 1, 1, OPF_DATA|OPF_CC },
+ { "setns", OP_JNS, 1, 1, OPF_DATA|OPF_CC },
+ { "setp", OP_JP, 1, 1, OPF_DATA|OPF_CC },
+ { "setpe", OP_JP, 1, 1, OPF_DATA|OPF_CC },
+ { "setnp", OP_JNP, 1, 1, OPF_DATA|OPF_CC },
+ { "setpo", OP_JNP, 1, 1, OPF_DATA|OPF_CC },
+ { "setl", OP_JL, 1, 1, OPF_DATA|OPF_CC },
+ { "setnge", OP_JL, 1, 1, OPF_DATA|OPF_CC },
+ { "setge", OP_JGE, 1, 1, OPF_DATA|OPF_CC },
+ { "setnl", OP_JGE, 1, 1, OPF_DATA|OPF_CC },
+ { "setle", OP_JLE, 1, 1, OPF_DATA|OPF_CC },
+ { "setng", OP_JLE, 1, 1, OPF_DATA|OPF_CC },
+ { "setg", OP_JG, 1, 1, OPF_DATA|OPF_CC },
+ { "setnle", OP_JG, 1, 1, OPF_DATA|OPF_CC },
};
static void parse_op(struct parsed_op *op, char words[16][256], int wordc)
words, wordc, w, op->flags);
}
- op->operand_cnt = opr;
-
if (w < wordc)
aerr("parse_op %s incomplete: %d/%d\n",
words[0], w, wordc);
+
+ // special cases
+ op->operand_cnt = opr;
+ if (!strncmp(op_table[i].name, "set", 3))
+ op->operand[0].lmod = OPLM_BYTE;
+
+ // ops with implicit argumets
+ switch (op->op) {
+ case OP_CDQ:
+ op->operand_cnt = 2;
+ setup_reg_opr(&op->operand[0], xDX, OPLM_DWORD, &op->regmask_dst);
+ setup_reg_opr(&op->operand[1], xAX, OPLM_DWORD, &op->regmask_src);
+ break;
+
+ case OP_IMUL:
+ if (op->operand_cnt != 1)
+ break;
+ // fallthrough
+ case OP_MUL:
+ // singleop mul
+ op->regmask_dst = (1 << xDX) | (1 << xAX);
+ op->regmask_src |= (1 << xAX);
+ if (op->operand[0].lmod == OPLM_UNSPEC)
+ op->operand[0].lmod = OPLM_DWORD;
+ break;
+
+ case OP_DIV:
+ case OP_IDIV:
+ // we could set up operands for edx:eax, but there is no real need to
+ // (see is_opr_modified())
+ regmask = (1 << xDX) | (1 << xAX);
+ op->regmask_dst = regmask;
+ op->regmask_src |= regmask;
+ if (op->operand[0].lmod == OPLM_UNSPEC)
+ op->operand[0].lmod = OPLM_DWORD;
+ break;
+
+ case OP_SHL:
+ case OP_SHR:
+ case OP_SAR:
+ if (op->operand[1].lmod == OPLM_UNSPEC)
+ op->operand[1].lmod = OPLM_BYTE;
+ break;
+
+ default:
+ break;
+ }
}
static const char *op_name(enum op_op op)
for (i = 0; i < g_eqcnt; i++)
if (IS(g_eqs[i].name, name))
break;
- if (i >= g_eqcnt)
- ferr(po, "unresolved equ name: '%s'\n", name);
+ if (i >= g_eqcnt) {
+ if (po != NULL)
+ ferr(po, "unresolved equ name: '%s'\n", name);
+ return NULL;
+ }
return &g_eqs[i];
}
snprintf(buf, buf_size, "(u16)%s", opr_reg_p(po, popr));
break;
case OPLM_BYTE:
- snprintf(buf, buf_size, "(u8)%s", opr_reg_p(po, popr));
+ if (popr->name[1] == 'h') // XXX..
+ snprintf(buf, buf_size, "(u8)(%s >> 8)", opr_reg_p(po, popr));
+ else
+ snprintf(buf, buf_size, "(u8)%s", opr_reg_p(po, popr));
break;
default:
ferr(po, "invalid src lmod: %d\n", popr->lmod);
if (is_lea)
snprintf(buf, buf_size, "(u32)&%s", popr->name);
else
- snprintf(buf, buf_size, "%s", popr->name);
+ snprintf(buf, buf_size, "(u32)%s", popr->name);
break;
case OPT_OFFSET:
if (is_lea)
ferr(po, "lea from const?\n");
- snprintf(buf, buf_size, popr->val < 10 ? "%u" : "0x%02x", popr->val);
+ printf_number(buf, buf_size, popr->val);
break;
default:
break;
case OPLM_BYTE:
// ugh..
- snprintf(buf, buf_size, "LOBYTE(%s)", opr_reg_p(po, popr));
+ if (popr->name[1] == 'h') // XXX..
+ snprintf(buf, buf_size, "BYTE1(%s)", opr_reg_p(po, popr));
+ else
+ snprintf(buf, buf_size, "LOBYTE(%s)", opr_reg_p(po, popr));
break;
default:
ferr(po, "invalid dst lmod: %d\n", popr->lmod);
}
}
+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 enum parsed_flag_op split_cond(struct parsed_op *po,
- enum op_op op, int *is_neg)
+ enum op_op op, int *is_inv)
{
- *is_neg = 0;
+ *is_inv = 0;
switch (op) {
case OP_JO:
return PFO_LE;
case OP_JNO:
- *is_neg = 1;
+ *is_inv = 1;
return PFO_O;
case OP_JNC:
- *is_neg = 1;
+ *is_inv = 1;
return PFO_C;
case OP_JNZ:
- *is_neg = 1;
+ *is_inv = 1;
return PFO_Z;
case OP_JA:
- *is_neg = 1;
+ *is_inv = 1;
return PFO_BE;
case OP_JNS:
- *is_neg = 1;
+ *is_inv = 1;
return PFO_S;
case OP_JNP:
- *is_neg = 1;
+ *is_inv = 1;
return PFO_P;
case OP_JGE:
- *is_neg = 1;
+ *is_inv = 1;
return PFO_L;
case OP_JG:
- *is_neg = 1;
+ *is_inv = 1;
return PFO_LE;
case OP_ADC:
}
static void out_test_for_cc(char *buf, size_t buf_size,
- struct parsed_op *po, enum parsed_flag_op pfo, int is_neg,
+ struct parsed_op *po, enum parsed_flag_op pfo, int is_inv,
enum opr_lenmod lmod, const char *expr)
{
const char *cast, *scast;
switch (pfo) {
case PFO_Z:
+ case PFO_BE: // CF=1||ZF=1; CF=0
snprintf(buf, buf_size, "(%s%s %s 0)",
- cast, expr, is_neg ? "!=" : "==");
+ cast, expr, is_inv ? "!=" : "==");
break;
- case PFO_LE: // ZF=1||SF!=OF; OF=0 after test
+ case PFO_S:
+ case PFO_L: // SF!=OF; OF=0
snprintf(buf, buf_size, "(%s%s %s 0)",
- scast, expr, is_neg ? ">" : "<=");
+ scast, expr, is_inv ? ">=" : "<");
+ break;
+
+ case PFO_LE: // ZF=1||SF!=OF; OF=0
+ snprintf(buf, buf_size, "(%s%s %s 0)",
+ scast, expr, is_inv ? ">" : "<=");
break;
default:
}
static void out_cmp_for_cc(char *buf, size_t buf_size,
- struct parsed_op *po, enum parsed_flag_op pfo, int is_neg,
+ struct parsed_op *po, enum parsed_flag_op pfo, int is_inv,
enum opr_lenmod lmod, const char *expr1, const char *expr2)
{
const char *cast, *scast;
scast = lmod_cast_s(po, lmod);
switch (pfo) {
+ case PFO_C:
+ // note: must be unsigned compare
+ snprintf(buf, buf_size, "(%s%s %s %s%s)",
+ cast, expr1, is_inv ? ">=" : "<", cast, expr2);
+ break;
+
case PFO_Z:
snprintf(buf, buf_size, "(%s%s %s %s%s)",
- cast, expr1, is_neg ? "!=" : "==", cast, expr2);
+ cast, expr1, is_inv ? "!=" : "==", cast, expr2);
break;
- case PFO_C:
+ case PFO_BE: // !a
// note: must be unsigned compare
snprintf(buf, buf_size, "(%s%s %s %s%s)",
- cast, expr1, is_neg ? ">=" : "<", cast, expr2);
+ cast, expr1, is_inv ? ">" : "<=", cast, expr2);
+ break;
+
+ // note: must be signed compare
+ case PFO_S:
+ snprintf(buf, buf_size, "(%s(%s - %s) %s 0)",
+ scast, expr1, expr2, is_inv ? ">=" : "<");
+ break;
+
+ case PFO_L: // !ge
+ snprintf(buf, buf_size, "(%s%s %s %s%s)",
+ scast, expr1, is_inv ? ">=" : "<", scast, expr2);
break;
- case PFO_L:
- // note: must be signed compare
+ case PFO_LE:
snprintf(buf, buf_size, "(%s%s %s %s%s)",
- scast, expr1, is_neg ? ">=" : "<", scast, expr2);
+ scast, expr1, is_inv ? ">" : "<=", scast, expr2);
break;
default:
}
static void out_cmp_test(char *buf, size_t buf_size,
- struct parsed_op *po, enum parsed_flag_op pfo, int is_neg)
+ struct parsed_op *po, enum parsed_flag_op pfo, int is_inv)
{
char buf1[256], buf2[256], buf3[256];
out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], 0);
snprintf(buf3, sizeof(buf3), "(%s & %s)", buf1, buf2);
}
- out_test_for_cc(buf, buf_size, po, pfo, is_neg,
+ out_test_for_cc(buf, buf_size, po, pfo, is_inv,
po->operand[0].lmod, buf3);
}
else if (po->op == OP_CMP) {
out_src_opr(buf2, sizeof(buf2), po, &po->operand[0], 0);
out_src_opr(buf3, sizeof(buf3), po, &po->operand[1], 0);
- out_cmp_for_cc(buf, buf_size, po, pfo, is_neg,
+ out_cmp_for_cc(buf, buf_size, po, pfo, is_inv,
po->operand[0].lmod, buf2, buf3);
}
else
static void propagate_lmod(struct parsed_op *po, struct parsed_opr *popr1,
struct parsed_opr *popr2)
{
- struct parsed_equ *eq;
-
- if (popr1->lmod == OPLM_UNSPEC && popr2->lmod == OPLM_UNSPEC) {
- // lmod could be specified by equ..
- if (!strncmp(popr1->name, "ebp+", 4)) {
- eq = equ_find(po, popr1->name + 4);
- popr1->lmod = eq->lmod;
- }
- if (!strncmp(popr2->name, "ebp+", 4)) {
- eq = equ_find(po, popr2->name + 4);
- popr2->lmod = eq->lmod;
- }
- }
-
if (popr1->lmod == OPLM_UNSPEC && popr2->lmod == OPLM_UNSPEC)
ferr(po, "missing lmod for both operands\n");
switch (po->op)
{
case OP_ADD:
+ case OP_ADC:
return "+";
case OP_SUB:
+ case OP_SBB:
return "-";
case OP_AND:
return "&";
}
}
-static int scan_for_pop(int i, int opcnt, const char *reg)
+static int scan_for_pop(int i, int opcnt, const char *reg,
+ int magic, int do_patch)
{
+ struct parsed_op *po;
+ int ret = 0;
+
for (; i < opcnt; i++) {
- if (ops[i].flags & OPF_RMD)
+ po = &ops[i];
+ if (po->cc_scratch == magic)
+ break; // already checked
+ po->cc_scratch = magic;
+
+ if (po->flags & OPF_TAIL)
+ return -1; // deadend
+
+ if (po->flags & OPF_RMD)
continue;
- if ((ops[i].flags & OPF_JMP) || g_labels[i][0] != 0)
- return -1;
+ if ((po->flags & OPF_JMP) && po->op != OP_CALL) {
+ if (po->bt_i < 0) {
+ ferr(po, "dead branch\n");
+ return -1;
+ }
- if (ops[i].op == OP_POP && ops[i].operand[0].type == OPT_REG
- && IS(ops[i].operand[0].name, reg))
- return i;
+ if (po->flags & OPF_CC) {
+ ret |= scan_for_pop(po->bt_i, opcnt, reg, magic, do_patch);
+ if (ret < 0)
+ return ret; // dead end
+ }
+ else {
+ i = po->bt_i - 1;
+ }
+ continue;
+ }
+
+ if (po->op == OP_POP && po->operand[0].type == OPT_REG
+ && IS(po->operand[0].name, reg))
+ {
+ if (do_patch)
+ po->flags |= OPF_RMD;
+ return 1;
+ }
}
- return -1;
+ return ret;
}
// scan for pop starting from 'ret' op (all paths)
int j;
for (; i < opcnt; i++) {
- if (ops[i].op != OP_RET)
+ if (!(ops[i].flags & OPF_TAIL))
continue;
for (j = i - 1; j >= 0; j--) {
return found ? 0 : -1;
}
-// is operand opr modified by parsed_op po?
-static int is_opr_modified(struct parsed_opr *opr,
+// is operand 'opr modified' by parsed_op 'po'?
+static int is_opr_modified(const struct parsed_opr *opr,
const struct parsed_op *po)
{
if ((po->flags & OPF_RMD) || !(po->flags & OPF_DATA))
return IS(po->operand[0].name, opr->name);
}
-// scan for provided opr modification in range given
-static int scan_for_mod(struct parsed_opr *opr, int i, int opcnt)
+// is any operand of parsed_op 'po_test' modified by parsed_op 'po'?
+static int is_any_opr_modified(const struct parsed_op *po_test,
+ const struct parsed_op *po)
+{
+ int i;
+
+ if ((po->flags & OPF_RMD) || !(po->flags & OPF_DATA))
+ return 0;
+
+ if (po_test->regmask_src & po->regmask_dst)
+ return 1;
+
+ for (i = 0; i < po_test->operand_cnt; i++)
+ if (IS(po_test->operand[i].name, po->operand[0].name))
+ return 1;
+
+ return 0;
+}
+
+// scan for any po_test operand modification in range given
+static int scan_for_mod(struct parsed_op *po_test, int i, int opcnt)
+{
+ for (; i < opcnt; i++) {
+ if (is_any_opr_modified(po_test, &ops[i]))
+ return i;
+ }
+
+ return -1;
+}
+
+// scan for po_test operand[0] modification in range given
+static int scan_for_mod_opr0(struct parsed_op *po_test,
+ int i, int opcnt)
{
for (; i < opcnt; i++) {
- if (is_opr_modified(opr, &ops[i]))
+ if (is_opr_modified(&po_test->operand[0], &ops[i]))
return i;
}
return -1;
}
-static int scan_for_flag_set(int i, int opcnt)
+static int scan_for_flag_set(int i)
{
for (; i >= 0; i--) {
if (ops[i].flags & OPF_FLAGS)
return -1;
}
+// scan back for cdq, if anything modifies edx, fail
+static int scan_for_cdq_edx(int i)
+{
+ for (; i >= 0; i--) {
+ if (ops[i].op == OP_CDQ)
+ return i;
+
+ if (ops[i].regmask_dst & (1 << xDX))
+ 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;
struct parsed_opr *last_arith_dst = NULL;
char buf1[256], buf2[256], buf3[256];
- struct parsed_proto *pp;
+ struct parsed_proto *pp, *pp_tmp;
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_arg = 0;
int regmask = 0;
- int special_sbb = 0;
+ int pfomask = 0;
int no_output;
int dummy;
int arg;
&& IS(opr_name(&ops[1], 0), "ebp")
&& IS(opr_name(&ops[1], 1), "esp"))
{
+ int ecx_push = 0;
+
g_bp_frame = 1;
ops[0].flags |= OPF_RMD;
ops[1].flags |= OPF_RMD;
g_bp_stack = 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;
+ ops[i].flags |= OPF_RMD;
+ ecx_push++;
+ i++;
+ }
+ }
i = 2;
do {
ferr(&ops[i - 2], "esp restore expected\n");
}
ops[i - 2].flags |= OPF_RMD;
+
+ if (ecx_push && ops[i - 3].op == OP_POP
+ && IS(opr_name(&ops[i - 3], 0), "ecx"))
+ {
+ ferr(&ops[i - 3], "unexpected ecx pop\n");
+ }
}
+
i++;
} while (i < opcnt);
}
// pass2:
+ // - resolve all branches
+ for (i = 0; i < opcnt; i++) {
+ po = &ops[i];
+ po->bt_i = -1;
+
+ 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;
+ break;
+ }
+ }
+
+ if (po->bt_i == -1) {
+ // assume tail call
+ po->op = OP_CALL;
+ po->flags |= OPF_TAIL;
+ }
+ }
+
+ // pass3:
// - find POPs for PUSHes, rm both
// - scan for all used registers
// - find flag set ops for their users
if (po->operand[0].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);
- if (ret >= 0) {
+ ret = scan_for_pop(i + 1, opcnt, po->operand[0].name, i + 1, 0);
+ if (ret == 1) {
po->flags |= OPF_RMD;
- ops[ret].flags |= OPF_RMD;
+ scan_for_pop(i + 1, opcnt, po->operand[0].name, i + 2, 1);
continue;
}
ret = scan_for_pop_ret(i + 1, opcnt, po->operand[0].name, 0);
if (po->flags & OPF_CC)
{
- ret = scan_for_flag_set(i - 1, opcnt);
+ ret = scan_for_flag_set(i - 1);
if (ret < 0)
ferr(po, "unable to trace flag setter\n");
tmp_op = &ops[ret]; // flag setter
- for (j = 0; j < tmp_op->operand_cnt; j++) {
- ret = scan_for_mod(&tmp_op->operand[j], tmp_op - ops + 1, i);
- if (ret >= 0) {
- ret = 1 << split_cond(po, po->op, &dummy);
- tmp_op->pfomask |= ret;
- cmp_result_vars |= ret;
- po->datap = tmp_op;
- }
+ pfo = split_cond(po, po->op, &dummy);
+ pfomask = 0;
+
+ // to get nicer code, we try to delay test and cmp;
+ // if we can't because of operand modification, or if we
+ // have math op, make it calculate flags explicitly
+ if (tmp_op->op == OP_TEST || tmp_op->op == OP_CMP) {
+ if (scan_for_mod(tmp_op, ret + 1, i) >= 0)
+ pfomask = 1 << pfo;
}
+ else {
+ if ((pfo != PFO_Z && pfo != PFO_S && pfo != PFO_P)
+ || scan_for_mod_opr0(tmp_op, ret + 1, i) >= 0)
+ pfomask = 1 << pfo;
+ }
+ if (pfomask) {
+ tmp_op->pfomask |= pfomask;
+ cmp_result_vars |= pfomask;
+ po->datap = tmp_op;
+ }
+
+ if (po->op == OP_ADC || po->op == OP_SBB)
+ cmp_result_vars |= 1 << PFO_C;
}
else if (po->op == OP_CALL)
{
break;
for (j = i - 1; j >= 0 && arg < pp->argc; j--) {
- if (ops[j].flags & OPF_RMD)
- continue;
- if (ops[j].op != OP_PUSH)
- continue;
- if (g_labels[j + 1][0] != 0)
- ferr(po, "arg search interrupted by '%s'\n", g_labels[j + 1]);
-
- pp->arg[arg].datap = &ops[j];
- ret = scan_for_mod(&ops[j].operand[0], j + 1, i);
- if (ret >= 0) {
- // mark this push as one that needs operand saving
- ops[j].datap = (void *)(long)(arg + 1);
- save_arg_vars |= 1 << arg;
+ 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;
}
- else
- ops[j].flags |= OPF_RMD;
- // next arg
- for (arg++; arg < pp->argc; 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);
po->datap = pp;
}
+ else if (po->op == OP_MUL
+ || (po->op == OP_IMUL && po->operand_cnt == 1))
+ {
+ need_mul_var = 1;
+ }
}
// declare stack frame
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);
- // instantiate arg-registers
+ // declare arg-registers
for (i = 0; i < g_func_pp.argc; i++) {
if (g_func_pp.arg[i].reg != NULL) {
reg = char_array_i(regs_r32,
}
}
- // instantiate other regs - special case for eax
+ // declare other regs - special case for eax
if (!((regmask | regmask_arg) & 1) && !IS(g_func_pp.ret_type, "void")) {
fprintf(fout, " u32 eax = 0;\n");
had_decl = 1;
}
}
+ if (need_mul_var) {
+ fprintf(fout, " u64 mul_tmp;\n");
+ had_decl = 1;
+ }
+
if (had_decl)
fprintf(fout, "\n");
if (po->operand_cnt != n_) \
ferr(po, "operand_cnt is %d/%d\n", po->operand_cnt, n_)
- // see is delayed flag stuff is still valid
- if (delayed_flag_op != NULL) {
- if (po->regmask_dst & delayed_flag_op->regmask_src)
- delayed_flag_op = NULL;
- else {
- for (j = 0; j < po->operand_cnt; j++) {
- if (is_opr_modified(&delayed_flag_op->operand[0], po))
- delayed_flag_op = NULL;
- }
- }
- }
-
- if (last_arith_dst != NULL) {
- if (is_opr_modified(last_arith_dst, po))
- last_arith_dst = NULL;
- }
-
// conditional/flag using op?
if (po->flags & OPF_CC)
{
- enum parsed_flag_op pfo;
- int is_neg = 0;
+ int is_delayed = 0;
+ int is_inv = 0;
- pfo = split_cond(po, po->op, &is_neg);
- special_sbb = 0;
- if (po->op == OP_SBB && IS(opr_name(po, 0), opr_name(po, 1)))
- special_sbb = 1;
+ pfo = split_cond(po, po->op, &is_inv);
// we go through all this trouble to avoid using parsed_flag_op,
// which makes generated code much nicer
if (delayed_flag_op != NULL)
{
- out_cmp_test(buf1, sizeof(buf1), delayed_flag_op, pfo, is_neg);
+ out_cmp_test(buf1, sizeof(buf1), delayed_flag_op, pfo, is_inv);
+ is_delayed = 1;
}
else if (last_arith_dst != NULL
&& (pfo == PFO_Z || pfo == PFO_S || pfo == PFO_P))
{
out_src_opr(buf3, sizeof(buf3), po, last_arith_dst, 0);
- out_test_for_cc(buf1, sizeof(buf1), po, pfo, is_neg,
+ out_test_for_cc(buf1, sizeof(buf1), po, pfo, is_inv,
last_arith_dst->lmod, buf3);
+ is_delayed = 1;
}
else if (po->datap != NULL) {
// use preprocessed results
if (!tmp_op || !(tmp_op->pfomask & (1 << pfo)))
ferr(po, "not prepared for pfo %d\n", pfo);
- // note: is_neg was not yet applied
+ // note: is_inv was not yet applied
snprintf(buf1, sizeof(buf1), "(%scond_%s)",
- is_neg ? "!" : "", parsed_flag_op_names[pfo]);
+ is_inv ? "!" : "", parsed_flag_op_names[pfo]);
}
else {
ferr(po, "all methods of finding comparison failed\n");
if (po->flags & OPF_JMP) {
fprintf(fout, " if %s\n", buf1);
}
- else if (special_sbb) {
- out_dst_opr(buf2, sizeof(buf2), po, &po->operand[0]);
- fprintf(fout, " %s = %s * -1;", buf2, buf1);
+ else if (po->op == OP_ADC || po->op == OP_SBB) {
+ if (is_delayed)
+ fprintf(fout, " cond_%s = %s;\n",
+ parsed_flag_op_names[pfo], buf1);
}
- else if (po->flags & OPF_JMP) { // setc
+ else if (po->flags & OPF_DATA) { // SETcc
out_dst_opr(buf2, sizeof(buf2), po, &po->operand[0]);
fprintf(fout, " %s = %s;", buf2, buf1);
}
}
}
+ pfomask = po->pfomask;
+
switch (po->op)
{
case OP_MOV:
case OP_LEA:
assert_operand_cnt(2);
- propagate_lmod(po, &po->operand[0], &po->operand[1]);
+ po->operand[1].lmod = OPLM_DWORD; // always
fprintf(fout, " %s = %s;",
out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]),
out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], 1));
fprintf(fout, " %s = ~%s;", buf1, buf1);
break;
+ case OP_CDQ:
+ assert_operand_cnt(2);
+ fprintf(fout, " %s = (s32)%s >> 31;",
+ out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]),
+ out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], 0));
+ strcpy(g_comment, "cdq");
+ break;
+
// arithmetic w/flags
case OP_ADD:
case OP_SUB:
case OP_AND:
case OP_OR:
- case OP_XOR:
+ propagate_lmod(po, &po->operand[0], &po->operand[1]);
+ // fallthrough
case OP_SHL:
case OP_SHR:
dualop_arith:
assert_operand_cnt(2);
- propagate_lmod(po, &po->operand[0], &po->operand[1]);
fprintf(fout, " %s %s= %s;",
out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]),
op_to_c(po),
delayed_flag_op = NULL;
break;
- case OP_SAR:
+ case OP_XOR:
assert_operand_cnt(2);
propagate_lmod(po, &po->operand[0], &po->operand[1]);
- switch (po->operand[0].lmod) {
- case OPLM_BYTE:
- strcpy(buf3, "(s8)");
+ if (IS(opr_name(po, 0), opr_name(po, 1))) {
+ // special case for XOR
+ fprintf(fout, " %s = 0;",
+ out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]));
+ last_arith_dst = &po->operand[0];
+ delayed_flag_op = NULL;
break;
- case OPLM_WORD:
- strcpy(buf3, "(s16)");
- break;
- case OPLM_DWORD:
- strcpy(buf3, "(s32)");
- break;
- default:
- ferr(po, "invalid dst lmod: %d\n", po->operand[0].lmod);
}
+ 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, buf3, buf1,
- out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], 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:
- if (!special_sbb)
- ferr(po, "TODO\n");
+ assert_operand_cnt(2);
+ propagate_lmod(po, &po->operand[0], &po->operand[1]);
+ fprintf(fout, " %s %s= %s + cond_c;",
+ out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]),
+ op_to_c(po),
+ out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], 0));
+ last_arith_dst = &po->operand[0];
+ delayed_flag_op = NULL;
break;
case OP_INC:
case OP_DEC:
out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]);
strcpy(buf2, po->op == OP_INC ? "++" : "--");
- switch (po->operand[0].lmod) {
- case OPLM_BYTE:
- fprintf(fout, " LOBYTE(%s)%s;", buf1, buf2);
- break;
- case OPLM_WORD:
- fprintf(fout, " LOWORD(%s)%s;", buf1, buf2);
- break;
- case OPLM_DWORD:
- fprintf(fout, " %s%s;", buf1, buf2);
- break;
- default:
- ferr(po, "invalid dst lmod: %d\n", po->operand[0].lmod);
- }
+ fprintf(fout, " %s%s;", buf1, buf2);
last_arith_dst = &po->operand[0];
delayed_flag_op = NULL;
break;
+ case OP_NEG:
+ out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]);
+ out_src_opr(buf2, sizeof(buf2), po, &po->operand[0], 0);
+ fprintf(fout, " %s = -%s%s;", buf1,
+ lmod_cast_s(po, po->operand[0].lmod), buf2);
+ last_arith_dst = &po->operand[0];
+ delayed_flag_op = NULL;
+ if (pfomask & (1 << PFO_C)) {
+ fprintf(fout, "\n cond_c = (%s != 0);", buf1);
+ pfomask &= ~(1 << PFO_C);
+ }
+ break;
+
case OP_IMUL:
if (po->operand_cnt == 2)
goto dualop_arith;
- ferr(po, "TODO imul\n");
- last_arith_dst = &po->operand[0];
+ if (po->operand_cnt == 3)
+ ferr(po, "TODO imul3\n");
+ // fallthrough
+ case OP_MUL:
+ assert_operand_cnt(1);
+ strcpy(buf1, po->op == OP_IMUL ? "(s64)(s32)" : "(u64)");
+ fprintf(fout, " mul_tmp = %seax * %s%s;\n", buf1, buf1,
+ out_src_opr(buf2, sizeof(buf2), po, &po->operand[0], 0));
+ fprintf(fout, " edx = mul_tmp >> 32;\n");
+ fprintf(fout, " eax = mul_tmp;");
+ last_arith_dst = NULL;
+ delayed_flag_op = NULL;
+ break;
+
+ case OP_DIV:
+ case OP_IDIV:
+ assert_operand_cnt(1);
+ if (po->operand[0].lmod != OPLM_DWORD)
+ 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) {
+ out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], 0);
+ strcpy(buf2, lmod_cast(po, po->operand[0].lmod,
+ po->op == OP_IDIV));
+ fprintf(fout, " edx = %seax %% %s%s;\n", buf2, buf2, buf1);
+ fprintf(fout, " eax = %seax / %s%s;", buf2, buf2, buf1);
+ }
+ else
+ ferr(po, "TODO 64bit divident\n");
+ last_arith_dst = NULL;
delayed_flag_op = NULL;
break;
case OP_TEST:
case OP_CMP:
propagate_lmod(po, &po->operand[0], &po->operand[1]);
- if (po->pfomask != 0) {
+ if (pfomask != 0) {
for (j = 0; j < 8; j++) {
- if (po->pfomask & (1 << j)) {
+ if (pfomask & (1 << j)) {
out_cmp_test(buf1, sizeof(buf1), po, j, 0);
fprintf(fout, " cond_%s = %s;",
parsed_flag_op_names[j], buf1);
}
}
+ pfomask = 0;
}
else
no_output = 1;
// note: we reuse OP_Jcc for SETcc, only flags differ
case OP_JO ... OP_JG:
- if (po->flags & OPF_CC)
+ if (po->flags & OPF_JMP)
fprintf(fout, " goto %s;", po->operand[0].name);
- else
- ferr(po, "TODO SETcc\n");
+ // else SETcc - should already be handled
break;
case OP_JMP:
+ assert_operand_cnt(1);
+ if (po->operand[0].type != OPT_LABEL)
+ ferr(po, "unhandled call 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");
fprintf(fout, " ");
if (!IS(pp->ret_type, "void")) {
- fprintf(fout, "eax = ");
+ if (po->flags & OPF_TAIL)
+ fprintf(fout, "return ");
+ else
+ fprintf(fout, "eax = ");
if (strchr(pp->ret_type, '*'))
fprintf(fout, "(u32)");
}
+
fprintf(fout, "%s(", opr_name(po, 0));
for (arg = 0; arg < pp->argc; arg++) {
if (arg > 0)
fprintf(fout, ", ");
+
+ if (strchr(pp->arg[arg].type, '*'))
+ fprintf(fout, "(%s)", pp->arg[arg].type);
+
if (pp->arg[arg].reg != NULL) {
fprintf(fout, "%s", pp->arg[arg].reg);
continue;
tmp_op = pp->arg[arg].datap;
if (tmp_op == NULL)
ferr(po, "parsed_op missing for arg%d\n", arg);
- if (tmp_op->datap) {
- fprintf(fout, "s_a%ld", (long)tmp_op->datap);
+ if (tmp_op->argmask) {
+ fprintf(fout, "s_a%d", arg + 1);
}
else {
fprintf(fout, "%s",
}
}
fprintf(fout, ");");
+
+ if (po->flags & OPF_TAIL) {
+ strcpy(g_comment, "tailcall");
+ if (IS(pp->ret_type, "void"))
+ fprintf(fout, "\n return;");
+ }
+ delayed_flag_op = NULL;
+ last_arith_dst = NULL;
break;
case OP_RET:
break;
case OP_PUSH:
- if (po->datap) {
+ if (po->argmask) {
// special case - saved func arg
- fprintf(fout, " s_a%ld = %s;", (long)po->datap,
- 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));
+ }
+ }
break;
}
ferr(po, "push encountered\n");
}
if (!no_output)
fprintf(fout, "\n");
+
+ if (pfomask != 0)
+ 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) {
+ if (is_any_opr_modified(delayed_flag_op, po))
+ delayed_flag_op = NULL;
+ }
+
+ if (last_arith_dst != NULL && last_arith_dst != &po->operand[0]) {
+ if (is_opr_modified(last_arith_dst, po))
+ last_arith_dst = NULL;
+ }
}
fprintf(fout, "}\n\n");
char line[256];
char words[16][256];
int in_func = 0;
+ int skip_warned = 0;
int eq_alloc;
int pi = 0;
int len;
words[0], g_func);
gen_func(fout, fhdr, g_func, pi);
in_func = 0;
+ skip_warned = 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;
continue;
}
+ if (!in_func) {
+ if (!skip_warned && g_labels[pi][0] != 0) {
+ anote("skipping from '%s'\n", g_labels[pi]);
+ skip_warned = 1;
+ }
+ g_labels[pi][0] = 0;
+ continue;
+ }
+
parse_op(&ops[pi], words, wordc);
pi++;
-
- (void)proto_parse;
}
fclose(fout);
notaz.gp2x.de / ia32rtools.git / blobdiff