[llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp PPCRegisterInfo.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/PowerPC:

PPCAsmPrinter.cpp updated: 1.232 -> 1.233
PPCRegisterInfo.cpp updated: 1.103 -> 1.104
---
Log message:

Fix CodeGen/PowerPC/2007-01-31-InlineAsmAddrMode.ll


---
Diffs of the changes:  (+7 -1)

 PPCAsmPrinter.cpp   |    5 ++++-
 PPCRegisterInfo.cpp |    3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)


Index: llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
diff -u llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp:1.232 llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp:1.233
--- llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp:1.232	Tue Jan 30 14:08:38 2007
+++ llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp	Wed Jan 31 18:39:08 2007
@@ -436,7 +436,10 @@
                                           const char *ExtraCode) {
   if (ExtraCode && ExtraCode[0])
     return true; // Unknown modifier.
-  printMemRegReg(MI, OpNo);
+  if (MI->getOperand(OpNo).isRegister())
+    printMemRegReg(MI, OpNo);
+  else
+    printMemRegImm(MI, OpNo);
   return false;
 }
 


Index: llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
diff -u llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp:1.103 llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp:1.104
--- llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp:1.103	Mon Jan 29 17:20:22 2007
+++ llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp	Wed Jan 31 18:39:08 2007
@@ -522,6 +522,9 @@
   }
   // Take into account whether it's an add or mem instruction
   unsigned OffIdx = (i == 2) ? 1 : 2;
+  if (MI.getOpcode() == TargetInstrInfo::INLINEASM)
+    OffIdx = i-1;
+      
   // Get the frame index.
   int FrameIndex = MI.getOperand(i).getFrameIndex();