[llvm-commits] CVS: llvm/lib/Target/X86/X86.h X86InstrInfo.cpp X86InstrInfo.def X86Implicit.cpp X86Implicit.h

Chris Lattner lattner at cs.uiuc.edu
Mon Dec 2 23:44:00 PST 2002


Changes in directory llvm/lib/Target/X86:

X86.h updated: 1.6 -> 1.7
X86InstrInfo.cpp updated: 1.9 -> 1.10
X86InstrInfo.def updated: 1.29 -> 1.30
X86Implicit.cpp (r1.1) removed
X86Implicit.h (r1.1) removed

---
Log message:

* Move information about Implicit Defs/Uses into X86InstrInfo.def.
* Expose information about implicit defs/uses of register through the 
  MachineInstrInfo.h file.


---
Diffs of the changes:

Index: llvm/lib/Target/X86/X86.h
diff -u llvm/lib/Target/X86/X86.h:1.6 llvm/lib/Target/X86/X86.h:1.7
--- llvm/lib/Target/X86/X86.h:1.6	Sun Nov 17 23:37:11 2002
+++ llvm/lib/Target/X86/X86.h	Mon Dec  2 23:42:53 2002
@@ -52,7 +52,7 @@
 
   // This defines a large number of symbolic names for X86 instruction opcodes.
   enum Opcode {
-#define I(ENUM, NAME, BASEOPCODE, FLAGS, TSFLAGS) ENUM,
+#define I(ENUM, NAME, BASEOPCODE, FLAGS, TSFLAGS, IMPDEFS, IMPUSES) ENUM,
 #include "X86InstrInfo.def"
   };
 }


Index: llvm/lib/Target/X86/X86InstrInfo.cpp
diff -u llvm/lib/Target/X86/X86InstrInfo.cpp:1.9 llvm/lib/Target/X86/X86InstrInfo.cpp:1.10
--- llvm/lib/Target/X86/X86InstrInfo.cpp:1.9	Fri Nov 22 16:42:50 2002
+++ llvm/lib/Target/X86/X86InstrInfo.cpp	Mon Dec  2 23:42:53 2002
@@ -5,18 +5,24 @@
 //===----------------------------------------------------------------------===//
 
 #include "X86InstrInfo.h"
+#include "X86.h"
 #include "llvm/CodeGen/MachineInstr.h"
-#include <iostream>
+
+#define I(ENUM, NAME, BASEOPCODE, FLAGS, TSFLAGS, IMPDEFS, IMPUSES)
+#define IMPREGSLIST(NAME, ...) \
+  static const unsigned NAME[] = { __VA_ARGS__ };
+#include "X86InstrInfo.def"
+
 
 // X86Insts - Turn the InstrInfo.def file into a bunch of instruction
 // descriptors
 //
 static const MachineInstrDescriptor X86Insts[] = {
-#define I(ENUM, NAME, BASEOPCODE, FLAGS, TSFLAGS)   \
+#define I(ENUM, NAME, BASEOPCODE, FLAGS, TSFLAGS, IMPDEFS, IMPUSES)   \
              { NAME,                    \
                -1, /* Always vararg */  \
                ((TSFLAGS) & X86II::Void) ? -1 : 0,  /* Result is in 0 */ \
-               0, false, 0, 0, TSFLAGS, FLAGS, TSFLAGS },
+               0, false, 0, 0, TSFLAGS, FLAGS, TSFLAGS, IMPDEFS, IMPUSES },
 #include "X86InstrInfo.def"
 };
 
@@ -26,7 +32,7 @@
 
 
 static unsigned char BaseOpcodes[] = {
-#define I(ENUM, NAME, BASEOPCODE, FLAGS, TSFLAGS) BASEOPCODE,
+#define I(ENUM, NAME, BASEOPCODE, FLAGS, TSFLAGS, IMPDEFS, IMPUSES) BASEOPCODE,
 #include "X86InstrInfo.def"
 };
 


Index: llvm/lib/Target/X86/X86InstrInfo.def
diff -u llvm/lib/Target/X86/X86InstrInfo.def:1.29 llvm/lib/Target/X86/X86InstrInfo.def:1.30
--- llvm/lib/Target/X86/X86InstrInfo.def:1.29	Sun Dec  1 17:25:59 2002
+++ llvm/lib/Target/X86/X86InstrInfo.def	Mon Dec  2 23:42:53 2002
@@ -17,6 +17,27 @@
 #errror "Must define I macro before including X86/X86InstructionInfo.def!"
 #endif
 
+// Macro to handle the implicit register uses lists...
+#ifndef IMPREGSLIST
+#define IMPREGSLIST(NAME, ...)
+#endif
+
+// Implicit register usage info: O_ is for one register, T_ is for two registers
+IMPREGSLIST(NoImpRegs, 0)
+IMPREGSLIST(O_AL     , X86::AL , 0)
+IMPREGSLIST(O_AH     , X86::AH , 0)
+IMPREGSLIST(O_CL     , X86::CL , 0)
+IMPREGSLIST(O_AX     , X86::AX , 0)
+IMPREGSLIST(O_DX     , X86::DX , 0)
+IMPREGSLIST(O_EAX    , X86::EAX, 0)
+IMPREGSLIST(O_EDX    , X86::EDX, 0)
+IMPREGSLIST(O_EBP    , X86::EBP, 0)
+IMPREGSLIST(T_AXDX   , X86::AX , X86::DX , 0)
+IMPREGSLIST(T_EAXEDX , X86::EAX, X86::EDX, 0)
+
+#undef IMPREGSLIST
+
+
 // Arguments to be passed into the I macro
 //  #1: Enum name - This ends up being the opcode symbol in the X86 namespace
 //  #2: Opcode name, as used by the gnu assembler
@@ -26,137 +47,139 @@
 //  #5: Target Specific Flags - Another bitfield containing X86 specific flags
 //      that we are interested in for each instruction.  These should be flags
 //      defined in X86InstrInfo.h in the X86II namespace.
+//  #6: Name of the implicit register uses list
+//  #7: Name of the implicit register definitions list
 //
 
 // The first instruction must always be the PHI instruction:
-I(PHI         , "phi",      0,             0, 0)
+I(PHI         , "phi",      0,             0, 0, NoImpRegs, NoImpRegs)
 
 // The second instruction must always be the noop instruction:
-I(NOOP        , "nop",   0x90,             0, X86II::RawFrm | X86II::Void)       // nop
+I(NOOP        , "nop",   0x90,             0, X86II::RawFrm | X86II::Void, NoImpRegs, NoImpRegs)       // nop
 
 // Flow control instructions
-I(RET         , "ret",   0xCB,    M_RET_FLAG, X86II::RawFrm | X86II::Void)       // ret
-I(JMP         , "jmp",   0xE9, M_BRANCH_FLAG, X86II::RawFrm | X86II::Void)       // jmp foo
-I(JNE         , "jne",   0x85, M_BRANCH_FLAG, X86II::RawFrm | X86II::TB | X86II::Void)
-I(JE          , "je",    0x84, M_BRANCH_FLAG, X86II::RawFrm | X86II::TB | X86II::Void)
-I(CALLpcrel32 , "call",  0xE8, M_BRANCH_FLAG, X86II::Void)
+I(RET         , "ret",   0xCB,    M_RET_FLAG, X86II::RawFrm | X86II::Void, NoImpRegs, NoImpRegs)       // ret
+I(JMP         , "jmp",   0xE9, M_BRANCH_FLAG, X86II::RawFrm | X86II::Void, NoImpRegs, NoImpRegs)       // jmp foo
+I(JNE         , "jne",   0x85, M_BRANCH_FLAG, X86II::RawFrm | X86II::TB | X86II::Void, NoImpRegs, NoImpRegs)
+I(JE          , "je",    0x84, M_BRANCH_FLAG, X86II::RawFrm | X86II::TB | X86II::Void, NoImpRegs, NoImpRegs)
+I(CALLpcrel32 , "call",  0xE8, M_BRANCH_FLAG, X86II::Void, NoImpRegs, NoImpRegs)
 
 // Misc instructions
-I(LEAVE       , "leave", 0xC9,             0, X86II::RawFrm)                     // leave
+I(LEAVE       , "leave", 0xC9,             0, X86II::RawFrm, O_EBP, O_EBP)                             // leave
 
 // Move instructions
-I(MOVrr8      , "movb",  0x88,             0, X86II::MRMDestReg)                 // R8  = R8
-I(MOVrr16     , "movw",  0x89,             0, X86II::MRMDestReg | X86II::OpSize) // R16 = R16
-I(MOVrr32     , "movl",  0x89,             0, X86II::MRMDestReg)                 // R32 = R32
-I(MOVir8      , "movb",  0xB0,             0, X86II::AddRegFrm)                  // R8  = imm8
-I(MOVir16     , "movw",  0xB8,             0, X86II::AddRegFrm  | X86II::OpSize) // R16 = imm16
-I(MOVir32     , "movl",  0xB8,             0, X86II::AddRegFrm)                  // R32 = imm32
-I(MOVmr8      , "movb",  0x8A,             0, X86II::MRMSrcMem)                  // R8  = [mem]  8A/r
-I(MOVmr16     , "movw",  0x8B,             0, X86II::MRMSrcMem  | X86II::OpSize) // R16 = [mem]  8B/r
-I(MOVmr32     , "movl",  0x8B,             0, X86II::MRMSrcMem)                  // R32 = [mem]  8B/r
-I(MOVrm8      , "movb",  0x88,             0, X86II::MRMDestMem | X86II::Void)   // [mem] = R8   88/r
-I(MOVrm16     , "movw",  0x89,             0, X86II::MRMDestMem | X86II::Void |  // [mem] = R16  89/r
-                                              X86II::OpSize)
-I(MOVrm32     , "movl",  0x89,             0, X86II::MRMDestMem | X86II::Void)   // [mem] = R32  89/r
+I(MOVrr8      , "movb",  0x88,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // R8  = R8
+I(MOVrr16     , "movw",  0x89,             0, X86II::MRMDestReg | X86II::OpSize, NoImpRegs, NoImpRegs) // R16 = R16
+I(MOVrr32     , "movl",  0x89,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // R32 = R32
+I(MOVir8      , "movb",  0xB0,             0, X86II::AddRegFrm, NoImpRegs, NoImpRegs)                  // R8  = imm8
+I(MOVir16     , "movw",  0xB8,             0, X86II::AddRegFrm  | X86II::OpSize, NoImpRegs, NoImpRegs) // R16 = imm16
+I(MOVir32     , "movl",  0xB8,             0, X86II::AddRegFrm, NoImpRegs, NoImpRegs)                  // R32 = imm32
+I(MOVmr8      , "movb",  0x8A,             0, X86II::MRMSrcMem, NoImpRegs, NoImpRegs)                  // R8  = [mem]
+I(MOVmr16     , "movw",  0x8B,             0, X86II::MRMSrcMem  | X86II::OpSize, NoImpRegs, NoImpRegs) // R16 = [mem]
+I(MOVmr32     , "movl",  0x8B,             0, X86II::MRMSrcMem, NoImpRegs, NoImpRegs)                  // R32 = [mem]
+I(MOVrm8      , "movb",  0x88,             0, X86II::MRMDestMem | X86II::Void, NoImpRegs, NoImpRegs)   // [mem] = R8
+I(MOVrm16     , "movw",  0x89,             0, X86II::MRMDestMem | X86II::Void |                        // [mem] = R16
+                                              X86II::OpSize, NoImpRegs, NoImpRegs)
+I(MOVrm32     , "movl",  0x89,             0, X86II::MRMDestMem | X86II::Void, NoImpRegs, NoImpRegs)   // [mem] = R32
 
-I(PUSHr32     , "pushl", 0x50,             0, X86II::AddRegFrm | X86II::Void)
+I(PUSHr32     , "pushl", 0x50,             0, X86II::AddRegFrm | X86II::Void, NoImpRegs, NoImpRegs)
 
 // Arithmetic instructions
-I(ADDrr8      , "addb",  0x00,             0, X86II::MRMDestReg)                 // R8  += R8
-I(ADDrr16     , "addw",  0x01,             0, X86II::MRMDestReg | X86II::OpSize) // R16 += R16
-I(ADDrr32     , "addl",  0x01,             0, X86II::MRMDestReg)                 // R32 += R32
-I(SUBrr8      , "subb",  0x2A,             0, X86II::MRMDestReg)                 // R8  -= R8
-I(SUBrr16     , "subw",  0x2B,             0, X86II::MRMDestReg | X86II::OpSize) // R16 -= R16
-I(SUBrr32     , "subl",  0x2B,             0, X86II::MRMDestReg)                 // R32 -= R32
-I(MULrr8      , "mulb",  0xF6,             0, X86II::MRMS4r     | X86II::Void)   // AX   = AL*R8
-I(MULrr16     , "mulw",  0xF7,             0, X86II::MRMS4r     | X86II::Void |  // DX:AX= AX*R16
-                                              X86II::OpSize)
-I(MULrr32     , "mull",  0xF7,             0, X86II::MRMS4r     | X86II::Void)   // ED:EA= EA*R32
+I(ADDrr8      , "addb",  0x00,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // R8  += R8
+I(ADDrr16     , "addw",  0x01,             0, X86II::MRMDestReg | X86II::OpSize, NoImpRegs, NoImpRegs) // R16 += R16
+I(ADDrr32     , "addl",  0x01,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // R32 += R32
+I(SUBrr8      , "subb",  0x2A,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // R8  -= R8
+I(SUBrr16     , "subw",  0x2B,             0, X86II::MRMDestReg | X86II::OpSize, NoImpRegs, NoImpRegs) // R16 -= R16
+I(SUBrr32     , "subl",  0x2B,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // R32 -= R32
+I(MULrr8      , "mulb",  0xF6,             0, X86II::MRMS4r     | X86II::Void, O_AL, O_AX)             // AX   = AL*R8
+I(MULrr16     , "mulw",  0xF7,             0, X86II::MRMS4r     | X86II::Void |                        // DX:AX= AX*R16
+                                              X86II::OpSize, O_AX, T_AXDX)
+I(MULrr32     , "mull",  0xF7,             0, X86II::MRMS4r     | X86II::Void, O_EAX, T_EAXEDX)        // ED:EA= EA*R32
 
 // unsigned division/remainder
-I(DIVrr8      , "divb",  0xF6,             0, X86II::MRMS6r     | X86II::Void)   // AX/r8= AL&AH
-I(DIVrr16     , "divw",  0xF7,             0, X86II::MRMS6r     | X86II::Void |  // DA/r16=AX&DX
-                                              X86II::OpSize)
-I(DIVrr32     , "divl",  0xF7,             0, X86II::MRMS6r     | X86II::Void)   // DA/r32=EAX&DX
+I(DIVrr8      , "divb",  0xF6,             0, X86II::MRMS6r     | X86II::Void, O_AX, O_AX)             // AX/r8= AL&AH
+I(DIVrr16     , "divw",  0xF7,             0, X86II::MRMS6r     | X86II::Void |                        // EDXEAX/r16=AX&DX
+                                              X86II::OpSize, T_AXDX, T_AXDX)
+I(DIVrr32     , "divl",  0xF7,             0, X86II::MRMS6r     | X86II::Void, T_EAXEDX, T_EAXEDX)     // EDXEAX/r32=EAX&EDX
 
 // signed division/remainder
-I(IDIVrr8     , "idivb", 0xF6,             0, X86II::MRMS7r     | X86II::Void)   // AX/r8= AL&AH
-I(IDIVrr16    , "idivw", 0xF7,             0, X86II::MRMS7r     | X86II::Void |  // DA/r16=AX&DX
-                                              X86II::OpSize)
-I(IDIVrr32    , "idivl", 0xF7,             0, X86II::MRMS7r     | X86II::Void)   // DA/r32=EAX&DX
+I(IDIVrr8     , "idivb", 0xF6,             0, X86II::MRMS7r     | X86II::Void, O_AX, O_AX)             // AX/r8= AL&AH
+I(IDIVrr16    , "idivw", 0xF7,             0, X86II::MRMS7r     | X86II::Void |                        // DA/r16=AX&DX
+                                              X86II::OpSize, T_AXDX, T_AXDX)
+I(IDIVrr32    , "idivl", 0xF7,             0, X86II::MRMS7r     | X86II::Void, T_EAXEDX, T_EAXEDX)     // DA/r32=EAX&DX
 
 // Logical operators
-I(ANDrr8      , "andb",  0x20,             0, X86II::MRMDestReg)                 // R8  &= R8
-I(ANDrr16     , "andw",  0x21,             0, X86II::MRMDestReg | X86II::OpSize) // R16 &= R16
-I(ANDrr32     , "andl",  0x21,             0, X86II::MRMDestReg)                 // R32 &= R32
-I(ORrr8       , "orb",   0x08,             0, X86II::MRMDestReg)                 // R8  |= R8
-I(ORrr16      , "orw",   0x09,             0, X86II::MRMDestReg | X86II::OpSize) // R16 |= R16
-I(ORrr32      , "orl",   0x09,             0, X86II::MRMDestReg)                 // R32 |= R32
-I(XORrr8      , "xorb",  0x30,             0, X86II::MRMDestReg)                 // R8  ^= R8
-I(XORrr16     , "xorw",  0x31,             0, X86II::MRMDestReg | X86II::OpSize) // R16 ^= R16
-I(XORrr32     , "xorl",  0x31,             0, X86II::MRMDestReg)                 // R32 ^= R32
+I(ANDrr8      , "andb",  0x20,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // R8  &= R8
+I(ANDrr16     , "andw",  0x21,             0, X86II::MRMDestReg | X86II::OpSize, NoImpRegs, NoImpRegs) // R16 &= R16
+I(ANDrr32     , "andl",  0x21,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // R32 &= R32
+I(ORrr8       , "orb",   0x08,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // R8  |= R8
+I(ORrr16      , "orw",   0x09,             0, X86II::MRMDestReg | X86II::OpSize, NoImpRegs, NoImpRegs) // R16 |= R16
+I(ORrr32      , "orl",   0x09,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // R32 |= R32
+I(XORrr8      , "xorb",  0x30,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // R8  ^= R8
+I(XORrr16     , "xorw",  0x31,             0, X86II::MRMDestReg | X86II::OpSize, NoImpRegs, NoImpRegs) // R16 ^= R16
+I(XORrr32     , "xorl",  0x31,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // R32 ^= R32
 
 // Shift instructions
-I(SHLrr8      , "shlb",  0xD2,             0, X86II::MRMS4r)                     // R8   <<= cl   D2/4
-I(SHLrr16     , "shlw",  0xD3,             0, X86II::MRMS4r | X86II::OpSize)     // R16  <<= cl   D3/4
-I(SHLrr32     , "shll",  0xD3,             0, X86II::MRMS4r)                     // R32  <<= cl   D3/4
-I(SHLir8      , "shlb",  0xC0,             0, X86II::MRMS4r)                     // R8   <<= imm8 C0/4 ib
-I(SHLir16     , "shlw",  0xC1,             0, X86II::MRMS4r | X86II::OpSize)     // R16  <<= imm8 C1/4 ib
-I(SHLir32     , "shll",  0xC1,             0, X86II::MRMS4r)                     // R32  <<= imm8 C1/4 ib
-I(SHRrr8      , "shrb",  0xD2,             0, X86II::MRMS5r)                     // R8  >>>= cl   D2/5
-I(SHRrr16     , "shrw",  0xD3,             0, X86II::MRMS5r | X86II::OpSize)     // R16 >>>= cl   D3/5
-I(SHRrr32     , "shrl",  0xD3,             0, X86II::MRMS5r)                     // R32 >>>= cl   D3/5
-I(SHRir8      , "shrb",  0xC0,             0, X86II::MRMS5r)                     // R8  >>>= imm8 C0/5 ib
-I(SHRir16     , "shrw",  0xC1,             0, X86II::MRMS5r | X86II::OpSize)     // R16 >>>= imm8 C1/5 ib
-I(SHRir32     , "shrl",  0xC1,             0, X86II::MRMS5r)                     // R32 >>>= imm8 C1/5 ib
-I(SARrr8      , "sarb",  0xD2,             0, X86II::MRMS7r)                     // R8   >>= cl   D2/7
-I(SARrr16     , "sarw",  0xD3,             0, X86II::MRMS7r | X86II::OpSize)     // R16  >>= cl   D3/7
-I(SARrr32     , "sarl",  0xD3,             0, X86II::MRMS7r)                     // R32  >>= cl   D3/7
-I(SARir8      , "sarb",  0xC0,             0, X86II::MRMS7r)                     // R8   >>= imm8 C0/7 ib
-I(SARir16     , "sarw",  0xC1,             0, X86II::MRMS7r | X86II::OpSize)     // R16  >>= imm8 C1/7 ib
-I(SARir32     , "sarl",  0xC1,             0, X86II::MRMS7r)                     // R32  >>= imm8 C1/7 ib
+I(SHLrr8      , "shlb",  0xD2,             0, X86II::MRMS4r, O_CL, NoImpRegs)                          // R8   <<= cl   D2/4
+I(SHLrr16     , "shlw",  0xD3,             0, X86II::MRMS4r | X86II::OpSize, O_CL, NoImpRegs)          // R16  <<= cl   D3/4
+I(SHLrr32     , "shll",  0xD3,             0, X86II::MRMS4r, O_CL, NoImpRegs)                          // R32  <<= cl   D3/4
+I(SHLir8      , "shlb",  0xC0,             0, X86II::MRMS4r, NoImpRegs, NoImpRegs)                     // R8   <<= imm8 C0/4 ib
+I(SHLir16     , "shlw",  0xC1,             0, X86II::MRMS4r | X86II::OpSize, NoImpRegs, NoImpRegs)     // R16  <<= imm8 C1/4 ib
+I(SHLir32     , "shll",  0xC1,             0, X86II::MRMS4r, NoImpRegs, NoImpRegs)                     // R32  <<= imm8 C1/4 ib
+I(SHRrr8      , "shrb",  0xD2,             0, X86II::MRMS5r, O_CL, NoImpRegs)                          // R8  >>>= cl   D2/5
+I(SHRrr16     , "shrw",  0xD3,             0, X86II::MRMS5r | X86II::OpSize, O_CL, NoImpRegs)          // R16 >>>= cl   D3/5
+I(SHRrr32     , "shrl",  0xD3,             0, X86II::MRMS5r, O_CL, NoImpRegs)                          // R32 >>>= cl   D3/5
+I(SHRir8      , "shrb",  0xC0,             0, X86II::MRMS5r, NoImpRegs, NoImpRegs)                     // R8  >>>= imm8 C0/5 ib
+I(SHRir16     , "shrw",  0xC1,             0, X86II::MRMS5r | X86II::OpSize, NoImpRegs, NoImpRegs)     // R16 >>>= imm8 C1/5 ib
+I(SHRir32     , "shrl",  0xC1,             0, X86II::MRMS5r, NoImpRegs, NoImpRegs)                     // R32 >>>= imm8 C1/5 ib
+I(SARrr8      , "sarb",  0xD2,             0, X86II::MRMS7r, O_CL, NoImpRegs)                          // R8   >>= cl   D2/7
+I(SARrr16     , "sarw",  0xD3,             0, X86II::MRMS7r | X86II::OpSize, O_CL, NoImpRegs)          // R16  >>= cl   D3/7
+I(SARrr32     , "sarl",  0xD3,             0, X86II::MRMS7r, O_CL, NoImpRegs)                          // R32  >>= cl   D3/7
+I(SARir8      , "sarb",  0xC0,             0, X86II::MRMS7r, NoImpRegs, NoImpRegs)                     // R8   >>= imm8 C0/7 ib
+I(SARir16     , "sarw",  0xC1,             0, X86II::MRMS7r | X86II::OpSize, NoImpRegs, NoImpRegs)     // R16  >>= imm8 C1/7 ib
+I(SARir32     , "sarl",  0xC1,             0, X86II::MRMS7r, NoImpRegs, NoImpRegs)                     // R32  >>= imm8 C1/7 ib
 
 // Floating point loads
-I(FLDr4       , "flds",  0xD9,             0, X86II::MRMS0m)                     // push float    D9/0
-I(FLDr8       , "fldl ", 0xDD,             0, X86II::MRMS0m)                     // push double   DD/0
+I(FLDr4       , "flds",  0xD9,             0, X86II::MRMS0m, NoImpRegs, NoImpRegs)                     // push float    D9/0
+I(FLDr8       , "fldl ", 0xDD,             0, X86II::MRMS0m, NoImpRegs, NoImpRegs)                     // push double   DD/0
 
 // Floating point compares
-I(FUCOMPP     , "fucompp", 0xDA,           0, X86II::Void)                       // compare+pop2x DA E9
+I(FUCOMPP     , "fucompp", 0xDA,           0, X86II::Void, NoImpRegs, NoImpRegs)                       // compare+pop2x DA E9
 
 // Floating point flag ops
-I(FNSTSWr8    , "fnstsw", 0xDF,            0, X86II::Void)                       // AX = fp flags DF E0
+I(FNSTSWr8    , "fnstsw", 0xDF,            0, X86II::Void, NoImpRegs, O_AX)                            // AX = fp flags DF E0
 
 // Condition code ops, incl. set if equal/not equal/...
-I(SAHF        , "sahf",  0x9E,             0, X86II::RawFrm)                     // flags = AH
-I(SETBr       , "setb",  0x92,             0, X86II::TB | X86II::MRMS0r)         // R8 = < unsign
-I(SETAEr      , "setae", 0x93,             0, X86II::TB | X86II::MRMS0r)         // R8 = >=unsign
-I(SETEr       , "sete",  0x94,             0, X86II::TB | X86II::MRMS0r)         // R8 = ==
-I(SETNEr      , "setne", 0x95,             0, X86II::TB | X86II::MRMS0r)         // R8 = !=
-I(SETBEr      , "setbe", 0x96,             0, X86II::TB | X86II::MRMS0r)         // R8 = <=unsign
-I(SETAr       , "seta",  0x97,             0, X86II::TB | X86II::MRMS0r)         // R8 = > unsign
-I(SETLr       , "setl",  0x9C,             0, X86II::TB | X86II::MRMS0r)         // R8 = < signed
-I(SETGEr      , "setge", 0x9D,             0, X86II::TB | X86II::MRMS0r)         // R8 = >=signed
-I(SETLEr      , "setle", 0x9E,             0, X86II::TB | X86II::MRMS0r)         // R8 = <=signed
-I(SETGr       , "setg",  0x9F,             0, X86II::TB | X86II::MRMS0r)         // R8 = > signed
+I(SAHF        , "sahf",  0x9E,             0, X86II::RawFrm, O_AH, NoImpRegs)                          // flags = AH
+I(SETBr       , "setb",  0x92,             0, X86II::TB | X86II::MRMS0r, NoImpRegs, NoImpRegs)         // R8 = < unsign
+I(SETAEr      , "setae", 0x93,             0, X86II::TB | X86II::MRMS0r, NoImpRegs, NoImpRegs)         // R8 = >=unsign
+I(SETEr       , "sete",  0x94,             0, X86II::TB | X86II::MRMS0r, NoImpRegs, NoImpRegs)         // R8 = ==
+I(SETNEr      , "setne", 0x95,             0, X86II::TB | X86II::MRMS0r, NoImpRegs, NoImpRegs)         // R8 = !=
+I(SETBEr      , "setbe", 0x96,             0, X86II::TB | X86II::MRMS0r, NoImpRegs, NoImpRegs)         // R8 = <=unsign
+I(SETAr       , "seta",  0x97,             0, X86II::TB | X86II::MRMS0r, NoImpRegs, NoImpRegs)         // R8 = > unsign
+I(SETLr       , "setl",  0x9C,             0, X86II::TB | X86II::MRMS0r, NoImpRegs, NoImpRegs)         // R8 = < signed
+I(SETGEr      , "setge", 0x9D,             0, X86II::TB | X86II::MRMS0r, NoImpRegs, NoImpRegs)         // R8 = >=signed
+I(SETLEr      , "setle", 0x9E,             0, X86II::TB | X86II::MRMS0r, NoImpRegs, NoImpRegs)         // R8 = <=signed
+I(SETGr       , "setg",  0x9F,             0, X86II::TB | X86II::MRMS0r, NoImpRegs, NoImpRegs)         // R8 = > signed
 
 // Integer comparisons
-I(CMPrr8      , "cmpb",  0x38,             0, X86II::MRMDestReg)                 // compare R8,R8
-I(CMPrr16     , "cmpw",  0x39,             0, X86II::MRMDestReg | X86II::OpSize) // compare R16,R16
-I(CMPrr32     , "cmpl",  0x39,             0, X86II::MRMDestReg)                 // compare R32,R32
-I(CMPri8      , "cmp",   0x80,             0, X86II::MRMS7r)                     // compare R8, imm8
+I(CMPrr8      , "cmpb",  0x38,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // compare R8,R8
+I(CMPrr16     , "cmpw",  0x39,             0, X86II::MRMDestReg | X86II::OpSize, NoImpRegs, NoImpRegs) // compare R16,R16
+I(CMPrr32     , "cmpl",  0x39,             0, X86II::MRMDestReg, NoImpRegs, NoImpRegs)                 // compare R32,R32
+I(CMPri8      , "cmp",   0x80,             0, X86II::MRMS7r, NoImpRegs, NoImpRegs)                     // compare R8, imm8
 
 // Sign extenders (first 3 are good for DIV/IDIV; the others are more general)
-I(CBW         , "cbw",   0x98,             0, X86II::RawFrm)                     // AX = signext(AL)
-I(CWD         , "cwd",   0x99,             0, X86II::RawFrm)                     // DX:AX = signext(AX)
-I(CDQ         , "cdq",   0x99,             0, X86II::RawFrm)                     // EDX:EAX = signext(EAX)
-I(MOVSXr16r8  , "movsx", 0xBE,             0, X86II::MRMSrcReg | X86II::TB |   // R16 = signext(R8)
-                                              X86II::OpSize)
-I(MOVSXr32r8  , "movsx", 0xBE,             0, X86II::MRMSrcReg | X86II::TB)    // R32 = signext(R8)
-I(MOVSXr32r16 , "movsx", 0xBF,             0, X86II::MRMSrcReg | X86II::TB)    // R32 = signext(R16)
+I(CBW         , "cbw",   0x98,             0, X86II::RawFrm, O_AL, O_AX)                               // AX = signext(AL)
+I(CWD         , "cwd",   0x99,             0, X86II::RawFrm, O_AX, O_DX)                               // DX:AX = signext(AX)
+I(CDQ         , "cdq",   0x99,             0, X86II::RawFrm, O_EAX, O_EDX)                             // EDX:EAX = signext(EAX)
+I(MOVSXr16r8  , "movsx", 0xBE,             0, X86II::MRMSrcReg | X86II::TB |                           // R16 = signext(R8)
+                                              X86II::OpSize, NoImpRegs, NoImpRegs)
+I(MOVSXr32r8  , "movsx", 0xBE,             0, X86II::MRMSrcReg | X86II::TB, NoImpRegs, NoImpRegs)      // R32 = signext(R8)
+I(MOVSXr32r16 , "movsx", 0xBF,             0, X86II::MRMSrcReg | X86II::TB, NoImpRegs, NoImpRegs)    // R32 = signext(R16)
 I(MOVZXr16r8  , "movzx", 0xB6,             0, X86II::MRMSrcReg | X86II::TB |   // R16 = zeroext(R8)
-                                              X86II::OpSize)
-I(MOVZXr32r8  , "movzx", 0xB6,             0, X86II::MRMSrcReg | X86II::TB)    // R32 = zeroext(R8)
-I(MOVZXr32r16 , "movzx", 0xB7,             0, X86II::MRMSrcReg | X86II::TB)    // R32 = zeroext(R16)
+                                              X86II::OpSize, NoImpRegs, NoImpRegs)
+I(MOVZXr32r8  , "movzx", 0xB6,             0, X86II::MRMSrcReg | X86II::TB, NoImpRegs, NoImpRegs)    // R32 = zeroext(R8)
+I(MOVZXr32r16 , "movzx", 0xB7,             0, X86II::MRMSrcReg | X86II::TB, NoImpRegs, NoImpRegs)    // R32 = zeroext(R16)
 
 // At this point, I is dead, so undefine the macro
 #undef I





More information about the llvm-commits mailing list