[llvm-commits] CVS: llvm/lib/Target/X86/X86.td X86InstrInfo.h

[Evan Cheng]

Changes in directory llvm/lib/Target/X86:

X86.td updated: 1.24 -> 1.25
X86InstrInfo.h updated: 1.50 -> 1.51
---
Log message:

ImmMask should be 3 for a two-bit field; Compact X86II

---
Diffs of the changes:  (+3 -4)

 X86.td         |    2 +-
 X86InstrInfo.h |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/X86/X86.td
diff -u llvm/lib/Target/X86/X86.td:1.24 llvm/lib/Target/X86/X86.td:1.25
--- llvm/lib/Target/X86/X86.td:1.24	Wed May 17 19:12:58 2006
+++ llvm/lib/Target/X86/X86.td	Thu May 18 01:27:15 2006
@@ -114,7 +114,7 @@
                        7,
                        11,
                        13,
-                       17];
+                       16];
 }
 
 // The X86 target supports two different syntaxes for emitting machine code.


Index: llvm/lib/Target/X86/X86InstrInfo.h
diff -u llvm/lib/Target/X86/X86InstrInfo.h:1.50 llvm/lib/Target/X86/X86InstrInfo.h:1.51
--- llvm/lib/Target/X86/X86InstrInfo.h:1.50	Thu Feb  2 14:12:32 2006
+++ llvm/lib/Target/X86/X86InstrInfo.h	Thu May 18 01:27:15 2006
@@ -120,7 +120,7 @@
     // This two-bit field describes the size of an immediate operand.  Zero is
     // unused so that we can tell if we forgot to set a value.
     ImmShift = 11,
-    ImmMask  = 7 << ImmShift,
+    ImmMask  = 3 << ImmShift,
     Imm8     = 1 << ImmShift,
     Imm16    = 2 << ImmShift,
     Imm32    = 3 << ImmShift,
@@ -161,8 +161,7 @@
     // SpecialFP - Special instruction forms.  Dispatch by opcode explicitly.
     SpecialFP  = 7 << FPTypeShift,
 
-    // Bit 15 is unused.
-    OpcodeShift   = 17,
+    OpcodeShift   = 16,
     OpcodeMask    = 0xFF << OpcodeShift,
     // Bits 25 -> 31 are unused
   };