fix: avoid symbol collisions (ariel-os#586)

chrysn-pull-requests · Nov 29, 2024 · 7a20485 · 7a20485
2 parents 2769a83 + 5728129
commit 7a20485
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 26 deletions.
diff --git a/src/ariel-os-embassy/src/lib.rs b/src/ariel-os-embassy/src/lib.rs
@@ -127,7 +127,7 @@ pub(crate) fn init() {
 }
 
 #[cfg(feature = "executor-single-thread")]
-#[export_name = "ariel_os_embassy_init"]
+#[export_name = "__ariel_os_embassy_init"]
 fn init() -> ! {
     debug!("ariel-os-embassy::init(): using single thread executor");
     let p = hal::init();

diff --git a/src/ariel-os-embassy/src/network.rs b/src/ariel-os-embassy/src/network.rs
@@ -42,9 +42,9 @@ pub(crate) fn config() -> embassy_net::Config {
     #[cfg(feature = "override-network-config")]
     {
         extern "Rust" {
-            fn ariel_os_network_config() -> embassy_net::Config;
+            fn __ariel_os_network_config() -> embassy_net::Config;
         }
-        unsafe { ariel_os_network_config() }
+        unsafe { __ariel_os_network_config() }
     }
 }
 

diff --git a/src/ariel-os-embassy/src/thread_executor.rs b/src/ariel-os-embassy/src/thread_executor.rs
@@ -12,7 +12,8 @@ use embassy_executor::{raw, Spawner};
 // doesn't matter.
 const THREAD_FLAG_WAKEUP: ThreadFlags = 0x01;
 
-#[export_name = "__pender"]
+// This name is required by embassy-executor.
+#[no_mangle]
 fn __pender(context: *mut ()) {
     // SAFETY: `context` is a `ThreadId` passed by `ThreadExecutor::new`.
     let thread_id = ThreadId::new(context as usize as u8);

diff --git a/src/ariel-os-embassy/src/usb.rs b/src/ariel-os-embassy/src/usb.rs
@@ -61,8 +61,8 @@ pub(crate) fn config() -> embassy_usb::Config<'static> {
     #[cfg(feature = "override-usb-config")]
     {
         extern "Rust" {
-            fn ariel_os_usb_config() -> embassy_usb::Config<'static>;
+            fn __ariel_os_usb_config() -> embassy_usb::Config<'static>;
         }
-        unsafe { ariel_os_usb_config() }
+        unsafe { __ariel_os_usb_config() }
     }
 }
diff --git a/src/ariel-os-macros/src/config.rs b/src/ariel-os-macros/src/config.rs
@@ -60,11 +60,11 @@ pub fn config(args: TokenStream, item: TokenStream) -> TokenStream {
 
     let (config_fn_name, return_type) = match attrs.kind {
         Some(ConfigKind::Network) => (
-            format_ident!("ariel_os_network_config"),
+            format_ident!("__ariel_os_network_config"),
             quote! {#ariel_os_crate::reexports::embassy_net::Config},
         ),
         Some(ConfigKind::Usb) => (
-            format_ident!("ariel_os_usb_config"),
+            format_ident!("__ariel_os_usb_config"),
             quote! {#ariel_os_crate::reexports::embassy_usb::Config<'static>},
         ),
         None => {

diff --git a/src/ariel-os-macros/src/thread.rs b/src/ariel-os-macros/src/thread.rs
@@ -63,12 +63,6 @@ pub fn thread(args: TokenStream, item: TokenStream) -> TokenStream {
         }
     };
 
-    let no_mangle_attr = if attrs.no_mangle {
-        quote! {#[no_mangle]}
-    } else {
-        quote! {}
-    };
-
     let maybe_wait_for_start_event = if attrs.no_wait {
         quote! {}
     } else {
@@ -85,7 +79,6 @@ pub fn thread(args: TokenStream, item: TokenStream) -> TokenStream {
     } = Parameters::from(attrs);
 
     let expanded = quote! {
-        #no_mangle_attr
         #[inline(always)]
         #thread_function
 
@@ -143,7 +136,6 @@ mod thread {
         pub stack_size: Option<syn::Expr>,
         pub priority: Option<syn::Expr>,
         pub affinity: Option<syn::Expr>,
-        pub no_mangle: bool,
         pub no_wait: bool,
     }
 
@@ -174,11 +166,6 @@ mod thread {
                 return Ok(());
             }
 
-            if meta.path.is_ident("no_mangle") {
-                self.no_mangle = true;
-                return Ok(());
-            }
-
             if meta.path.is_ident("no_wait") {
                 self.no_wait = true;
                 return Ok(());

diff --git a/src/ariel-os-rt/src/lib.rs b/src/ariel-os-rt/src/lib.rs
@@ -88,10 +88,10 @@ fn startup() -> ! {
     #[cfg(feature = "executor-single-thread")]
     {
         extern "Rust" {
-            fn ariel_os_embassy_init() -> !;
+            fn __ariel_os_embassy_init() -> !;
         }
         debug!("ariel_os_rt::startup() launching single thread executor");
-        unsafe { ariel_os_embassy_init() };
+        unsafe { __ariel_os_embassy_init() };
     }
 
     #[cfg(not(any(feature = "threading", feature = "executor-single-thread")))]

diff --git a/src/ariel-os-threads/src/arch/cortex_m.rs b/src/ariel-os-threads/src/arch/cortex_m.rs
@@ -125,7 +125,7 @@ unsafe extern "C" fn PendSV() {
     unsafe {
         asm!(
             "
-            bl sched
+            bl {sched}
             cmp r0, #0
             beq 99f
 
@@ -171,6 +171,7 @@ unsafe extern "C" fn PendSV() {
             999:
             .word 0xFFFFFFFD
             ",
+            sched = sym sched,
             options(noreturn)
         )
     };
@@ -190,8 +191,6 @@ unsafe extern "C" fn PendSV() {
 ///   - `r0`: stack-pointer for new thread
 ///
 /// This function is called in PendSV.
-// TODO: make arch independent, or move to arch
-#[no_mangle]
 unsafe fn sched() -> u128 {
     loop {
         if let Some(res) = critical_section::with(|cs| {