commit 62871a34609d669a3825936993e490f7e5053628
author Akira Hatanaka <ahatanaka@mips.com> Wed Jun 27 00:20:39 2012 +0000
committer Akira Hatanaka <ahatanaka@mips.com> Wed Jun 27 00:20:39 2012 +0000
tree 8a24078d178e7b7e3700d4d2b07d533ef423af8d
parent 3b70d784a217a1467f9fc39e75077aea35f8b24a

Fix bug in computation of stack size in MipsFrameLowering.cpp.

llvm-svn: 159240

llvm/lib/Target/Mips/MipsFrameLowering.cpp

diff --git a/llvm/lib/Target/Mips/MipsFrameLowering.cpp b/llvm/lib/Target/Mips/MipsFrameLowering.cpp
index 15ab1c3..5afd2fc 100644
--- a/llvm/lib/Target/Mips/MipsFrameLowering.cpp
+++ b/llvm/lib/Target/Mips/MipsFrameLowering.cpp
@@ -112,9 +112,12 @@
 
   // First, compute final stack size.
   unsigned StackAlign = getStackAlignment();
-  uint64_t StackSize = STI.inMips16Mode()? 0:
-    MFI->getObjectOffset(MipsFI->getGlobalRegFI()) +
-    StackAlign + RoundUpToAlignment(MFI->getStackSize(), StackAlign);
+  uint64_t StackSize = RoundUpToAlignment(MFI->getStackSize(), StackAlign);
+
+  if (MipsFI->globalBaseRegSet()) 
+    StackSize += MFI->getObjectOffset(MipsFI->getGlobalRegFI()) + StackAlign;
+  else
+    StackSize += RoundUpToAlignment(MipsFI->getMaxCallFrameSize(), StackAlign);
 
    // Update stack size
   MFI->setStackSize(StackSize);