[PATCH] D75627: [PowerPC][AIX] Fix printing of program counter for AIX assembly.

[Sean Fertile via Phabricator via llvm-commits]

sfertile updated this revision to Diff 248293.
sfertile added a comment.

Reworded comment and added 64-bit RUN step to the test.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D75627/new/

https://reviews.llvm.org/D75627

Files:
  llvm/lib/Target/PowerPC/MCTargetDesc/PPCInstPrinter.cpp
  llvm/test/CodeGen/PowerPC/aix-print-pc.mir


Index: llvm/test/CodeGen/PowerPC/aix-print-pc.mir
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/PowerPC/aix-print-pc.mir
@@ -0,0 +1,31 @@
+# RUN: llc -x mir -mtriple powerpc-unknown-aix-xcoff --verify-machineinstrs \
+# RUN: -start-before=ppc-branch-select < %s | FileCheck %s
+#
+# RUN: llc -x mir -mtriple powerpc64-unknown-aix-xcoff --verify-machineinstrs \
+# RUN: -start-before=ppc-branch-select < %s | FileCheck %s
+
+# Test uses a long branch to force printing of a branch that uses the program
+# counter as an operand. ($PC + 8)
+
+---
+name:            print_program_counter
+machineFunctionInfo: {}
+body:             |
+  bb.0.entry:
+    successors: %bb.1(0x30000000), %bb.2(0x50000000)
+    liveins: $r3
+    renamable $cr0 = CMPLWI killed renamable $r3, 0
+    BCC 76, killed renamable $cr0, %bb.1
+  bb.2:
+    renamable $r3 = LI 2
+    INLINEASM &".space 32760", 1
+    BLR implicit $lr, implicit $rm, implicit killed $r3
+  bb.1:
+    renamable $r3 = LI 1
+    INLINEASM &".space 32760", 1
+    BLR implicit $lr, implicit $rm, implicit killed $r3
+
+# CHECK-LABEL: .print_program_counter:
+# CHECK:         cmplwi
+# CHECK-NEXT:    bne    {{[0-9]}}, $+8
+
Index: llvm/lib/Target/PowerPC/MCTargetDesc/PPCInstPrinter.cpp
===================================================================
--- llvm/lib/Target/PowerPC/MCTargetDesc/PPCInstPrinter.cpp
+++ llvm/lib/Target/PowerPC/MCTargetDesc/PPCInstPrinter.cpp
@@ -418,9 +418,14 @@
   if (!MI->getOperand(OpNo).isImm())
     return printOperand(MI, OpNo, O);
 
-  // Branches can take an immediate operand.  This is used by the branch
-  // selection pass to print .+8, an eight byte displacement from the PC.
-  O << ".";
+  // Branches can take an immediate operand. This is used by the branch
+  // selection pass to print, for example `.+8` (for ELF) or `$+8` (for AIX) to
+  // express an eight byte displacement from the program counter.
+  if (!TT.isOSAIX())
+    O << ".";
+  else
+    O << "$";
+
   int32_t Imm = SignExtend32<32>((unsigned)MI->getOperand(OpNo).getImm() << 2);
   if (Imm >= 0)
     O << "+";


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D75627.248293.patch
Type: text/x-patch
Size: 2141 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200304/8791b03b/attachment.bin>