Skip to content

Commit f696d74

Browse files
committed
Add TARGET_CORTEX_M_BASELINE/MAINLINE labels
To make it easier to have Thumb-1 and Thumb-2 versions of assembly, add labels corresponding to them. Naming mirrors that of ARMv8-M variants, but "baseline" also covers ARMv6-M, so does not include exclusive-access instructions, for example. These two labels correspond to the "p" and "w" variants of the ARM standard library.
1 parent 97a380f commit f696d74

File tree

1 file changed

+17
-22
lines changed

1 file changed

+17
-22
lines changed

tools/targets/__init__.py

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,24 @@
3737
"CUMULATIVE_ATTRIBUTES", "get_resolution_order"]
3838

3939
CORE_LABELS = {
40-
"Cortex-M0": ["M0", "CORTEX_M", "LIKE_CORTEX_M0", "CORTEX"],
41-
"Cortex-M0+": ["M0P", "CORTEX_M", "LIKE_CORTEX_M0", "CORTEX"],
42-
"Cortex-M1": ["M1", "CORTEX_M", "LIKE_CORTEX_M1", "CORTEX"],
43-
"Cortex-M3": ["M3", "CORTEX_M", "LIKE_CORTEX_M3", "CORTEX"],
44-
"Cortex-M4": ["M4", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M4", "CORTEX"],
45-
"Cortex-M4F": ["M4", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M4", "CORTEX"],
46-
"Cortex-M7": ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7", "CORTEX"],
47-
"Cortex-M7F": ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7", "CORTEX"],
48-
"Cortex-M7FD": ["M7", "CORTEX_M", "RTOS_M4_M7", "LIKE_CORTEX_M7",
49-
"CORTEX"],
40+
"Cortex-M0": ["M0", "CORTEX_M", "CORTEX_M_BASELINE", "LIKE_CORTEX_M0", "CORTEX"],
41+
"Cortex-M0+": ["M0P", "CORTEX_M", "CORTEX_M_BASELINE", "LIKE_CORTEX_M0", "CORTEX"],
42+
"Cortex-M1": ["M1", "CORTEX_M", "CORTEX_M_BASELINE", "LIKE_CORTEX_M1", "CORTEX"],
43+
"Cortex-M3": ["M3", "CORTEX_M", "CORTEX_M_MAINLINE", "LIKE_CORTEX_M3", "CORTEX"],
44+
"Cortex-M4": ["M4", "CORTEX_M", "CORTEX_M_MAINLINE", "RTOS_M4_M7", "LIKE_CORTEX_M4", "CORTEX"],
45+
"Cortex-M4F": ["M4", "CORTEX_M", "CORTEX_M_MAINLINE", "RTOS_M4_M7", "LIKE_CORTEX_M4", "CORTEX"],
46+
"Cortex-M7": ["M7", "CORTEX_M", "CORTEX_M_MAINLINE", "RTOS_M4_M7", "LIKE_CORTEX_M7", "CORTEX"],
47+
"Cortex-M7F": ["M7", "CORTEX_M", "CORTEX_M_MAINLINE", "RTOS_M4_M7", "LIKE_CORTEX_M7", "CORTEX"],
48+
"Cortex-M7FD": ["M7", "CORTEX_M", "CORTEX_M_MAINLINE", "RTOS_M4_M7", "LIKE_CORTEX_M7", "CORTEX"],
5049
"Cortex-A9": ["A9", "CORTEX_A", "LIKE_CORTEX_A9", "CORTEX"],
51-
"Cortex-M23": ["M23", "CORTEX_M", "LIKE_CORTEX_M23", "CORTEX"],
52-
"Cortex-M23-NS": ["M23", "M23_NS", "CORTEX_M", "LIKE_CORTEX_M23",
53-
"CORTEX"],
54-
"Cortex-M33": ["M33", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"],
55-
"Cortex-M33-NS": ["M33", "M33_NS", "CORTEX_M", "LIKE_CORTEX_M33",
56-
"CORTEX"],
57-
"Cortex-M33F": ["M33", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"],
58-
"Cortex-M33F-NS": ["M33", "M33_NS", "CORTEX_M", "LIKE_CORTEX_M33",
59-
"CORTEX"],
60-
"Cortex-M33FE": ["M33", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"],
61-
"Cortex-M33FE-NS": ["M33", "M33_NS", "CORTEX_M", "LIKE_CORTEX_M33",
62-
"CORTEX"]
50+
"Cortex-M23": ["M23", "CORTEX_M", "CORTEX_M_BASELINE", "LIKE_CORTEX_M23", "CORTEX"],
51+
"Cortex-M23-NS": ["M23", "M23_NS", "CORTEX_M_BASELINE", "CORTEX_M", "LIKE_CORTEX_M23", "CORTEX"],
52+
"Cortex-M33": ["M33", "CORTEX_M", "CORTEX_M_MAINLINE", "LIKE_CORTEX_M33", "CORTEX"],
53+
"Cortex-M33-NS": ["M33", "M33_NS", "CORTEX_M_MAINLINE", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"],
54+
"Cortex-M33F": ["M33", "CORTEX_M", "CORTEX_M_MAINLINE", "LIKE_CORTEX_M33", "CORTEX"],
55+
"Cortex-M33F-NS": ["M33", "M33_NS", "CORTEX_M_MAINLINE", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"],
56+
"Cortex-M33FE": ["M33", "CORTEX_M", "CORTEX_M_MAINLINE", "LIKE_CORTEX_M33", "CORTEX"],
57+
"Cortex-M33FE-NS": ["M33", "M33_NS", "CORTEX_M_MAINLINE", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"]
6358
}
6459

6560
CORE_ARCH = {

0 commit comments

Comments
 (0)