[llvm-commits] [llvm] r67949 - in /llvm/trunk/lib/Target/X86: X86CodeEmitter.cpp X86FloatingPoint.cpp X86ISelLowering.cpp X86InstrInfo.cpp X86InstrInfo.h

[Rafael Espindola]

Author: rafael
Date: Sat Mar 28 13:55:31 2009
New Revision: 67949

URL: http://llvm.org/viewvc/llvm-project?rev=67949&view=rev
Log:
Have only one definition of X86AddrNumOperands.

Modified:
    llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp
    llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
    llvm/trunk/lib/Target/X86/X86InstrInfo.cpp
    llvm/trunk/lib/Target/X86/X86InstrInfo.h

Modified: llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp?rev=67949&r1=67948&r2=67949&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp Sat Mar 28 13:55:31 2009
@@ -32,9 +32,6 @@
 #include "llvm/Target/TargetOptions.h"
 using namespace llvm;
 
-// FIXME: This should be some header
-static const int X86AddrNumOperands = 4;
-
 STATISTIC(NumEmitted, "Number of machine instructions emitted");
 
 namespace {

Modified: llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp?rev=67949&r1=67948&r2=67949&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp Sat Mar 28 13:55:31 2009
@@ -616,7 +616,6 @@
 /// handleOneArgFP - fst <mem>, ST(0)
 ///
 void FPS::handleOneArgFP(MachineBasicBlock::iterator &I) {
-  const int X86AddrNumOperands = 4;
   MachineInstr *MI = I;
   unsigned NumOps = MI->getDesc().getNumOperands();
   assert((NumOps == X86AddrNumOperands + 1 || NumOps == 1) &&

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=67949&r1=67948&r2=67949&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Sat Mar 28 13:55:31 2009
@@ -41,8 +41,6 @@
 #include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
-const int X86AddrNumOperands = 4;
-
 static cl::opt<bool>
 DisableMMX("disable-mmx", cl::Hidden, cl::desc("Disable use of MMX"));
 

Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.cpp?rev=67949&r1=67948&r2=67949&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Sat Mar 28 13:55:31 2009
@@ -31,9 +31,6 @@
 
 using namespace llvm;
 
-// FIXME: This should be some header
-static const int X86AddrNumOperands = 4;
-
 namespace {
   cl::opt<bool>
   NoFusing("disable-spill-fusing",

Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.h?rev=67949&r1=67948&r2=67949&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrInfo.h (original)
+++ llvm/trunk/lib/Target/X86/X86InstrInfo.h Sat Mar 28 13:55:31 2009
@@ -243,6 +243,8 @@
   };
 }
 
+const int X86AddrNumOperands = 4;
+
 inline static bool isScale(const MachineOperand &MO) {
   return MO.isImm() &&
     (MO.getImm() == 1 || MO.getImm() == 2 ||