X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Ftranslate.c;h=f9ac8a8d2a98372bdee4323b54c292ae495c410f;hb=36595fd27d06b03f1abf320bd511aec325845ed5;hp=8c52603f69532d20f444698087bb35e60e5fe206;hpb=63df67be95c2bf23c14dc83d82cb38f871c4d544;p=ia32rtools.git

diff --git a/tools/translate.c b/tools/translate.c
index 8c52603..f9ac8a8 100644
--- a/tools/translate.c
+++ b/tools/translate.c
@@ -26,6 +26,8 @@ static FILE *g_fhdr;
 	exit(1); \
 } while (0)
 
+#include "masm_tools.h"
+
 enum op_flags {
   OPF_RMD    = (1 << 0), /* removed or optimized out */
   OPF_DATA   = (1 << 1), /* data processing - writes to dst opr */
@@ -37,6 +39,8 @@ enum op_flags {
   OPF_REP    = (1 << 7), /* prefixed by rep */
   OPF_REPZ   = (1 << 8), /* rep is repe/repz */
   OPF_REPNZ  = (1 << 9), /* rep is repne/repnz */
+  OPF_FARG   = (1 << 10), /* push collected as func arg (no reuse) */
+  OPF_EBP_S  = (1 << 11), /* ebp used as scratch, not BP */
 };
 
 enum op_op {
@@ -104,6 +108,7 @@ enum opr_type {
   OPT_CONST,
 };
 
+// must be sorted (larger len must be further in enum)
 enum opr_lenmod {
 	OPLM_UNSPEC,
 	OPLM_BYTE,
@@ -118,6 +123,9 @@ struct parsed_opr {
   enum opr_lenmod lmod;
   unsigned int is_ptr:1;   // pointer in C
   unsigned int is_array:1; // array in C
+  unsigned int type_from_var:1; // .. in header, sometimes wrong
+  unsigned int size_mismatch:1; // type override differs from C
+  unsigned int size_lt:1;  // type override is larger than C
   int reg;
   unsigned int val;
   char name[256];
@@ -131,7 +139,7 @@ struct parsed_op {
   int regmask_src;        // all referensed regs
   int regmask_dst;
   int pfomask;            // flagop: parsed_flag_op that can't be delayed
-  int argmask;            // push: args that are altered before call
+  int argnum;             // push: altered before call arg #
   int cc_scratch;         // scratch storage during analysis
   int bt_i;               // branch target for branches
   struct parsed_data *btj;// branch targets for jumptables
@@ -140,7 +148,7 @@ struct parsed_op {
 
 // datap:
 // OP_CALL - ptr to parsed_proto
-// (OPF_CC) - point to corresponding (OPF_FLAGS)
+// (OPF_CC) - point to one of (OPF_FLAGS) that affects cc op
 
 struct parsed_equ {
   char name[64];
@@ -184,13 +192,14 @@ static struct parsed_equ *g_eqs;
 static int g_eqcnt;
 static char g_labels[MAX_OPS][32];
 static struct label_ref g_label_refs[MAX_OPS];
-static struct parsed_proto g_func_pp;
+static const 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_sp_frame;
+static int g_stack_frame_used;
 static int g_stack_fsz;
 static int g_ida_func_attr;
 #define ferr(op_, fmt, ...) do { \
@@ -199,6 +208,9 @@ static int g_ida_func_attr;
   fcloseall(); \
   exit(1); \
 } while (0)
+#define fnote(op_, fmt, ...) \
+  printf("error:%s:#%zd: '%s': " fmt, g_func, (op_) - ops, \
+    dump_op(op_), ##__VA_ARGS__)
 
 #define MAX_REGS 8
 
@@ -271,36 +283,6 @@ static int parse_reg(enum opr_lenmod *reg_lmod, const char *s)
   return -1;
 }
 
-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;
-
-  if (*p == '-') {
-    neg = 1;
-    p++;
-  }
-  if (len > 1 && *p == '0')
-    p++;
-  if (number[len - 1] == 'h') {
-    ret = strtoul(p, &endp, 16);
-    bad = (*endp != 'h');
-  }
-  else {
-    ret = strtoul(p, &endp, 10);
-    bad = (*endp != 0);
-  }
-  if (bad)
-    aerr("number parsing failed\n");
-  if (neg)
-    ret = -ret;
-  return ret;
-}
-
 static int parse_indmode(char *name, int *regmask, int need_c_cvt)
 {
   enum opr_lenmod lmod;
@@ -457,58 +439,54 @@ 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 int guess_lmod_from_c_type(enum opr_lenmod *lmod,
+  const struct parsed_type *c_type)
 {
-  static const char *ptr_types[] = {
-    "LPCSTR",
-  };
   static const char *dword_types[] = {
-    "int", "_DWORD", "DWORD", "HANDLE", "HWND", "HMODULE",
+    "int", "_DWORD", "UINT_PTR",
+    "DWORD", "HANDLE", "HWND", "HMODULE",
+    "WPARAM", "LPARAM", "UINT",
   };
   static const char *word_types[] = {
-    "__int16", "unsigned __int16",
+    "uint16_t", "int16_t",
+    "unsigned __int16", "__int16",
   };
   static const char *byte_types[] = {
-    "char", "__int8", "unsigned __int8", "BYTE",
+    "uint8_t", "int8_t", "char",
+    "unsigned __int8", "__int8", "BYTE",
+    "_UNKNOWN",
   };
+  const char *n;
   int i;
 
-  if (strchr(c_type, '*')) {
-    opr->lmod = OPLM_DWORD;
-    opr->is_ptr = 1;
+  if (c_type->is_ptr) {
+    *lmod = OPLM_DWORD;
     return 1;
   }
 
-  for (i = 0; i < ARRAY_SIZE(dword_types); i++) {
-    if (IS(c_type, dword_types[i])) {
-      opr->lmod = OPLM_DWORD;
-      return 1;
-    }
-  }
+  n = skip_type_mod(c_type->name);
 
-  for (i = 0; i < ARRAY_SIZE(ptr_types); i++) {
-    if (IS(c_type, ptr_types[i])) {
-      opr->lmod = OPLM_DWORD;
-      opr->is_ptr = 1;
+  for (i = 0; i < ARRAY_SIZE(dword_types); i++) {
+    if (IS(n, dword_types[i])) {
+      *lmod = OPLM_DWORD;
       return 1;
     }
   }
 
   for (i = 0; i < ARRAY_SIZE(word_types); i++) {
-    if (IS(c_type, word_types[i])) {
-      opr->lmod = OPLM_WORD;
+    if (IS(n, word_types[i])) {
+      *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;
+    if (IS(n, byte_types[i])) {
+      *lmod = OPLM_BYTE;
       return 1;
     }
   }
 
-  anote("unhandled C type '%s' for '%s'\n", c_type, opr->name);
   return 0;
 }
 
@@ -541,7 +519,7 @@ 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)
 {
-  struct parsed_proto pp;
+  const struct parsed_proto *pp;
   enum opr_lenmod tmplmod;
   unsigned long number;
   int ret, len;
@@ -672,17 +650,31 @@ 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) {
+  pp = proto_parse(g_fhdr, opr->name, 0);
+  if (pp != NULL) {
+    if (pp->is_fptr || pp->is_func) {
       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;
+    else {
+      tmplmod = OPLM_UNSPEC;
+      if (!guess_lmod_from_c_type(&tmplmod, &pp->type))
+        anote("unhandled C type '%s' for '%s'\n",
+          pp->type.name, opr->name);
+      
+      if (opr->lmod == OPLM_UNSPEC) {
+        opr->lmod = tmplmod;
+        opr->type_from_var = 1;
+      }
+      else if (opr->lmod != tmplmod) {
+        opr->size_mismatch = 1;
+        if (tmplmod < opr->lmod)
+          opr->size_lt = 1;
+      }
+      opr->is_ptr = pp->type.is_ptr;
+    }
+    opr->is_array = pp->type.is_array;
   }
-  proto_release(&pp);
 
   if (opr->lmod == OPLM_UNSPEC)
     guess_lmod_from_name(opr);
@@ -747,8 +739,8 @@ static const struct {
   { "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|OPF_TAIL },
-  { "call", OP_CALL,   1, 1, OPF_JMP|OPF_FLAGS },
+  { "retn", OP_RET,    0, 1, OPF_TAIL },
+  { "call", OP_CALL,   1, 1, OPF_JMP|OPF_DATA|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
@@ -954,6 +946,26 @@ static void parse_op(struct parsed_op *op, char words[16][256], int wordc)
       op->operand[0].lmod = OPLM_DWORD;
     break;
 
+  // alignment
+  case OP_MOV:
+    if (op->operand[0].type == OPT_REG && op->operand[1].type == OPT_REG
+     && op->operand[0].reg == xDI && op->operand[1].reg == xDI)
+    {
+      op->flags |= OPF_RMD;
+    }
+    break;
+
+  case OP_LEA:
+    if (op->operand[0].type == OPT_REG
+     && op->operand[1].type == OPT_REGMEM)
+    {
+      char buf[16];
+      snprintf(buf, sizeof(buf), "%s+0", op->operand[0].name);
+      if (IS(buf, op->operand[1].name))
+        op->flags |= OPF_RMD;
+    }
+    break;
+
   default:
     break;
   }
@@ -1103,6 +1115,48 @@ static const char *opr_reg_p(struct parsed_op *po, struct parsed_opr *popr)
   return regs_r32[popr->reg];
 }
 
+// cast1 is the "final" cast
+static const char *simplify_cast(const char *cast1, const char *cast2)
+{
+  static char buf[256];
+
+  if (cast1[0] == 0)
+    return cast2;
+  if (cast2[0] == 0)
+    return cast1;
+  if (IS(cast1, cast2))
+    return cast1;
+  if (IS(cast1, "(s8)") && IS(cast2, "(u8)"))
+    return cast1;
+  if (IS(cast1, "(s16)") && IS(cast2, "(u16)"))
+    return cast1;
+  if (IS(cast1, "(u8)") && IS_START(cast2, "*(u8 *)"))
+    return cast2;
+  if (IS(cast1, "(u16)") && IS_START(cast2, "*(u16 *)"))
+    return cast2;
+  if (strchr(cast1, '*') && IS_START(cast2, "(u32)"))
+    return cast1;
+
+  snprintf(buf, sizeof(buf), "%s%s", cast1, cast2);
+  return buf;
+}
+
+static const char *simplify_cast_num(const char *cast, unsigned int val)
+{
+  if (IS(cast, "(u8)") && val < 0x100)
+    return "";
+  if (IS(cast, "(s8)") && val < 0x80)
+    return "";
+  if (IS(cast, "(u16)") && val < 0x10000)
+    return "";
+  if (IS(cast, "(s16)") && val < 0x8000)
+    return "";
+  if (IS(cast, "(s32)") && val < 0x80000000)
+    return "";
+
+  return cast;
+}
+
 static struct parsed_equ *equ_find(struct parsed_op *po, const char *name,
   int *extra_offs)
 {
@@ -1140,103 +1194,207 @@ static struct parsed_equ *equ_find(struct parsed_op *po, const char *name,
   return &g_eqs[i];
 }
 
-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)
+static int is_stack_access(struct parsed_op *po,
+  const struct parsed_opr *popr)
 {
-  const char *prefix = "";
-  char ofs_reg[16] = { 0, };
+  return (parse_stack_el(popr->name, NULL)
+    || (g_bp_frame && !(po->flags & OPF_EBP_S)
+        && IS_START(popr->name, "ebp")));
+}
+
+static void parse_stack_access(struct parsed_op *po,
+  const char *name, char *ofs_reg, int *offset_out,
+  int *stack_ra_out, const char **bp_arg_out)
+{
+  const char *bp_arg = "";
+  const char *p = NULL;
   struct parsed_equ *eq;
-  int i, arg_i, arg_s;
-  const char *bp_arg;
+  char *endp = NULL;
   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");
+  ofs_reg[0] = 0;
 
-  offset += eq->offset;
+  if (IS_START(name, "ebp-")
+   || (IS_START(name, "ebp+") && '0' <= name[4] && name[4] <= '9'))
+  {
+    p = name + 4;
+    if (IS_START(p, "0x"))
+      p += 2;
+    offset = strtoul(p, &endp, 16);
+    if (name[3] == '-')
+      offset = -offset;
+    if (*endp != 0)
+      ferr(po, "ebp- parse of '%s' failed\n", name);
+  }
+  else {
+    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;
+  }
 
   if (!strncmp(name, "ebp", 3))
     stack_ra = 4;
 
-  if (stack_ra <= offset && offset < stack_ra + 4)
+  if (ofs_reg[0] == 0 && stack_ra <= offset && offset < stack_ra + 4)
     ferr(po, "reference to ra? %d %d\n", offset, stack_ra);
 
-  if (offset > stack_ra) {
+  *offset_out = offset;
+  *stack_ra_out = stack_ra;
+  if (bp_arg_out)
+    *bp_arg_out = bp_arg;
+}
+
+static void stack_frame_access(struct parsed_op *po,
+  struct parsed_opr *popr, char *buf, size_t buf_size,
+  const char *name, const char *cast, int is_src, int is_lea)
+{
+  enum opr_lenmod tmp_lmod = OPLM_UNSPEC;
+  const char *prefix = "";
+  const char *bp_arg = NULL;
+  char ofs_reg[16] = { 0, };
+  int i, arg_i, arg_s;
+  int unaligned = 0;
+  int stack_ra = 0;
+  int offset = 0;
+  int sf_ofs;
+  int lim;
+
+  if (po->flags & OPF_EBP_S)
+    ferr(po, "stack_frame_access while ebp is scratch\n");
+
+  parse_stack_access(po, name, ofs_reg, &offset, &stack_ra, &bp_arg);
+
+  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 (%s) doesn't map to any arg\n",
-        offset, bp_arg);
+    if (arg_i < 0 || arg_i >= g_func_pp->argc_stack)
+    {
+      if (g_func_pp->is_vararg
+          && arg_i == g_func_pp->argc_stack && is_lea)
+      {
+        // should be va_list
+        if (cast[0] == 0)
+          cast = "(u32)";
+        snprintf(buf, buf_size, "%sap", cast);
+        return;
+      }
+      ferr(po, "offset %d (%s,%d) doesn't map to any arg\n",
+        offset, bp_arg, arg_i);
+    }
     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)
+    for (i = arg_s = 0; i < g_func_pp->argc; i++) {
+      if (g_func_pp->arg[i].reg != NULL)
         continue;
       if (arg_s == arg_i)
         break;
       arg_s++;
     }
-    if (i == g_func_pp.argc)
+    if (i == g_func_pp->argc)
       ferr(po, "arg %d not in prototype?\n", arg_i);
-    if (is_lea)
-      ferr(po, "lea to arg?\n");
 
-    switch (lmod)
+    popr->is_ptr = g_func_pp->arg[i].type.is_ptr;
+
+    switch (popr->lmod)
     {
     case OPLM_BYTE:
+      if (is_lea)
+        ferr(po, "lea/byte to arg?\n");
       if (is_src && (offset & 3) == 0)
-        snprintf(buf, buf_size, "(u8)a%d", i + 1);
+        snprintf(buf, buf_size, "%sa%d",
+          simplify_cast(cast, "(u8)"), i + 1);
       else
-        snprintf(buf, buf_size, "BYTE%d(a%d)", offset & 3, i + 1);
+        snprintf(buf, buf_size, "%sBYTE%d(a%d)",
+          cast, 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);
+      if (is_lea)
+        ferr(po, "lea/word to arg?\n");
+      if (offset & 1) {
+        unaligned = 1;
+        if (!is_src) {
+          if (offset & 2)
+            ferr(po, "problematic arg store\n");
+          snprintf(buf, buf_size, "%s((char *)&a%d + 1)",
+            simplify_cast(cast, "*(u16 *)"), i + 1);
+        }
+        else
+          ferr(po, "unaligned arg word load\n");
+      }
+      else if (is_src && (offset & 2) == 0)
+        snprintf(buf, buf_size, "%sa%d",
+          simplify_cast(cast, "(u16)"), i + 1);
       else
-        snprintf(buf, buf_size, "%sWORD(a%d)",
-          (offset & 2) ? "HI" : "LO", i + 1);
+        snprintf(buf, buf_size, "%s%sWORD(a%d)",
+          cast, (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);
+      if (cast[0])
+        prefix = cast;
+      else if (is_src)
+        prefix = "(u32)";
+
+      if (offset & 3) {
+        unaligned = 1;
+        if (is_lea)
+          snprintf(buf, buf_size, "(u32)&a%d + %d",
+            i + 1, offset & 3);
+        else if (!is_src)
+          ferr(po, "unaligned arg store\n");
+        else {
+          // mov edx, [ebp+arg_4+2]; movsx ecx, dx
+          snprintf(buf, buf_size, "%s(a%d >> %d)",
+            prefix, i + 1, (offset & 3) * 8);
+        }
+      }
+      else {
+        snprintf(buf, buf_size, "%s%sa%d",
+          prefix, is_lea ? "&" : "", i + 1);
+      }
       break;
 
     default:
-      ferr(po, "bp_arg bad lmod: %d\n", lmod);
+      ferr(po, "bp_arg bad lmod: %d\n", popr->lmod);
     }
 
+    if (unaligned)
+      snprintf(g_comment, sizeof(g_comment), "%s unaligned", bp_arg);
+
     // common problem
-    if ((offset & 3)
-        && (strstr(g_func_pp.arg[i].type, "int8")
-         || strstr(g_func_pp.arg[i].type, "int16")))
+    guess_lmod_from_c_type(&tmp_lmod, &g_func_pp->arg[i].type);
+    if (tmp_lmod != OPLM_DWORD
+      && (unaligned || (!is_src && tmp_lmod < popr->lmod)))
     {
-      ferr(po, "bp_arg arg/w offset %d and type '%s'\n",
-        offset, g_func_pp.arg[i].type);
+      ferr(po, "bp_arg arg%d/w offset %d and type '%s' is too small\n",
+        i + 1, offset, g_func_pp->arg[i].type.name);
     }
+    if (popr->is_ptr && popr->lmod != OPLM_DWORD)
+      ferr(po, "bp_arg arg%d: non-dword ptr access\n", i + 1);
   }
-  else {
+  else
+  {
     if (g_stack_fsz == 0)
       ferr(po, "stack var access without stackframe\n");
+    g_stack_frame_used = 1;
 
     sf_ofs = g_stack_fsz + offset;
-    if (sf_ofs < 0)
+    lim = (ofs_reg[0] != 0) ? -4 : 0;
+    if (offset > 0 || sf_ofs < lim)
       ferr(po, "bp_stack offset %d/%d\n", offset, g_stack_fsz);
 
     if (is_lea)
       prefix = "(u32)&";
+    else
+      prefix = cast;
 
-    switch (lmod)
+    switch (popr->lmod)
     {
     case OPLM_BYTE:
       snprintf(buf, buf_size, "%ssf.b[%d%s%s]",
@@ -1270,18 +1428,36 @@ static void stack_frame_access(struct parsed_op *po,
       break;
 
     default:
-      ferr(po, "bp_stack bad lmod: %d\n", lmod);
+      ferr(po, "bp_stack bad lmod: %d\n", popr->lmod);
     }
   }
 }
 
+static void check_label_read_ref(struct parsed_op *po, const char *name)
+{
+  const struct parsed_proto *pp;
+
+  pp = proto_parse(g_fhdr, name, 0);
+  if (pp == NULL)
+    ferr(po, "proto_parse failed for ref '%s'\n", name);
+
+  // currently we can take __cdecl and __stdcall
+  if (pp->is_func && pp->argc_reg != 0)
+    ferr(po, "reg-arg func reference?\n");
+}
+
 static char *out_src_opr(char *buf, size_t buf_size,
-	struct parsed_op *po, struct parsed_opr *popr, int is_lea)
+	struct parsed_op *po, struct parsed_opr *popr, const char *cast,
+  int is_lea)
 {
   char tmp1[256], tmp2[256];
   char expr[256];
+  char *p;
   int ret;
 
+  if (cast == NULL)
+    cast = "";
+
   switch (popr->type) {
   case OPT_REG:
     if (is_lea)
@@ -1289,16 +1465,19 @@ static char *out_src_opr(char *buf, size_t buf_size,
 
     switch (popr->lmod) {
     case OPLM_DWORD:
-      snprintf(buf, buf_size, "%s", opr_reg_p(po, popr));
+      snprintf(buf, buf_size, "%s%s", cast, opr_reg_p(po, popr));
       break;
     case OPLM_WORD:
-      snprintf(buf, buf_size, "(u16)%s", opr_reg_p(po, popr));
+      snprintf(buf, buf_size, "%s%s",
+        simplify_cast(cast, "(u16)"), opr_reg_p(po, popr));
       break;
     case OPLM_BYTE:
       if (popr->name[1] == 'h') // XXX..
-        snprintf(buf, buf_size, "(u8)(%s >> 8)", opr_reg_p(po, popr));
+        snprintf(buf, buf_size, "%s(%s >> 8)",
+          simplify_cast(cast, "(u8)"), opr_reg_p(po, popr));
       else
-        snprintf(buf, buf_size, "(u8)%s", opr_reg_p(po, popr));
+        snprintf(buf, buf_size, "%s%s",
+          simplify_cast(cast, "(u8)"), opr_reg_p(po, popr));
       break;
     default:
       ferr(po, "invalid src lmod: %d\n", popr->lmod);
@@ -1306,9 +1485,9 @@ static char *out_src_opr(char *buf, size_t buf_size,
     break;
 
   case OPT_REGMEM:
-    if (parse_stack_el(popr->name, NULL)) {
-      stack_frame_access(po, popr->lmod, buf, buf_size,
-        popr->name, 1, is_lea);
+    if (is_stack_access(po, popr)) {
+      stack_frame_access(po, popr, buf, buf_size,
+        popr->name, cast, 1, is_lea);
       break;
     }
 
@@ -1318,6 +1497,14 @@ static char *out_src_opr(char *buf, size_t buf_size,
       ret = sscanf(expr, "%[^[][%[^]]]", tmp1, tmp2);
       if (ret != 2)
         ferr(po, "parse failure for '%s'\n", expr);
+      if (tmp1[0] == '(') {
+        // (off_4FFF50+3)[eax]
+        p = strchr(tmp1 + 1, ')');
+        if (p == NULL || p[1] != 0)
+          ferr(po, "parse failure (2) for '%s'\n", expr);
+        *p = 0;
+        memmove(tmp1, tmp1 + 1, strlen(tmp1));
+      }
       snprintf(expr, sizeof(expr), "(u32)&%s + %s", tmp1, tmp2);
     }
 
@@ -1328,30 +1515,42 @@ static char *out_src_opr(char *buf, size_t buf_size,
     }
 
     snprintf(buf, buf_size, "%s(%s)",
-      lmod_cast_u_ptr(po, popr->lmod), expr);
+      simplify_cast(cast, lmod_cast_u_ptr(po, popr->lmod)), expr);
     break;
 
   case OPT_LABEL:
+    check_label_read_ref(po, popr->name);
+    if (cast[0] == 0 && popr->is_ptr)
+      cast = "(u32)";
+
     if (is_lea)
       snprintf(buf, buf_size, "(u32)&%s", popr->name);
+    else if (popr->size_lt)
+      snprintf(buf, buf_size, "%s%s%s%s", cast,
+        lmod_cast_u_ptr(po, popr->lmod),
+        popr->is_array ? "" : "&",
+        popr->name);
     else
-      snprintf(buf, buf_size, "%s%s%s",
-        popr->is_ptr ? "(u32)" : "",
-        popr->name,
+      snprintf(buf, buf_size, "%s%s%s", cast, popr->name,
         popr->is_array ? "[0]" : "");
     break;
 
   case OPT_OFFSET:
+    check_label_read_ref(po, popr->name);
+    if (cast[0] == 0)
+      cast = "(u32)";
     if (is_lea)
       ferr(po, "lea an offset?\n");
-    snprintf(buf, buf_size, "(u32)&%s", popr->name);
+    snprintf(buf, buf_size, "%s&%s", cast, popr->name);
     break;
 
   case OPT_CONST:
     if (is_lea)
       ferr(po, "lea from const?\n");
 
-    printf_number(buf, buf_size, popr->val);
+    printf_number(tmp1, sizeof(tmp1), popr->val);
+    snprintf(buf, buf_size, "%s%s",
+      simplify_cast_num(cast, popr->val), tmp1);
     break;
 
   default:
@@ -1361,6 +1560,7 @@ static char *out_src_opr(char *buf, size_t buf_size,
   return buf;
 }
 
+// note: may set is_ptr (we find that out late for ebp frame..)
 static char *out_dst_opr(char *buf, size_t buf_size,
 	struct parsed_op *po, struct parsed_opr *popr)
 {
@@ -1387,17 +1587,22 @@ static char *out_dst_opr(char *buf, size_t buf_size,
     break;
 
   case OPT_REGMEM:
-    if (parse_stack_el(popr->name, NULL)) {
-      stack_frame_access(po, popr->lmod, buf, buf_size,
-        popr->name, 0, 0);
+    if (is_stack_access(po, popr)) {
+      stack_frame_access(po, popr, buf, buf_size,
+        popr->name, "", 0, 0);
       break;
     }
 
-    return out_src_opr(buf, buf_size, po, popr, 0);
+    return out_src_opr(buf, buf_size, po, popr, NULL, 0);
 
   case OPT_LABEL:
-    snprintf(buf, buf_size, "%s%s", popr->name,
-      popr->is_array ? "[0]" : "");
+    if (popr->size_mismatch)
+      snprintf(buf, buf_size, "%s%s%s",
+        lmod_cast_u_ptr(po, popr->lmod),
+        popr->is_array ? "" : "&", popr->name);
+    else
+      snprintf(buf, buf_size, "%s%s", popr->name,
+        popr->is_array ? "[0]" : "");
     break;
 
   default:
@@ -1407,6 +1612,12 @@ static char *out_dst_opr(char *buf, size_t buf_size,
   return buf;
 }
 
+static char *out_src_opr_u32(char *buf, size_t buf_size,
+	struct parsed_op *po, struct parsed_opr *popr)
+{
+  return out_src_opr(buf, buf_size, po, popr, NULL, 0);
+}
+
 static enum parsed_flag_op split_cond(struct parsed_op *po,
   enum op_op op, int *is_inv)
 {
@@ -1498,50 +1709,85 @@ static void out_test_for_cc(char *buf, size_t buf_size,
 }
 
 static void out_cmp_for_cc(char *buf, size_t buf_size,
-  struct parsed_op *po, enum parsed_flag_op pfo, int is_inv,
-  enum opr_lenmod lmod, const char *expr1, const char *expr2)
+  struct parsed_op *po, enum parsed_flag_op pfo, int is_inv)
 {
-  const char *cast, *scast;
+  const char *cast, *scast, *cast_use;
+  char buf1[256], buf2[256];
+  enum opr_lenmod lmod;
+
+  if (po->operand[0].lmod != po->operand[1].lmod)
+    ferr(po, "%s: lmod mismatch: %d %d\n", __func__,
+      po->operand[0].lmod, po->operand[1].lmod);
+  lmod = po->operand[0].lmod;
 
   cast = lmod_cast_u(po, lmod);
   scast = lmod_cast_s(po, lmod);
 
+  switch (pfo) {
+  case PFO_C:
+  case PFO_Z:
+  case PFO_BE: // !a
+    cast_use = cast;
+    break;
+
+  case PFO_S:
+  case PFO_L: // !ge
+  case PFO_LE:
+    cast_use = scast;
+    break;
+
+  default:
+    ferr(po, "%s: unhandled parsed_flag_op: %d\n", __func__, pfo);
+  }
+
+  out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], cast_use, 0);
+  out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], cast_use, 0);
+
   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);
+    snprintf(buf, buf_size, "(%s %s %s)",
+      buf1, is_inv ? ">=" : "<", buf2);
     break;
 
   case PFO_Z:
-    snprintf(buf, buf_size, "(%s%s %s %s%s)",
-      cast, expr1, is_inv ? "!=" : "==", cast, expr2);
+    snprintf(buf, buf_size, "(%s %s %s)",
+      buf1, is_inv ? "!=" : "==", buf2);
     break;
 
   case PFO_BE: // !a
     // note: must be unsigned compare
-    snprintf(buf, buf_size, "(%s%s %s %s%s)",
-      cast, expr1, is_inv ? ">" : "<=", cast, expr2);
+    snprintf(buf, buf_size, "(%s %s %s)",
+      buf1, is_inv ? ">" : "<=", buf2);
+
+    // annoying case
+    if (is_inv && lmod == OPLM_BYTE
+      && po->operand[1].type == OPT_CONST
+      && po->operand[1].val == 0xff)
+    {
+      snprintf(g_comment, sizeof(g_comment), "if %s", buf);
+      snprintf(buf, buf_size, "(0)");
+    }
     break;
 
   // note: must be signed compare
   case PFO_S:
     snprintf(buf, buf_size, "(%s(%s - %s) %s 0)",
-      scast, expr1, expr2, is_inv ? ">=" : "<");
+      scast, buf1, buf2, is_inv ? ">=" : "<");
     break;
 
   case PFO_L: // !ge
-    snprintf(buf, buf_size, "(%s%s %s %s%s)",
-      scast, expr1, is_inv ? ">=" : "<", scast, expr2);
+    snprintf(buf, buf_size, "(%s %s %s)",
+      buf1, is_inv ? ">=" : "<", buf2);
     break;
 
   case PFO_LE:
-    snprintf(buf, buf_size, "(%s%s %s %s%s)",
-      scast, expr1, is_inv ? ">" : "<=", scast, expr2);
+    snprintf(buf, buf_size, "(%s %s %s)",
+      buf1, is_inv ? ">" : "<=", buf2);
     break;
 
   default:
-    ferr(po, "%s: unhandled parsed_flag_op: %d\n", __func__, pfo);
+    break;
   }
 }
 
@@ -1552,21 +1798,18 @@ static void out_cmp_test(char *buf, size_t buf_size,
 
   if (po->op == OP_TEST) {
     if (IS(opr_name(po, 0), opr_name(po, 1))) {
-      out_src_opr(buf3, sizeof(buf3), po, &po->operand[0], 0);
+      out_src_opr_u32(buf3, sizeof(buf3), po, &po->operand[0]);
     }
     else {
-      out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], 0);
-      out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], 0);
+      out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]);
+      out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1]);
       snprintf(buf3, sizeof(buf3), "(%s & %s)", buf1, buf2);
     }
     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_inv,
-      po->operand[0].lmod, buf2, buf3);
+    out_cmp_for_cc(buf, buf_size, po, pfo, is_inv);
   }
   else
     ferr(po, "%s: unhandled op: %d\n", __func__, po->op);
@@ -1582,8 +1825,23 @@ static void propagate_lmod(struct parsed_op *po, struct parsed_opr *popr1,
     popr1->lmod = popr2->lmod;
   else if (popr2->lmod == OPLM_UNSPEC)
     popr2->lmod = popr1->lmod;
-  else if (popr1->lmod != popr2->lmod)
-    ferr(po, "conflicting lmods: %d vs %d\n", popr1->lmod, popr2->lmod);
+  else if (popr1->lmod != popr2->lmod) {
+    if (popr1->type_from_var) {
+      popr1->size_mismatch = 1;
+      if (popr1->lmod < popr2->lmod)
+        popr1->size_lt = 1;
+      popr1->lmod = popr2->lmod;
+    }
+    else if (popr2->type_from_var) {
+      popr2->size_mismatch = 1;
+      if (popr2->lmod < popr1->lmod)
+        popr2->size_lt = 1;
+      popr2->lmod = popr1->lmod;
+    }
+    else
+      ferr(po, "conflicting lmods: %d vs %d\n",
+        popr1->lmod, popr2->lmod);
+  }
 }
 
 static const char *op_to_c(struct parsed_op *po)
@@ -1614,17 +1872,17 @@ 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)
+static void op_set_clear_flag(struct parsed_op *po,
+  enum op_flags flag_set, enum op_flags flag_clear)
 {
-  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;
+  po->flags |= flag_set;
+  po->flags &= ~flag_clear;
 }
 
+// last op in stream - unconditional branch or ret
+#define LAST_OP(_i) ((ops[_i].flags & OPF_TAIL) \
+  || (ops[_i].flags & (OPF_JMP|OPF_CC)) == OPF_JMP)
+
 static int scan_for_pop(int i, int opcnt, const char *reg,
   int magic, int depth, int *maxdepth, int do_flags)
 {
@@ -1642,7 +1900,7 @@ static int scan_for_pop(int i, int opcnt, const char *reg,
       return -1; // deadend
 
     if ((po->flags & OPF_RMD)
-        || (po->op == OP_PUSH && po->argmask)) // arg push
+        || (po->op == OP_PUSH && po->argnum != 0)) // arg push
       continue;
 
     if ((po->flags & OPF_JMP) && po->op != OP_CALL) {
@@ -1685,11 +1943,11 @@ static int scan_for_pop(int i, int opcnt, const char *reg,
         if (depth > *maxdepth)
           *maxdepth = depth;
         if (do_flags)
-          set_flag_no_dup(po, OPF_RSAVE, OPF_RMD);
+          op_set_clear_flag(po, OPF_RSAVE, OPF_RMD);
       }
       else if (depth == 0) {
         if (do_flags)
-          set_flag_no_dup(po, OPF_RMD, OPF_RSAVE);
+          op_set_clear_flag(po, OPF_RMD, OPF_RSAVE);
         return 1;
       }
       else {
@@ -1697,7 +1955,7 @@ static int scan_for_pop(int i, int opcnt, const char *reg,
         if (depth < 0) // should not happen
           ferr(po, "fail with depth\n");
         if (do_flags)
-          set_flag_no_dup(po, OPF_RSAVE, OPF_RMD);
+          op_set_clear_flag(po, OPF_RSAVE, OPF_RMD);
       }
     }
   }
@@ -1738,7 +1996,7 @@ static int scan_for_pop_ret(int i, int opcnt, const char *reg,
   return found ? 0 : -1;
 }
 
-// is operand 'opr modified' by parsed_op 'po'?
+// is operand 'opr' modified by parsed_op 'po'?
 static int is_opr_modified(const struct parsed_opr *opr,
   const struct parsed_op *po)
 {
@@ -1764,7 +2022,17 @@ static int is_any_opr_modified(const struct parsed_op *po_test,
   if ((po->flags & OPF_RMD) || !(po->flags & OPF_DATA))
     return 0;
 
-  if (po_test->regmask_src & po->regmask_dst)
+  if (po_test->operand_cnt == 1 && po_test->operand[0].type == OPT_CONST)
+    return 0;
+
+  if ((po_test->regmask_src | po_test->regmask_dst) & po->regmask_dst)
+    return 1;
+
+  // in reality, it can wreck any register, but in decompiled C
+  // version it can only overwrite eax or edx:eax
+  if (po->op == OP_CALL
+   && ((po_test->regmask_src | po_test->regmask_dst)
+       & ((1 << xAX)|(1 << xDX))))
     return 1;
 
   for (i = 0; i < po_test->operand_cnt; i++)
@@ -1777,6 +2045,9 @@ static int is_any_opr_modified(const struct parsed_op *po_test,
 // scan for any po_test operand modification in range given
 static int scan_for_mod(struct parsed_op *po_test, int i, int opcnt)
 {
+  if (po_test->operand_cnt == 1 && po_test->operand[0].type == OPT_CONST)
+    return -1;
+
   for (; i < opcnt; i++) {
     if (is_any_opr_modified(po_test, &ops[i]))
       return i;
@@ -1797,15 +2068,48 @@ static int scan_for_mod_opr0(struct parsed_op *po_test,
   return -1;
 }
 
-static int scan_for_flag_set(int i)
+static int scan_for_flag_set(int i, int magic, int *branched,
+  int *setters, int *setter_cnt)
 {
-  for (; i >= 0; i--) {
-    if (ops[i].flags & OPF_FLAGS)
-      return i;
+  struct label_ref *lr;
+  int ret;
 
-    if ((ops[i].flags & OPF_JMP) && !(ops[i].flags & OPF_CC))
+  while (i >= 0) {
+    if (ops[i].cc_scratch == magic) {
+      ferr(&ops[i], "%s looped\n", __func__);
       return -1;
-    if (g_labels[i][0] != 0)
+    }
+    ops[i].cc_scratch = magic;
+
+    if (g_labels[i][0] != 0) {
+      *branched = 1;
+
+      lr = &g_label_refs[i];
+      for (; lr->next; lr = lr->next) {
+        ret = scan_for_flag_set(lr->i, magic,
+                branched, setters, setter_cnt);
+        if (ret < 0)
+          return ret;
+      }
+
+      if (i > 0 && LAST_OP(i - 1)) {
+        i = lr->i;
+        continue;
+      }
+      ret = scan_for_flag_set(lr->i, magic,
+              branched, setters, setter_cnt);
+      if (ret < 0)
+        return ret;
+    }
+    i--;
+
+    if (ops[i].flags & OPF_FLAGS) {
+      setters[*setter_cnt] = i;
+      (*setter_cnt)++;
+      return 0;
+    }
+
+    if ((ops[i].flags & OPF_JMP) && !(ops[i].flags & OPF_CC))
       return -1;
   }
 
@@ -1815,7 +2119,18 @@ static int scan_for_flag_set(int i)
 // scan back for cdq, if anything modifies edx, fail
 static int scan_for_cdq_edx(int i)
 {
-  for (; i >= 0; i--) {
+  while (i >= 0) {
+    if (g_labels[i][0] != 0) {
+      if (g_label_refs[i].next != NULL)
+        return -1;
+      if (i > 0 && LAST_OP(i - 1)) {
+        i = g_label_refs[i].i;
+        continue;
+      }
+      return -1;
+    }
+    i--;
+
     if (ops[i].op == OP_CDQ)
       return i;
 
@@ -1830,7 +2145,18 @@ static int scan_for_cdq_edx(int i)
 
 static int scan_for_reg_clear(int i, int reg)
 {
-  for (; i >= 0; i--) {
+  while (i >= 0) {
+    if (g_labels[i][0] != 0) {
+      if (g_label_refs[i].next != NULL)
+        return -1;
+      if (i > 0 && LAST_OP(i - 1)) {
+        i = g_label_refs[i].i;
+        continue;
+      }
+      return -1;
+    }
+    i--;
+
     if (ops[i].op == OP_XOR
      && ops[i].operand[0].lmod == OPLM_DWORD
      && ops[i].operand[0].reg == ops[i].operand[1].reg
@@ -1850,11 +2176,15 @@ static int scan_for_reg_clear(int i, int reg)
 static int scan_for_esp_adjust(int i, int opcnt, int *adj)
 {
   struct parsed_op *po;
+  int first_pop = -1;
   *adj = 0;
 
   for (; i < opcnt; i++) {
     po = &ops[i];
 
+    if (g_labels[i][0] != 0)
+      break;
+
     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");
@@ -1863,72 +2193,439 @@ static int scan_for_esp_adjust(int i, int opcnt, int *adj)
         ferr(&ops[i], "unaligned esp adjust: %x\n", *adj);
       return i;
     }
-    else if (po->op == OP_PUSH)
+    else if (po->op == OP_PUSH) {
+      if (first_pop == -1)
+        first_pop = -2; // none
       *adj -= lmod_bytes(po, po->operand[0].lmod);
-    else if (po->op == OP_POP)
+    }
+    else if (po->op == OP_POP) {
+      if (first_pop == -1)
+        first_pop = i;
       *adj += lmod_bytes(po, po->operand[0].lmod);
-    else if ((po->flags & (OPF_JMP|OPF_TAIL)) && po->op != OP_CALL)
-      return -1;
+    }
+    else if (po->flags & (OPF_JMP|OPF_TAIL)) {
+      if (po->op != OP_CALL)
+        break;
+      if (po->operand[0].type != OPT_LABEL)
+        break;
+      // TODO: should only allow combining __cdecl calls..
+    }
+  }
 
-    if (g_labels[i][0] != 0)
-      return -1;
+  if (*adj == 4 && first_pop >= 0 && ops[first_pop].op == OP_POP
+    && ops[first_pop].operand[0].type == OPT_REG
+    && ops[first_pop].operand[0].reg == xCX)
+  {
+    // probably 'pop ecx' was used..
+    return first_pop;
   }
 
   return -1;
 }
 
-static void add_label_ref(struct label_ref *lr, int op_i)
+static void scan_fwd_set_flags(int i, int opcnt, int magic, int flags)
 {
-  struct label_ref *lr_new;
+  struct parsed_op *po;
+  int j;
 
-  if (lr->i == -1) {
-    lr->i = op_i;
-    return;
-  }
+  if (i < 0)
+    ferr(ops, "%s: followed bad branch?\n", __func__);
 
-  lr_new = calloc(1, sizeof(*lr_new));
-  lr_new->i = op_i;
-  lr->next = lr_new;
+  for (; i < opcnt; i++) {
+    po = &ops[i];
+    if (po->cc_scratch == magic)
+      return;
+    po->cc_scratch = magic;
+    po->flags |= flags;
+
+    if ((po->flags & OPF_JMP) && po->op != OP_CALL) {
+      if (po->btj != NULL) {
+        // jumptable
+        for (j = 0; j < po->btj->count; j++)
+          scan_fwd_set_flags(po->btj->d[j].bt_i, opcnt, magic, flags);
+        return;
+      }
+
+      scan_fwd_set_flags(po->bt_i, opcnt, magic, flags);
+      if (!(po->flags & OPF_CC))
+        return;
+    }
+    if (po->flags & OPF_TAIL)
+      return;
+  }
 }
 
-static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
+static const struct parsed_proto *try_recover_pp(
+  struct parsed_op *po, const struct parsed_opr *opr)
 {
-  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 reg;
-  int ret;
+  const struct parsed_proto *pp = NULL;
 
-  g_bp_frame = g_sp_frame = g_stack_fsz = 0;
+  // maybe an arg of g_func?
+  if (opr->type == OPT_REGMEM && is_stack_access(po, opr))
+  {
+    char ofs_reg[16] = { 0, };
+    int arg, arg_s, arg_i;
+    int stack_ra = 0;
+    int offset = 0;
 
-  ret = proto_parse(fhdr, funcn, &g_func_pp);
-  if (ret)
-    ferr(ops, "proto_parse failed for '%s'\n", funcn);
+    parse_stack_access(po, opr->name, ofs_reg,
+      &offset, &stack_ra, NULL);
+    if (ofs_reg[0] != 0)
+      ferr(po, "offset reg on arg access?\n");
+    if (offset <= stack_ra)
+      ferr(po, "stack var call unhandled yet\n");
+
+    arg_i = (offset - stack_ra - 4) / 4;
+    for (arg = arg_s = 0; arg < g_func_pp->argc; arg++) {
+      if (g_func_pp->arg[arg].reg != NULL)
+        continue;
+      if (arg_s == arg_i)
+        break;
+      arg_s++;
+    }
+    if (arg == g_func_pp->argc)
+      ferr(po, "stack arg %d not in prototype?\n", arg_i);
+
+    pp = g_func_pp->arg[arg].fptr;
+    if (pp == NULL)
+      ferr(po, "icall sa: arg%d is not a fptr?\n", arg + 1);
+    if (pp->argc_reg != 0)
+      ferr(po, "icall sa: reg arg in arg-call unhandled yet\n");
+  }
+  else if (opr->type == OPT_OFFSET || opr->type == OPT_LABEL) {
+    pp = proto_parse(g_fhdr, opr->name, 0);
+    if (pp == NULL)
+      ferr(po, "proto_parse failed for icall from '%s'\n", opr->name);
+    if (pp->argc_reg != 0)
+      ferr(po, "arg-call unhandled yet for '%s'\n", opr->name);
+  }
+
+  return pp;
+}
+
+static void scan_for_call_type(int i, struct parsed_opr *opr,
+  int magic, const struct parsed_proto **pp_found)
+{
+  const struct parsed_proto *pp = NULL;
+  struct parsed_op *po;
+  struct label_ref *lr;
+
+  while (i >= 0) {
+    if (ops[i].cc_scratch == magic)
+      return;
+    ops[i].cc_scratch = magic;
+
+    if (g_labels[i][0] != 0) {
+      lr = &g_label_refs[i];
+      for (; lr != NULL; lr = lr->next)
+        scan_for_call_type(lr->i, opr, magic, pp_found);
+      if (i > 0 && LAST_OP(i - 1))
+        return;
+    }
+    i--;
+
+    if (!(ops[i].flags & OPF_DATA))
+      continue;
+    if (!is_opr_modified(opr, &ops[i]))
+      continue;
+    if (ops[i].op != OP_MOV && ops[i].op != OP_LEA) {
+      // most probably trashed by some processing
+      *pp_found = NULL;
+      return;
+    }
+
+    opr = &ops[i].operand[1];
+    if (opr->type != OPT_REG)
+      break;
+  }
+
+  po = (i >= 0) ? &ops[i] : ops;
+
+  if (i < 0) {
+    // reached the top - can only be an arg-reg
+    if (opr->type != OPT_REG)
+      return;
+
+    for (i = 0; i < g_func_pp->argc; i++) {
+      if (g_func_pp->arg[i].reg == NULL)
+        continue;
+      if (IS(opr->name, g_func_pp->arg[i].reg))
+        break;
+    }
+    if (i == g_func_pp->argc)
+      return;
+    pp = g_func_pp->arg[i].fptr;
+    if (pp == NULL)
+      ferr(po, "icall: arg%d (%s) is not a fptr?\n",
+        i + 1, g_func_pp->arg[i].reg);
+    if (pp->argc_reg != 0)
+      ferr(po, "icall: reg arg in arg-call unhandled yet\n");
+  }
+  else
+    pp = try_recover_pp(po, opr);
+
+  if (*pp_found != NULL && pp != NULL) {
+    if (!IS((*pp_found)->ret_type.name, pp->ret_type.name)
+      || (*pp_found)->is_stdcall != pp->is_stdcall
+      || (*pp_found)->argc != pp->argc
+      || (*pp_found)->argc_reg != pp->argc_reg
+      || (*pp_found)->argc_stack != pp->argc_stack)
+    {
+      ferr(po, "icall: parsed_proto mismatch\n");
+    }
+  }
+  if (pp != NULL)
+    *pp_found = pp;
+}
+
+static const struct parsed_proto *resolve_call(int i, int opcnt)
+{
+  const struct parsed_proto *pp = NULL;
+
+  switch (ops[i].operand[0].type) {
+  case OPT_REGMEM:
+  case OPT_LABEL:
+  case OPT_OFFSET:
+    pp = try_recover_pp(&ops[i], &ops[i].operand[0]);
+    break;
+  default:
+    scan_for_call_type(i, &ops[i].operand[0], i + opcnt * 9, &pp);
+    break;
+  }
+
+  return pp;
+}
+
+static int collect_call_args(struct parsed_op *po, int i,
+  struct parsed_proto *pp, int *save_arg_vars, int arg,
+  int magic, int need_op_saving, int may_reuse)
+{
+  struct parsed_proto *pp_tmp;
+  struct label_ref *lr;
+  int need_to_save_current;
+  int ret = 0;
+  int j;
+
+  if (i < 0) {
+    ferr(po, "dead label encountered\n");
+    return -1;
+  }
+
+  for (; arg < pp->argc; arg++)
+    if (pp->arg[arg].reg == NULL)
+      break;
+  magic = (magic & 0xffffff) | (arg << 24);
+
+  for (j = i; j >= 0 && arg < pp->argc; )
+  {
+    if (((ops[j].cc_scratch ^ magic) & 0xffffff) == 0) {
+      if (ops[j].cc_scratch != magic) {
+        ferr(&ops[j], "arg collect hit same path with diff args for %s\n",
+           pp->name);
+        return -1;
+      }
+      // ok: have already been here
+      return 0;
+    }
+    ops[j].cc_scratch = magic;
+
+    if (g_labels[j][0] != 0 && g_label_refs[j].i != -1) {
+      lr = &g_label_refs[j];
+      if (lr->next != NULL)
+        need_op_saving = 1;
+      for (; lr->next; lr = lr->next) {
+        if ((ops[lr->i].flags & (OPF_JMP|OPF_CC)) != OPF_JMP)
+          may_reuse = 1;
+        ret = collect_call_args(po, lr->i, pp, save_arg_vars,
+                arg, magic, need_op_saving, may_reuse);
+        if (ret < 0)
+          return ret;
+      }
+
+      if ((ops[lr->i].flags & (OPF_JMP|OPF_CC)) != OPF_JMP)
+        may_reuse = 1;
+      if (j > 0 && LAST_OP(j - 1)) {
+        // follow last branch in reverse
+        j = lr->i;
+        continue;
+      }
+      need_op_saving = 1;
+      ret = collect_call_args(po, lr->i, pp, save_arg_vars,
+               arg, magic, need_op_saving, may_reuse);
+      if (ret < 0)
+        return ret;
+    }
+    j--;
+
+    if (ops[j].op == OP_CALL)
+    {
+      pp_tmp = ops[j].datap;
+      if (pp_tmp == NULL)
+        ferr(po, "arg collect hit unparsed call '%s'\n",
+          ops[j].operand[0].name);
+      if (may_reuse && pp_tmp->argc_stack > 0)
+        ferr(po, "arg collect %d/%d hit '%s' with %d stack args\n",
+          arg, pp->argc, opr_name(&ops[j], 0), pp_tmp->argc_stack);
+    }
+    else if (ops[j].op == OP_ADD && ops[j].operand[0].reg == xSP) {
+      ferr(po, "arg collect %d/%d hit esp adjust\n",
+        arg, pp->argc);
+    }
+    else if (ops[j].op == OP_POP) {
+      ferr(po, "arg collect %d/%d hit pop\n", arg, pp->argc);
+    }
+    else if ((ops[j].flags & (OPF_JMP|OPF_CC)) == (OPF_JMP|OPF_CC))
+    {
+      may_reuse = 1;
+    }
+    else if (ops[j].op == OP_PUSH && !(ops[j].flags & OPF_FARG))
+    {
+      pp->arg[arg].datap = &ops[j];
+      need_to_save_current = 0;
+      if (!need_op_saving) {
+        ret = scan_for_mod(&ops[j], j + 1, i);
+        need_to_save_current = (ret >= 0);
+      }
+      if (need_op_saving || need_to_save_current) {
+        // mark this push as one that needs operand saving
+        ops[j].flags &= ~OPF_RMD;
+        if (ops[j].argnum == 0) {
+          ops[j].argnum = arg + 1;
+          *save_arg_vars |= 1 << arg;
+        }
+        else if (ops[j].argnum < arg + 1)
+          ferr(&ops[j], "argnum conflict (%d<%d) for '%s'\n",
+            ops[j].argnum, arg + 1, pp->name);
+      }
+      else if (ops[j].argnum == 0)
+        ops[j].flags |= OPF_RMD;
+
+      // some PUSHes are reused by different calls on other branches,
+      // but that can't happen if we didn't branch, so they
+      // can be removed from future searches (handles nested calls)
+      if (!may_reuse)
+        ops[j].flags |= OPF_FARG;
+
+      // next arg
+      for (arg++; arg < pp->argc; arg++)
+        if (pp->arg[arg].reg == NULL)
+          break;
+      magic = (magic & 0xffffff) | (arg << 24);
+    }
+  }
+
+  if (arg < pp->argc) {
+    ferr(po, "arg collect failed for '%s': %d/%d\n",
+      pp->name, arg, pp->argc);
+    ret = -1;
+  }
+  return ret;
+}
+
+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_new->next = lr->next;
+  lr->next = lr_new;
+}
+
+static void output_std_flags(FILE *fout, struct parsed_op *po,
+  int *pfomask, const char *dst_opr_text)
+{
+  if (*pfomask & (1 << PFO_Z)) {
+    fprintf(fout, "\n  cond_z = (%s%s == 0);",
+      lmod_cast_u(po, po->operand[0].lmod), dst_opr_text);
+    *pfomask &= ~(1 << PFO_Z);
+  }
+  if (*pfomask & (1 << PFO_S)) {
+    fprintf(fout, "\n  cond_s = (%s%s < 0);",
+      lmod_cast_s(po, po->operand[0].lmod), dst_opr_text);
+    *pfomask &= ~(1 << PFO_S);
+  }
+}
+
+static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
+{
+  struct parsed_op *po, *delayed_flag_op = NULL, *tmp_op;
+  struct parsed_opr *last_arith_dst = NULL;
+  char buf1[256], buf2[256], buf3[256], cast[64];
+  const struct parsed_proto *pp_c;
+  struct parsed_proto *pp, *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 have_func_ret = 0;
+  int have_normal_ret = 0;
+  int had_decl = 0;
+  int label_pending = 0;
+  int regmask_save = 0;
+  int regmask_arg = 0;
+  int regmask_now = 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 reg;
+  int ret;
+
+  g_bp_frame = g_sp_frame = g_stack_fsz = 0;
+  g_stack_frame_used = 0;
+
+  g_func_pp = proto_parse(fhdr, funcn, 0);
+  if (g_func_pp == NULL)
+    ferr(ops, "proto_parse failed for '%s'\n", funcn);
+
+  fprintf(fout, "%s ", g_func_pp->ret_type.name);
+  if (g_func_pp->is_stdcall && g_func_pp->argc_reg == 0)
+    fprintf(fout, "__stdcall ");
+  if (g_ida_func_attr & IDAFA_NORETURN)
+    fprintf(fout, "noreturn ");
+  fprintf(fout, "%s(", funcn);
+
+  for (i = 0; i < g_func_pp->argc; i++) {
+    if (i > 0)
+      fprintf(fout, ", ");
+    if (g_func_pp->arg[i].fptr != NULL) {
+      // func pointer..
+      pp = g_func_pp->arg[i].fptr;
+      fprintf(fout, "%s (", pp->ret_type.name);
+      if (pp->is_stdcall && pp->argc_reg == 0)
+        fprintf(fout, "__stdcall ");
+      fprintf(fout, "*a%d)(", i + 1);
+      for (j = 0; j < pp->argc; j++) {
+        if (j > 0)
+          fprintf(fout, ", ");
+        if (pp->arg[j].fptr)
+          ferr(ops, "nested fptr\n");
+        fprintf(fout, "%s", pp->arg[j].type.name);
+      }
+      fprintf(fout, ")");
+    }
+    else {
+      fprintf(fout, "%s a%d", g_func_pp->arg[i].type.name, i + 1);
+    }
+  }
+  if (g_func_pp->is_vararg) {
+    if (i > 0)
+      fprintf(fout, ", ");
+    fprintf(fout, "...");
+  }
 
-  fprintf(fout, "%s %s(", g_func_pp.ret_type, funcn);
-  for (i = 0; i < g_func_pp.argc; i++) {
-    if (i > 0)
-      fprintf(fout, ", ");
-    fprintf(fout, "%s a%d", g_func_pp.arg[i].type, i + 1);
-  }
   fprintf(fout, ")\n{\n");
 
   // pass1:
@@ -1981,18 +2678,20 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
       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"))
+      if (ops[i - 1].op == OP_POP && IS(opr_name(&ops[i - 1], 0), "ebp"))
+        ops[i - 1].flags |= OPF_RMD;
+      else if (!(g_ida_func_attr & IDAFA_NORETURN))
         ferr(&ops[i - 1], "'pop ebp' expected\n");
-      ops[i - 1].flags |= OPF_RMD;
 
       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"))
+        if (ops[i - 2].op == OP_MOV
+            && IS(opr_name(&ops[i - 2], 0), "esp")
+            && IS(opr_name(&ops[i - 2], 1), "ebp"))
         {
-          ferr(&ops[i - 2], "esp restore expected\n");
+          ops[i - 2].flags |= OPF_RMD;
         }
-        ops[i - 2].flags |= OPF_RMD;
+        else if (!(g_ida_func_attr & IDAFA_NORETURN))
+          ferr(&ops[i - 2], "esp restore expected\n");
 
         if (ecx_push && ops[i - 3].op == OP_POP
           && IS(opr_name(&ops[i - 3], 0), "ecx"))
@@ -2040,14 +2739,35 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
   }
 
   // pass2:
+  // - parse calls with labels
   // - resolve all branches
-  for (i = 0; i < opcnt; i++) {
+  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)
+    if (po->flags & OPF_RMD)
+      continue;
+
+    if (po->op == OP_CALL) {
+      if (po->operand[0].type == OPT_LABEL) {
+        tmpname = opr_name(po, 0);
+        if (IS_START(tmpname, "loc_"))
+          ferr(po, "call to loc_*\n");
+        pp_c = proto_parse(fhdr, tmpname, 0);
+        if (pp_c == NULL)
+          ferr(po, "proto_parse failed for call '%s'\n", tmpname);
+        if (pp_c->is_fptr && pp_c->argc_reg != 0)
+          ferr(po, "fptr call with reg arg\n");
+        pp = proto_clone(pp_c);
+        my_assert_not(pp, NULL);
+        po->datap = pp;
+      }
+      continue;
+    }
+
+    if (!(po->flags & OPF_JMP) || po->op == OP_RET)
       continue;
 
     if (po->operand[0].type == OPT_REGMEM) {
@@ -2065,7 +2785,8 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
         }
       }
       if (pd == NULL)
-        ferr(po, "label '%s' not parsed?\n", buf1);
+        //ferr(po, "label '%s' not parsed?\n", buf1);
+        goto tailcall;
       if (pd->type != OPT_OFFSET)
         ferr(po, "label '%s' with non-offset data?\n", buf1);
 
@@ -2095,51 +2816,60 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
     if (po->bt_i != -1)
       continue;
 
-    if (po->operand[0].type == OPT_LABEL) {
+    if (po->operand[0].type == OPT_LABEL)
       // assume tail call
-      po->op = OP_CALL;
-      po->flags |= OPF_TAIL;
-      continue;
-    }
+      goto tailcall;
 
     ferr(po, "unhandled branch\n");
+
+tailcall:
+    po->op = OP_CALL;
+    po->flags |= OPF_TAIL;
+    i--; // reprocess
   }
 
   // pass3:
+  // - remove dead labels
   // - process calls
   for (i = 0; i < opcnt; i++)
   {
+    if (g_labels[i][0] != 0 && g_label_refs[i].i == -1)
+      g_labels[i][0] = 0;
+
     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)
+      pp = po->datap;
+      if (pp == NULL)
       {
-        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);
+        // indirect call
+        pp_c = resolve_call(i, opcnt);
+        if (pp_c != NULL)
+          pp = proto_clone(pp_c);
+        if (pp == NULL) {
+          pp = calloc(1, sizeof(*pp));
+          my_assert_not(pp, NULL);
+          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.name = strdup("int");
+          pp->argc = pp->argc_stack = j;
+          for (arg = 0; arg < pp->argc; arg++)
+            pp->arg[arg].type.name = strdup("int");
+        }
+        po->datap = pp;
       }
 
       // look for and make use of esp adjust
       ret = -1;
-      if (!pp->is_stdcall)
+      if (!pp->is_stdcall && pp->argc_stack > 0)
         ret = scan_for_esp_adjust(i + 1, opcnt, &j);
       if (ret >= 0) {
         if (pp->is_vararg) {
@@ -2150,15 +2880,15 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
           arg = pp->argc;
           pp->argc += j / 4 - pp->argc_stack;
           for (; arg < pp->argc; arg++) {
-            pp->arg[arg].type = strdup("int");
+            pp->arg[arg].type.name = strdup("int");
             pp->argc_stack++;
           }
           if (pp->argc > ARRAY_SIZE(pp->arg))
-            ferr(po, "too many args\n");
+            ferr(po, "too many args for '%s'\n", tmpname);
         }
         if (pp->argc_stack != j / 4)
-          ferr(po, "stack tracking failed: %x %x\n",
-            pp->argc_stack * 4, j);
+          ferr(po, "stack tracking failed for '%s': %x %x\n",
+            tmpname, pp->argc_stack * 4, j);
 
         ops[ret].flags |= OPF_RMD;
         // a bit of a hack, but deals with use of
@@ -2173,71 +2903,18 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
       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);
+          if (pp_tmp->argc_reg != 0)
+            ferr(po, "'%s' has a callback with reg-args\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;
+      collect_call_args(po, i, pp, &save_arg_vars,
+        0, i + opcnt * 2, 0, 0);
 
-          // 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;
+      if (strstr(pp->ret_type.name, "int64"))
+        need_mul_var = 1;
+      if (!(po->flags & OPF_TAIL) && !IS(pp->ret_type.name, "void"))
+        have_func_ret = 1;
     }
   }
 
@@ -2251,8 +2928,17 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
     if (po->flags & OPF_RMD)
       continue;
 
+    if (po->op == OP_PUSH && (po->flags & OPF_RSAVE)) {
+      reg = po->operand[0].reg;
+      if (!(regmask & (1 << reg)))
+        // not a reg save after all, rerun scan_for_pop
+        po->flags &= ~OPF_RSAVE;
+      else
+        regmask_save |= 1 << reg;
+    }
+
     if (po->op == OP_PUSH
-        && po->argmask == 0 && !(po->flags & OPF_RSAVE)
+        && po->argnum == 0 && !(po->flags & OPF_RSAVE)
         && po->operand[0].type == OPT_REG)
     {
       reg = po->operand[0].reg;
@@ -2261,16 +2947,14 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
 
       depth = 0;
       ret = scan_for_pop(i + 1, opcnt,
-              po->operand[0].name, i + opcnt, 0, &depth, 0);
+              po->operand[0].name, i + opcnt * 3, 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);
+          i + opcnt * 4, 0, &depth, 1);
         continue;
       }
       ret = scan_for_pop_ret(i + 1, opcnt, po->operand[0].name, 0);
@@ -2287,36 +2971,59 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
       }
     }
 
-    regmask |= po->regmask_src | po->regmask_dst;
+    regmask_now = po->regmask_src | po->regmask_dst;
+    if (regmask_now & (1 << xBP)) {
+      if (g_bp_frame && !(po->flags & OPF_EBP_S)) {
+        if (po->regmask_dst & (1 << xBP))
+          // compiler decided to drop bp frame and use ebp as scratch
+          scan_fwd_set_flags(i, opcnt, i + opcnt * 5, OPF_EBP_S);
+        else
+          regmask_now &= ~(1 << xBP);
+      }
+    }
+
+    regmask |= regmask_now;
 
     if (po->flags & OPF_CC)
     {
-      ret = scan_for_flag_set(i - 1);
-      if (ret < 0)
-        ferr(po, "unable to trace flag setter\n");
+      int setters[16], cnt = 0, branched = 0;
 
-      tmp_op = &ops[ret]; // flag setter
-      pfo = split_cond(po, po->op, &dummy);
-      pfomask = 0;
+      ret = scan_for_flag_set(i, i + opcnt * 6,
+              &branched, setters, &cnt);
+      if (ret < 0 || cnt <= 0)
+        ferr(po, "unable to trace flag setter(s)\n");
+      if (cnt > ARRAY_SIZE(setters))
+        ferr(po, "too many flag setters\n");
 
-      // 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 (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)
-          pfomask = 1 << pfo;
-      }
-      if (pfomask) {
-        tmp_op->pfomask |= pfomask;
-        cmp_result_vars |= pfomask;
+      pfo = split_cond(po, po->op, &dummy);
+      for (j = 0; j < cnt; j++)
+      {
+        tmp_op = &ops[setters[j]]; // flag setter
+        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, or branch, make it calculate flags explicitly
+        if (tmp_op->op == OP_TEST || tmp_op->op == OP_CMP) {
+          if (branched || scan_for_mod(tmp_op, setters[j] + 1, i) >= 0)
+            pfomask = 1 << pfo;
+        }
+        else if (tmp_op->op == OP_CMPS) {
+          pfomask = 1 << PFO_Z;
+        }
+        else {
+          // see if we'll be able to handle based on op result
+          if ((tmp_op->op != OP_AND && tmp_op->op != OP_OR
+               && pfo != PFO_Z && pfo != PFO_S && pfo != PFO_P)
+              || branched
+              || scan_for_mod_opr0(tmp_op, setters[j] + 1, i) >= 0)
+            pfomask = 1 << pfo;
+        }
+        if (pfomask) {
+          tmp_op->pfomask |= pfomask;
+          cmp_result_vars |= pfomask;
+        }
+        // note: may overwrite, currently not a problem
         po->datap = tmp_op;
       }
 
@@ -2331,14 +3038,19 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
     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);
+      fprintf(fout, "  %s (", pp->ret_type.name);
+      if (pp->is_stdcall && pp->argc_reg == 0)
+        fprintf(fout, "__stdcall ");
+      fprintf(fout, "*icall%d)(", 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, "%s a%d", pp->arg[j].type.name, j + 1);
       }
       fprintf(fout, ");\n");
     }
+    else if (po->op == OP_RET)
+      have_normal_ret = 1;
   }
 
   // output LUTs/jumptables
@@ -2367,36 +3079,40 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
     fprintf(fout, " };\n");
   }
 
-  // declare stack frame
+  // declare stack frame, va_arg
   if (g_stack_fsz)
     fprintf(fout, "  union { u32 d[%d]; u16 w[%d]; u8 b[%d]; } sf;\n",
       (g_stack_fsz + 3) / 4, (g_stack_fsz + 1) / 2, g_stack_fsz);
 
+  if (g_func_pp->is_vararg)
+    fprintf(fout, "  va_list ap;\n");
+
   // declare arg-registers
-  for (i = 0; i < g_func_pp.argc; i++) {
-    if (g_func_pp.arg[i].reg != NULL) {
+  for (i = 0; i < g_func_pp->argc; i++) {
+    if (g_func_pp->arg[i].reg != NULL) {
       reg = char_array_i(regs_r32,
-              ARRAY_SIZE(regs_r32), g_func_pp.arg[i].reg);
+              ARRAY_SIZE(regs_r32), g_func_pp->arg[i].reg);
       if (reg < 0)
-        ferr(ops, "arg '%s' is not a reg?\n", g_func_pp.arg[i].reg);
+        ferr(ops, "arg '%s' is not a reg?\n", g_func_pp->arg[i].reg);
 
       regmask_arg |= 1 << reg;
       fprintf(fout, "  u32 %s = (u32)a%d;\n",
-        g_func_pp.arg[i].reg, i + 1);
+        g_func_pp->arg[i].reg, i + 1);
       had_decl = 1;
     }
   }
 
   // declare other regs - special case for eax
-  if (!((regmask | regmask_arg) & 1) && !IS(g_func_pp.ret_type, "void")) {
+  if (!((regmask | regmask_arg) & 1)
+   && (have_func_ret || have_normal_ret)
+   && !IS(g_func_pp->ret_type.name, "void"))
+  {
     fprintf(fout, "  u32 eax = 0;\n");
     had_decl = 1;
   }
 
   regmask &= ~regmask_arg;
   regmask &= ~(1 << xSP);
-  if (g_bp_frame)
-    regmask &= ~(1 << xBP);
   if (regmask) {
     for (reg = 0; reg < 8; reg++) {
       if (regmask & (1 << reg)) {
@@ -2441,11 +3157,22 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
   if (had_decl)
     fprintf(fout, "\n");
 
+  if (g_func_pp->is_vararg) {
+    if (g_func_pp->argc_stack == 0)
+      ferr(ops, "vararg func without stack args?\n");
+    fprintf(fout, "  va_start(ap, a%d);\n", g_func_pp->argc);
+  }
+
   // output ops
   for (i = 0; i < opcnt; i++)
   {
-    if (g_labels[i][0] != 0 && g_label_refs[i].i != -1)
+    if (g_labels[i][0] != 0) {
       fprintf(fout, "\n%s:\n", g_labels[i]);
+      label_pending = 1;
+
+      delayed_flag_op = NULL;
+      last_arith_dst = NULL;
+    }
 
     po = &ops[i];
     if (po->flags & OPF_RMD)
@@ -2464,6 +3191,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
       int is_inv = 0;
 
       pfo = split_cond(po, po->op, &is_inv);
+      tmp_op = po->datap;
 
       // we go through all this trouble to avoid using parsed_flag_op,
       // which makes generated code much nicer
@@ -2473,17 +3201,18 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
         is_delayed = 1;
       }
       else if (last_arith_dst != NULL
-        && (pfo == PFO_Z || pfo == PFO_S || pfo == PFO_P))
+        && (pfo == PFO_Z || pfo == PFO_S || pfo == PFO_P
+           || (tmp_op && (tmp_op->op == OP_AND || tmp_op->op == OP_OR))
+           ))
       {
-        out_src_opr(buf3, sizeof(buf3), po, last_arith_dst, 0);
+        out_src_opr_u32(buf3, sizeof(buf3), po, last_arith_dst);
         out_test_for_cc(buf1, sizeof(buf1), po, pfo, is_inv,
           last_arith_dst->lmod, buf3);
         is_delayed = 1;
       }
-      else if (po->datap != NULL) {
+      else if (tmp_op != NULL) {
         // use preprocessed flag calc results
-        tmp_op = po->datap;
-        if (!tmp_op || !(tmp_op->pfomask & (1 << pfo)))
+        if (!(tmp_op->pfomask & (1 << pfo)))
           ferr(po, "not prepared for pfo %d\n", pfo);
 
         // note: is_inv was not yet applied
@@ -2518,10 +3247,10 @@ 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%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));
+        out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]);
+        fprintf(fout, "  %s = %s;", buf1,
+            out_src_opr(buf2, sizeof(buf2), po, &po->operand[1],
+              po->operand[0].is_ptr ? "(void *)" : "", 0));
         break;
 
       case OP_LEA:
@@ -2529,14 +3258,15 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
         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));
+            out_src_opr(buf2, sizeof(buf2), po, &po->operand[1],
+              NULL, 1));
         break;
 
       case OP_MOVZX:
         assert_operand_cnt(2);
         fprintf(fout, "  %s = %s;",
             out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]),
-            out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], 0));
+            out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1]));
         break;
 
       case OP_MOVSX:
@@ -2551,10 +3281,10 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
         default:
           ferr(po, "invalid src lmod: %d\n", po->operand[1].lmod);
         }
-        fprintf(fout, "  %s = %s%s;",
+        fprintf(fout, "  %s = %s;",
             out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]),
-            buf3,
-            out_src_opr(buf2, sizeof(buf2), po, &po->operand[1], 0));
+            out_src_opr(buf2, sizeof(buf2), po, &po->operand[1],
+              buf3, 0));
         break;
 
       case OP_NOT:
@@ -2567,7 +3297,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
         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));
+            out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1]));
         strcpy(g_comment, "cdq");
         break;
 
@@ -2645,14 +3375,44 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
       case OP_OR:
         propagate_lmod(po, &po->operand[0], &po->operand[1]);
         // fallthrough
-      case OP_SHL:
-      case OP_SHR:
       dualop_arith:
         assert_operand_cnt(2);
         fprintf(fout, "  %s %s= %s;",
             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));
+            out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1]));
+        output_std_flags(fout, po, &pfomask, buf1);
+        last_arith_dst = &po->operand[0];
+        delayed_flag_op = NULL;
+        break;
+
+      case OP_SHL:
+      case OP_SHR:
+        assert_operand_cnt(2);
+        out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]);
+        if (pfomask & (1 << PFO_C)) {
+          if (po->operand[1].type == OPT_CONST) {
+            l = lmod_bytes(po, po->operand[0].lmod) * 8;
+            j = po->operand[1].val;
+            j %= l;
+            if (j != 0) {
+              if (po->op == OP_SHL)
+                j = l - j;
+              else
+                j -= 1;
+              fprintf(fout, "  cond_c = (%s & 0x%02x) ? 1 : 0;\n",
+                buf1, 1 << j);
+            }
+            else
+              ferr(po, "zero shift?\n");
+          }
+          else
+            ferr(po, "TODO\n");
+          pfomask &= ~(1 << PFO_C);
+        }
+        fprintf(fout, "  %s %s= %s;", buf1, op_to_c(po),
+            out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1]));
+        output_std_flags(fout, po, &pfomask, buf1);
         last_arith_dst = &po->operand[0];
         delayed_flag_op = NULL;
         break;
@@ -2662,7 +3422,8 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
         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));
+          out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1]));
+        output_std_flags(fout, po, &pfomask, buf1);
         last_arith_dst = &po->operand[0];
         delayed_flag_op = NULL;
         break;
@@ -2682,6 +3443,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
         }
         else
           ferr(po, "TODO\n");
+        output_std_flags(fout, po, &pfomask, buf1);
         last_arith_dst = &po->operand[0];
         delayed_flag_op = NULL;
         break;
@@ -2703,10 +3465,20 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
       case OP_SBB:
         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));
+        out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]);
+        if (po->op == OP_SBB
+          && IS(po->operand[0].name, po->operand[1].name))
+        {
+          // avoid use of unitialized var
+          fprintf(fout, "  %s = -cond_c;", buf1);
+          // carry remains what it was
+          pfomask &= ~(1 << PFO_C);
+        }
+        else {
+          fprintf(fout, "  %s %s= %s + cond_c;", buf1, op_to_c(po),
+            out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[1]));
+        }
+        output_std_flags(fout, po, &pfomask, buf1);
         last_arith_dst = &po->operand[0];
         delayed_flag_op = NULL;
         break;
@@ -2722,13 +3494,14 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
           strcpy(buf2, po->op == OP_INC ? "+" : "-");
           fprintf(fout, "  %s %s= 1;", buf1, buf2);
         }
+        output_std_flags(fout, po, &pfomask, buf1);
         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);
+        out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[0]);
         fprintf(fout, "  %s = -%s%s;", buf1,
           lmod_cast_s(po, po->operand[0].lmod), buf2);
         last_arith_dst = &po->operand[0];
@@ -2740,8 +3513,10 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
         break;
 
       case OP_IMUL:
-        if (po->operand_cnt == 2)
+        if (po->operand_cnt == 2) {
+          propagate_lmod(po, &po->operand[0], &po->operand[1]);
           goto dualop_arith;
+        }
         if (po->operand_cnt == 3)
           ferr(po, "TODO imul3\n");
         // fallthrough
@@ -2749,7 +3524,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
         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));
+          out_src_opr_u32(buf2, sizeof(buf2), po, &po->operand[0]));
         fprintf(fout, "  edx = mul_tmp >> 32;\n");
         fprintf(fout, "  eax = mul_tmp;");
         last_arith_dst = NULL;
@@ -2764,11 +3539,11 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
 
         // 32bit division is common, look for it
         if (po->op == OP_DIV)
-          ret = scan_for_reg_clear(i - 1, xDX);
+          ret = scan_for_reg_clear(i, xDX);
         else
-          ret = scan_for_cdq_edx(i - 1);
+          ret = scan_for_cdq_edx(i);
         if (ret >= 0) {
-          out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], 0);
+          out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]);
           strcpy(buf2, lmod_cast(po, po->operand[0].lmod,
             po->op == OP_IDIV));
           fprintf(fout, "  edx = %seax %% %s%s;\n", buf2, buf2, buf1);
@@ -2808,6 +3583,9 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
 
       case OP_JMP:
         assert_operand_cnt(1);
+        last_arith_dst = NULL;
+        delayed_flag_op = NULL;
+
         if (po->operand[0].type == OPT_REGMEM) {
           ret = sscanf(po->operand[0].name, "%[^[][%[^*]*4]",
                   buf1, buf2);
@@ -2830,17 +3608,29 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
           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, "  icall%d = %s;\n", i,
+            out_src_opr(buf1, sizeof(buf1), po, &po->operand[0],
+              "(void *)", 0));
 
         fprintf(fout, "  ");
-        if (!IS(pp->ret_type, "void")) {
+        if (strstr(pp->ret_type.name, "int64")) {
           if (po->flags & OPF_TAIL)
-            fprintf(fout, "return ");
-          else
+            ferr(po, "int64 and tail?\n");
+          fprintf(fout, "mul_tmp = ");
+        }
+        else if (!IS(pp->ret_type.name, "void")) {
+          if (po->flags & OPF_TAIL) {
+            if (!IS(g_func_pp->ret_type.name, "void")) {
+              fprintf(fout, "return ");
+              if (g_func_pp->ret_type.is_ptr != pp->ret_type.is_ptr)
+                fprintf(fout, "(%s)", g_func_pp->ret_type.name);
+            }
+          }
+          else {
             fprintf(fout, "eax = ");
-          if (strchr(pp->ret_type, '*'))
-            fprintf(fout, "(u32)");
+            if (pp->ret_type.is_ptr)
+              fprintf(fout, "(u32)");
+          }
         }
 
         if (po->operand[0].type != OPT_LABEL) {
@@ -2849,18 +3639,20 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
         else {
           if (pp->name[0] == 0)
             ferr(po, "missing pp->name\n");
-          fprintf(fout, "%s(", pp->name);
+          fprintf(fout, "%s%s(", pp->name,
+            pp->has_structarg ? "_sa" : "");
         }
 
         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);
+          cast[0] = 0;
+          if (pp->arg[arg].type.is_ptr)
+            snprintf(cast, sizeof(cast), "(%s)", pp->arg[arg].type.name);
 
           if (pp->arg[arg].reg != NULL) {
-            fprintf(fout, "%s", pp->arg[arg].reg);
+            fprintf(fout, "%s%s", cast, pp->arg[arg].reg);
             continue;
           }
 
@@ -2868,57 +3660,84 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
           tmp_op = pp->arg[arg].datap;
           if (tmp_op == NULL)
             ferr(po, "parsed_op missing for arg%d\n", arg);
-          if (tmp_op->argmask) {
-            fprintf(fout, "s_a%d", arg + 1);
+          if (tmp_op->argnum != 0) {
+            fprintf(fout, "%ss_a%d", cast, tmp_op->argnum);
           }
           else {
             fprintf(fout, "%s",
               out_src_opr(buf1, sizeof(buf1),
-                tmp_op, &tmp_op->operand[0], 0));
+                tmp_op, &tmp_op->operand[0], cast, 0));
           }
         }
         fprintf(fout, ");");
 
+        if (strstr(pp->ret_type.name, "int64")) {
+          fprintf(fout, "\n");
+          fprintf(fout, "  edx = mul_tmp >> 32;\n");
+          fprintf(fout, "  eax = mul_tmp;");
+        }
+
         if (po->flags & OPF_TAIL) {
           strcpy(g_comment, "tailcall");
-          if (IS(pp->ret_type, "void"))
+          ret = 0;
+          if (i == opcnt - 1)
+            ret = 0;
+          else if (IS(pp->ret_type.name, "void"))
+            ret = 1;
+          else if (IS(g_func_pp->ret_type.name, "void"))
+            ret = 1;
+          // else already handled as 'return f()'
+
+          if (ret) {
+            if (!IS(g_func_pp->ret_type.name, "void"))
+              ferr(po, "int func -> void func tailcall?\n");
             fprintf(fout, "\n  return;");
+            strcpy(g_comment, "^ tailcall");
+          }
         }
         delayed_flag_op = NULL;
         last_arith_dst = NULL;
         break;
 
       case OP_RET:
-        if (IS(g_func_pp.ret_type, "void"))
-          fprintf(fout, "  return;");
-        else if (strchr(g_func_pp.ret_type, '*'))
+        if (g_func_pp->is_vararg)
+          fprintf(fout, "  va_end(ap);\n");
+ 
+        if (IS(g_func_pp->ret_type.name, "void")) {
+          if (i != opcnt - 1 || label_pending)
+            fprintf(fout, "  return;");
+        }
+        else if (g_func_pp->ret_type.is_ptr) {
           fprintf(fout, "  return (%s)eax;",
-            g_func_pp.ret_type);
+            g_func_pp->ret_type.name);
+        }
         else
           fprintf(fout, "  return eax;");
+
+        last_arith_dst = NULL;
+        delayed_flag_op = NULL;
         break;
 
       case OP_PUSH:
-        if (po->argmask) {
+        if (po->argnum != 0) {
           // 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, buf1);
-          }
+          out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]);
+          fprintf(fout, "  s_a%d = %s;", po->argnum, buf1);
           break;
         }
         else if (po->flags & OPF_RSAVE) {
-          out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], 0);
+          out_src_opr_u32(buf1, sizeof(buf1), po, &po->operand[0]);
           fprintf(fout, "  s_%s = %s;", buf1, buf1);
           break;
         }
-        ferr(po, "stray push encountered\n");
+        if (!(g_ida_func_attr & IDAFA_NORETURN))
+          ferr(po, "stray push encountered\n");
+        no_output = 1;
         break;
 
       case OP_POP:
         if (po->flags & OPF_RSAVE) {
-          out_src_opr(buf1, sizeof(buf1), po, &po->operand[0], 0);
+          out_dst_opr(buf1, sizeof(buf1), po, &po->operand[0]);
           fprintf(fout, "  %s = s_%s;", buf1, buf1);
           break;
         }
@@ -2926,6 +3745,7 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
         break;
 
       case OP_NOP:
+        no_output = 1;
         break;
 
       default:
@@ -2935,13 +3755,6 @@ 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;
@@ -2950,6 +3763,13 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
     if (!no_output)
       fprintf(fout, "\n");
 
+    // 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 (pfomask != 0)
       ferr(po, "missed flag calc, pfomask=%x\n", pfomask);
 
@@ -2963,8 +3783,13 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
       if (is_opr_modified(last_arith_dst, po))
         last_arith_dst = NULL;
     }
+
+    label_pending = 0;
   }
 
+  if (g_stack_fsz && !g_stack_frame_used)
+    fprintf(fout, "  (void)sf;\n");
+
   fprintf(fout, "}\n\n");
 
   // cleanup
@@ -2982,13 +3807,11 @@ static void gen_func(FILE *fout, FILE *fhdr, const char *funcn, int opcnt)
 
     if (ops[i].op == OP_CALL) {
       pp = ops[i].datap;
-      if (pp) {
+      if (pp)
         proto_release(pp);
-        free(pp);
-      }
     }
   }
-  proto_release(&g_func_pp);
+  g_func_pp = NULL;
 }
 
 static void set_label(int i, const char *name)
@@ -3003,8 +3826,8 @@ static void set_label(int i, const char *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);
+  if (g_labels[i][0] != 0 && !IS_START(g_labels[i], "algn_"))
+    aerr("dupe label '%s' vs '%s'?\n", name, g_labels[i]);
   memcpy(g_labels[i], name, len);
   g_labels[i][len] = 0;
 }
@@ -3029,11 +3852,99 @@ static char *next_word_s(char *w, size_t wsize, char *s)
 	return s + i;
 }
 
+struct chunk_item {
+  char *name;
+  long fptr;
+  int asmln;
+};
+
+static struct chunk_item *func_chunks;
+static int func_chunk_cnt;
+static int func_chunk_alloc;
+
+static void add_func_chunk(FILE *fasm, const char *name, int line)
+{
+  if (func_chunk_cnt >= func_chunk_alloc) {
+    func_chunk_alloc *= 2;
+    func_chunks = realloc(func_chunks,
+      func_chunk_alloc * sizeof(func_chunks[0]));
+    my_assert_not(func_chunks, NULL);
+  }
+  func_chunks[func_chunk_cnt].fptr = ftell(fasm);
+  func_chunks[func_chunk_cnt].name = strdup(name);
+  func_chunks[func_chunk_cnt].asmln = line;
+  func_chunk_cnt++;
+}
+
+static int cmp_chunks(const void *p1, const void *p2)
+{
+  const struct chunk_item *c1 = p1, *c2 = p2;
+  return strcmp(c1->name, c2->name);
+}
+
 static int cmpstringp(const void *p1, const void *p2)
 {
   return strcmp(*(char * const *)p1, *(char * const *)p2);
 }
 
+static void scan_ahead(FILE *fasm)
+{
+  char words[2][256];
+  char line[256];
+  long oldpos;
+  int oldasmln;
+  int wordc;
+  char *p;
+  int i;
+
+  oldpos = ftell(fasm);
+  oldasmln = asmln;
+
+  while (fgets(line, sizeof(line), fasm))
+  {
+    wordc = 0;
+    asmln++;
+
+    p = sskip(line);
+    if (*p == 0)
+      continue;
+
+    if (*p == ';')
+    {
+      // get rid of random tabs
+      for (i = 0; line[i] != 0; i++)
+        if (line[i] == '\t')
+          line[i] = ' ';
+
+      if (p[2] == 'S' && IS_START(p, "; START OF FUNCTION CHUNK FOR "))
+      {
+        p += 30;
+        next_word(words[0], sizeof(words[0]), p);
+        if (words[0][0] == 0)
+          aerr("missing name for func chunk?\n");
+
+        add_func_chunk(fasm, words[0], asmln);
+      }
+      continue;
+    } // *p == ';'
+
+    for (wordc = 0; wordc < ARRAY_SIZE(words); wordc++) {
+      words[wordc][0] = 0;
+      p = sskip(next_word_s(words[wordc], sizeof(words[0]), p));
+      if (*p == 0 || *p == ';') {
+        wordc++;
+        break;
+      }
+    }
+
+    if (wordc == 2 && IS(words[1], "ends"))
+      break;
+  }
+
+  fseek(fasm, oldpos, SEEK_SET);
+  asmln = oldasmln;
+}
+
 int main(int argc, char *argv[])
 {
   FILE *fout, *fasm, *frlist;
@@ -3042,8 +3953,14 @@ int main(int argc, char *argv[])
   char **rlist = NULL;
   int rlist_len = 0;
   int rlist_alloc = 0;
+  int func_chunks_used = 0;
+  int func_chunks_sorted = 0;
+  int func_chunk_i = -1;
+  long func_chunk_ret = 0;
+  int func_chunk_ret_ln = 0;
+  int scanned_ahead = 0;
   char line[256];
-  char words[16][256];
+  char words[20][256];
   enum opr_lenmod lmod;
   int in_func = 0;
   int pending_endp = 0;
@@ -3054,7 +3971,8 @@ int main(int argc, char *argv[])
   int arg_out;
   int arg = 1;
   int pi = 0;
-  int i, j, len;
+  int i, j;
+  int ret, len;
   char *p;
   int wordc;
 
@@ -3085,13 +4003,28 @@ int main(int argc, char *argv[])
   // needs special handling..
   rlist[rlist_len++] = "__alloca_probe";
 
+  func_chunk_alloc = 32;
+  func_chunks = malloc(func_chunk_alloc * sizeof(func_chunks[0]));
+  my_assert_not(func_chunks, NULL);
+
+  memset(words, 0, sizeof(words));
+
   for (; arg < argc; arg++) {
     frlist = fopen(argv[arg], "r");
     my_assert_not(frlist, NULL);
 
     while (fgets(line, sizeof(line), frlist)) {
       p = sskip(line);
-      if (*p == 0 || *p == ';' || *p == '#')
+      if (*p == 0 || *p == ';')
+        continue;
+      if (*p == '#') {
+        if (IS_START(p, "#if 0"))
+          skip_func = 1;
+        else if (IS_START(p, "#endif"))
+          skip_func = 0;
+        continue;
+      }
+      if (skip_func)
         continue;
 
       p = next_word(words[0], sizeof(words[0]), p);
@@ -3105,6 +4038,7 @@ int main(int argc, char *argv[])
       }
       rlist[rlist_len++] = strdup(words[0]);
     }
+    skip_func = 0;
 
     fclose(frlist);
     frlist = NULL;
@@ -3134,62 +4068,119 @@ int main(int argc, char *argv[])
     if (*p == 0)
       continue;
 
-    if (*p == ';') {
-      static const char *attrs[] = {
-        "bp-based frame",
-        "library function",
-        "static",
-        "noreturn",
-        "thunk",
-        "fpd=",
-      };
+    // get rid of random tabs
+    for (i = 0; line[i] != 0; i++)
+      if (line[i] == '\t')
+        line[i] = ' ';
+
+    if (*p == ';')
+    {
       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]);
+      if (p[2] == 'A' && IS_START(p, "; Attributes:"))
+      {
+        static const char *attrs[] = {
+          "bp-based frame",
+          "library function",
+          "static",
+          "noreturn",
+          "thunk",
+          "fpd=",
+        };
+
+        // parse IDA's attribute-list comment
+        g_ida_func_attr = 0;
+        p = sskip(p + 13);
+
+        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..
+          }
         }
-        if (i == ARRAY_SIZE(attrs)) {
-          anote("unparsed IDA attr: %s\n", p);
-          break;
+      }
+      else if (p[2] == 'S' && IS_START(p, "; START OF FUNCTION CHUNK FOR "))
+      {
+        p += 30;
+        next_word(words[0], sizeof(words[0]), p);
+        if (words[0][0] == 0)
+          aerr("missing name for func chunk?\n");
+
+        if (!scanned_ahead) {
+          add_func_chunk(fasm, words[0], asmln);
+          func_chunks_sorted = 0;
+        }
+      }
+      else if (p[2] == 'E' && IS_START(p, "; END OF FUNCTION CHUNK"))
+      {
+        if (func_chunk_i >= 0) {
+          if (func_chunk_i < func_chunk_cnt
+            && IS(func_chunks[func_chunk_i].name, g_func))
+          {
+            // move on to next chunk
+            ret = fseek(fasm, func_chunks[func_chunk_i].fptr, SEEK_SET);
+            if (ret)
+              aerr("seek failed for '%s' chunk #%d\n",
+                g_func, func_chunk_i);
+            asmln = func_chunks[func_chunk_i].asmln;
+            func_chunk_i++;
+          }
+          else {
+            if (func_chunk_ret == 0)
+              aerr("no return from chunk?\n");
+            fseek(fasm, func_chunk_ret, SEEK_SET);
+            asmln = func_chunk_ret_ln;
+            func_chunk_ret = 0;
+            pending_endp = 1;
+          }
         }
-        if (IS(attrs[i], "fpd=")) {
-          p = next_word(words[0], sizeof(words[0]), p);
-          // ignore for now..
+      }
+      else if (p[2] == 'F' && IS_START(p, "; FUNCTION CHUNK AT ")) {
+        func_chunks_used = 1;
+        p += 20;
+        if (IS_START(g_func, "sub_")) {
+          unsigned long addr = strtoul(p, NULL, 16);
+          unsigned long f_addr = strtoul(g_func + 4, NULL, 16);
+          if (addr > f_addr && !scanned_ahead) {
+            anote("scan_ahead caused by '%s', addr %lx\n",
+              g_func, addr);
+            scan_ahead(fasm);
+            scanned_ahead = 1;
+            func_chunks_sorted = 0;
+          }
         }
       }
       continue;
-    }
+    } // *p == ';'
 
 parse_words:
-    memset(words, 0, sizeof(words));
-    for (wordc = 0; wordc < 16; wordc++) {
+    for (i = wordc; i < ARRAY_SIZE(words); i++)
+      words[i][0] = 0;
+    for (wordc = 0; wordc < ARRAY_SIZE(words); wordc++) {
       p = sskip(next_word_s(words[wordc], sizeof(words[0]), p));
       if (*p == 0 || *p == ';') {
         wordc++;
         break;
       }
     }
+    if (*p != 0 && *p != ';')
+      aerr("too many words\n");
 
     // alow asm patches in comments
-    if (*p == ';' && IS_START(p, "; sctpatch: ")) {
-      p = sskip(p + 12);
+    if (*p == ';' && IS_START(p, "; sctpatch:")) {
+      p = sskip(p + 11);
       if (*p == 0 || *p == ';')
         continue;
       goto parse_words; // lame
@@ -3272,6 +4263,8 @@ do_pending_endp:
       skip_warned = 0;
       skip_func = 0;
       g_func[0] = 0;
+      func_chunks_used = 0;
+      func_chunk_i = -1;
       if (pi != 0) {
         memset(&ops, 0, pi * sizeof(ops[0]));
         memset(g_labels, 0, pi * sizeof(g_labels[0]));
@@ -3307,17 +4300,48 @@ do_pending_endp:
       continue;
     }
 
-    if (IS(words[1], "endp")) {
+    if (IS(words[1], "endp"))
+    {
       if (!in_func)
         aerr("endp '%s' while not in_func?\n", words[0]);
       if (!IS(g_func, words[0]))
         aerr("endp '%s' while in_func '%s'?\n",
           words[0], g_func);
 
+      if (!skip_func && func_chunks_used) {
+        // start processing chunks
+        struct chunk_item *ci, key = { g_func, 0 };
+
+        func_chunk_ret = ftell(fasm);
+        func_chunk_ret_ln = asmln;
+        if (!func_chunks_sorted) {
+          qsort(func_chunks, func_chunk_cnt,
+            sizeof(func_chunks[0]), cmp_chunks);
+          func_chunks_sorted = 1;
+        }
+        ci = bsearch(&key, func_chunks, func_chunk_cnt,
+               sizeof(func_chunks[0]), cmp_chunks);
+        if (ci == NULL)
+          aerr("'%s' needs chunks, but none found\n", g_func);
+        func_chunk_i = ci - func_chunks;
+        for (; func_chunk_i > 0; func_chunk_i--)
+          if (!IS(func_chunks[func_chunk_i - 1].name, g_func))
+            break;
+
+        ret = fseek(fasm, func_chunks[func_chunk_i].fptr, SEEK_SET);
+        if (ret)
+          aerr("seek failed for '%s' chunk #%d\n", g_func, func_chunk_i);
+        asmln = func_chunks[func_chunk_i].asmln;
+        func_chunk_i++;
+        continue;
+      }
       pending_endp = 1;
       continue;
     }
 
+    if (wordc == 2 && IS(words[1], "ends"))
+      break;
+
     p = strchr(words[0], ':');
     if (p != NULL) {
       set_label(pi, words[0]);