[llvm-commits] CVS: llvm/lib/Target/X86/X86ISelDAGToDAG.cpp

Evan Cheng evan.cheng at apple.com
Sat Feb 4 21:25:18 PST 2006



Changes in directory llvm/lib/Target/X86:

X86ISelDAGToDAG.cpp updated: 1.40 -> 1.41
---
Log message:

Re-commit the last bit of change that was backed out.


---
Diffs of the changes:  (+2 -13)

 X86ISelDAGToDAG.cpp |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)


Index: llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
diff -u llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.40 llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.41
--- llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.40	Sat Feb  4 03:24:16 2006
+++ llvm/lib/Target/X86/X86ISelDAGToDAG.cpp	Sat Feb  4 23:25:07 2006
@@ -369,17 +369,11 @@
     return false;
 
   if (AM.BaseType == X86ISelAddressMode::RegBase) {
-    if (AM.Base.Reg.Val) {
-      if (AM.Base.Reg.getOpcode() != ISD::Register)
-        AM.Base.Reg = Select(AM.Base.Reg);
-    } else {
+    if (!AM.Base.Reg.Val)
       AM.Base.Reg = CurDAG->getRegister(0, MVT::i32);
-    }
   }
 
-  if (AM.IndexReg.Val)
-    AM.IndexReg = Select(AM.IndexReg);
-  else
+  if (!AM.IndexReg.Val)
     AM.IndexReg = CurDAG->getRegister(0, MVT::i32);
 
   getAddressOperands(AM, Base, Scale, Index, Disp);
@@ -441,11 +435,6 @@
         return false;
     }
 
-    if (SelectBase)
-      AM.Base.Reg = Select(AM.Base.Reg);
-    if (SelectIndex)
-      AM.IndexReg = Select(AM.IndexReg);
-
     getAddressOperands(AM, Base, Scale, Index, Disp);
     return true;
   }






More information about the llvm-commits mailing list