summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2012-01-30 18:24:49 -0500
committerTom Stellard <thomas.stellard@amd.com>2012-01-30 18:39:38 -0500
commit15866a3d7f8766ae199dcff7cb5d9c5f64ce5dac (patch)
treef813d9b73d2e759012cd96afe3232b4479d0e044
parent16719d67512cc68161654054b924f8914a4e04dd (diff)
gallium/radeon: Use isPseudo flag for AMDIL instructionsr600g-llvm-shader-Jan15-2012
-rw-r--r--src/gallium/drivers/radeon/AMDILFormats.td3
-rw-r--r--src/gallium/drivers/radeon/R600CodeEmitter.cpp8
2 files changed, 2 insertions, 9 deletions
diff --git a/src/gallium/drivers/radeon/AMDILFormats.td b/src/gallium/drivers/radeon/AMDILFormats.td
index 2038f053868..d14e52665be 100644
--- a/src/gallium/drivers/radeon/AMDILFormats.td
+++ b/src/gallium/drivers/radeon/AMDILFormats.td
@@ -58,15 +58,14 @@ include "AMDILTokenDesc.td"
//===--------------------------------------------------------------------===//
class ILFormat<ILOpCode op, dag outs, dag ins, string asmstr, list<dag> pattern>
: Instruction {
- field bits<32> Inst;
- let Inst = 0xffffffff;
let Namespace = "AMDIL";
dag OutOperandList = outs;
dag InOperandList = ins;
ILOpCode operation = op;
let Pattern = pattern;
let AsmString = !strconcat(asmstr, "\n");
+ let isPseudo = 1;
bit hasIEEEFlag = 0;
bit hasZeroOpFlag = 0;
}
diff --git a/src/gallium/drivers/radeon/R600CodeEmitter.cpp b/src/gallium/drivers/radeon/R600CodeEmitter.cpp
index 66be609a007..65511c001ed 100644
--- a/src/gallium/drivers/radeon/R600CodeEmitter.cpp
+++ b/src/gallium/drivers/radeon/R600CodeEmitter.cpp
@@ -542,10 +542,6 @@ void R600CodeEmitter::emitFCInstr(MachineInstr &MI)
unsigned int R600CodeEmitter::getHWInst(const MachineInstr &MI)
{
- unsigned hwInst = getBinaryCodeForInstr(MI);
- if (hwInst != 0xffffffff) {
- return hwInst;
- }
/* XXX: Lower these to MOV before the code emitter. */
switch (MI.getOpcode()) {
@@ -566,9 +562,7 @@ unsigned int R600CodeEmitter::getHWInst(const MachineInstr &MI)
return 0x19;
default:
- fprintf(stderr, "Unhandled opcode: %s\n", MI.getDesc().getName());
- abort();
- return 0;
+ return getBinaryCodeForInstr(MI);
}
}