On Wed, Jul 25, 2012 at 6:35 AM, Rafael Espindola <span dir="ltr"><<a href="mailto:rafael.espindola@gmail.com" target="_blank">rafael.espindola@gmail.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Wed Jul 25 08:35:45 2012<br>
New Revision: 160724<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=160724&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=160724&view=rev</a><br>
Log:<br>
Factor a long list of conditions into a predicate function. No functionality<br>
change.<br>
<br>
Modified:<br>
    llvm/trunk/lib/Target/X86/X86FastISel.cpp<br>
<br>
Modified: llvm/trunk/lib/Target/X86/X86FastISel.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FastISel.cpp?rev=160724&r1=160723&r2=160724&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FastISel.cpp?rev=160724&r1=160723&r2=160724&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Target/X86/X86FastISel.cpp (original)<br>
+++ llvm/trunk/lib/Target/X86/X86FastISel.cpp Wed Jul 25 08:35:45 2012<br>
@@ -1516,6 +1516,20 @@<br>
   return DoSelectCall(I, 0);<br>
 }<br>
<br>
+static unsigned computeBytesPopedByCalle(const X86Subtarget &Subtarget,<br></blockquote><div><br></div><div>Spelling: "Popped", "Callee"</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

+                                         const ImmutableCallSite &CS) {<br>
+  if (Subtarget.is64Bit())<br>
+    return 0;<br>
+  if (Subtarget.isTargetWindows())<br>
+    return 0;<br>
+  CallingConv::ID CC = CS.getCallingConv();<br>
+  if (CC == CallingConv::Fast || CC == CallingConv::GHC)<br>
+    return 0;<br>
+  if (!CS.paramHasAttr(1, Attribute::StructRet))<br>
+    return 0;<br>
+  return 4;<br>
+}<br>
+<br>
 // Select either a call, or an llvm.memcpy/memmove/memset intrinsic<br>
 bool X86FastISel::DoSelectCall(const Instruction *I, const char *MemIntName) {<br>
   const CallInst *CI = cast<CallInst>(I);<br>
@@ -1862,12 +1876,7 @@<br>
<br>
   // Issue CALLSEQ_END<br>
   unsigned AdjStackUp = TII.getCallFrameDestroyOpcode();<br>
-  unsigned NumBytesCallee = 0;<br>
-  if (!Subtarget->is64Bit() && !Subtarget->isTargetWindows() &&<br>
-      !(CS.getCallingConv() == CallingConv::Fast ||<br>
-        CS.getCallingConv() == CallingConv::GHC) &&<br>
-      CS.paramHasAttr(1, Attribute::StructRet))<br>
-    NumBytesCallee = 4;<br>
+  const unsigned NumBytesCallee = computeBytesPopedByCalle(*Subtarget, CS);<br>
   BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, TII.get(AdjStackUp))<br>
     .addImm(NumBytes).addImm(NumBytesCallee);<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>