[llvm-commits] [llvm] r102217 - in /llvm/trunk: tools/edis/EDOperand.cpp utils/TableGen/EDEmitter.cpp

[Sean Callanan]

Author: spyffe
Date: Fri Apr 23 17:17:17 2010
New Revision: 102217

URL: http://llvm.org/viewvc/llvm-project?rev=102217&view=rev
Log:
Fixes to edis that mark x86 call targets as
memory operands rather than immediate operands.

Modified:
    llvm/trunk/tools/edis/EDOperand.cpp
    llvm/trunk/utils/TableGen/EDEmitter.cpp

Modified: llvm/trunk/tools/edis/EDOperand.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/edis/EDOperand.cpp?rev=102217&r1=102216&r2=102217&view=diff
==============================================================================
--- llvm/trunk/tools/edis/EDOperand.cpp (original)
+++ llvm/trunk/tools/edis/EDOperand.cpp Fri Apr 23 17:17:17 2010
@@ -233,6 +233,8 @@
   default:
     return 0;
   case kOperandTypeX86Memory:
+  case kOperandTypeX86PCRelative:
+  case kOperandTypeX86EffectiveAddress:
   case kOperandTypeARMSoReg:
   case kOperandTypeARMSoImm:
   case kOperandTypeARMAddrMode2:
@@ -243,6 +245,7 @@
   case kOperandTypeARMAddrMode5:
   case kOperandTypeARMAddrMode6:
   case kOperandTypeARMAddrModePC:
+  case kOperandTypeARMBranchTarget:
   case kOperandTypeThumbAddrModeS1:
   case kOperandTypeThumbAddrModeS2:
   case kOperandTypeThumbAddrModeS4:

Modified: llvm/trunk/utils/TableGen/EDEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/EDEmitter.cpp?rev=102217&r1=102216&r2=102217&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/EDEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/EDEmitter.cpp Fri Apr 23 17:17:17 2010
@@ -316,12 +316,10 @@
   IMM("i16imm");
   IMM("i16i8imm");
   IMM("i32imm");
-  IMM("i32imm_pcrel");
   IMM("i32i8imm");
   IMM("i64imm");
   IMM("i64i8imm");
   IMM("i64i32imm");
-  IMM("i64i32imm_pcrel");
   IMM("SSECC");
   
   // all R, I, R, I, R
@@ -350,6 +348,8 @@
   LEA("lea64mem");
   
   // all I
+  PCR("i32imm_pcrel");
+  PCR("i64i32imm_pcrel");
   PCR("brtarget8");
   PCR("offset8");
   PCR("offset16");