From e99ebb9b2fcaa08d153ed9f73bdd13d39067c6af Mon Sep 17 00:00:00 2001 From: Daniel Sanders Date: Mon, 14 Jul 2014 10:26:15 +0000 Subject: [PATCH] [mips] Correct the AFL_FLAGS1_ODDSPREG flag in .MIPS.abiflags when no '.module oddspreg' is used Differential Revision: http://reviews.llvm.org/D4486 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@212932 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/Mips/AsmParser/MipsAsmParser.cpp | 6 +++--- .../Mips/MCTargetDesc/MipsABIFlagsSection.h | 1 + test/MC/Mips/mips32/abiflags.s | 2 +- test/MC/Mips/mips32r2/abiflags.s | 2 +- test/MC/Mips/mips64/abiflags.s | 2 +- test/MC/Mips/mips64r2/abiflags.s | 2 +- test/MC/Mips/mips_abi_flags_xx.s | 2 +- test/MC/Mips/mips_abi_flags_xx_set.s | 2 +- test/MC/Mips/msa/abiflags.s | 2 +- test/MC/Mips/oddspreg.s | 16 +++++++++++++++- 10 files changed, 26 insertions(+), 11 deletions(-) diff --git a/lib/Target/Mips/AsmParser/MipsAsmParser.cpp b/lib/Target/Mips/AsmParser/MipsAsmParser.cpp index 0c06be8c7d9..765ac02df13 100644 --- a/lib/Target/Mips/AsmParser/MipsAsmParser.cpp +++ b/lib/Target/Mips/AsmParser/MipsAsmParser.cpp @@ -237,7 +237,7 @@ public: ((STI.getFeatureBits() & Mips::FeatureN32) != 0) + ((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"); } @@ -254,7 +254,7 @@ public: bool isABI_O32() const { return STI.getFeatureBits() & Mips::FeatureO32; } bool isABI_FPXX() const { return false; } // TODO: add check for FeatureXX - bool allowOddSPReg() const { + bool useOddSPReg() const { return !(STI.getFeatureBits() & Mips::FeatureNoOddSPReg); } @@ -572,7 +572,7 @@ public: assert(N == 1 && "Invalid number of operands!"); Inst.addOperand(MCOperand::CreateReg(getFGR32Reg())); // 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 " "registers"); } diff --git a/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h b/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h index ab18c4413ef..6ae2a3b60f3 100644 --- a/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h +++ b/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h @@ -228,6 +228,7 @@ public: setCPR1SizeFromPredicates(P); setASESetFromPredicates(P); setFpAbiFromPredicates(P); + OddSPReg = P.useOddSPReg(); } }; diff --git a/test/MC/Mips/mips32/abiflags.s b/test/MC/Mips/mips32/abiflags.s index 021ff793cea..3f568648037 100644 --- a/test/MC/Mips/mips32/abiflags.s +++ b/test/MC/Mips/mips32/abiflags.s @@ -26,7 +26,7 @@ # CHECK-OBJ: ] # CHECK-OBJ: SectionData ( # CHECK-OBJ: 0000: 00002001 01010001 00000000 00000000 |.. .............| -# CHECK-OBJ: 0010: 00000000 00000000 |........| +# CHECK-OBJ: 0010: 00000001 00000000 |........| # CHECK-OBJ: ) # CHECK-OBJ: } diff --git a/test/MC/Mips/mips32r2/abiflags.s b/test/MC/Mips/mips32r2/abiflags.s index 1904117ef66..228ba57e8b8 100644 --- a/test/MC/Mips/mips32r2/abiflags.s +++ b/test/MC/Mips/mips32r2/abiflags.s @@ -27,7 +27,7 @@ # CHECK-OBJ: ] # CHECK-OBJ: SectionData ( # CHECK-OBJ: 0000: 00002002 01010001 00000000 00000000 |.. .............| -# CHECK-OBJ: 0010: 00000000 00000000 |........| +# CHECK-OBJ: 0010: 00000001 00000000 |........| # CHECK-OBJ: ) # CHECK-OBJ: } diff --git a/test/MC/Mips/mips64/abiflags.s b/test/MC/Mips/mips64/abiflags.s index b41d914f1b2..0b4bad09210 100644 --- a/test/MC/Mips/mips64/abiflags.s +++ b/test/MC/Mips/mips64/abiflags.s @@ -26,7 +26,7 @@ # CHECK-OBJ: ] # CHECK-OBJ: SectionData ( # CHECK-OBJ: 0000: 00004001 02020001 00000000 00000000 |..@.............| -# CHECK-OBJ: 0010: 00000000 00000000 |........| +# CHECK-OBJ: 0010: 00000001 00000000 |........| # CHECK-OBJ: ) # CHECK-OBJ: } diff --git a/test/MC/Mips/mips64r2/abiflags.s b/test/MC/Mips/mips64r2/abiflags.s index b76a4b4720d..82afbbba935 100644 --- a/test/MC/Mips/mips64r2/abiflags.s +++ b/test/MC/Mips/mips64r2/abiflags.s @@ -26,7 +26,7 @@ # CHECK-OBJ: ] # CHECK-OBJ: SectionData ( # CHECK-OBJ: 0000: 00004002 02020001 00000000 00000000 |..@.............| -# CHECK-OBJ: 0010: 00000000 00000000 |........| +# CHECK-OBJ: 0010: 00000001 00000000 |........| # CHECK-OBJ: ) # CHECK-OBJ: } diff --git a/test/MC/Mips/mips_abi_flags_xx.s b/test/MC/Mips/mips_abi_flags_xx.s index 47d90841d86..b8416fc2454 100644 --- a/test/MC/Mips/mips_abi_flags_xx.s +++ b/test/MC/Mips/mips_abi_flags_xx.s @@ -26,7 +26,7 @@ # CHECK-OBJ: ] # CHECK-OBJ: SectionData ( # CHECK-OBJ: 0000: 00002001 01010005 00000000 00000000 |.. .............| -# CHECK-OBJ: 0010: 00000000 00000000 |........| +# CHECK-OBJ: 0010: 00000001 00000000 |........| # CHECK-OBJ: ) # CHECK-OBJ: } diff --git a/test/MC/Mips/mips_abi_flags_xx_set.s b/test/MC/Mips/mips_abi_flags_xx_set.s index 9694b9de5a5..0c2d9bb7e95 100644 --- a/test/MC/Mips/mips_abi_flags_xx_set.s +++ b/test/MC/Mips/mips_abi_flags_xx_set.s @@ -27,7 +27,7 @@ # CHECK-OBJ: ] # CHECK-OBJ: SectionData ( # CHECK-OBJ: 0000: 00002001 01010005 00000000 00000000 |.. .............| -# CHECK-OBJ: 0010: 00000000 00000000 |........| +# CHECK-OBJ: 0010: 00000001 00000000 |........| # CHECK-OBJ: ) # CHECK-OBJ: } diff --git a/test/MC/Mips/msa/abiflags.s b/test/MC/Mips/msa/abiflags.s index 3b13870f8d4..7856447f009 100644 --- a/test/MC/Mips/msa/abiflags.s +++ b/test/MC/Mips/msa/abiflags.s @@ -27,7 +27,7 @@ # CHECK-OBJ: ] # CHECK-OBJ: SectionData ( # CHECK-OBJ: 0000: 00002002 01030001 00000000 00000200 |.. .............| -# CHECK-OBJ: 0010: 00000000 00000000 |........| +# CHECK-OBJ: 0010: 00000001 00000000 |........| # CHECK-OBJ: ) # CHECK-OBJ: } diff --git a/test/MC/Mips/oddspreg.s b/test/MC/Mips/oddspreg.s index 39155f2b059..a7b0c4b189e 100644 --- a/test/MC/Mips/oddspreg.s +++ b/test/MC/Mips/oddspreg.s @@ -15,7 +15,21 @@ # RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 | \ # 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: FileCheck %s -check-prefix=CHECK-OBJ-ALL -check-prefix=CHECK-OBJ-N64 -- 2.34.1