i965: Reduce cross-pollination between the DRI driver and compiler

[mesa.git] / src / intel / tools / disasm.c

diff --git a/src/intel/tools/disasm.c b/src/intel/tools/disasm.c
index a1cb19197cf53fc03a3dfcca5ebfbb42e5278117..96c6ce290a0b822c408adc007c520ba59569821c 100644 (file)
--- a/src/intel/tools/disasm.c
+++ b/src/intel/tools/disasm.c
@@ -23,7 +23,6 @@
 
 #include <stdlib.h>
 
-#include "brw_context.h"
 #include "brw_inst.h"
 #include "brw_eu.h"
 
@@ -32,17 +31,28 @@
 uint64_t INTEL_DEBUG;
 
 struct gen_disasm {
-    struct brw_device_info devinfo;
+    struct gen_device_info devinfo;
 };
 
+static bool
+is_send(uint32_t opcode)
+{
+   return (opcode == BRW_OPCODE_SEND  ||
+           opcode == BRW_OPCODE_SENDC ||
+           opcode == BRW_OPCODE_SENDS ||
+           opcode == BRW_OPCODE_SENDSC );
+}
+
 void
-gen_disasm_disassemble(struct gen_disasm *disasm, void *assembly, int start,
-                       int end, FILE *out)
+gen_disasm_disassemble(struct gen_disasm *disasm, void *assembly,
+                       int start, FILE *out)
 {
-   struct brw_device_info *devinfo = &disasm->devinfo;
+   struct gen_device_info *devinfo = &disasm->devinfo;
    bool dump_hex = false;
+   int offset = start;
 
-   for (int offset = start; offset < end;) {
+   /* This loop exits when send-with-EOT or when opcode is 0 */
+   while (true) {
       brw_inst *insn = assembly + offset;
       brw_inst uncompacted;
       bool compacted = brw_inst_cmpt_control(devinfo, insn);
@@ -74,13 +84,10 @@ gen_disasm_disassemble(struct gen_disasm *disasm, void *assembly, int start,
       brw_disassemble_inst(out, devinfo, insn, compacted);
 
       /* Simplistic, but efficient way to terminate disasm */
-      if (brw_inst_opcode(devinfo, insn) == BRW_OPCODE_SEND ||
-          brw_inst_opcode(devinfo, insn) == BRW_OPCODE_SENDC)
-         if (brw_inst_eot(devinfo, insn))
-            break;
-         if (brw_inst_opcode(devinfo, insn) == 0)
-            break;
-
+      uint32_t opcode = brw_inst_opcode(devinfo, insn);
+      if (opcode == 0 || (is_send(opcode) && brw_inst_eot(devinfo, insn))) {
+         break;
+      }
    }
 }
 
@@ -88,17 +95,15 @@ struct gen_disasm *
 gen_disasm_create(int pciid)
 {
    struct gen_disasm *gd;
-   const struct brw_device_info *dev_info = NULL;
 
    gd = malloc(sizeof *gd);
    if (gd == NULL)
       return NULL;
 
-   dev_info = brw_get_device_info(pciid);
-
-   gd->devinfo.gen = dev_info->gen;
-   gd->devinfo.is_cherryview = dev_info->is_cherryview;
-   gd->devinfo.is_g4x = dev_info->is_g4x;
+   if (!gen_get_device_info(pciid, &gd->devinfo)) {
+      free(gd);
+      return NULL;
+   }
 
    brw_init_compaction_tables(&gd->devinfo);