Skip to content

Commit b294e61

Browse files
nickdesaulnierststellar
authored andcommitted
[PPCAsmPrinter] support 'L' output template for memory operands
Summary: L is meant to support the second word used by 32b calling conventions for 64b arguments. This is required for build 32b PowerPC Linux kernels after upstream commit 334710b1496a ("powerpc/uaccess: Implement unsafe_put_user() using 'asm goto'") Thanks for the report from @nathanchance, and reference to GCC's implementation from @segher. Fixes: pr/46186 Fixes: ClangBuiltLinux/linux#1044 Reviewers: echristo, hfinkel, MaskRay Reviewed By: MaskRay Subscribers: MaskRay, wuzish, nemanjai, hiraditya, kbarton, steven.zhang, llvm-commits, segher, nathanchance, srhines Tags: #llvm Differential Revision: https://reviews.llvm.org/D81767 (cherry picked from commit 2d8e105)
1 parent a110c3f commit b294e61

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,11 @@ bool PPCAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI, unsigned OpNo,
298298

299299
switch (ExtraCode[0]) {
300300
default: return true; // Unknown modifier.
301+
case 'L': // A memory reference to the upper word of a double word op.
302+
O << getDataLayout().getPointerSize() << "(";
303+
printOperand(MI, OpNo, O);
304+
O << ")";
305+
return false;
301306
case 'y': // A memory reference for an X-form instruction
302307
{
303308
const char *RegName = "r0";
@@ -309,7 +314,6 @@ bool PPCAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI, unsigned OpNo,
309314
}
310315
case 'U': // Print 'u' for update form.
311316
case 'X': // Print 'x' for indexed form.
312-
{
313317
// FIXME: Currently for PowerPC memory operands are always loaded
314318
// into a register, so we never get an update or indexed form.
315319
// This is bad even for offset forms, since even if we know we
@@ -319,7 +323,6 @@ bool PPCAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI, unsigned OpNo,
319323
assert(MI->getOperand(OpNo).isReg());
320324
return false;
321325
}
322-
}
323326
}
324327

325328
assert(MI->getOperand(OpNo).isReg());

llvm/test/CodeGen/PowerPC/inlineasm-output-template.ll

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
; RUN: llc -mtriple=ppc32-- < %s | FileCheck %s
1+
; RUN: llc -mtriple=ppc32 < %s | FileCheck %s
2+
; RUN: llc -mtriple=ppc64 < %s | FileCheck %s --check-prefix=PPC64
23

34
; Test that %c works with immediates
45
; CHECK-LABEL: test_inlineasm_c_output_template0
@@ -24,3 +25,13 @@ define dso_local i32 @test_inlineasm_c_output_template2() {
2425
tail call void asm sideeffect "#TEST ${0:n}", "i"(i32 42)
2526
ret i32 42
2627
}
28+
29+
; Test that the machine specific %L works with memory operands.
30+
; CHECK-LABEL: test_inlineasm_L_output_template
31+
; CHECK: # 4(5)
32+
; PPC64-LABEL: test_inlineasm_L_output_template
33+
; PPC64: # 8(4)
34+
define dso_local void @test_inlineasm_L_output_template(i64 %0, i64* %1) {
35+
tail call void asm sideeffect "# ${0:L}", "*m"(i64* %1)
36+
ret void
37+
}

0 commit comments

Comments
 (0)