From 1ee6d4503ea765fda22fbb65c081aaa7c2668678 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sat, 24 Mar 2018 16:44:59 +0100
Subject: [PATCH 1/2] Update to split 'special' into its sane parts (update
 from @mubes)

---
 src/target/cortexm.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/target/cortexm.c b/src/target/cortexm.c
index abd64f4a..8c15128b 100644
--- a/src/target/cortexm.c
+++ b/src/target/cortexm.c
@@ -125,7 +125,10 @@ static const char tdesc_cortex_m[] =
 	"    <reg name=\"xpsr\" bitsize=\"32\"/>"
 	"    <reg name=\"msp\" bitsize=\"32\" save-restore=\"no\" type=\"data_ptr\"/>"
 	"    <reg name=\"psp\" bitsize=\"32\" save-restore=\"no\" type=\"data_ptr\"/>"
-	"    <reg name=\"special\" bitsize=\"32\" save-restore=\"no\"/>"
+	"    <reg name=\"PRIMASK\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"BASEPRI\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"FAULTMASK\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"Control\" bitsize=\"8\" save-restore=\"no\"/>"
 	"  </feature>"
 	"</target>";
 
@@ -154,7 +157,10 @@ static const char tdesc_cortex_mf[] =
 	"    <reg name=\"xpsr\" bitsize=\"32\"/>"
 	"    <reg name=\"msp\" bitsize=\"32\" save-restore=\"no\" type=\"data_ptr\"/>"
 	"    <reg name=\"psp\" bitsize=\"32\" save-restore=\"no\" type=\"data_ptr\"/>"
-	"    <reg name=\"special\" bitsize=\"32\" save-restore=\"no\"/>"
+	"    <reg name=\"PRIMASK\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"BASEPRI\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"FAULTMASK\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"Control\" bitsize=\"8\" save-restore=\"no\"/>"
 	"  </feature>"
 	"  <feature name=\"org.gnu.gdb.arm.vfp\">"
 	"    <reg name=\"fpscr\" bitsize=\"32\"/>"

From 76bfb4929d02c1ca7ac069296c524e7650dadb87 Mon Sep 17 00:00:00 2001
From: Gareth McMullin <gareth@blacksphere.co.nz>
Date: Tue, 27 Mar 2018 12:57:42 +1300
Subject: [PATCH 2/2] Use lowercase register names.

---
 src/target/cortexm.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/target/cortexm.c b/src/target/cortexm.c
index 8c15128b..474f28e3 100644
--- a/src/target/cortexm.c
+++ b/src/target/cortexm.c
@@ -125,10 +125,10 @@ static const char tdesc_cortex_m[] =
 	"    <reg name=\"xpsr\" bitsize=\"32\"/>"
 	"    <reg name=\"msp\" bitsize=\"32\" save-restore=\"no\" type=\"data_ptr\"/>"
 	"    <reg name=\"psp\" bitsize=\"32\" save-restore=\"no\" type=\"data_ptr\"/>"
-	"    <reg name=\"PRIMASK\" bitsize=\"8\" save-restore=\"no\"/>"
-	"    <reg name=\"BASEPRI\" bitsize=\"8\" save-restore=\"no\"/>"
-	"    <reg name=\"FAULTMASK\" bitsize=\"8\" save-restore=\"no\"/>"
-	"    <reg name=\"Control\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"primask\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"basepri\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"faultmask\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"control\" bitsize=\"8\" save-restore=\"no\"/>"
 	"  </feature>"
 	"</target>";
 
@@ -157,10 +157,10 @@ static const char tdesc_cortex_mf[] =
 	"    <reg name=\"xpsr\" bitsize=\"32\"/>"
 	"    <reg name=\"msp\" bitsize=\"32\" save-restore=\"no\" type=\"data_ptr\"/>"
 	"    <reg name=\"psp\" bitsize=\"32\" save-restore=\"no\" type=\"data_ptr\"/>"
-	"    <reg name=\"PRIMASK\" bitsize=\"8\" save-restore=\"no\"/>"
-	"    <reg name=\"BASEPRI\" bitsize=\"8\" save-restore=\"no\"/>"
-	"    <reg name=\"FAULTMASK\" bitsize=\"8\" save-restore=\"no\"/>"
-	"    <reg name=\"Control\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"primask\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"basepri\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"faultmask\" bitsize=\"8\" save-restore=\"no\"/>"
+	"    <reg name=\"control\" bitsize=\"8\" save-restore=\"no\"/>"
 	"  </feature>"
 	"  <feature name=\"org.gnu.gdb.arm.vfp\">"
 	"    <reg name=\"fpscr\" bitsize=\"32\"/>"