Remove the rest of it.

diff --git a/gmqcc.h b/gmqcc.h
index 6f42d440f1c783227ae977278b0bce4b93a4af5d..d8ad37465ef0525ea2298a9eb484f7a6e9220f04 100644 (file)
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -726,13 +726,7 @@ enum {
     VINSTR_BITXOR,
     VINSTR_BITXOR_V,
     VINSTR_BITXOR_VF,
     VINSTR_BITXOR,
     VINSTR_BITXOR_V,
     VINSTR_BITXOR_VF,

-    VINSTR_CROSS,
-
-    /*
-     * An instruction that is never emitted, useful for marking ir_instr
-     * to not be generated (just set the ->opcode member to it).
-     */
-    VINSTR_NOP
+    VINSTR_CROSS

 };
 
 /* TODO: elide */
 };
 
 /* TODO: elide */

diff --git a/ir.c b/ir.c
index 55fffb34f1e4c624b93a211fdb3c59fad311cebd..f92d5524eb12281e4d13fe1044f906e150718e41 100644 (file)
--- a/ir.c
+++ b/ir.c
@@ -2799,10 +2799,6 @@ static bool gen_blocks_recursive(code_t *code, ir_function *func, ir_block *bloc
     {
         instr = block->instr[i];
 
     {
         instr = block->instr[i];
 

-        /* Ignore NOP instruction */
-        if (instr->opcode == VINSTR_NOP)
-            continue;
-

         if (instr->opcode == VINSTR_PHI) {
             irerror(block->context, "cannot generate virtual instruction (phi)");
             return false;
         if (instr->opcode == VINSTR_PHI) {
             irerror(block->context, "cannot generate virtual instruction (phi)");
             return false;