[llvm-branch-commits] [llvm-branch] r196764 - Merging r196755:

[Bill Wendling]

Author: void
Date: Mon Dec  9 02:55:55 2013
New Revision: 196764

URL: http://llvm.org/viewvc/llvm-project?rev=196764&view=rev
Log:
Merging r196755:
------------------------------------------------------------------------
r196755 | venkatra | 2013-12-08 21:13:25 -0800 (Sun, 08 Dec 2013) | 2 lines

[SPARCV9]: Adjust the resultant pointer of DYNAMIC_STACKALLOC with the stack BIAS on sparcV9.

------------------------------------------------------------------------

Modified:
    llvm/branches/release_34/   (props changed)
    llvm/branches/release_34/lib/Target/Sparc/SparcISelLowering.cpp
    llvm/branches/release_34/test/CodeGen/SPARC/2013-05-17-CallFrame.ll

Propchange: llvm/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  9 02:55:55 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195136,195138,195148,195152,195156-195157,195161-195162,195193,195272,195317-195318,195327,195330,195333,195339,195343,195355,195364,195379,195397-195399,195401,195408,195421,195423-195424,195432,195439,195444,195455-195456,195469,195476-195477,195479,195491-195495,195514,195528,195547,195567,195573-195576,195590-195591,195599,195632,195635-195636,195670,195677,195679,195682,195684,195713,195716,195769,195773,195779,195782,195787-195788,195791,195803,195812,195827,195834,195843-195844,195878-195881,195887,195903,195905,195912,195915,195932,195936-195943,195972-195973,195975-195976,196004,196044-196046,196069,196100,196104,196129,196151,196153,196189-196192,196198-196199,196208-196209,196211,196261,196267,196269,196294,196359-196362,196369,196391,196456,196493,196508,196532-196533,196535,196538,196588,196611,196637-196638,196658,196668,196735
+/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195136,195138,195148,195152,195156-195157,195161-195162,195193,195272,195317-195318,195327,195330,195333,195339,195343,195355,195364,195379,195397-195399,195401,195408,195421,195423-195424,195432,195439,195444,195455-195456,195469,195476-195477,195479,195491-195495,195514,195528,195547,195567,195573-195576,195590-195591,195599,195632,195635-195636,195670,195677,195679,195682,195684,195713,195716,195769,195773,195779,195782,195787-195788,195791,195803,195812,195827,195834,195843-195844,195878-195881,195887,195903,195905,195912,195915,195932,195936-195943,195972-195973,195975-195976,196004,196044-196046,196069,196100,196104,196129,196151,196153,196189-196192,196198-196199,196208-196209,196211,196261,196267,196269,196294,196359-196362,196369,196391,196456,196493,196508,196532-196533,196535,196538,196588,196611,196637-196638,196658,196668,196735,196755

Modified: llvm/branches/release_34/lib/Target/Sparc/SparcISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/Target/Sparc/SparcISelLowering.cpp?rev=196764&r1=196763&r2=196764&view=diff
==============================================================================
--- llvm/branches/release_34/lib/Target/Sparc/SparcISelLowering.cpp (original)
+++ llvm/branches/release_34/lib/Target/Sparc/SparcISelLowering.cpp Mon Dec  9 02:55:55 2013
@@ -2298,7 +2298,7 @@ static SDValue LowerVAARG(SDValue Op, Se
 }
 
 static SDValue LowerDYNAMIC_STACKALLOC(SDValue Op, SelectionDAG &DAG,
-                                       bool is64Bit) {
+                                       const SparcSubtarget *Subtarget) {
   SDValue Chain = Op.getOperand(0);  // Legalize the chain.
   SDValue Size  = Op.getOperand(1);  // Legalize the size.
   EVT VT = Size->getValueType(0);
@@ -2311,7 +2311,9 @@ static SDValue LowerDYNAMIC_STACKALLOC(S
 
   // The resultant pointer is actually 16 words from the bottom of the stack,
   // to provide a register spill area.
-  unsigned regSpillArea = (is64Bit) ? 128 : 96;
+  unsigned regSpillArea = Subtarget->is64Bit() ? 128 : 96;
+  regSpillArea += Subtarget->getStackPointerBias();
+
   SDValue NewVal = DAG.getNode(ISD::ADD, dl, VT, NewSP,
                                DAG.getConstant(regSpillArea, VT));
   SDValue Ops[2] = { NewVal, Chain };
@@ -2638,7 +2640,7 @@ LowerOperation(SDValue Op, SelectionDAG
   case ISD::VASTART:            return LowerVASTART(Op, DAG, *this);
   case ISD::VAARG:              return LowerVAARG(Op, DAG);
   case ISD::DYNAMIC_STACKALLOC: return LowerDYNAMIC_STACKALLOC(Op, DAG,
-                                                               is64Bit);
+                                                               Subtarget);
 
   case ISD::LOAD:               return LowerF128Load(Op, DAG);
   case ISD::STORE:              return LowerF128Store(Op, DAG);

Modified: llvm/branches/release_34/test/CodeGen/SPARC/2013-05-17-CallFrame.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/test/CodeGen/SPARC/2013-05-17-CallFrame.ll?rev=196764&r1=196763&r2=196764&view=diff
==============================================================================
--- llvm/branches/release_34/test/CodeGen/SPARC/2013-05-17-CallFrame.ll (original)
+++ llvm/branches/release_34/test/CodeGen/SPARC/2013-05-17-CallFrame.ll Mon Dec  9 02:55:55 2013
@@ -10,7 +10,7 @@
 
 ; SPARC64-LABEL: variable_alloca_with_adj_call_stack
 ; SPARC64:       save %sp, -128, %sp
-; SPARC64:       add {{.+}}, 128, %o0
+; SPARC64:       add {{.+}}, 2175, %o0
 ; SPARC64:       add %sp, -80, %sp
 ; SPARC64:       call foo
 ; SPARC64:       add %sp, 80, %sp