mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 11:13:28 +01:00
Fix a problem with mips16 stubs when calls are transformed during
tail call optimization. Some more work may be needed for indirect calls but this patch fixes the current regression in Prolangc++/trees. S2 optimization as part of the general cleanup and optimization of prolog and epilog was not saving S2 in this case and needed to. llvm-svn: 197630
This commit is contained in:
parent
e73fd60399
commit
012c0a0f79
@ -13,6 +13,7 @@
|
||||
|
||||
#define DEBUG_TYPE "mips16-hard-float"
|
||||
#include "Mips16HardFloat.h"
|
||||
#include "llvm/IR/Value.h"
|
||||
#include "llvm/IR/Module.h"
|
||||
#include "llvm/Support/Debug.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
@ -167,6 +168,11 @@ static bool needsFPReturnHelper(Function &F) {
|
||||
return whichFPReturnVariant(RetType) != NoFPRet;
|
||||
}
|
||||
|
||||
static bool needsFPReturnHelper(const FunctionType &FT) {
|
||||
Type* RetType = FT.getReturnType();
|
||||
return whichFPReturnVariant(RetType) != NoFPRet;
|
||||
}
|
||||
|
||||
static bool needsFPHelperFromSig(Function &F) {
|
||||
return needsFPStubFromParams(F) || needsFPReturnHelper(F);
|
||||
}
|
||||
@ -400,7 +406,19 @@ static bool fixupFPReturnAndCall
|
||||
Value *F = (M->getOrInsertFunction(Name, A, MyVoid, T, NULL));
|
||||
CallInst::Create(F, Params, "", &Inst );
|
||||
} else if (const CallInst *CI = dyn_cast<CallInst>(I)) {
|
||||
const Value* V = CI->getCalledValue();
|
||||
const Type* T = 0;
|
||||
if (V) T = V->getType();
|
||||
const PointerType *PFT=0;
|
||||
if (T) PFT = dyn_cast<PointerType>(T);
|
||||
const FunctionType *FT=0;
|
||||
if (PFT) FT = dyn_cast<FunctionType>(PFT->getElementType());
|
||||
Function *F_ = CI->getCalledFunction();
|
||||
if (FT && needsFPReturnHelper(*FT) &&
|
||||
!(F_ && isIntrinsicInline(F_))) {
|
||||
Modified=true;
|
||||
F.addFnAttr("saveS2");
|
||||
}
|
||||
if (F_ && !isIntrinsicInline(F_)) {
|
||||
// pic mode calls are handled by already defined
|
||||
// helper functions
|
||||
|
20
test/CodeGen/Mips/tail16.ll
Normal file
20
test/CodeGen/Mips/tail16.ll
Normal file
@ -0,0 +1,20 @@
|
||||
; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -soft-float -mips16-hard-float -relocation-model=pic < %s | FileCheck %s
|
||||
|
||||
; Function Attrs: nounwind optsize
|
||||
define float @h() {
|
||||
entry:
|
||||
%call = tail call float bitcast (float (...)* @g to float ()*)()
|
||||
ret float %call
|
||||
; CHECK: .ent h
|
||||
; CHECK: save $16, $ra, $18, 32
|
||||
; CHECK: lw ${{[0-9]+}}, %got(__mips16_call_stub_sf_0)(${{[0-9]+}})
|
||||
; CHECK: restore $16, $ra, $18, 32
|
||||
; CHECK: .end h
|
||||
}
|
||||
|
||||
; Function Attrs: optsize
|
||||
declare float @g(...)
|
||||
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user