* src/vm/jit/codegen-common.c (codegen_reg_of_var): Removed unused

conditional move code. This will not be implemented in the baseline
compiler.
* src/vm/jit/x86_64/emit.c (emit_store): Likewise.

diff --git a/src/vm/jit/codegen-common.c b/src/vm/jit/codegen-common.c
index 50482514dbdb85bcee725497458146186345fb3d..6d1988762f56735ef75f072ba03f333558be52df 100644 (file)
--- a/src/vm/jit/codegen-common.c
+++ b/src/vm/jit/codegen-common.c
@@ -1694,16 +1694,6 @@ void removenativestub(u1 *stub)
 
 s4 codegen_reg_of_var(u2 opcode, varinfo *v, s4 tempregnum)
 {
-
-#if 0
-       /* Do we have to generate a conditional move?  Yes, then always
-          return the temporary register.  The real register is identified
-          during the store. */
-
-       if (opcode & ICMD_CONDITION_MASK)
-               return tempregnum;
-#endif
-
        if (!(v->flags & INMEMORY))
                return v->vv.regoff;
 

diff --git a/src/vm/jit/x86_64/emit.c b/src/vm/jit/x86_64/emit.c
index 6ce0eb3a3a4bc87c77bee2977932abece1314850..1c81412ee6ded1ad19728cb1fa266a295beca9a0 100644 (file)
--- a/src/vm/jit/x86_64/emit.c
+++ b/src/vm/jit/x86_64/emit.c
@@ -115,38 +115,11 @@ inline void emit_store(jitdata *jd, instruction *iptr, varinfo *dst, s4 d)
 {
        codegendata  *cd;
        s4            disp;
-#if 0
-       s4            s;
-       u2            opcode;
-#endif
 
        /* get required compiler data */
 
        cd = jd->cd;
 
-#if 0
-       /* do we have to generate a conditional move? */
-
-       if ((iptr != NULL) && (iptr->opc & ICMD_CONDITION_MASK)) {
-               /* the passed register d is actually the source register */
-
-               s = d;
-
-               /* Only pass the opcode to codegen_reg_of_var to get the real
-                  destination register. */
-
-               opcode = iptr->opc & ICMD_OPCODE_MASK;
-
-               /* get the real destination register */
-
-               d = codegen_reg_of_var(rd, opcode, dst, REG_ITMP1);
-
-               /* and emit the conditional move */
-
-               emit_cmovxx(cd, iptr, s, d);
-       }
-#endif
-
        if (IS_INMEMORY(dst->flags)) {
                COUNT_SPILLS;