Renaming according to BSPEC: jump_count -> JIP; pop_count -> UIP.

Since bspec SNB+, jump_count and pop_count is renamed to JIP and uIP.

diff --git a/assembler/src/brw_structs.h b/assembler/src/brw_structs.h
index 30815b2..7958a48 100644 (file)
--- a/assembler/src/brw_structs.h
+++ b/assembler/src/brw_structs.h
@@ -1309,9 +1309,8 @@ struct brw_instruction
 
       struct
       {
-        GLint  jump_count:16;  /* note: signed */
-        GLuint  pop_count:4;
-        GLuint  pad0:12;
+        GLint JIP:16; /* bspec: both the JIP and UIP are signed 16-bit numbers */
+        GLint UIP:16;
       } if_else;
 
       struct {

diff --git a/assembler/src/main.c b/assembler/src/main.c
index ee29412..72d9a50 100644 (file)
--- a/assembler/src/main.c
+++ b/assembler/src/main.c
@@ -330,13 +330,13 @@ int main(int argc, char **argv)
                                entry1->inst_offset - entry->inst_offset;
                            int delta = (entry->instruction.header.opcode == BRW_OPCODE_JMPI ? 1 : 0);
                             if (gen_level >= 5)
-                                    entry->instruction.bits3.if_else.jump_count = 2 * (offset - delta); // bspec: the jump distance in number of eight-byte units
+                                    entry->instruction.bits3.if_else.JIP = 2 * (offset - delta); // bspec: the jump distance in number of eight-byte units
                             else
-                                    entry->instruction.bits3.if_else.jump_count = offset - delta;
+                                    entry->instruction.bits3.if_else.JIP = offset - delta;
 
                             if (entry->instruction.header.opcode == BRW_OPCODE_ELSE)
-                                    entry->instruction.bits3.if_else.pop_count = 1;
-                               found = 1;
+                                    entry->instruction.bits3.if_else.UIP = 1;
+                           found = 1;
                            break;
                        }
                        entry1 = entry1->next;