From 31b1128daaff24cc45605d62e0c3bc6aaff04e87 Mon Sep 17 00:00:00 2001
From: Kesavan Yogeswaran <hikes@google.com>
Date: Tue, 3 Jun 2025 13:27:05 -0400
Subject: [PATCH 1/2] Add awareness of some Armv8.1-M branch instructions

Armv8.1-M adds some new direct branch instructions. This commit adds
support for parsing WLS, WLSTP, LE, and LETP instructions.

The branch future (BF) family of instructions is not handled by this
commit.
---
 decoder/source/i_dec/trc_idec_arminst.cpp | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/decoder/source/i_dec/trc_idec_arminst.cpp b/decoder/source/i_dec/trc_idec_arminst.cpp
index aba781cf2128..60e2cdc0eec2 100644
--- a/decoder/source/i_dec/trc_idec_arminst.cpp
+++ b/decoder/source/i_dec/trc_idec_arminst.cpp
@@ -163,6 +163,16 @@ int inst_Thumb_is_direct_branch_link(uint32_t inst, uint8_t *is_link, uint8_t *i
     } else if ((inst & 0xf5000000) == 0xb1000000) {
         /* CB(NZ) */
         *is_cond = 1;
+    } else if ((inst & 0xfffff001) == 0xf00fc001) {
+        /* LE (encoding T1) */
+    } else if ((inst & 0xfffff001) == 0xf02fc001) {
+        /* LE (encoding T2) */
+    } else if ((inst & 0xfffff001) == 0xf01fc001) {
+        /* LETP (encoding T3) */
+    } else if ((inst & 0xfff0f001) == 0xf040c001) {
+        /* WLS (encoding T1) */
+    } else if ((inst & 0xffc0f001) == 0xf000c001) {
+        /* WLSTP (encoding T3) */
     } else {
         is_direct_branch = 0;
     }
@@ -503,6 +513,26 @@ int inst_Thumb_branch_destination(uint32_t addr, uint32_t inst, uint32_t *pnpc)
         npc = addr + 4 + ((((inst & 0x02000000) << 6) |
                            ((inst & 0x00f80000) << 7)) >> 25);
         npc |= 1;
+    } else if ((inst & 0xfffff001) == 0xf00fc001) {
+        /* LE (encoding T1) */
+        npc = addr + 4 - (((inst & 0x000007fe) << 1) | ((inst & 0x00000800) >> 10));
+        npc |= 1;
+    } else if ((inst & 0xfffff001) == 0xf02fc001) {
+        /* LE (encoding T2) */
+        npc = addr + 4 - (((inst & 0x000007fe) << 1) | ((inst & 0x00000800) >> 10));
+        npc |= 1;
+    } else if ((inst & 0xfffff001) == 0xf01fc001) {
+        /* LETP (encoding T3) */
+        npc = addr + 4 - (((inst & 0x000007fe) << 1) | ((inst & 0x00000800) >> 10));
+        npc |= 1;
+    } else if ((inst & 0xfff0f001) == 0xf040c001) {
+        /* WLS (encoding T1) */
+        npc = addr + 4 + (((inst & 0x000007fe) << 1) | ((inst & 0x00000800) >> 10));
+        npc |= 1;
+    } else if ((inst & 0xffc0f001) == 0xf000c001) {
+        /* WLSTP (encoding T3) */
+        npc = addr + 4 + (((inst & 0x000007fe) << 1) | ((inst & 0x00000800) >> 10));
+        npc |= 1;
     } else {
         is_direct_branch = 0;
     }

From 46703aae5f8531009209971d8a2c43e8554d4822 Mon Sep 17 00:00:00 2001
From: Kesavan Yogeswaran <hikes@google.com>
Date: Tue, 23 Dec 2025 16:10:25 +0000
Subject: [PATCH 2/2] Add armv8_1m_branches snapshot

Add snapshot that contains test data with Armv8.1-M branch instruction
---
 decoder/source/trc_core_arch_map.cpp          |   1 +
 decoder/tests/run_pkt_decode_tests.bash       |  18 ++++++++++--------
 .../snapshots/armv8_1m_branches/cpu_0.ini     |  18 ++++++++++++++++++
 .../snapshots/armv8_1m_branches/etm_0.ini     |  18 ++++++++++++++++++
 .../snapshots/armv8_1m_branches/range1.bin    | Bin 0 -> 436 bytes
 .../snapshots/armv8_1m_branches/range2.bin    | Bin 0 -> 2776 bytes
 .../snapshots/armv8_1m_branches/snapshot.ini  |   9 +++++++++
 .../snapshots/armv8_1m_branches/trace.bin     | Bin 0 -> 33 bytes
 .../snapshots/armv8_1m_branches/trace.ini     |  13 +++++++++++++
 9 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 decoder/tests/snapshots/armv8_1m_branches/cpu_0.ini
 create mode 100644 decoder/tests/snapshots/armv8_1m_branches/etm_0.ini
 create mode 100644 decoder/tests/snapshots/armv8_1m_branches/range1.bin
 create mode 100644 decoder/tests/snapshots/armv8_1m_branches/range2.bin
 create mode 100644 decoder/tests/snapshots/armv8_1m_branches/snapshot.ini
 create mode 100644 decoder/tests/snapshots/armv8_1m_branches/trace.bin
 create mode 100644 decoder/tests/snapshots/armv8_1m_branches/trace.ini

diff --git a/decoder/source/trc_core_arch_map.cpp b/decoder/source/trc_core_arch_map.cpp
index f25ab1e5ddfa..71645477ccd6 100644
--- a/decoder/source/trc_core_arch_map.cpp
+++ b/decoder/source/trc_core_arch_map.cpp
@@ -65,6 +65,7 @@ static ap_map_elem_t ap_map_array[] =
     { "Cortex-R5", { ARCH_V7, profile_CortexR } },
     { "Cortex-R4", { ARCH_V7, profile_CortexR } },
     { "Cortex-M33", { ARCH_V8, profile_CortexM } },
+    { "Cortex-M55", { ARCH_V8, profile_CortexM } },
     { "Cortex-M23", { ARCH_V8, profile_CortexM } },
     { "Cortex-M0", { ARCH_V7, profile_CortexM } },
     { "Cortex-M0+", { ARCH_V7, profile_CortexM } },
diff --git a/decoder/tests/run_pkt_decode_tests.bash b/decoder/tests/run_pkt_decode_tests.bash
index 0f9388ca0058..f6752733a229 100755
--- a/decoder/tests/run_pkt_decode_tests.bash
+++ b/decoder/tests/run_pkt_decode_tests.bash
@@ -51,23 +51,25 @@ SNAPSHOT_DIR=./snapshots
 BIN_DIR=./bin/linux64/rel/
 
 # directories for tests using full decode
-declare -a test_dirs_decode=( "juno-ret-stck"
+declare -a test_dirs_decode=( 
+                              "Snowball"
+                              "TC2"
                               "a57_single_step"
+                              "armv8_1m_branches"
                               "bugfix-exact-match"
+                              "itm_only_csformat"                              
+                              "itm_only_raw"
+                              "juno-ret-stck"
                               "juno-uname-001"
                               "juno-uname-002"
                               "juno_r1_1"
-                              "tc2-ptm-rstk-t32"
-                              "trace_cov_a15"
+                              "stm-issue-27"
                               "stm_only"
                               "stm_only-2"
                               "stm_only-juno"
-                              "stm-issue-27"
-                              "TC2"
-                              "Snowball"
+                              "tc2-ptm-rstk-t32"
                               "test-file-mem-offsets"
-                              "itm_only_raw"
-                              "itm_only_csformat"                              
+                              "trace_cov_a15"
                             )
 
 
diff --git a/decoder/tests/snapshots/armv8_1m_branches/cpu_0.ini b/decoder/tests/snapshots/armv8_1m_branches/cpu_0.ini
new file mode 100644
index 000000000000..5d47ffdea43a
--- /dev/null
+++ b/decoder/tests/snapshots/armv8_1m_branches/cpu_0.ini
@@ -0,0 +1,18 @@
+[device]
+name=cpu_0
+class=core
+type=Cortex-M55
+
+[regs]
+PC(size:32)=0x4F9A02
+SP(size:32)=0
+SCTLR_EL1=0x1007
+CPSR=0x1C5
+
+[dump.text1]
+file=range1.bin
+address=0x1E008
+
+[dump.text2]
+file=range2.bin
+address=0x4F9A02
diff --git a/decoder/tests/snapshots/armv8_1m_branches/etm_0.ini b/decoder/tests/snapshots/armv8_1m_branches/etm_0.ini
new file mode 100644
index 000000000000..f5cc1697d7db
--- /dev/null
+++ b/decoder/tests/snapshots/armv8_1m_branches/etm_0.ini
@@ -0,0 +1,18 @@
+[device]
+name=etm_0
+class=trace_source
+type=ETM4
+
+[regs]
+TRCCONFIGR(0x004)=0x00000001
+TRCTRACEIDR(0x010)=0x00000000
+TRCAUTHSTATUS(0x3EE)=0x000000CC
+TRCIDR0(0x078)=0x280006E1
+TRCIDR1(0x079)=0x4100F454
+TRCIDR2(0x07A)=0x00000004
+TRCIDR8(0x060)=0x00000000
+TRCIDR9(0x061)=0x00000000
+TRCIDR10(0x062)=0x00000000
+TRCIDR11(0x063)=0x00000000
+TRCIDR12(0x064)=0x00000001
+TRCIDR13(0x065)=0x00000000
diff --git a/decoder/tests/snapshots/armv8_1m_branches/range1.bin b/decoder/tests/snapshots/armv8_1m_branches/range1.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7ded8b8cdc8fac4da7b23ef8d867483ee7dc14ba
GIT binary patch
literal 436
zcmXYqze^)Q7=~vi>&|4B5WOO<TSd7-7es}-CKe|WSF6NyXK!;{cg0;}v9VC`2WQs8
z?0TqJC}?2}*a))u2Lcuraw6Kr-PJG?A<YUpt2QqmFW>V%gC5JTRf^+fqu^H-WlKMq
z^Z}~!mv3WFt_g<f9)f@$n}DsDsdAnHn)jFD83S-hNvA<D)!DHrt;=O;n5-x6fQuc<
z3GLWXcv_LlBtz`83793NpZ}rWX<+Nhg=x~CX9OJt6i)lqRWeZUt0o*6y_Rk8nQX&g
z8KrEIv6qGvP>e&uHy(kGf+8$E0!_1fn@AHE&9YdnOE`OM_+@qihmfl~xh#JF(|4Ot
zFA6SsaozZ8%oxBueSrGO1I+X_WBQ2LNHV2%*8uJr2g$t)Dm=0iKkC_zOev@CDJl(R
z9=B9SG+48h!^qlg*FEr?mI}r#`^Og=Hy#>U8P{$|2$}3ew28iJsV%|x%OPyVH`J|I
zFpo8{ZAH9T7QCe#-m*EKsGQ%kzq$60;avOqQ?2y}?DvX9g_hcWYg_nN)K)**MEmmc
E71C3;Jpcdz

literal 0
HcmV?d00001

diff --git a/decoder/tests/snapshots/armv8_1m_branches/range2.bin b/decoder/tests/snapshots/armv8_1m_branches/range2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..53b0a4f240af68359b0aa3090e180eab4f3f6757
GIT binary patch
literal 2776
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
ZOU@DUk{2{;<4Ba*K0^4u;?$9;e*@*q^|Jr~

literal 0
HcmV?d00001

diff --git a/decoder/tests/snapshots/armv8_1m_branches/snapshot.ini b/decoder/tests/snapshots/armv8_1m_branches/snapshot.ini
new file mode 100644
index 000000000000..64ae3bae4fe6
--- /dev/null
+++ b/decoder/tests/snapshots/armv8_1m_branches/snapshot.ini
@@ -0,0 +1,9 @@
+[snapshot]
+version=1.0
+
+[device_list]
+device0=cpu_0.ini
+device1=etm_0.ini
+
+[trace]
+metadata=trace.ini
diff --git a/decoder/tests/snapshots/armv8_1m_branches/trace.bin b/decoder/tests/snapshots/armv8_1m_branches/trace.bin
new file mode 100644
index 0000000000000000000000000000000000000000..eeb82aa9f9572f7f82504c15ba07a9983e563f43
GIT binary patch
literal 33
icmZQzfP)4`hGxcD{tOJ$8fX3a_v^>szt{f$JqQ48x(ycq

literal 0
HcmV?d00001

diff --git a/decoder/tests/snapshots/armv8_1m_branches/trace.ini b/decoder/tests/snapshots/armv8_1m_branches/trace.ini
new file mode 100644
index 000000000000..a77769cb379a
--- /dev/null
+++ b/decoder/tests/snapshots/armv8_1m_branches/trace.ini
@@ -0,0 +1,13 @@
+[trace_buffers]
+buffers=buffer0
+
+[buffer0]
+name=etr_0
+file=trace.bin
+format=source_data
+
+[source_buffers]
+etm_0=etr_0
+
+[core_trace_sources]
+cpu_0=etm_0