From f1006f97c24b9cd21fcc7d3faaaea8b6e0305857 Mon Sep 17 00:00:00 2001
From: Anton Kochkov <anton.kochkov@gmail.com>
Date: Thu, 20 Jul 2023 16:20:04 +0800
Subject: [PATCH] arm: use `cortexm` cpu instead of `cortex` (#3674)

---
 librz/analysis/p/analysis_arm_cs.c            |  2 +-
 librz/asm/p/asm_arm_cs.c                      |  4 ++--
 test/db/asm/{arm_cortex_16 => arm_cortexm_16} |  1 +
 test/db/cmd/cmd_pd                            |  6 +++---
 test/db/cmd/cmd_pd_bugs                       | 10 +++++-----
 test/db/tools/rz_asm                          |  4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)
 rename test/db/asm/{arm_cortex_16 => arm_cortexm_16} (50%)

diff --git a/librz/analysis/p/analysis_arm_cs.c b/librz/analysis/p/analysis_arm_cs.c
index 7ad788816a..95ca7bde18 100644
--- a/librz/analysis/p/analysis_arm_cs.c
+++ b/librz/analysis/p/analysis_arm_cs.c
@@ -1737,7 +1737,7 @@ static int analysis_op(RzAnalysis *a, RzAnalysisOp *op, ut64 addr, const ut8 *bu
 	int n, ret;
 	mode |= (a->big_endian) ? CS_MODE_BIG_ENDIAN : CS_MODE_LITTLE_ENDIAN;
 	if (RZ_STR_ISNOTEMPTY(a->cpu)) {
-		if (strstr(a->cpu, "cortex")) {
+		if (strstr(a->cpu, "cortexm") || strstr(a->cpu, "cortex-m")) {
 			mode |= CS_MODE_MCLASS;
 		}
 		if (a->bits != 64 && strstr(a->cpu, "v8")) {
diff --git a/librz/asm/p/asm_arm_cs.c b/librz/asm/p/asm_arm_cs.c
index 5b614dd066..de5bac5e9d 100644
--- a/librz/asm/p/asm_arm_cs.c
+++ b/librz/asm/p/asm_arm_cs.c
@@ -102,7 +102,7 @@ static int disassemble(RzAsm *a, RzAsmOp *op, const ut8 *buf, int len) {
 	}
 
 	if (a->cpu) {
-		if (strstr(a->cpu, "cortex")) {
+		if (strstr(a->cpu, "cortexm") || strstr(a->cpu, "cortex-m")) {
 			mode |= CS_MODE_MCLASS;
 		}
 		if (a->bits != 64) {
@@ -298,7 +298,7 @@ static char *mnemonics(RzAsm *a, int id, bool json) {
 RzAsmPlugin rz_asm_plugin_arm_cs = {
 	.name = "arm",
 	.desc = "Capstone ARM disassembler",
-	.cpus = "v8,cortex,arm1176,cortexA72,cortexA8",
+	.cpus = "v8,cortexm,arm1176,cortexA72,cortexA8",
 	.platforms = "bcm2835,omap3430",
 	.features = "v8",
 	.license = "BSD",
diff --git a/test/db/asm/arm_cortex_16 b/test/db/asm/arm_cortexm_16
similarity index 50%
rename from test/db/asm/arm_cortex_16
rename to test/db/asm/arm_cortexm_16
index c39296777a..3bd403e7f9 100644
--- a/test/db/asm/arm_cortex_16
+++ b/test/db/asm/arm_cortexm_16
@@ -1 +1,2 @@
 d "mrs r0, primask" eff31080
+d "msr basepri, r3" 83f31188
diff --git a/test/db/cmd/cmd_pd b/test/db/cmd/cmd_pd
index 5fcca74402..49c79c0df2 100644
--- a/test/db/cmd/cmd_pd
+++ b/test/db/cmd/cmd_pd
@@ -32,15 +32,15 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=pd v8 and cortex
+NAME=pd V8 and Cortex-M profiles 
 FILE=malloc://128
 ARGS=-a arm -b 16
 CMDS=<<EOF
 echo
 pad fff7c0ea@e:asm.cpu=v8
-pad fff7c0ea@e:asm.cpu=cortex
+pad fff7c0ea@e:asm.cpu=cortexm
 pad fff7c0ea@e:asm.cpu=v8
-pad fff7c0ea@e:asm.cpu=cortex
+pad fff7c0ea@e:asm.cpu=cortexm
 pad fff7c0ea@e:asm.cpu=v8
 pad fff7c0ea@e:asm.cpu=
 pad fff7c0ea@e:asm.cpu=tetris
diff --git a/test/db/cmd/cmd_pd_bugs b/test/db/cmd/cmd_pd_bugs
index a16a35a1ae..99981a1c31 100644
--- a/test/db/cmd/cmd_pd_bugs
+++ b/test/db/cmd/cmd_pd_bugs
@@ -15,7 +15,7 @@ EXPECT=<<EOF
 EOF
 RUN
 
-NAME=pd arm cortex 0
+NAME=pd arm cortex-m 0
 FILE==
 ARGS=-a arm -b 16
 CMDS=wx 80f30988; pi 1
@@ -25,9 +25,9 @@ EOF
 EXPECT_ERR=
 RUN
 
-NAME=pd arm cortex 1
+NAME=pd arm cortex-m 1
 FILE==
-ARGS=-a arm -b 16 -e asm.cpu=cortex
+ARGS=-a arm -b 16 -e asm.cpu=cortexm
 CMDS=wx 80f30988;pi 1
 EXPECT=<<EOF
 msr psp, r0
@@ -35,10 +35,10 @@ EOF
 EXPECT_ERR=
 RUN
 
-NAME=pd arm cortex 2
+NAME=pd arm cortex-m 2
 FILE==
 ARGS=-a arm -b 16
-CMDS=e asm.cpu=cortex;wx 80f30988;pi 1
+CMDS=e asm.cpu=cortexm;wx 80f30988;pi 1
 EXPECT=<<EOF
 msr psp, r0
 EOF
diff --git a/test/db/tools/rz_asm b/test/db/tools/rz_asm
index adac354d12..ce7afca77c 100644
--- a/test/db/tools/rz_asm
+++ b/test/db/tools/rz_asm
@@ -388,7 +388,7 @@ RUN
 
 NAME=rz-asm -c
 FILE==
-CMDS=!rz-asm -a arm -b 16 -d -c cortex 0x80f30988
+CMDS=!rz-asm -a arm -b 16 -d -c cortexm 0x80f30988
 EXPECT=<<EOF
 msr psp, r0
 EOF
@@ -396,7 +396,7 @@ RUN
 
 NAME=rz-asm -A with -c and -o
 FILE==
-CMDS=!rz-asm -a arm -b 16 -A -o 0x1000 -c cortex 0x80f30988
+CMDS=!rz-asm -a arm -b 16 -A -o 0x1000 -c cortexm 0x80f30988
 EXPECT=<<EOF
 offset:   0x00001000
 bytes:    80f30988