RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-19 10:13:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[mips] Fix unsigned/signed type error

Browse Source 
MipsFastISel uses a a class to represent addresses with a signed member
to represent the offset. MipsFastISel::emitStore, emitLoad and computeAddress
all treated the offset as being positive. In cases where the offset was
actually negative and a frame pointer was used, this would cause the constant
synthesis routine to crash as it would generate an unexpected instruction
sequence when frame indexes are replaced.

Reviewers: vkalintiris

Differential Revision: https://reviews.llvm.org/D26192

llvm-svn: 287099
This commit is contained in:
Simon Dardis 2016-11-16 11:29:07 +00:00
parent b405b54cc4
commit 05136523b9
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Target/Mips/MipsFastISel.cpp
View File

@ -438,7 +438,7 @@ bool MipsFastISel::computeAddress(const Value *Obj, Address &Addr) {
}
case Instruction::GetElementPtr: {
Address SavedAddr = Addr;
uint64_t TmpOffset = Addr.getOffset();
int64_t TmpOffset = Addr.getOffset();
// Iterate through the GEP folding the constants into offsets where
// we can.
gep_type_iterator GTI = gep_type_begin(U);
@ -756,7 +756,7 @@ bool MipsFastISel::emitLoad(MVT VT, unsigned &ResultReg, Address &Addr,
if (Addr.isFIBase()) {
unsigned FI = Addr.getFI();
unsigned Align = 4;
unsigned Offset = Addr.getOffset();
int64_t Offset = Addr.getOffset();
MachineFrameInfo &MFI = MF->getFrameInfo();
MachineMemOperand *MMO = MF->getMachineMemOperand(
MachinePointerInfo::getFixedStack(*MF, FI), MachineMemOperand::MOLoad,
@ -807,7 +807,7 @@ bool MipsFastISel::emitStore(MVT VT, unsigned SrcReg, Address &Addr,
if (Addr.isFIBase()) {
unsigned FI = Addr.getFI();
unsigned Align = 4;
unsigned Offset = Addr.getOffset();
int64_t Offset = Addr.getOffset();
MachineFrameInfo &MFI = MF->getFrameInfo();
MachineMemOperand *MMO = MF->getMachineMemOperand(
MachinePointerInfo::getFixedStack(*MF, FI), MachineMemOperand::MOStore,

18
test/CodeGen/Mips/Fast-ISel/stackloadstore.ll Normal file
View File

@ -0,0 +1,18 @@
; RUN: llc < %s -march=mipsel -mcpu=mips32 -fast-isel -disable-fp-elim -relocation-model=pic < %s
; Test that negative array access don't crash constant synthesis when fast isel
; generates negative offsets.
define i16 @test() {
%a = alloca [4 x i16], align 4
%arrayidx = getelementptr inbounds [4 x i16], [4 x i16]* %a, i32 0, i32 -2
%b = load i16, i16* %arrayidx, align 2
ret i16 %b
}
define void @test2() {
%a = alloca [4 x i16], align 4
%arrayidx = getelementptr inbounds [4 x i16], [4 x i16]* %a, i32 0, i32 -2
store i16 2, i16* %arrayidx, align 2
ret void
}