mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tell std to use statics for TLS given mikros is single-threaded

Browse Source
This commit is contained in:
pjht 2024-06-05 10:47:05 -05:00
parent 9690e01be2
commit c0c4a87103
Signed by: pjht
GPG Key ID: 7B5F6AFBEC7EE78E
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
library/std/src/sys/pal/mikros/thread_local_key.rs
View File

@ -1,32 +1,21 @@
use crate::{
ptr,
sync::atomic::{AtomicUsize, Ordering}
};
pub type Key = usize; pub type Key = usize;
static mut TLS_SLOTS: [*mut u8; 64] = [ptr::null_mut(); 64];
static NEXT_TLS: AtomicUsize = AtomicUsize::new(1);
#[inline] #[inline]
pub unsafe fn create(_dtor: Option<unsafe extern "C" fn(*mut u8)>) -> Key { pub unsafe fn create(_dtor: Option<unsafe extern "C" fn(*mut u8)>) -> Key {
if NEXT_TLS.load(Ordering::Relaxed) == 65 { panic!("should not be used on this target");
panic!("Out of TLS slots");
}
NEXT_TLS.fetch_add(1, Ordering::Relaxed)
} }
#[inline] #[inline]
pub unsafe fn set(key: Key, value: *mut u8) { pub unsafe fn set(_key: Key, _value: *mut u8) {
unsafe { TLS_SLOTS[key - 1] = value } panic!("should not be used on this target");
} }
#[inline] #[inline]
pub unsafe fn get(key: Key) -> *mut u8 { pub unsafe fn get(_key: Key) -> *mut u8 {
unsafe { TLS_SLOTS[key - 1]} panic!("should not be used on this target");
} }
#[inline] #[inline]
pub unsafe fn destroy(_key: Key) { pub unsafe fn destroy(_key: Key) {
// Ignore destructors for now panic!("should not be used on this target");
} }

2
library/std/src/sys/thread_local/mod.rs
View File

@ -7,7 +7,7 @@
// "static" is for single-threaded platforms where a global static is sufficient. // "static" is for single-threaded platforms where a global static is sufficient.
cfg_if::cfg_if! { cfg_if::cfg_if! {
if #[cfg(any(all(target_family = "wasm", not(target_feature = "atomics")), target_os = "uefi"))] { if #[cfg(any(all(target_family = "wasm", not(target_feature = "atomics")), target_os = "uefi", target_os = "mikros"))] {
#[doc(hidden)] #[doc(hidden)]
mod static_local; mod static_local;
#[doc(hidden)] #[doc(hidden)]