From 6e9422e14c816ab6cdc691989bb7d42a19b28fa3 Mon Sep 17 00:00:00 2001 From: "Vikram S. Adve" Date: Mon, 12 Nov 2001 23:26:35 +0000 Subject: When allocating space on stack for writing a register, use the size of the register, not the size of the Value type, to get the right alignment. llvm-svn: 1284 --- llvm/lib/Target/Sparc/Sparc.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'llvm/lib/Target/Sparc/Sparc.cpp') diff --git a/llvm/lib/Target/Sparc/Sparc.cpp b/llvm/lib/Target/Sparc/Sparc.cpp index b6bf94f81e3..20bad83dfc6 100644 --- a/llvm/lib/Target/Sparc/Sparc.cpp +++ b/llvm/lib/Target/Sparc/Sparc.cpp @@ -193,7 +193,8 @@ UltraSparcSchedInfo::initializeResources() // // Purpose: // Interface to stack frame layout info for the UltraSPARC. -// Note that there is no machine-independent interface to this information +// Starting offsets for each area of the stack frame are aligned at +// a multiple of getStackFrameSizeAlignment(). //--------------------------------------------------------------------------- int @@ -210,7 +211,9 @@ UltraSparcFrameInfo::getRegSpillAreaOffset(MachineCodeForMethod& mcInfo, { pos = false; // static stack area grows downwards unsigned int autoVarsSize = mcInfo.getAutomaticVarsSize(); - return StaticAreaOffsetFromFP - autoVarsSize; + if (int mod = autoVarsSize % getStackFrameSizeAlignment()) + autoVarsSize += (getStackFrameSizeAlignment() - mod); + return StaticAreaOffsetFromFP - autoVarsSize; } int @@ -220,7 +223,10 @@ UltraSparcFrameInfo::getTmpAreaOffset(MachineCodeForMethod& mcInfo, pos = false; // static stack area grows downwards unsigned int autoVarsSize = mcInfo.getAutomaticVarsSize(); unsigned int spillAreaSize = mcInfo.getRegSpillsSize(); - return StaticAreaOffsetFromFP - (autoVarsSize + spillAreaSize); + int offset = autoVarsSize + spillAreaSize; + if (int mod = offset % getStackFrameSizeAlignment()) + offset += (getStackFrameSizeAlignment() - mod); + return StaticAreaOffsetFromFP - offset; } int @@ -229,7 +235,9 @@ UltraSparcFrameInfo::getDynamicAreaOffset(MachineCodeForMethod& mcInfo, { // dynamic stack area grows downwards starting at top of opt-args area unsigned int optArgsSize = mcInfo.getMaxOptionalArgsSize(); - return optArgsSize + FirstOptionalOutgoingArgOffsetFromSP; + int offset = optArgsSize + FirstOptionalOutgoingArgOffsetFromSP; + assert(offset % getStackFrameSizeAlignment() == 0); + return offset; } -- cgit v1.2.3