From 35c2a4cf35589e1c3046ecbe2c480a57b6d10360 Mon Sep 17 00:00:00 2001
From: Galen Williamson <galen@vector35.com>
Date: Mon, 9 Jun 2025 19:30:13 -0400
Subject: [thumb2] Converted MSR system registers into enum

---
 arch/armv7/armv7_disasm/armv7.c | 26 +++++++++++++++++++++-----
 arch/armv7/armv7_disasm/armv7.h | 14 ++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

(limited to 'arch/armv7/armv7_disasm')

diff --git a/arch/armv7/armv7_disasm/armv7.c b/arch/armv7/armv7_disasm/armv7.c
index 69ce44fb..2a5e5c6f 100644
--- a/arch/armv7/armv7_disasm/armv7.c
+++ b/arch/armv7/armv7_disasm/armv7.c
@@ -498,14 +498,14 @@ static const char* registerString[] = {
 	"r6",
 	"r7",
 	"r8",
-	"r9",
-	"r10",
-	"r11",
-	"r12",
 	// "sb",
+	"r9",
 	// "sl",
+	"r10",
 	// "fp",
+	"r11",
 	// "ip",
+	"r12",
 	"sp",
 	"lr",
 	"pc",
@@ -677,7 +677,23 @@ static const char* registerString[] = {
 	"basepri",
 	"faultmask",
 	"control",
-
+	"basepri_max",
+	"ipsr",
+	"epsr",
+	"iepsr",
+
+	"iapsr",
+	"iapsr_g",
+	"iapsr_nzcvq",
+	"iapsr_nzcvqg",
+	"eapsr",
+	"eapsr_g",
+	"eapsr_nzcvq",
+	"eapsr_nzcvqg",
+	"xpsr",
+	"xpsr_g",
+	"xpsr_nzcvq",
+	"xpsr_nzcvqg",
 	/* invalid */
 	""
 };
diff --git a/arch/armv7/armv7_disasm/armv7.h b/arch/armv7/armv7_disasm/armv7.h
index d91d75ca..14ff191a 100644
--- a/arch/armv7/armv7_disasm/armv7.h
+++ b/arch/armv7/armv7_disasm/armv7.h
@@ -712,6 +712,20 @@ enum Register
 	REGS_EPSR,
 	REGS_IEPSR,
 
+	REGS_IAPSR,
+	REGS_IAPSR_G,
+	REGS_IAPSR_NZCVQ,
+	REGS_IAPSR_NZCVQG,
+	REGS_EAPSR,
+	REGS_EAPSR_G,
+	REGS_EAPSR_NZCVQ,
+	REGS_EAPSR_NZCVQG,
+	REGS_XPSR,
+	REGS_XPSR_G,
+	REGS_XPSR_NZCVQ,
+	REGS_XPSR_NZCVQG,
+
+
 	REG_INVALID,
 };
 
-- 
cgit v1.3.1