summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp74
-rw-r--r--llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp72
-rw-r--r--llvm/lib/Target/Sparc/SparcInstrInfo.td89
-rw-r--r--llvm/lib/Target/Sparc/SparcRegisterInfo.td78
-rw-r--r--llvm/test/MC/Disassembler/Sparc/sparc-special-registers.txt12
-rw-r--r--llvm/test/MC/Sparc/sparc-fp-instructions.s30
6 files changed, 21 insertions, 334 deletions
diff --git a/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp b/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp
index 94f1e67f588..036e9ffc652 100644
--- a/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp
+++ b/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp
@@ -150,22 +150,6 @@ public:
Sparc::L0_L1, Sparc::L2_L3, Sparc::L4_L5, Sparc::L6_L7,
Sparc::I0_I1, Sparc::I2_I3, Sparc::I4_I5, Sparc::I6_I7};
- static const MCPhysReg CoprocRegs[32] = {
- Sparc::C0, Sparc::C1, Sparc::C2, Sparc::C3,
- Sparc::C4, Sparc::C5, Sparc::C6, Sparc::C7,
- Sparc::C8, Sparc::C9, Sparc::C10, Sparc::C11,
- Sparc::C12, Sparc::C13, Sparc::C14, Sparc::C15,
- Sparc::C16, Sparc::C17, Sparc::C18, Sparc::C19,
- Sparc::C20, Sparc::C21, Sparc::C22, Sparc::C23,
- Sparc::C24, Sparc::C25, Sparc::C26, Sparc::C27,
- Sparc::C28, Sparc::C29, Sparc::C30, Sparc::C31 };
-
- static const MCPhysReg CoprocPairRegs[] = {
- Sparc::C0_C1, Sparc::C2_C3, Sparc::C4_C5, Sparc::C6_C7,
- Sparc::C8_C9, Sparc::C10_C11, Sparc::C12_C13, Sparc::C14_C15,
- Sparc::C16_C17, Sparc::C18_C19, Sparc::C20_C21, Sparc::C22_C23,
- Sparc::C24_C25, Sparc::C26_C27, Sparc::C28_C29, Sparc::C30_C31};
-
/// SparcOperand - Instances of this class represent a parsed Sparc machine
/// instruction.
class SparcOperand : public MCParsedAsmOperand {
@@ -177,8 +161,6 @@ public:
rk_FloatReg,
rk_DoubleReg,
rk_QuadReg,
- rk_CoprocReg,
- rk_CoprocPairReg,
rk_Special,
};
@@ -242,9 +224,6 @@ public:
|| Reg.Kind == rk_DoubleReg));
}
- bool isCoprocReg() const {
- return (Kind == k_Register && Reg.Kind == rk_CoprocReg);
- }
StringRef getToken() const {
assert(Kind == k_Token && "Invalid access!");
@@ -419,19 +398,6 @@ public:
return true;
}
- static bool MorphToCoprocPairReg(SparcOperand &Op) {
- unsigned Reg = Op.getReg();
- assert(Op.Reg.Kind == rk_CoprocReg);
- unsigned regIdx = 32;
- if (Reg >= Sparc::C0 && Reg <= Sparc::C31)
- regIdx = Reg - Sparc::C0;
- if (regIdx % 2 || regIdx > 31)
- return false;
- Op.Reg.RegNum = CoprocPairRegs[regIdx / 2];
- Op.Reg.Kind = rk_CoprocPairReg;
- return true;
- }
-
static std::unique_ptr<SparcOperand>
MorphToMEMrr(unsigned Base, std::unique_ptr<SparcOperand> Op) {
unsigned offsetReg = Op->getReg();
@@ -843,15 +809,6 @@ SparcAsmParser::parseSparcAsmOperand(std::unique_ptr<SparcOperand> &Op,
case Sparc::FSR:
Op = SparcOperand::CreateToken("%fsr", S);
break;
- case Sparc::FQ:
- Op = SparcOperand::CreateToken("%fq", S);
- break;
- case Sparc::CPSR:
- Op = SparcOperand::CreateToken("%csr", S);
- break;
- case Sparc::CPQ:
- Op = SparcOperand::CreateToken("%cq", S);
- break;
case Sparc::WIM:
Op = SparcOperand::CreateToken("%wim", S);
break;
@@ -984,24 +941,6 @@ bool SparcAsmParser::matchRegisterName(const AsmToken &Tok,
return true;
}
- if (name.equals("fq")) {
- RegNo = Sparc::FQ;
- RegKind = SparcOperand::rk_Special;
- return true;
- }
-
- if (name.equals("csr")) {
- RegNo = Sparc::CPSR;
- RegKind = SparcOperand::rk_Special;
- return true;
- }
-
- if (name.equals("cq")) {
- RegNo = Sparc::CPQ;
- RegKind = SparcOperand::rk_Special;
- return true;
- }
-
if (name.equals("wim")) {
RegNo = Sparc::WIM;
RegKind = SparcOperand::rk_Special;
@@ -1086,15 +1025,6 @@ bool SparcAsmParser::matchRegisterName(const AsmToken &Tok,
return true;
}
- // %c0 - %c31
- if (name.substr(0, 1).equals_lower("c")
- && !name.substr(1).getAsInteger(10, intVal)
- && intVal < 32) {
- RegNo = CoprocRegs[intVal];
- RegKind = SparcOperand::rk_CoprocReg;
- return true;
- }
-
if (name.equals("tpc")) {
RegNo = Sparc::TPC;
RegKind = SparcOperand::rk_Special;
@@ -1285,9 +1215,5 @@ unsigned SparcAsmParser::validateTargetOperandClass(MCParsedAsmOperand &GOp,
if (SparcOperand::MorphToIntPairReg(Op))
return MCTargetAsmParser::Match_Success;
}
- if (Op.isCoprocReg() && Kind == MCK_CoprocPair) {
- if (SparcOperand::MorphToCoprocPairReg(Op))
- return MCTargetAsmParser::Match_Success;
- }
return Match_InvalidOperand;
}
diff --git a/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp b/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp
index 44d35764003..8585d5c4392 100644
--- a/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp
+++ b/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp
@@ -130,25 +130,6 @@ static const uint16_t IntPairDecoderTable[] = {
SP::I0_I1, SP::I2_I3, SP::I4_I5, SP::I6_I7,
};
-static const unsigned CPRegDecoderTable[] = {
- SP::C0, SP::C1, SP::C2, SP::C3,
- SP::C4, SP::C5, SP::C6, SP::C7,
- SP::C8, SP::C9, SP::C10, SP::C11,
- SP::C12, SP::C13, SP::C14, SP::C15,
- SP::C16, SP::C17, SP::C18, SP::C19,
- SP::C20, SP::C21, SP::C22, SP::C23,
- SP::C24, SP::C25, SP::C26, SP::C27,
- SP::C28, SP::C29, SP::C30, SP::C31
-};
-
-
-static const uint16_t CPPairDecoderTable[] = {
- SP::C0_C1, SP::C2_C3, SP::C4_C5, SP::C6_C7,
- SP::C8_C9, SP::C10_C11, SP::C12_C13, SP::C14_C15,
- SP::C16_C17, SP::C18_C19, SP::C20_C21, SP::C22_C23,
- SP::C24_C25, SP::C26_C27, SP::C28_C29, SP::C30_C31
-};
-
static DecodeStatus DecodeIntRegsRegisterClass(MCInst &Inst,
unsigned RegNo,
uint64_t Address,
@@ -210,17 +191,6 @@ static DecodeStatus DecodeQFPRegsRegisterClass(MCInst &Inst,
return MCDisassembler::Success;
}
-static DecodeStatus DecodeCPRegsRegisterClass(MCInst &Inst,
- unsigned RegNo,
- uint64_t Address,
- const void *Decoder) {
- if (RegNo > 31)
- return MCDisassembler::Fail;
- unsigned Reg = CPRegDecoderTable[RegNo];
- Inst.addOperand(MCOperand::createReg(Reg));
- return MCDisassembler::Success;
-}
-
static DecodeStatus DecodeFCCRegsRegisterClass(MCInst &Inst, unsigned RegNo,
uint64_t Address,
const void *Decoder) {
@@ -263,16 +233,6 @@ static DecodeStatus DecodeIntPairRegisterClass(MCInst &Inst, unsigned RegNo,
return S;
}
-static DecodeStatus DecodeCPPairRegisterClass(MCInst &Inst, unsigned RegNo,
- uint64_t Address, const void *Decoder) {
- if (RegNo > 31)
- return MCDisassembler::Fail;
-
- unsigned RegisterPair = CPPairDecoderTable[RegNo/2];
- Inst.addOperand(MCOperand::createReg(RegisterPair));
- return MCDisassembler::Success;
-}
-
static DecodeStatus DecodeLoadInt(MCInst &Inst, unsigned insn, uint64_t Address,
const void *Decoder);
static DecodeStatus DecodeLoadIntPair(MCInst &Inst, unsigned insn, uint64_t Address,
@@ -283,10 +243,6 @@ static DecodeStatus DecodeLoadDFP(MCInst &Inst, unsigned insn, uint64_t Address,
const void *Decoder);
static DecodeStatus DecodeLoadQFP(MCInst &Inst, unsigned insn, uint64_t Address,
const void *Decoder);
-static DecodeStatus DecodeLoadCP(MCInst &Inst, unsigned insn, uint64_t Address,
- const void *Decoder);
-static DecodeStatus DecodeLoadCPPair(MCInst &Inst, unsigned insn, uint64_t Address,
- const void *Decoder);
static DecodeStatus DecodeStoreInt(MCInst &Inst, unsigned insn,
uint64_t Address, const void *Decoder);
static DecodeStatus DecodeStoreIntPair(MCInst &Inst, unsigned insn,
@@ -297,10 +253,6 @@ static DecodeStatus DecodeStoreDFP(MCInst &Inst, unsigned insn,
uint64_t Address, const void *Decoder);
static DecodeStatus DecodeStoreQFP(MCInst &Inst, unsigned insn,
uint64_t Address, const void *Decoder);
-static DecodeStatus DecodeStoreCP(MCInst &Inst, unsigned insn,
- uint64_t Address, const void *Decoder);
-static DecodeStatus DecodeStoreCPPair(MCInst &Inst, unsigned insn,
- uint64_t Address, const void *Decoder);
static DecodeStatus DecodeCall(MCInst &Inst, unsigned insn,
uint64_t Address, const void *Decoder);
static DecodeStatus DecodeSIMM13(MCInst &Inst, unsigned insn,
@@ -438,18 +390,6 @@ static DecodeStatus DecodeLoadQFP(MCInst &Inst, unsigned insn, uint64_t Address,
DecodeQFPRegsRegisterClass);
}
-static DecodeStatus DecodeLoadCP(MCInst &Inst, unsigned insn, uint64_t Address,
- const void *Decoder) {
- return DecodeMem(Inst, insn, Address, Decoder, true,
- DecodeCPRegsRegisterClass);
-}
-
-static DecodeStatus DecodeLoadCPPair(MCInst &Inst, unsigned insn, uint64_t Address,
- const void *Decoder) {
- return DecodeMem(Inst, insn, Address, Decoder, true,
- DecodeCPPairRegisterClass);
-}
-
static DecodeStatus DecodeStoreInt(MCInst &Inst, unsigned insn,
uint64_t Address, const void *Decoder) {
return DecodeMem(Inst, insn, Address, Decoder, false,
@@ -480,18 +420,6 @@ static DecodeStatus DecodeStoreQFP(MCInst &Inst, unsigned insn,
DecodeQFPRegsRegisterClass);
}
-static DecodeStatus DecodeStoreCP(MCInst &Inst, unsigned insn,
- uint64_t Address, const void *Decoder) {
- return DecodeMem(Inst, insn, Address, Decoder, false,
- DecodeCPRegsRegisterClass);
-}
-
-static DecodeStatus DecodeStoreCPPair(MCInst &Inst, unsigned insn,
- uint64_t Address, const void *Decoder) {
- return DecodeMem(Inst, insn, Address, Decoder, false,
- DecodeCPPairRegisterClass);
-}
-
static bool tryAddingSymbolicOperand(int64_t Value, bool isBranch,
uint64_t Address, uint64_t Offset,
uint64_t Width, MCInst &MI,
diff --git a/llvm/lib/Target/Sparc/SparcInstrInfo.td b/llvm/lib/Target/Sparc/SparcInstrInfo.td
index e728cf7776d..ec37c22a5b3 100644
--- a/llvm/lib/Target/Sparc/SparcInstrInfo.td
+++ b/llvm/lib/Target/Sparc/SparcInstrInfo.td
@@ -235,28 +235,12 @@ def FCC_UL : FCC_VAL<19>; // Unordered or Less
def FCC_LG : FCC_VAL<18>; // Less or Greater
def FCC_NE : FCC_VAL<17>; // Not Equal
def FCC_E : FCC_VAL<25>; // Equal
-def FCC_UE : FCC_VAL<26>; // Unordered or Equal
-def FCC_GE : FCC_VAL<27>; // Greater or Equal
-def FCC_UGE : FCC_VAL<28>; // Unordered or Greater or Equal
-def FCC_LE : FCC_VAL<29>; // Less or Equal
-def FCC_ULE : FCC_VAL<30>; // Unordered or Less or Equal
-def FCC_O : FCC_VAL<31>; // Ordered
-
-class CPCC_VAL<int N> : PatLeaf<(i32 N)>;
-def CPCC_3 : CPCC_VAL<39>; // 3
-def CPCC_2 : CPCC_VAL<38>; // 2
-def CPCC_23 : CPCC_VAL<37>; // 2 or 3
-def CPCC_1 : CPCC_VAL<36>; // 1
-def CPCC_13 : CPCC_VAL<35>; // 1 or 3
-def CPCC_12 : CPCC_VAL<34>; // 1 or 2
-def CPCC_123 : CPCC_VAL<33>; // 1 or 2 or 3
-def CPCC_0 : CPCC_VAL<41>; // 0
-def CPCC_03 : CPCC_VAL<42>; // 0 or 3
-def CPCC_02 : CPCC_VAL<43>; // 0 or 2
-def CPCC_023 : CPCC_VAL<44>; // 0 or 2 or 3
-def CPCC_01 : CPCC_VAL<45>; // 0 or 1
-def CPCC_013 : CPCC_VAL<46>; // 0 or 1 or 3
-def CPCC_012 : CPCC_VAL<47>; // 0 or 1 or 2
+def FCC_UE : FCC_VAL<24>; // Unordered or Equal
+def FCC_GE : FCC_VAL<25>; // Greater or Equal
+def FCC_UGE : FCC_VAL<26>; // Unordered or Greater or Equal
+def FCC_LE : FCC_VAL<27>; // Less or Equal
+def FCC_ULE : FCC_VAL<28>; // Unordered or Less or Equal
+def FCC_O : FCC_VAL<29>; // Ordered
//===----------------------------------------------------------------------===//
// Instruction Class Templates
@@ -461,20 +445,6 @@ let DecoderMethod = "DecodeLoadQFP" in
defm LDQF : LoadA<"ldq", 0b100010, 0b110010, load, QFPRegs, f128>,
Requires<[HasV9, HasHardQuad]>;
-let DecoderMethod = "DecodeLoadCP" in
- defm LDC : Load<"ld", 0b110000, load, CoprocRegs, i32>;
-let DecoderMethod = "DecodeLoadCPPair" in
- defm LDDC : Load<"ldd", 0b110011, load, CoprocPair, v2i32>;
-
-let DecoderMethod = "DecodeLoadCP", Defs = [CPSR] in {
- let rd = 0 in {
- def LDCSRrr : F3_1<3, 0b110001, (outs), (ins MEMrr:$addr),
- "ld [$addr], %csr", []>;
- def LDCSRri : F3_2<3, 0b110001, (outs), (ins MEMri:$addr),
- "ld [$addr], %csr", []>;
- }
-}
-
let DecoderMethod = "DecodeLoadFP" in
let Defs = [FSR] in {
let rd = 0 in {
@@ -516,27 +486,6 @@ let DecoderMethod = "DecodeStoreQFP" in
defm STQF : StoreA<"stq", 0b100110, 0b110110, store, QFPRegs, f128>,
Requires<[HasV9, HasHardQuad]>;
-let DecoderMethod = "DecodeStoreCP" in
- defm STC : Store<"st", 0b110100, store, CoprocRegs, i32>;
-
-let DecoderMethod = "DecodeStoreCPPair" in
- defm STDC : Store<"std", 0b110111, store, CoprocPair, v2i32>;
-
-let DecoderMethod = "DecodeStoreCP", rd = 0 in {
- let Defs = [CPSR] in {
- def STCSRrr : F3_1<3, 0b110101, (outs MEMrr:$addr), (ins),
- "st %csr, [$addr]", []>;
- def STCSRri : F3_2<3, 0b110101, (outs MEMri:$addr), (ins),
- "st %csr, [$addr]", []>;
- }
- let Defs = [CPQ] in {
- def STDCQrr : F3_1<3, 0b110110, (outs MEMrr:$addr), (ins),
- "std %cq, [$addr]", []>;
- def STDCQri : F3_2<3, 0b110110, (outs MEMri:$addr), (ins),
- "std %cq, [$addr]", []>;
- }
-}
-
let DecoderMethod = "DecodeStoreFP" in
let Defs = [FSR] in {
let rd = 0 in {
@@ -552,14 +501,6 @@ let DecoderMethod = "DecodeStoreFP" in
"stx %fsr, [$addr]", []>, Requires<[HasV9]>;
}
}
- let Defs = [FQ] in {
- let rd = 0 in {
- def STDFQrr : F3_1<3, 0b100110, (outs MEMrr:$addr), (ins),
- "std %fq, [$addr]", []>;
- def STDFQri : F3_2<3, 0b100110, (outs MEMri:$addr), (ins),
- "std %fq, [$addr]", []>;
- }
- }
// Section B.8 - SWAP Register with Memory Instruction
// (Atomic swap)
@@ -814,25 +755,7 @@ let Uses = [FCC0] in {
let Predicates = [HasV9] in
defm BPF : FPredBranch;
-// Section B.22 - Branch on Co-processor Condition Codes Instructions, p. 123
-let isBranch = 1, isTerminator = 1, hasDelaySlot = 1 in {
-
-// co-processor conditional branch class:
-class CPBranchSP<dag ins, string asmstr, list<dag> pattern>
- : F2_2<0b111, 0, (outs), ins, asmstr, pattern>;
-
-// co-processor conditional branch with annul class:
-class CPBranchSPA<dag ins, string asmstr, list<dag> pattern>
- : F2_2<0b111, 1, (outs), ins, asmstr, pattern>;
-
-} // let isBranch = 1, isTerminator = 1, hasDelaySlot = 1
-def CBCOND : CPBranchSP<(ins brtarget:$imm22, CCOp:$cond),
- "cb$cond $imm22",
- [(SPbrfcc bb:$imm22, imm:$cond)]>;
-def CBCONDA : CPBranchSPA<(ins brtarget:$imm22, CCOp:$cond),
- "cb$cond,a $imm22", []>;
-
// Section B.24 - Call and Link Instruction, p. 125
// This is the only Format 1 instruction
let Uses = [O6],
diff --git a/llvm/lib/Target/Sparc/SparcRegisterInfo.td b/llvm/lib/Target/Sparc/SparcRegisterInfo.td
index d1ef3b19dca..cca9463562a 100644
--- a/llvm/lib/Target/Sparc/SparcRegisterInfo.td
+++ b/llvm/lib/Target/Sparc/SparcRegisterInfo.td
@@ -62,12 +62,6 @@ foreach I = 0-3 in
def FSR : SparcCtrlReg<0, "FSR">; // Floating-point state register.
-def FQ : SparcCtrlReg<0, "FQ">; // Floating-point deferred-trap queue.
-
-def CPSR : SparcCtrlReg<0, "CPSR">; // Co-processor state register.
-
-def CPQ : SparcCtrlReg<0, "CPQ">; // Co-processor queue.
-
// Y register
def Y : SparcCtrlReg<0, "Y">, DwarfRegNum<[64]>;
// Ancillary state registers (implementation defined)
@@ -210,40 +204,6 @@ def D13 : Rd<26, "F26", [F26, F27]>, DwarfRegNum<[85]>;
def D14 : Rd<28, "F28", [F28, F29]>, DwarfRegNum<[86]>;
def D15 : Rd<30, "F30", [F30, F31]>, DwarfRegNum<[87]>;
-// Co-processor registers
-def C0 : Ri< 0, "C0">;
-def C1 : Ri< 1, "C1">;
-def C2 : Ri< 2, "C2">;
-def C3 : Ri< 3, "C3">;
-def C4 : Ri< 4, "C4">;
-def C5 : Ri< 5, "C5">;
-def C6 : Ri< 6, "C6">;
-def C7 : Ri< 7, "C7">;
-def C8 : Ri< 8, "C8">;
-def C9 : Ri< 9, "C9">;
-def C10 : Ri< 10, "C10">;
-def C11 : Ri< 11, "C11">;
-def C12 : Ri< 12, "C12">;
-def C13 : Ri< 13, "C13">;
-def C14 : Ri< 14, "C14">;
-def C15 : Ri< 15, "C15">;
-def C16 : Ri< 16, "C16">;
-def C17 : Ri< 17, "C17">;
-def C18 : Ri< 18, "C18">;
-def C19 : Ri< 19, "C19">;
-def C20 : Ri< 20, "C20">;
-def C21 : Ri< 21, "C21">;
-def C22 : Ri< 22, "C22">;
-def C23 : Ri< 23, "C23">;
-def C24 : Ri< 24, "C24">;
-def C25 : Ri< 25, "C25">;
-def C26 : Ri< 26, "C26">;
-def C27 : Ri< 27, "C27">;
-def C28 : Ri< 28, "C28">;
-def C29 : Ri< 29, "C29">;
-def C30 : Ri< 30, "C30">;
-def C31 : Ri< 31, "C31">;
-
// Unaliased double precision floating point registers.
// FIXME: Define DwarfRegNum for these registers.
def D16 : SparcReg< 1, "F32">;
@@ -299,24 +259,6 @@ def I2_I3 : Rdi<26, "I2", [I2, I3]>;
def I4_I5 : Rdi<28, "I4", [I4, I5]>;
def I6_I7 : Rdi<30, "I6", [I6, I7]>;
-// Aliases of the co-processor registers used for LDD/STD double-word operations
-def C0_C1 : Rdi<0, "C0", [C0, C1]>;
-def C2_C3 : Rdi<2, "C2", [C2, C3]>;
-def C4_C5 : Rdi<4, "C4", [C4, C5]>;
-def C6_C7 : Rdi<6, "C6", [C6, C7]>;
-def C8_C9 : Rdi<8, "C8", [C8, C9]>;
-def C10_C11 : Rdi<10, "C10", [C10, C11]>;
-def C12_C13 : Rdi<12, "C12", [C12, C13]>;
-def C14_C15 : Rdi<14, "C14", [C14, C15]>;
-def C16_C17 : Rdi<16, "C16", [C16, C17]>;
-def C18_C19 : Rdi<18, "C18", [C18, C19]>;
-def C20_C21 : Rdi<20, "C20", [C20, C21]>;
-def C22_C23 : Rdi<22, "C22", [C22, C23]>;
-def C24_C25 : Rdi<24, "C24", [C24, C25]>;
-def C26_C27 : Rdi<26, "C26", [C26, C27]>;
-def C28_C29 : Rdi<28, "C28", [C28, C29]>;
-def C30_C31 : Rdi<30, "C30", [C30, C31]>;
-
// Register classes.
//
// FIXME: the register order should be defined in terms of the preferred
@@ -331,7 +273,6 @@ def IntRegs : RegisterClass<"SP", [i32, i64], 32,
(sequence "L%u", 0, 7),
(sequence "O%u", 0, 7))>;
-
// Should be in the same order as IntRegs.
def IntPair : RegisterClass<"SP", [v2i32], 64,
(add I0_I1, I2_I3, I4_I5, I6_I7,
@@ -355,21 +296,10 @@ def QFPRegs : RegisterClass<"SP", [f128], 128, (sequence "Q%u", 0, 15)>;
// Floating point control register classes.
def FCCRegs : RegisterClass<"SP", [i1], 1, (sequence "FCC%u", 0, 3)>;
-let isAllocatable = 0 in {
- // Ancillary state registers
- def ASRRegs : RegisterClass<"SP", [i32], 32,
- (add Y, (sequence "ASR%u", 1, 31))>;
-
- // This register class should not be used to hold i64 values.
- def CoprocRegs : RegisterClass<"SP", [i32], 32,
- (add (sequence "C%u", 0, 31))>;
-
- // Should be in the same order as CoprocRegs.
- def CoprocPair : RegisterClass<"SP", [v2i32], 64,
- (add C0_C1, C2_C3, C4_C5, C6_C7,
- C8_C9, C10_C11, C12_C13, C14_C15,
- C16_C17, C18_C19, C20_C21, C22_C23,
- C24_C25, C26_C27, C28_C29, C30_C31)>;
+// Ancillary state registers
+def ASRRegs : RegisterClass<"SP", [i32], 32,
+ (add Y, (sequence "ASR%u", 1, 31))> {
+ let isAllocatable = 0;
}
// Privileged Registers
diff --git a/llvm/test/MC/Disassembler/Sparc/sparc-special-registers.txt b/llvm/test/MC/Disassembler/Sparc/sparc-special-registers.txt
index a35126dc1ae..f653dbda605 100644
--- a/llvm/test/MC/Disassembler/Sparc/sparc-special-registers.txt
+++ b/llvm/test/MC/Disassembler/Sparc/sparc-special-registers.txt
@@ -32,15 +32,3 @@
# CHECK: wr %i0, 5, %tbr
0x81 0x9e 0x20 0x05
-
-# CHECK: st %fsr, [%i5]
-0xc1 0x2f 0x40 0x00
-
-# CHECK: st %csr, [%i5]
-0xc1 0xaf 0x40 0x00
-
-# CHECK: std %cq, [%o3+-93]
-0xc1 0xb2 0xff 0xa3
-
-# CHECK: std %fq, [%i5+%l1]
-0xc1 0x37 0x40 0x11 \ No newline at end of file
diff --git a/llvm/test/MC/Sparc/sparc-fp-instructions.s b/llvm/test/MC/Sparc/sparc-fp-instructions.s
index ae5ef37bf22..64f1538cb91 100644
--- a/llvm/test/MC/Sparc/sparc-fp-instructions.s
+++ b/llvm/test/MC/Sparc/sparc-fp-instructions.s
@@ -65,8 +65,8 @@
faddq %f0, %f4, %f8
! make sure we can handle V9 double registers and their aliased quad registers.
- ! CHECK: faddd %f32, %f34, %f62 ! encoding: [0xbf,0xa0,0x48,0x43]
- ! CHECK: faddq %f32, %f36, %f60 ! encoding: [0xbb,0xa0,0x48,0x65]
+ ! CHECK: faddd %f32, %f34, %f62 ! encoding: [0xbf,0xa0,0x48,0x43]
+ ! CHECK: faddq %f32, %f36, %f60 ! encoding: [0xbb,0xa0,0x48,0x65]
faddd %f32, %f34, %f62
faddq %f32, %f36, %f60
@@ -103,23 +103,23 @@
fcmpd %f0, %f4
fcmpq %f0, %f4
- ! CHECK: fcmpes %f0, %f4 ! encoding: [0x81,0xa8,0x0a,0xa4]
- ! CHECK: fcmped %f0, %f4 ! encoding: [0x81,0xa8,0x0a,0xc4]
- ! CHECK: fcmpeq %f0, %f4 ! encoding: [0x81,0xa8,0x0a,0xe4]
+ ! CHECK: fcmpes %f0, %f4 ! encoding: [0x81,0xa8,0x0a,0xa4]
+ ! CHECK: fcmped %f0, %f4 ! encoding: [0x81,0xa8,0x0a,0xc4]
+ ! CHECK: fcmpeq %f0, %f4 ! encoding: [0x81,0xa8,0x0a,0xe4]
fcmpes %f0, %f4
fcmped %f0, %f4
fcmpeq %f0, %f4
- ! CHECK: fcmps %fcc2, %f0, %f4 ! encoding: [0x85,0xa8,0x0a,0x24]
- ! CHECK: fcmpd %fcc2, %f0, %f4 ! encoding: [0x85,0xa8,0x0a,0x44]
- ! CHECK: fcmpq %fcc2, %f0, %f4 ! encoding: [0x85,0xa8,0x0a,0x64]
+ ! CHECK: fcmps %fcc2, %f0, %f4 ! encoding: [0x85,0xa8,0x0a,0x24]
+ ! CHECK: fcmpd %fcc2, %f0, %f4 ! encoding: [0x85,0xa8,0x0a,0x44]
+ ! CHECK: fcmpq %fcc2, %f0, %f4 ! encoding: [0x85,0xa8,0x0a,0x64]
fcmps %fcc2, %f0, %f4
fcmpd %fcc2, %f0, %f4
fcmpq %fcc2, %f0, %f4
- ! CHECK: fcmpes %fcc2, %f0, %f4 ! encoding: [0x85,0xa8,0x0a,0xa4]
- ! CHECK: fcmped %fcc2, %f0, %f4 ! encoding: [0x85,0xa8,0x0a,0xc4]
- ! CHECK: fcmpeq %fcc2, %f0, %f4 ! encoding: [0x85,0xa8,0x0a,0xe4]
+ ! CHECK: fcmpes %fcc2, %f0, %f4 ! encoding: [0x85,0xa8,0x0a,0xa4]
+ ! CHECK: fcmped %fcc2, %f0, %f4 ! encoding: [0x85,0xa8,0x0a,0xc4]
+ ! CHECK: fcmpeq %fcc2, %f0, %f4 ! encoding: [0x85,0xa8,0x0a,0xe4]
fcmpes %fcc2, %f0, %f4
fcmped %fcc2, %f0, %f4
fcmpeq %fcc2, %f0, %f4
@@ -147,11 +147,3 @@
! CHECK: std %f48, [%l0] ! encoding: [0xe3,0x3c,0x00,0x00]
st %f29, [%l0]
std %f48, [%l0]
-
- ! CHECK: std %fq, [%o4] ! encoding: [0xc1,0x33,0x00,0x00]
- ! CHECK: std %fq, [%l1+62] ! encoding: [0xc1,0x34,0x60,0x3e]
- ! CHECK: std %fq, [%i3+%l7] ! encoding: [0xc1,0x36,0xc0,0x17]
- std %fq, [%o4]
- std %fq, [%l1+62]
- std %fq, [%i3+%l7]
- \ No newline at end of file
OpenPOWER on IntegriCloud