diff options
| author | Akira Hatanaka <ahatanaka@mips.com> | 2012-06-21 20:39:10 +0000 |
|---|---|---|
| committer | Akira Hatanaka <ahatanaka@mips.com> | 2012-06-21 20:39:10 +0000 |
| commit | 54c5bc87992ebeaa9e71f2bfb60ac5cf74b77db3 (patch) | |
| tree | 10f8e7a9269390f01b1da8697290bf0aed552476 /lib/Target/Mips/MipsFrameLowering.cpp | |
| parent | 43d2ff1171d6c9c50ac2b3c5dfaea0746aee99d4 (diff) | |
| download | llvm-54c5bc87992ebeaa9e71f2bfb60ac5cf74b77db3.tar.gz llvm-54c5bc87992ebeaa9e71f2bfb60ac5cf74b77db3.tar.bz2 llvm-54c5bc87992ebeaa9e71f2bfb60ac5cf74b77db3.tar.xz | |
1. fix null program output after some other changes
2. re-enable null.ll test
3. fix some minor style violations
Patch by Reed Kotler.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@158935 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/Mips/MipsFrameLowering.cpp')
| -rw-r--r-- | lib/Target/Mips/MipsFrameLowering.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Target/Mips/MipsFrameLowering.cpp b/lib/Target/Mips/MipsFrameLowering.cpp index f7baca9246..15ab1c30ce 100644 --- a/lib/Target/Mips/MipsFrameLowering.cpp +++ b/lib/Target/Mips/MipsFrameLowering.cpp @@ -112,7 +112,8 @@ void MipsFrameLowering::emitPrologue(MachineFunction &MF) const { // First, compute final stack size. unsigned StackAlign = getStackAlignment(); - uint64_t StackSize = MFI->getObjectOffset(MipsFI->getGlobalRegFI()) + + uint64_t StackSize = STI.inMips16Mode()? 0: + MFI->getObjectOffset(MipsFI->getGlobalRegFI()) + StackAlign + RoundUpToAlignment(MFI->getStackSize(), StackAlign); // Update stack size |