This is an archive of the discontinued LLVM Phabricator instance.

Differential D4486

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

Authored by dsanders on Jul 13 2014, 6:05 AM.

Details

Reviewers
sstankovic
vmedic
Commits
rG9ee2aee85962: [mips] Correct the AFL_FLAGS1_ODDSPREG flag in .MIPS.abiflags when no '.module…
rL212932: [mips] Correct the AFL_FLAGS1_ODDSPREG flag in .MIPS.abiflags when no '.module…

Diff Detail

Event Timeline

dsanders updated this revision to Diff 11349.Jul 13 2014, 6:05 AM
dsanders retitled this revision from to [mips] Correct the AFL_FLAGS1_ODDSPREG flag in .MIPS.abiflags when no '.module oddspreg' is used.
dsanders updated this object.
dsanders edited the test plan for this revision. (Show Details)
dsanders added reviewers: sstankovic, vmedic.
vmedic accepted this revision.Jul 14 2014, 1:58 AM
vmedic edited edge metadata.

LGTM

This revision is now accepted and ready to land.Jul 14 2014, 1:58 AM
dsanders closed this revision.Jul 14 2014, 3:34 AM

Revision Contents

PathSize
lib/
Target/
Mips/
AsmParser/
6 lines
MCTargetDesc/
1 line
test/
MC/
Mips/
mips32/
2 lines
mips32r2/
2 lines
mips64/
2 lines
mips64r2/
2 lines
2 lines
2 lines
msa/
2 lines
16 lines

Diff 11349

lib/Target/Mips/AsmParser/MipsAsmParser.cpp

Show First 20 Lines • Show All 231 Lines • ▼ Show 20 Lines MipsAsmParser(MCSubtargetInfo &sti, MCAsmParser &parser,
getTargetStreamer().updateABIInfo(*this); getTargetStreamer().updateABIInfo(*this);
// Assert exactly one ABI was chosen. // Assert exactly one ABI was chosen.
assert((((STI.getFeatureBits() & Mips::FeatureO32) != 0) + assert((((STI.getFeatureBits() & Mips::FeatureO32) != 0) +
((STI.getFeatureBits() & Mips::FeatureEABI) != 0) + ((STI.getFeatureBits() & Mips::FeatureEABI) != 0) +
((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");
} }
MCAsmParser &getParser() const { return Parser; } MCAsmParser &getParser() const { return Parser; }
MCAsmLexer &getLexer() const { return Parser.getLexer(); } MCAsmLexer &getLexer() const { return Parser.getLexer(); }
/// True if all of $fcc0 - $fcc7 exist for the current ISA. /// True if all of $fcc0 - $fcc7 exist for the current ISA.
bool hasEightFccRegisters() const { return hasMips4() || hasMips32(); } bool hasEightFccRegisters() const { return hasMips4() || hasMips32(); }
bool isGP64bit() const { return STI.getFeatureBits() & Mips::FeatureGP64Bit; } bool isGP64bit() const { return STI.getFeatureBits() & Mips::FeatureGP64Bit; }
bool isFP64bit() const { return STI.getFeatureBits() & Mips::FeatureFP64Bit; } bool isFP64bit() const { return STI.getFeatureBits() & Mips::FeatureFP64Bit; }
bool isABI_N32() const { return STI.getFeatureBits() & Mips::FeatureN32; } bool isABI_N32() const { return STI.getFeatureBits() & Mips::FeatureN32; }
bool isABI_N64() const { return STI.getFeatureBits() & Mips::FeatureN64; } bool isABI_N64() const { return STI.getFeatureBits() & Mips::FeatureN64; }
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);
} }
bool inMicroMipsMode() const { bool inMicroMipsMode() const {
return STI.getFeatureBits() & Mips::FeatureMicroMips; return STI.getFeatureBits() & Mips::FeatureMicroMips;
} }
bool hasMips1() const { return STI.getFeatureBits() & Mips::FeatureMips1; } bool hasMips1() const { return STI.getFeatureBits() & Mips::FeatureMips1; }
bool hasMips2() const { return STI.getFeatureBits() & Mips::FeatureMips2; } bool hasMips2() const { return STI.getFeatureBits() & Mips::FeatureMips2; }
▲ Show 20 Lines • Show All 301 Lines • ▼ Show 20 Lines void addFGR64AsmRegOperands(MCInst &Inst, unsigned N) const {
assert(N == 1 && "Invalid number of operands!"); assert(N == 1 && "Invalid number of operands!");
Inst.addOperand(MCOperand::CreateReg(getFGR64Reg())); Inst.addOperand(MCOperand::CreateReg(getFGR64Reg()));
} }
void addFGR32AsmRegOperands(MCInst &Inst, unsigned N) const { void addFGR32AsmRegOperands(MCInst &Inst, unsigned N) const {
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");
} }
void addFGRH32AsmRegOperands(MCInst &Inst, unsigned N) const { void addFGRH32AsmRegOperands(MCInst &Inst, unsigned N) const {
assert(N == 1 && "Invalid number of operands!"); assert(N == 1 && "Invalid number of operands!");
Inst.addOperand(MCOperand::CreateReg(getFGRH32Reg())); Inst.addOperand(MCOperand::CreateReg(getFGRH32Reg()));
} }
▲ Show 20 Lines • Show All 2,437 Lines • Show Last 20 Lines

lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h

Show First 20 Lines • Show All 222 Lines • ▼ Show 20 Linespublic:
template <class PredicateLibrary> template <class PredicateLibrary>
void setAllFromPredicates(const PredicateLibrary &P) { void setAllFromPredicates(const PredicateLibrary &P) {
setISALevelAndRevisionFromPredicates(P); setISALevelAndRevisionFromPredicates(P);
setGPRSizeFromPredicates(P); setGPRSizeFromPredicates(P);
setCPR1SizeFromPredicates(P); setCPR1SizeFromPredicates(P);
setASESetFromPredicates(P); setASESetFromPredicates(P);
setFpAbiFromPredicates(P); setFpAbiFromPredicates(P);
OddSPReg = P.useOddSPReg();
} }
}; };
MCStreamer &operator<<(MCStreamer &OS, MipsABIFlagsSection &ABIFlagsSection); MCStreamer &operator<<(MCStreamer &OS, MipsABIFlagsSection &ABIFlagsSection);
} }
#endif #endif

test/MC/Mips/mips32/abiflags.s

Show All 20 Lines
# CHECK-OBJ: Link: 0 # CHECK-OBJ: Link: 0
# CHECK-OBJ: Info: 0 # CHECK-OBJ: Info: 0
# CHECK-OBJ: AddressAlignment: 8 # CHECK-OBJ: AddressAlignment: 8
# CHECK-OBJ: EntrySize: 0 # CHECK-OBJ: EntrySize: 0
# CHECK-OBJ: Relocations [ # CHECK-OBJ: Relocations [
# 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: }
.module fp=32 .module fp=32
# FIXME: Test should include gnu_attributes directive when implemented. # FIXME: Test should include gnu_attributes directive when implemented.
# An explicit .gnu_attribute must be checked against the effective # An explicit .gnu_attribute must be checked against the effective
# command line options and any inconsistencies reported via a warning. # command line options and any inconsistencies reported via a warning.

test/MC/Mips/mips32r2/abiflags.s

Show All 21 Lines
# CHECK-OBJ: Link: 0 # CHECK-OBJ: Link: 0
# CHECK-OBJ: Info: 0 # CHECK-OBJ: Info: 0
# CHECK-OBJ: AddressAlignment: 8 # CHECK-OBJ: AddressAlignment: 8
# CHECK-OBJ: EntrySize: 0 # CHECK-OBJ: EntrySize: 0
# CHECK-OBJ: Relocations [ # CHECK-OBJ: Relocations [
# 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: }
.module fp=32 .module fp=32
.set fp=64 .set fp=64
# FIXME: Test should include gnu_attributes directive when implemented. # FIXME: Test should include gnu_attributes directive when implemented.
# An explicit .gnu_attribute must be checked against the effective # An explicit .gnu_attribute must be checked against the effective
# command line options and any inconsistencies reported via a warning. # command line options and any inconsistencies reported via a warning.

test/MC/Mips/mips64/abiflags.s

Show All 20 Lines
# CHECK-OBJ: Link: 0 # CHECK-OBJ: Link: 0
# CHECK-OBJ: Info: 0 # CHECK-OBJ: Info: 0
# CHECK-OBJ: AddressAlignment: 8 # CHECK-OBJ: AddressAlignment: 8
# CHECK-OBJ: EntrySize: 0 # CHECK-OBJ: EntrySize: 0
# CHECK-OBJ: Relocations [ # CHECK-OBJ: Relocations [
# 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: }
.module fp=64 .module fp=64
# FIXME: Test should include gnu_attributes directive when implemented. # FIXME: Test should include gnu_attributes directive when implemented.
# An explicit .gnu_attribute must be checked against the effective # An explicit .gnu_attribute must be checked against the effective
# command line options and any inconsistencies reported via a warning. # command line options and any inconsistencies reported via a warning.

test/MC/Mips/mips64r2/abiflags.s

Show All 20 Lines
# CHECK-OBJ: Link: 0 # CHECK-OBJ: Link: 0
# CHECK-OBJ: Info: 0 # CHECK-OBJ: Info: 0
# CHECK-OBJ: AddressAlignment: 8 # CHECK-OBJ: AddressAlignment: 8
# CHECK-OBJ: EntrySize: 0 # CHECK-OBJ: EntrySize: 0
# CHECK-OBJ: Relocations [ # CHECK-OBJ: Relocations [
# 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: }
.module fp=64 .module fp=64
# FIXME: Test should include gnu_attributes directive when implemented. # FIXME: Test should include gnu_attributes directive when implemented.
# An explicit .gnu_attribute must be checked against the effective # An explicit .gnu_attribute must be checked against the effective
# command line options and any inconsistencies reported via a warning. # command line options and any inconsistencies reported via a warning.

test/MC/Mips/mips_abi_flags_xx.s

Show All 20 Lines
# CHECK-OBJ: Link: 0 # CHECK-OBJ: Link: 0
# CHECK-OBJ: Info: 0 # CHECK-OBJ: Info: 0
# CHECK-OBJ: AddressAlignment: 8 # CHECK-OBJ: AddressAlignment: 8
# CHECK-OBJ: EntrySize: 0 # CHECK-OBJ: EntrySize: 0
# CHECK-OBJ: Relocations [ # CHECK-OBJ: Relocations [
# 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: }
.module fp=xx .module fp=xx
# FIXME: Test should include gnu_attributes directive when implemented. # FIXME: Test should include gnu_attributes directive when implemented.
# An explicit .gnu_attribute must be checked against the effective # An explicit .gnu_attribute must be checked against the effective
# command line options and any inconsistencies reported via a warning. # command line options and any inconsistencies reported via a warning.

test/MC/Mips/mips_abi_flags_xx_set.s

Show All 21 Lines
# CHECK-OBJ: Link: 0 # CHECK-OBJ: Link: 0
# CHECK-OBJ: Info: 0 # CHECK-OBJ: Info: 0
# CHECK-OBJ: AddressAlignment: 8 # CHECK-OBJ: AddressAlignment: 8
# CHECK-OBJ: EntrySize: 0 # CHECK-OBJ: EntrySize: 0
# CHECK-OBJ: Relocations [ # CHECK-OBJ: Relocations [
# 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: }
.module fp=xx .module fp=xx
.set fp=64 .set fp=64
# FIXME: Test should include gnu_attributes directive when implemented. # FIXME: Test should include gnu_attributes directive when implemented.
# An explicit .gnu_attribute must be checked against the effective # An explicit .gnu_attribute must be checked against the effective
# command line options and any inconsistencies reported via a warning. # command line options and any inconsistencies reported via a warning.

test/MC/Mips/msa/abiflags.s

Show All 21 Lines
# CHECK-OBJ: Link: 0 # CHECK-OBJ: Link: 0
# CHECK-OBJ: Info: 0 # CHECK-OBJ: Info: 0
# CHECK-OBJ: AddressAlignment: 8 # CHECK-OBJ: AddressAlignment: 8
# CHECK-OBJ: EntrySize: 0 # CHECK-OBJ: EntrySize: 0
# CHECK-OBJ: Relocations [ # CHECK-OBJ: Relocations [
# 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: }
.module fp=32 .module fp=32
.set fp=64 .set fp=64
# FIXME: Test should include gnu_attributes directive when implemented. # FIXME: Test should include gnu_attributes directive when implemented.
# An explicit .gnu_attribute must be checked against the effective # An explicit .gnu_attribute must be checked against the effective
# command line options and any inconsistencies reported via a warning. # command line options and any inconsistencies reported via a warning.

test/MC/Mips/oddspreg.s

Show All 9 Lines
# #
# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -mattr=-n64,+n32 -filetype=obj -o - | \ # RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -mattr=-n64,+n32 -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-N32 # RUN: FileCheck %s -check-prefix=CHECK-OBJ-ALL -check-prefix=CHECK-OBJ-N32
# 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
# CHECK-ASM: .module oddspreg # CHECK-ASM: .module oddspreg
# Checking if the Mips.abiflags were correctly emitted. # Checking if the Mips.abiflags were correctly emitted.
# CHECK-OBJ-ALL: Section { # CHECK-OBJ-ALL: Section {
# CHECK-OBJ-ALL: Index: 5 # CHECK-OBJ-ALL: Index: 5
Show All 30 Lines