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

[Chris Lattner]

Changes in directory llvm/lib/Target/X86:

X86PeepholeOpt.cpp updated: 1.36 -> 1.37
---
Log message:

Handle the global address case here, not just the offset case.


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

Index: llvm/lib/Target/X86/X86PeepholeOpt.cpp
diff -u llvm/lib/Target/X86/X86PeepholeOpt.cpp:1.36 llvm/lib/Target/X86/X86PeepholeOpt.cpp:1.37
--- llvm/lib/Target/X86/X86PeepholeOpt.cpp:1.36	Tue Oct  5 23:01:02 2004
+++ llvm/lib/Target/X86/X86PeepholeOpt.cpp	Tue Jan 11 16:58:43 2005
@@ -191,10 +191,17 @@
         unsigned R0 = MI->getOperand(0).getReg();
         unsigned Scale = MI->getOperand(1).getImmedValue();
         unsigned R1 = MI->getOperand(2).getReg();
-        unsigned Offset = MI->getOperand(3).getImmedValue();
-        I = MBB.insert(MBB.erase(I),
-                       BuildMI(Opcode, 5).addReg(R0).addZImm(Scale).
-                             addReg(R1).addSImm(Offset).addZImm((char)Val));
+        if (MI->getOperand(3).isImmediate()) {
+          unsigned Offset = MI->getOperand(3).getImmedValue();
+          I = MBB.insert(MBB.erase(I),
+                         BuildMI(Opcode, 5).addReg(R0).addZImm(Scale).
+                         addReg(R1).addSImm(Offset).addZImm((char)Val));
+        } else if (MI->getOperand(3).isGlobalAddress()) {
+          GlobalValue *GA = MI->getOperand(3).getGlobal();
+          I = MBB.insert(MBB.erase(I),
+                         BuildMI(Opcode, 5).addReg(R0).addZImm(Scale).
+                         addReg(R1).addGlobalAddress(GA).addZImm((char)Val));
+        }
         return true;
       }
     }