Add CCAssignToStackABISizeAlign for convenience in

dealing with types whose size & alignment are
different on different subtargets.  Use it for x86 f80.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@43988 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/TargetCallingConv.td b/lib/Target/TargetCallingConv.td
index 176a848ec02bc4eddd17f0850b8c041c4c3b89dc..05029a01a6db6d4ad18779c282a1a3dcfaee39f9 100644 (file)
--- a/lib/Target/TargetCallingConv.td
+++ b/lib/Target/TargetCallingConv.td
@@ -66,6 +66,13 @@ class CCAssignToStack<int size, int align> : CCAction {
   int Align = align;
 }
 
+/// CCAssignToStackABISizeAlign - This action always matches: it assigns
+/// the value to a stack slot of the ABISize and ABIAlignment for the type,
+/// which may depend on the target or subtarget.
+/// "ignored" is here because an empty arg list does not work.
+class CCAssignToStackABISizeAlign<int ignored> : CCAction {
+}
+
 /// CCStructAssign - This action always matches: it will use the C ABI and
 /// the register availability to decided whether to assign to a set of
 /// registers or to a stack slot.

diff --git a/lib/Target/X86/X86CallingConv.td b/lib/Target/X86/X86CallingConv.td
index 5c8f75e495acf6e43fdc8f9fdcc843bcac899347..97d4636b814f685330989a17b929bcc08b26aa0a 100644 (file)
--- a/lib/Target/X86/X86CallingConv.td
+++ b/lib/Target/X86/X86CallingConv.td
@@ -118,10 +118,12 @@ def CC_X86_64_C : CallingConv<[
   // 8-byte aligned if there are no more registers to hold them.
   CCIfType<[i32, i64, f32, f64], CCAssignToStack<8, 8>>,
   
-  // Long doubles get 16-byte stack slots that are 16-byte aligned.
+  // Long doubles get stack slots whose size and alignment depends on the
+  // subtarget.
+  CCIfType<[f80], CCAssignToStackABISizeAlign<0>>,
+
   // Vectors get 16-byte stack slots that are 16-byte aligned.
-  CCIfType<[f80, v16i8, v8i16, v4i32, v2i64, v4f32, v2f64], 
-              CCAssignToStack<16, 16>>,
+  CCIfType<[v16i8, v8i16, v4i32, v2i64, v4f32, v2f64], CCAssignToStack<16, 16>>,
 
   // __m64 vectors get 8-byte stack slots that are 8-byte aligned.
   CCIfType<[v8i8, v4i16, v2i32, v1i64], CCAssignToStack<8, 8>>
@@ -177,8 +179,9 @@ def CC_X86_32_Common : CallingConv<[
   // Doubles get 8-byte slots that are 4-byte aligned.
   CCIfType<[f64], CCAssignToStack<8, 4>>,
 
-  // Long doubles get 16-byte slots that are 4-byte aligned.
-  CCIfType<[f80], CCAssignToStack<16, 4>>,
+  // Long doubles get slots whose size and alignment depends on the
+  // subtarget.
+  CCIfType<[f80], CCAssignToStackABISizeAlign<0>>,
 
   // The first 4 vector arguments are passed in XMM registers.
   CCIfType<[v16i8, v8i16, v4i32, v2i64, v4f32, v2f64],

diff --git a/utils/TableGen/CallingConvEmitter.cpp b/utils/TableGen/CallingConvEmitter.cpp
index 5c88b5fc7a485fd4b222ea1caa06e01fd6a4e30f..79e3a9c6cefcffeb0c38ca67043d3bebba62942b 100644 (file)
--- a/utils/TableGen/CallingConvEmitter.cpp
+++ b/utils/TableGen/CallingConvEmitter.cpp
@@ -120,6 +120,15 @@ void CallingConvEmitter::EmitAction(Record *Action,
       O << IndentStr << "State.addLoc(CCValAssign::getMem(ValNo, ValVT, Offset"
         << Counter << ", LocVT, LocInfo));\n";
       O << IndentStr << "return false;\n";
+    } else if (Action->isSubClassOf("CCAssignToStackABISizeAlign")) {
+      O << IndentStr << "unsigned Offset" << ++Counter
+        << " = State.AllocateStack(State.getTarget().getTargetData()"
+           "->getABITypeSize(MVT::getTypeForValueType(LocVT)),\n";
+      O << IndentStr << "       State.getTarget().getTargetData()"
+           "->getABITypeAlignment(MVT::getTypeForValueType(LocVT)));\n";
+      O << IndentStr << "State.addLoc(CCValAssign::getMem(ValNo, ValVT, Offset"
+        << Counter << ", LocVT, LocInfo));\n";
+      O << IndentStr << "return false;\n";
     } else if (Action->isSubClassOf("CCPromoteToType")) {
       Record *DestTy = Action->getValueAsDef("DestTy");
       O << IndentStr << "LocVT = " << getEnumName(getValueType(DestTy)) <<";\n";