amd64: get rid of xinc/xdec. handle those at emit stage

2 files changed, 7 insertions, 26 deletions

diff --git a/amd64/emit.c b/amd64/emit.c
index aa041c3..946f396 100644
--- a/amd64/emit.c
+++ b/amd64/emit.c
@@ -185,6 +185,7 @@ enum operpat {
    PGPR,
    PFPR,
    P1, /* imm = 1 */
+   PN1, /* imm = -1 */
    PI8,
    PU8,
    PI16,
@@ -233,6 +234,7 @@ opermatch(enum operpat pat, struct oper oper)
    case PGPR: return oper.t == OREG && oper.reg <= R15;
    case PFPR: return oper.t == OREG && oper.reg >= XMM0;
    case P1:   return oper.t == OIMM && oper.imm == 1;
+   case PN1:  return oper.t == OIMM && oper.imm == -1;
    case PI8:  return oper.t == OIMM && (schar)oper.imm == oper.imm;
    case PU8:  return oper.t == OIMM && (uchar)oper.imm == oper.imm;
    case PI16: return oper.t == OIMM && (short)oper.imm == oper.imm;
@@ -526,6 +528,8 @@ DEFINSTR2(Xlea,
 )
 DEFINSTR2(Xadd,
    {4|8, PGPR, PGPR, "\x03", EN_RR},   /* ADD r32/64, r32/64 */
+   {4|8, PGPR, P1,   "\xFF", EN_R, .ext=0}, /* INC r32/64 */
+   {4|8, PGPR, PN1,  "\xFF", EN_R, .ext=1}, /* DEC r32/64 */
    {4|8, PGPR, PI8,  "\x83", EN_RI8},  /* ADD r32/64, imm8 */
    {4|8, PRAX, PI32, "\x05", EN_I32},  /* ADD eax/rax, imm */
    {4|8, PGPR, PI32, "\x81", EN_RI32}, /* ADD r32/64, imm */
@@ -539,6 +543,8 @@ DEFINSTR2(Xaddf,
 )
 DEFINSTR2(Xsub,
    {4|8, PGPR, PGPR, "\x2B", EN_RR},           /* SUB r32/64, r32/64 */
+   {4|8, PGPR, P1,   "\xFF", EN_R, .ext=1},    /* DEC r32/64 */
+   {4|8, PGPR, PN1,  "\xFF", EN_R, .ext=0},    /* INC r32/64 */
    {4|8, PGPR, PI8,  "\x83", EN_RI8, .ext=5},  /* SUB r32/64, imm8 */
    {4|8, PRAX, PI32, "\x2D", EN_I32},          /* SUB eax/rax, imm */
    {4|8, PGPR, PI32, "\x81", EN_RI32, .ext=5}, /* SUB r32/64, imm */
@@ -624,12 +630,6 @@ DEFINSTR2(Xcvttsd2si,
    {-1,  PGPR, PFPR, "\xF2\x0F\x2C", EN_RR}, /* CVTTSD2SI r32/64, xmm */
    {-1,  PGPR, PMEM, "\xF2\x0F\x2C", EN_RM}, /* CVTTSD2SI r32/64, m32 */
 )
-DEFINSTR1(Xinc,
-   {4|8, PGPR, 0, "\xFF", EN_R, .ext=0} /* INC r32/64 */
-)
-DEFINSTR1(Xdec,
-   {4|8, PGPR, 0, "\xFF", EN_R, .ext=1} /* DEC r32/64 */
-)
 DEFINSTR1(Xneg,
    {4|8, PGPR, 0, "\xF7", EN_R, .ext=3} /* NEG r32/64 */
 )
@@ -992,8 +992,6 @@ emitinstr(uchar **pcode, struct function *fn, struct block *blk, int curi, struc
       assert(ins->reg-1 == dst.reg);
       X(pcode, cls, dst, mkimmdatregoper(ins->r));
       break;
-   case Oxinc: X1 = Xinc; goto ALU1;
-   case Oxdec: X1 = Xdec; goto ALU1;
    case Oneg: X1 = Xneg; goto ALU1;
    case Onot: X1 = Xnot; goto ALU1;
    ALU1:
diff --git a/amd64/isel.c b/amd64/isel.c
index c250ec0..f993d3b 100644
--- a/amd64/isel.c
+++ b/amd64/isel.c
@@ -37,8 +37,6 @@ static const uchar opflags[] = {
    [Oulte] = ZF|CLOBF,
    [Ougte] = ZF|CLOBF,
    [Ocall] = CLOBF,
-   [Oxinc] = ZF|CLOBF,
-   [Oxdec] = ZF|CLOBF,
 };
 
 static int iflagsrc = -1;
@@ -358,11 +356,7 @@ sel(struct function *fn, struct instr *ins, struct block *blk, int *curi)
       blk->ins.p[*curi - 0] = t;
       break;
    case Osub:
-       if (ins->r.bits == mkref(RICON, 1).bits) {
-         /* sub x,1 -> dec x */
-         ins->op = op = Oxdec;
-         ins->r = NOREF;
-      } else if (isintcon(ins->l)) {
+       if (isintcon(ins->l)) {
          /* sub imm, x -> sub x, imm; neg x */
          struct instr sub = *ins;
          rswap(sub.l, sub.r);
@@ -381,17 +375,6 @@ sel(struct function *fn, struct instr *ins, struct block *blk, int *curi)
                *ins = temp;
                break;
             }
-         } else if (ins->l.bits == mkref(RICON, 1).bits) {
-            /* add 1,x -> inc x */
-            ins->op = op = Oxinc;
-            ins->l = ins->r;
-            ins->r = NOREF;
-            goto ALU;
-         } else if (ins->r.bits == mkref(RICON, 1).bits) {
-            /* add x,1 -> inc x */
-            ins->op = op = Oxinc;
-            ins->r = NOREF;
-            goto ALU;
          }
       }
       /* fallthru */