[llvm-branch-commits] [llvm] [MSP430][MC] Use CoerceFromRegClass for GR8 operands (PR #241447)
Alexander Richardson via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Tue Nov 17 18:49:21 PST 2026
https://github.com/arichardson updated https://github.com/llvm/llvm-project/pull/241447
>From 31b198f66f2dc492b3746a2c7823876ab8b69bc2 Mon Sep 17 00:00:00 2001
From: Alex Richardson <alexrichardson at google.com>
Date: Wed, 11 Nov 2026 11:07:10 -0800
Subject: [PATCH] [nspr] initial commit
---
.../MSP430/AsmParser/MSP430AsmParser.cpp | 49 -------------------
llvm/lib/Target/MSP430/MSP430RegisterInfo.td | 18 ++++---
2 files changed, 10 insertions(+), 57 deletions(-)
diff --git a/llvm/lib/Target/MSP430/AsmParser/MSP430AsmParser.cpp b/llvm/lib/Target/MSP430/AsmParser/MSP430AsmParser.cpp
index 847ca9b6297042..fd33fa51daa035 100644
--- a/llvm/lib/Target/MSP430/AsmParser/MSP430AsmParser.cpp
+++ b/llvm/lib/Target/MSP430/AsmParser/MSP430AsmParser.cpp
@@ -53,9 +53,6 @@ class MSP430AsmParser : public MCTargetAsmParser {
ParseStatus parseDirective(AsmToken DirectiveID) override;
bool ParseDirectiveRefSym(AsmToken DirectiveID);
- unsigned validateTargetOperandClass(MCParsedAsmOperand &Op,
- unsigned Kind) override;
-
bool parseJccInstruction(ParseInstructionInfo &Info, StringRef Name,
SMLoc NameLoc, OperandVector &Operands);
@@ -185,11 +182,6 @@ class MSP430Operand : public MCParsedAsmOperand {
return Reg;
}
- void setReg(MCRegister RegNo) {
- assert(Kind == k_Reg && "Invalid access!");
- Reg = RegNo;
- }
-
static std::unique_ptr<MSP430Operand> CreateToken(StringRef Str, SMLoc S) {
return std::make_unique<MSP430Operand>(Str, S);
}
@@ -542,44 +534,3 @@ LLVMInitializeMSP430AsmParser() {
#define GET_REGISTER_MATCHER
#define GET_MATCHER_IMPLEMENTATION
#include "MSP430GenAsmMatcher.inc"
-
-static MCRegister convertGR16ToGR8(MCRegister Reg) {
- switch (Reg.id()) {
- default:
- llvm_unreachable("Unknown GR16 register");
- case MSP430::PC: return MSP430::PCB;
- case MSP430::SP: return MSP430::SPB;
- case MSP430::SR: return MSP430::SRB;
- case MSP430::CG: return MSP430::CGB;
- case MSP430::R4: return MSP430::R4B;
- case MSP430::R5: return MSP430::R5B;
- case MSP430::R6: return MSP430::R6B;
- case MSP430::R7: return MSP430::R7B;
- case MSP430::R8: return MSP430::R8B;
- case MSP430::R9: return MSP430::R9B;
- case MSP430::R10: return MSP430::R10B;
- case MSP430::R11: return MSP430::R11B;
- case MSP430::R12: return MSP430::R12B;
- case MSP430::R13: return MSP430::R13B;
- case MSP430::R14: return MSP430::R14B;
- case MSP430::R15: return MSP430::R15B;
- }
-}
-
-unsigned MSP430AsmParser::validateTargetOperandClass(MCParsedAsmOperand &AsmOp,
- unsigned Kind) {
- MSP430Operand &Op = static_cast<MSP430Operand &>(AsmOp);
-
- if (!Op.isReg())
- return Match_InvalidOperand;
-
- MCRegister Reg = Op.getReg();
- bool isGR16 = getMSP430MCRegisterClass(MSP430::GR16RegClassID).contains(Reg);
-
- if (isGR16 && (Kind == MCK_GR8)) {
- Op.setReg(convertGR16ToGR8(Reg));
- return Match_Success;
- }
-
- return Match_InvalidOperand;
-}
diff --git a/llvm/lib/Target/MSP430/MSP430RegisterInfo.td b/llvm/lib/Target/MSP430/MSP430RegisterInfo.td
index 153df285aebd57..1d8ae08c9e09e5 100644
--- a/llvm/lib/Target/MSP430/MSP430RegisterInfo.td
+++ b/llvm/lib/Target/MSP430/MSP430RegisterInfo.td
@@ -70,14 +70,6 @@ def R14 : MSP430RegWithSubregs<14, "r14", [R14B]>, DwarfRegNum<[14]>;
def R15 : MSP430RegWithSubregs<15, "r15", [R15B]>, DwarfRegNum<[15]>;
}
-def GR8 : RegisterClass<"MSP430", [i8], 8,
- // Volatile registers
- (add R12B, R13B, R14B, R15B, R11B, R10B, R9B, R8B, R7B, R6B, R5B,
- // Frame pointer, sometimes allocable
- R4B,
- // Volatile, but not allocable
- PCB, SPB, SRB, CGB)>;
-
def GR16 : RegisterClass<"MSP430", [i16], 16,
// Volatile registers
(add R12, R13, R14, R15, R11, R10, R9, R8, R7, R6, R5,
@@ -85,3 +77,13 @@ def GR16 : RegisterClass<"MSP430", [i16], 16,
R4,
// Volatile, but not allocable
PC, SP, SR, CG)>;
+
+def GR8 : RegisterClass<"MSP430", [i8], 8,
+ // Volatile registers
+ (add R12B, R13B, R14B, R15B, R11B, R10B, R9B, R8B, R7B, R6B, R5B,
+ // Frame pointer, sometimes allocable
+ R4B,
+ // Volatile, but not allocable
+ PCB, SPB, SRB, CGB)> {
+ let CoerceFromRegClass = GR16;
+}
More information about the llvm-branch-commits
mailing list