From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu, 11 Apr 2013 23:22:30 +0000 (+0100)
Subject: nv50/codegen: do not emitATOM() if the subOp is unknown
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=249f3d73cf5e9d22c592a619830a2f40912e6197;p=mesa.git

nv50/codegen: do not emitATOM() if the subOp is unknown

For debug build we'll hit the assert, for release we are going to emit random data
as subOp is used uninitilised. Spotted by gcc

codegen/nv50_ir_emit_nv50.cpp: In member function 'void nv50_ir::CodeEmitterNV50::emitATOM(const nv50_ir::Instruction*)':
codegen/nv50_ir_emit_nv50.cpp:1554:12: warning: 'subOp' may be used uninitialized in this function [-Wmaybe-uninitialized]
    uint8_t subOp;
            ^

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---

diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_emit_nv50.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_emit_nv50.cpp
index 2638ef1399d..bc5a833743b 100644
--- a/src/gallium/drivers/nv50/codegen/nv50_ir_emit_nv50.cpp
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir_emit_nv50.cpp
@@ -1565,7 +1565,7 @@ CodeEmitterNV50::emitATOM(const Instruction *i)
    case NV50_IR_SUBOP_ATOM_EXCH: subOp = 0x1; break;
    default:
       assert(!"invalid subop");
-      break;
+      return;
    }
    code[0] = 0xd0000001;
    code[1] = 0xe0c00000 | (subOp << 2);