Skip to content

Commit abb9371

Browse files
soburisoburi
committed
rust: Add a Rust compatible API implementation.
We will gradually add a Rust compatible API implementation conforming to Apache-2. This PR adds an alternative implementation of Common.cpp. Signed-off-by: TOKITA Hiroshi <[email protected]>
1 parent 568d8d0 commit abb9371

File tree

8 files changed

+155
-0
lines changed

8 files changed

+155
-0
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rust/Cargo.lock

‎CMakeLists.txt‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,76 @@ if (CONFIG_ARDUINO_API)
1010
add_subdirectory(cores)
1111
add_subdirectory(libraries)
1212
zephyr_include_directories(${variant_dir})
13+
14+
if (CONFIG_USE_ARDUINO_API_RUST_IMPLEMENTATION)
15+
# quote from https://github.com/zephyrproject-rtos/zephyr-lang-rust/blob/main/CMakeLists.txt
16+
function (rust_target_arch RUST_TARGET)
17+
# Map Zephyr targets to LLVM targets.
18+
if(CONFIG_CPU_CORTEX_M)
19+
if(CONFIG_CPU_CORTEX_M0 OR CONFIG_CPU_CORTEX_M0PLUS OR CONFIG_CPU_CORTEX_M1)
20+
set(${RUST_TARGET} "thumbv6m-none-eabi" PARENT_SCOPE)
21+
elseif(CONFIG_CPU_CORTEX_M3)
22+
set(${RUST_TARGET} "thumbv7m-none-eabi" PARENT_SCOPE)
23+
elseif(CONFIG_CPU_CORTEX_M4 OR CONFIG_CPU_CORTEX_M7)
24+
if(CONFIG_FP_HARDABI OR FORCE_FP_HARDABI)
25+
set(${RUST_TARGET} "thumbv7em-none-eabihf" PARENT_SCOPE)
26+
else()
27+
set(${RUST_TARGET} "thumbv7em-none-eabi" PARENT_SCOPE)
28+
endif()
29+
elseif(CONFIG_CPU_CORTEX_M23)
30+
set(${RUST_TARGET} "thumbv8m.base-none-eabi" PARENT_SCOPE)
31+
elseif(CONFIG_CPU_CORTEX_M33 OR CONFIG_CPU_CORTEX_M55)
32+
# Not a typo, Zephyr, uses ARMV7_M_ARMV8_M_FP to select the FP even on v8m.
33+
if(CONFIG_FP_HARDABI OR FORCE_FP_HARDABI)
34+
set(${RUST_TARGET} "thumbv8m.main-none-eabihf" PARENT_SCOPE)
35+
else()
36+
set(${RUST_TARGET} "thumbv8m.main-none-eabi" PARENT_SCOPE)
37+
endif()
38+
39+
# Todo: The M55 is thumbv8.1m.main-none-eabi, which can be added when Rust
40+
# gain support for this target.
41+
else()
42+
message(FATAL_ERROR "Unknown Cortex-M target.")
43+
endif()
44+
elseif(CONFIG_RISCV)
45+
if(CONFIG_RISCV_ISA_RV64I)
46+
# TODO: Should fail if the extensions don't match.
47+
set(${RUST_TARGET} "riscv64imac-unknown-none-elf" PARENT_SCOPE)
48+
elseif(CONFIG_RISCV_ISA_RV32I)
49+
# TODO: We have multiple choices, try to pick the best.
50+
set(${RUST_TARGET} "riscv32i-unknown-none-elf" PARENT_SCOPE)
51+
else()
52+
message(FATAL_ERROR "Rust: Unsupported riscv ISA")
53+
endif()
54+
elseif(CONFIG_ARCH_POSIX AND CONFIG_64BIT AND (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "x86_64"))
55+
set(${RUST_TARGET} "x86_64-unknown-none" PARENT_SCOPE)
56+
elseif(CONFIG_ARCH_POSIX AND CONFIG_64BIT AND (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "aarch64"))
57+
set(${RUST_TARGET} "aarch64-unknown-none" PARENT_SCOPE)
58+
else()
59+
message(FATAL_ERROR "Rust: Add support for other target")
60+
endif()
61+
endfunction()
62+
63+
rust_target_arch(RUST_TARGET_TRIPLE)
64+
65+
set(RUST_CRATE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rust)
66+
set(RUST_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/rust)
67+
set(RUST_LIB ${RUST_OUT_DIR}/target/${RUST_TARGET_TRIPLE}/release/libarduinocore_api_rust.a)
68+
69+
add_custom_command(
70+
OUTPUT ${RUST_LIB}
71+
COMMAND ${CMAKE_COMMAND} -E env CARGO_TARGET_DIR=${RUST_OUT_DIR}/target
72+
cargo build --manifest-path ${RUST_CRATE_DIR}/Cargo.toml
73+
--target ${RUST_TARGET_TRIPLE} --release
74+
WORKING_DIRECTORY ${RUST_CRATE_DIR}
75+
COMMENT "Building Rust staticlib for ${RUST_TARGET}"
76+
VERBATIM
77+
)
78+
79+
add_custom_target(arduinocore_api_rust_build ALL DEPENDS ${RUST_LIB})
80+
add_library(arduinocore_api_rust STATIC IMPORTED GLOBAL)
81+
set_target_properties(arduinocore_api_rust PROPERTIES IMPORTED_LOCATION ${RUST_LIB})
82+
zephyr_link_libraries(arduinocore_api_rust)
83+
endif()
84+
1385
endif()

‎Kconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ config ARDUINO_API
1717

1818
if ARDUINO_API
1919

20+
config USE_ARDUINO_API_RUST_IMPLEMENTATION
21+
bool "Use Rust implementation API core"
22+
select RUST
23+
2024
config QEMU_ICOUNT
2125
bool "QEMU icount mode"
2226
default n

‎cores/arduino/CMakeLists.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
# SPDX-License-Identifier: Apache-2.0
2+
3+
# This line ensures that cores/arduino/zephyr/api is loaded ahead of
4+
# cores/arduino/api.
5+
if(CONFIG_USE_ARDUINO_API_RUST_IMPLEMENTATION)
6+
zephyr_include_directories(zephyr)
7+
endif()
8+
29
zephyr_include_directories(.)
310
zephyr_include_directories(../../variants)
411

@@ -7,6 +14,7 @@ if(NOT DEFINED ARDUINO_BUILD_PATH)
714
zephyr_sources(zephyrPrint.cpp)
815
zephyr_sources(zephyrSerial.cpp)
916
zephyr_sources(zephyrCommon.cpp)
17+
zephyr_sources(apiCommon.cpp)
1018

1119
if(DEFINED CONFIG_ARDUINO_ENTRY)
1220
zephyr_sources(main.cpp)

‎cores/arduino/apiCommon.cpp‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Copyright (c) 2025 TOKITA Hiroshi
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#include <Arduino.h>
8+
#include "zephyrInternal.h"
9+
10+
extern "C" {
11+
int32_t map_i32(int32_t x, int32_t in_min, int32_t in_max, int32_t out_min, int32_t out_max);
12+
uint16_t makeWord_w(uint16_t w);
13+
uint16_t makeWord_hl(byte h, byte l);
14+
}
15+
16+
long map(long x, long in_min, long in_max, long out_min, long out_max)
17+
{
18+
return map_i32(x, in_min, in_max, out_min, out_max);
19+
}
20+
21+
uint16_t makeWord(uint16_t w) {
22+
return makeWord_w(w);
23+
}
24+
uint16_t makeWord(byte h, byte l) {
25+
return makeWord_hl(h, l);
26+
}

‎rust/Cargo.toml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[package]
2+
name = "arduinocore_api_rust"
3+
version = "0.1.0"
4+
edition = "2024"
5+
license = "Apache-2.0"
6+
7+
[lib]
8+
crate-type = ["staticlib"]

‎rust/src/common.rs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright (c) 2025 TOKITA Hiroshi
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
#[unsafe(no_mangle)]
5+
pub extern "C" fn map_i32(
6+
x: i32, in_min: i32, in_max: i32, out_min: i32, out_max: i32
7+
) -> i32 {
8+
let num = x.wrapping_sub(in_min).wrapping_mul(out_max.wrapping_sub(out_min));
9+
let den = in_max.wrapping_sub(in_min);
10+
// Note: To keep compatibility, the panic when den=0 is left as is.
11+
num / den.wrapping_add(out_min)
12+
}
13+
14+
#[unsafe(no_mangle)]
15+
pub extern "C" fn makeWord_w(w: u16) -> u16 {
16+
w
17+
}
18+
19+
#[unsafe(no_mangle)]
20+
pub extern "C" fn makeWord_hl(h: u8, l: u8) -> u16 {
21+
((h as u16) << 8) | (l as u16)
22+
}

‎rust/src/lib.rs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Copyright (c) 2025 TOKITA Hiroshi
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
#![no_std]
5+
6+
mod common;
7+
pub use common::*;
8+
9+
use core::panic::PanicInfo;
10+
11+
#[panic_handler]
12+
fn panic(_panic: &PanicInfo<'_>) -> ! {
13+
loop {}
14+
}

0 commit comments

Comments
 (0)