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

[mips] Correct the AFL_FLAGS1_ODDSPREG flag in .MIPS.abiflags when no '.module oddspreg' is used

Browse Source 
Differential Revision: http://reviews.llvm.org/D4486


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@212932 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Sanders 2014-07-14 10:26:15 +00:00
parent fce699d88a
commit e99ebb9b2f
10 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Target/Mips/AsmParser/MipsAsmParser.cpp
View File

@ -237,7 +237,7 @@ public:
((STI.getFeatureBits() & Mips::FeatureN32) != 0) + ((STI.getFeatureBits() & Mips::FeatureN32) != 0) +
((STI.getFeatureBits() & Mips::FeatureN64) != 0)) == 1); ((STI.getFeatureBits() & Mips::FeatureN64) != 0)) == 1);
if (!isABI_O32() && !allowOddSPReg() != 0) if (!isABI_O32() && !useOddSPReg() != 0)
report_fatal_error("-mno-odd-spreg requires the O32 ABI"); report_fatal_error("-mno-odd-spreg requires the O32 ABI");
} }
@ -254,7 +254,7 @@ public:
bool isABI_O32() const { return STI.getFeatureBits() & Mips::FeatureO32; } bool isABI_O32() const { return STI.getFeatureBits() & Mips::FeatureO32; }
bool isABI_FPXX() const { return false; } // TODO: add check for FeatureXX bool isABI_FPXX() const { return false; } // TODO: add check for FeatureXX
bool allowOddSPReg() const { bool useOddSPReg() const {
return !(STI.getFeatureBits() & Mips::FeatureNoOddSPReg); return !(STI.getFeatureBits() & Mips::FeatureNoOddSPReg);
} }
@ -572,7 +572,7 @@ public:
assert(N == 1 && "Invalid number of operands!"); assert(N == 1 && "Invalid number of operands!");
Inst.addOperand(MCOperand::CreateReg(getFGR32Reg())); Inst.addOperand(MCOperand::CreateReg(getFGR32Reg()));
// FIXME: We ought to do this for -integrated-as without -via-file-asm too. // FIXME: We ought to do this for -integrated-as without -via-file-asm too.
if (!AsmParser.allowOddSPReg() && RegIdx.Index & 1) if (!AsmParser.useOddSPReg() && RegIdx.Index & 1)
AsmParser.Error(StartLoc, "-mno-odd-spreg prohibits the use of odd FPU " AsmParser.Error(StartLoc, "-mno-odd-spreg prohibits the use of odd FPU "
"registers"); "registers");
} }

1
lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h
View File

@ -228,6 +228,7 @@ public:
setCPR1SizeFromPredicates(P); setCPR1SizeFromPredicates(P);
setASESetFromPredicates(P); setASESetFromPredicates(P);
setFpAbiFromPredicates(P); setFpAbiFromPredicates(P);
OddSPReg = P.useOddSPReg();
} }
}; };

2
test/MC/Mips/mips32/abiflags.s
View File

@ -26,7 +26,7 @@
# CHECK-OBJ: ] # CHECK-OBJ: ]
# CHECK-OBJ: SectionData ( # CHECK-OBJ: SectionData (
# CHECK-OBJ: 0000: 00002001 01010001 00000000 00000000 |.. .............| # CHECK-OBJ: 0000: 00002001 01010001 00000000 00000000 |.. .............|
# CHECK-OBJ: 0010: 00000000 00000000 |........| # CHECK-OBJ: 0010: 00000001 00000000 |........|
# CHECK-OBJ: ) # CHECK-OBJ: )
# CHECK-OBJ: } # CHECK-OBJ: }

2
test/MC/Mips/mips32r2/abiflags.s
View File

@ -27,7 +27,7 @@
# CHECK-OBJ: ] # CHECK-OBJ: ]
# CHECK-OBJ: SectionData ( # CHECK-OBJ: SectionData (
# CHECK-OBJ: 0000: 00002002 01010001 00000000 00000000 |.. .............| # CHECK-OBJ: 0000: 00002002 01010001 00000000 00000000 |.. .............|
# CHECK-OBJ: 0010: 00000000 00000000 |........| # CHECK-OBJ: 0010: 00000001 00000000 |........|
# CHECK-OBJ: ) # CHECK-OBJ: )
# CHECK-OBJ: } # CHECK-OBJ: }

2
test/MC/Mips/mips64/abiflags.s
View File

@ -26,7 +26,7 @@
# CHECK-OBJ: ] # CHECK-OBJ: ]
# CHECK-OBJ: SectionData ( # CHECK-OBJ: SectionData (
# CHECK-OBJ: 0000: 00004001 02020001 00000000 00000000 |..@.............| # CHECK-OBJ: 0000: 00004001 02020001 00000000 00000000 |..@.............|
# CHECK-OBJ: 0010: 00000000 00000000 |........| # CHECK-OBJ: 0010: 00000001 00000000 |........|
# CHECK-OBJ: ) # CHECK-OBJ: )
# CHECK-OBJ: } # CHECK-OBJ: }

2
test/MC/Mips/mips64r2/abiflags.s
View File

@ -26,7 +26,7 @@
# CHECK-OBJ: ] # CHECK-OBJ: ]
# CHECK-OBJ: SectionData ( # CHECK-OBJ: SectionData (
# CHECK-OBJ: 0000: 00004002 02020001 00000000 00000000 |..@.............| # CHECK-OBJ: 0000: 00004002 02020001 00000000 00000000 |..@.............|
# CHECK-OBJ: 0010: 00000000 00000000 |........| # CHECK-OBJ: 0010: 00000001 00000000 |........|
# CHECK-OBJ: ) # CHECK-OBJ: )
# CHECK-OBJ: } # CHECK-OBJ: }

2
test/MC/Mips/mips_abi_flags_xx.s
View File

@ -26,7 +26,7 @@
# CHECK-OBJ: ] # CHECK-OBJ: ]
# CHECK-OBJ: SectionData ( # CHECK-OBJ: SectionData (
# CHECK-OBJ: 0000: 00002001 01010005 00000000 00000000 |.. .............| # CHECK-OBJ: 0000: 00002001 01010005 00000000 00000000 |.. .............|
# CHECK-OBJ: 0010: 00000000 00000000 |........| # CHECK-OBJ: 0010: 00000001 00000000 |........|
# CHECK-OBJ: ) # CHECK-OBJ: )
# CHECK-OBJ: } # CHECK-OBJ: }

2
test/MC/Mips/mips_abi_flags_xx_set.s
View File

@ -27,7 +27,7 @@
# CHECK-OBJ: ] # CHECK-OBJ: ]
# CHECK-OBJ: SectionData ( # CHECK-OBJ: SectionData (
# CHECK-OBJ: 0000: 00002001 01010005 00000000 00000000 |.. .............| # CHECK-OBJ: 0000: 00002001 01010005 00000000 00000000 |.. .............|
# CHECK-OBJ: 0010: 00000000 00000000 |........| # CHECK-OBJ: 0010: 00000001 00000000 |........|
# CHECK-OBJ: ) # CHECK-OBJ: )
# CHECK-OBJ: } # CHECK-OBJ: }

2
test/MC/Mips/msa/abiflags.s
View File

@ -27,7 +27,7 @@
# CHECK-OBJ: ] # CHECK-OBJ: ]
# CHECK-OBJ: SectionData ( # CHECK-OBJ: SectionData (
# CHECK-OBJ: 0000: 00002002 01030001 00000000 00000200 |.. .............| # CHECK-OBJ: 0000: 00002002 01030001 00000000 00000200 |.. .............|
# CHECK-OBJ: 0010: 00000000 00000000 |........| # CHECK-OBJ: 0010: 00000001 00000000 |........|
# CHECK-OBJ: ) # CHECK-OBJ: )
# CHECK-OBJ: } # CHECK-OBJ: }

16
test/MC/Mips/oddspreg.s
View File

@ -15,7 +15,21 @@
# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 | \ # RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 | \
# RUN: FileCheck %s -check-prefix=CHECK-ASM # RUN: FileCheck %s -check-prefix=CHECK-ASM
# #
# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -filetype=obj -o - | \ # Repeat the -filetype=obj tests but this time use an empty assembly file. The
# output should be unchanged.
# RUN: llvm-mc /dev/null -arch=mips64 -mcpu=mips64 -filetype=obj -o - | \
# RUN: llvm-readobj -sections -section-data -section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ-ALL -check-prefix=CHECK-OBJ-N64
# RUN: llvm-mc /dev/null -arch=mips -mcpu=mips32 -mattr=+fp64 -filetype=obj -o - | \
# RUN: llvm-readobj -sections -section-data -section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ-ALL -check-prefix=CHECK-OBJ-O32
#
# RUN: llvm-mc /dev/null -arch=mips64 -mcpu=mips64 -mattr=-n64,+n32 -filetype=obj -o - | \
# RUN: llvm-readobj -sections -section-data -section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ-ALL -check-prefix=CHECK-OBJ-N32
# RUN: llvm-mc /dev/null -arch=mips64 -mcpu=mips64 -filetype=obj -o - | \
# RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ-ALL -check-prefix=CHECK-OBJ-N64 # RUN: FileCheck %s -check-prefix=CHECK-OBJ-ALL -check-prefix=CHECK-OBJ-N64