Skip to content

added support for Cortex-M33 (nRF5340 app core) #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

added support for Cortex-M33 (nRF5340 app core) #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df83590
added support for Cortex-M33 (nRF5340 app core)
sprhawk Mar 6, 2024
eadfbaf
updated thumbv8m.main-zephyr-eabihf.json
sprhawk Mar 12, 2024
9f3d152
added thumbv8m.main-zephyr-eabi.json
sprhawk Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@ elseif(${ARCH} STREQUAL "arm")
set(rust_target thumbv7em-zephyr-eabi)
set(clang_target thumbv7em-unknown-none-eabi)
endif()
elseif(CONFIG_CPU_CORTEX_M33)
if(CONFIG_FPU)
set(rust_target thumbv8m.main-zephyr-eabihf)
set(clang_target thumbv8m.main-unknown-none-eabihf)
set(clang_cflags "-mcpu=cortex-m33 -mthumb -mabi=aapcs -mfpu=fpv5-sp-d16 -mfloat-abi=hard")
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these cpu-specific CFLAGS necessary? Clang should be only used here for bindgen, so it should not be generating binaries with these flags.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For me, when there is no clang_cflags, it reported they (the lib generated by zephyr and the one generated by rust) have different VFP usage.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you see if #49 works for you?

Using the target-json generated from Rust for the hf variant, I get "features": "+fp-armv8,-fp64,-d32", in the json, and that generates and elf with the correct vfp usage.

I'm building with west build -p auto -b nrf5340dk_nrf5340_cpuapp samples/rust-app/ and manually enabling CONFIG_FPU in ninja menuconfig.

readelf -A ./modules/zephyr-rust/app/thumbv8m.main-zephyr-eabihf/release/librust_app.a
File: ./modules/zephyr-rust/app/thumbv8m.main-zephyr-eabihf/release/librust_app.a(compiler_builtins-190bfd2d1f14c110.compiler_builtins.5742c880-cgu.9.rcgu.o)
Attribute Section: aeabi
File Attributes
  Tag_conformance: "2.09"
  Tag_CPU_arch: v8-M.mainline
  Tag_CPU_arch_profile: Microcontroller
  Tag_ARM_ISA_use: No
  Tag_THUMB_ISA_use: Yes
  Tag_FP_arch: FPv5/FP-D16 for ARMv8

else()
set(rust_target thumbv8m.main-zephyr-eabi)
set(clang_target thumbv8m.main-unknown-none-eabi)
endif()
else()
set(rust_target thumbv7m-zephyr-eabi)
set(clang_target thumbv7m-none-eabi)
Expand Down Expand Up @@ -142,7 +151,7 @@ if (CONFIG_RUST)
"CONFIG_RUST_ALLOC_POOL=${CONFIG_RUST_ALLOC_POOL}"
"CONFIG_RUST_MUTEX_POOL=${CONFIG_RUST_MUTEX_POOL}"
"CONFIG_POSIX_CLOCK=${CONFIG_POSIX_CLOCK}"
"TARGET_CFLAGS=${external_project_cflags} --target=${clang_target}"
"TARGET_CFLAGS=${external_project_cflags} --target=${clang_target} ${clang_cflags}"
"SYSROOT=${rust_sysroot}"
"SYSROOT_BUILD=${rust_sysroot_build}"
"APP_BUILD=${rust_app_build}"
Expand Down
32 changes: 32 additions & 0 deletions rust/thumbv8m.main-zephyr-eabi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"abi-blacklist": [
"stdcall",
"fastcall",
"vectorcall",
"thiscall",
"win64",
"sysv64"
],
"abi": "eabi",
"arch": "arm",
"c-enum-min-bits": 8,
"crt-objects-fallback": "false",
"data-layout": "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64",
"emit-debug-gdb-scripts": false,
"frame-pointer": "always",
"is-builtin": true,
"env": "gnu",
"executables": true,
"os": "zephyr",
"linker": "rust-lld",
"linker-flavor": "gnu-lld",
"llvm-target": "thumbv8m.main-none-eabi",
"max-atomic-width": 32,
"panic-strategy": "abort",
"relocation-model": "static",
"target-pointer-width": "32"
"target-c-int-width": "32",
"target-endian": "little",
"target-family": "zephyr",
"vendor": ""
}
34 changes: 34 additions & 0 deletions rust/thumbv8m.main-zephyr-eabihf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"abi-blacklist": [
"stdcall",
"fastcall",
"vectorcall",
"thiscall",
"win64",
"sysv64"
],
"abi": "eabihf",
"arch": "arm",
"data-layout": "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64",
"features": "+fp-armv8,-fp64,-d32",
"emit-debug-gdb-scripts": false,
"frame-pointer": "always",
"is-builtin": true,
"env": "gnu",
"executables": true,
"linker": "rust-lld",
"linker-flavor": "gcc",
"linker-is-gnu": true,
"llvm-target": "thumbv8m.main-none-eabihf",
"c-enum-min-bits": 8,
"crt-objects-fallback": "false",
"max-atomic-width": 32,
"os": "zephyr",
"panic-strategy": "abort",
"relocation-model": "static",
"target-c-int-width": "32",
"target-endian": "little",
"target-family": "zephyr",
"target-pointer-width": "32",
"vendor": ""
}