From: Dale Weiler <killfieldengine@gmail.com>
Date: Sat, 28 Sep 2013 10:10:02 +0000 (-0400)
Subject: Remove the rest of it.
X-Git-Tag: 0.3.5~65
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=81df8fa139791a4c96af6ff261c84364b918a1b2;p=xonotic%2Fgmqcc.git

Remove the rest of it.
---

diff --git a/gmqcc.h b/gmqcc.h
index 6f42d44..d8ad374 100644
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -726,13 +726,7 @@ enum {
     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 */
diff --git a/ir.c b/ir.c
index 55fffb3..f92d552 100644
--- 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];
 
-        /* Ignore NOP instruction */
-        if (instr->opcode == VINSTR_NOP)
-            continue;
-
         if (instr->opcode == VINSTR_PHI) {
             irerror(block->context, "cannot generate virtual instruction (phi)");
             return false;