user/llvm6: fix ppc32 calling conventions

1 files changed, 69 insertions, 0 deletions

diff --git a/user/llvm6/ppc32-calling-convention.patch b/user/llvm6/ppc32-calling-convention.patch
new file mode 100644
index 000000000..2e6d66427
--- /dev/null
+++ b/user/llvm6/ppc32-calling-convention.patch
@@ -0,0 +1,69 @@
+Index: trunk/lib/Target/PowerPC/PPCISelLowering.cpp
+===================================================================
+--- trunk/lib/Target/PowerPC/PPCISelLowering.cpp
++++ trunk/lib/Target/PowerPC/PPCISelLowering.cpp
+@@ -3511,9 +3511,14 @@
+       // Argument stored in memory.
+       assert(VA.isMemLoc());
+ 
++      // Get the extended size of the argument type in stack
+       unsigned ArgSize = VA.getLocVT().getStoreSize();
+-      int FI = MFI.CreateFixedObject(ArgSize, VA.getLocMemOffset(),
+-                                     isImmutable);
++      // Get the actual size of the argument type
++      unsigned ObjSize = VA.getValVT().getStoreSize();
++      unsigned ArgOffset = VA.getLocMemOffset();
++      // Stack objects in PPC32 are right justified.
++      ArgOffset += ArgSize - ObjSize;
++      int FI = MFI.CreateFixedObject(ArgSize, ArgOffset, isImmutable);
+ 
+       // Create load nodes to retrieve arguments from the stack.
+       SDValue FIN = DAG.getFrameIndex(FI, PtrVT);
+@@ -5468,10 +5473,15 @@
+       Arg = PtrOff;
+     }
+ 
+-    if (VA.isRegLoc()) {
+-      if (Arg.getValueType() == MVT::i1)
+-        Arg = DAG.getNode(ISD::ZERO_EXTEND, dl, MVT::i32, Arg);
++    // When useCRBits() is true, there can be i1 arguments.
++    // It is because getRegisterType(MVT::i1) => MVT::i1,
++    // and for other integer types getRegisterType() => MVT::i32.
++    // Extend i1 and ensure callee will get i32.
++    if (Arg.getValueType() == MVT::i1)
++      Arg = DAG.getNode(Flags.isSExt() ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND,
++                        dl, MVT::i32, Arg);
+ 
++    if (VA.isRegLoc()) {
+       seenFloatArg |= VA.getLocVT().isFloatingPoint();
+       // Put argument in a physical register.
+       RegsToPass.push_back(std::make_pair(VA.getLocReg(), Arg));
+Index: trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
+===================================================================
+--- trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
++++ trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
+@@ -0,0 +1,24 @@
++; RUN: llc -verify-machineinstrs < %s -mcpu=ppc32 -mattr=+crbits | FileCheck %s
++target triple = "powerpc-unknown-linux-gnu"
++
++define void @check_callee(
++  i32, i32, i32, i32,
++  i32, i32, i32, i32,
++  i1 zeroext %s1
++) {
++  call void @check_caller(
++    i32 9, i32 9, i32 9, i32 9,
++    i32 9, i32 9, i32 9, i32 9,
++    i1 zeroext %s1)
++  ret void
++}
++
++; CHECK-LABEL: @check_callee
++; CHECK: lbz {{[0-9]+}}, 27(1)
++; CHECK: stw {{[0-9]+}}, 8(1)
++
++declare void @check_caller(
++  i32, i32, i32, i32,
++  i32, i32, i32, i32,
++  i1 zeroext
++)