From 960ca001cadb2824ecbb93a2dffacf198e61cece Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 1 Sep 2006 12:11:55 -0700
Subject: [PATCH] Fix initialization of null reg for ELSE, and set the pop
 count right.

This fixes the ELSE test.
---
 assembler/src/gram.y | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/assembler/src/gram.y b/assembler/src/gram.y
index 9d450b22..232f7a0d 100644
--- a/assembler/src/gram.y
+++ b/assembler/src/gram.y
@@ -359,6 +359,12 @@ elseinstruction: ELSE relativelocation
 		   * offset is the second source operand.  The offset is added
 		   * to the IP pre-increment.
 		   */
+		  dst.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
+		  dst.reg_nr = BRW_ARF_IP;
+		  dst.subreg_nr = 0;
+
+		  /* Set the istack pop count, which must always be 1. */
+		  $2.imm32 |= (1 << 16);
 
 		  bzero(&$$, sizeof($$));
 		  $$.header.opcode = $1;