[llvm-branch-commits] [llvm-branch] r76255 - in /llvm/branches/Apple/Bender-SWB/lib: CodeGen/SelectionDAG/TargetLowering.cpp Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp

[Bill Wendling]

Author: void
Date: Fri Jul 17 17:37:42 2009
New Revision: 76255

URL: http://llvm.org/viewvc/llvm-project?rev=76255&view=rev
Log:
More asm blocks merging issues.

Modified:
    llvm/branches/Apple/Bender-SWB/lib/CodeGen/SelectionDAG/TargetLowering.cpp
    llvm/branches/Apple/Bender-SWB/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp

Modified: llvm/branches/Apple/Bender-SWB/lib/CodeGen/SelectionDAG/TargetLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Bender-SWB/lib/CodeGen/SelectionDAG/TargetLowering.cpp?rev=76255&r1=76254&r2=76255&view=diff

==============================================================================
--- llvm/branches/Apple/Bender-SWB/lib/CodeGen/SelectionDAG/TargetLowering.cpp (original)
+++ llvm/branches/Apple/Bender-SWB/lib/CodeGen/SelectionDAG/TargetLowering.cpp Fri Jul 17 17:37:42 2009
@@ -19,6 +19,7 @@
 #include "llvm/Target/TargetRegisterInfo.h"
 #include "llvm/GlobalVariable.h"
 #include "llvm/DerivedTypes.h"
+#include "llvm/Instruction.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/SelectionDAG.h"
 #include "llvm/ADT/StringExtras.h"

Modified: llvm/branches/Apple/Bender-SWB/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Bender-SWB/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=76255&r1=76254&r2=76255&view=diff

==============================================================================
--- llvm/branches/Apple/Bender-SWB/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp (original)
+++ llvm/branches/Apple/Bender-SWB/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Fri Jul 17 17:37:42 2009
@@ -712,6 +712,15 @@
     case 'c': // Don't print "$" before a global var name or constant.
       printOperand(MI, OpNo, "mem", /*NotRIPRel=*/true);
       return false;
+
+    case 'A': // Print '*' before a register (it must be a register)
+      if (MI->getOperand(OpNo).isReg()) {
+        O << '*';
+        printOperand(MI, OpNo);
+        return false;
+      }
+      return true;
+
     case 'b': // Print QImode register
     case 'h': // Print QImode high register
     case 'w': // Print HImode register
@@ -723,7 +732,7 @@
       return false;
 
     case 'P': // Don't print @PLT, but do print as memory.
-      printOperand(MI, OpNo, "mem");
+      printOperand(MI, OpNo, "call");
       return false;
 
       case 'n': { // Negate the immediate or print a '-' before the operand.
@@ -760,7 +769,7 @@
       // These only apply to registers, ignore on mem.
       break;
     case 'P': // Don't print @PLT, but do print as memory.
-      printOperand(MI, OpNo, "call");
+      printOperand(MI, OpNo, "mem");
       return false;
     }
   }