Fix for no_std

Evian-Zhang · Jul 24, 2024 · b1ca34e · b1ca34e
1 parent 5f1127d
commit b1ca34e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/code_manipulate.rs b/src/code_manipulate.rs
@@ -66,3 +66,13 @@ impl CodeManipulator for NixCodeManipulator {
         .expect("Unable to restore code region to non-writable");
     }
 }
+
+pub(crate) struct DummyCodeManipulator;
+
+impl CodeManipulator for DummyCodeManipulator {
+    unsafe fn mark_code_region_writable(_addr: *const core::ffi::c_void, _length: usize) -> Self {
+        Self
+    }
+
+    unsafe fn restore_code_region_protect(&self) {}
+}
diff --git a/src/lib.rs b/src/lib.rs
@@ -132,7 +132,8 @@ pub type StaticFalseKey = StaticKey<false>;
 // however, it seems a Rust bug to erase sections marked with "R" (retained). If we specify
 // --print-gc-sections for linker options, it's strange that linker itself does not
 // erase it. IT IS SO STRANGE.
-define_static_key_false!(DUMMY_STATIC_KEY);
+static mut DUMMY_STATIC_KEY: NoStdStaticKey<code_manipulate::DummyCodeManipulator, true> =
+    NoStdStaticKey::new(true);
 
 impl<M: CodeManipulator, const S: bool> NoStdStaticKey<M, S> {
     /// Whether initial status is `true`
@@ -172,8 +173,8 @@ impl<M: CodeManipulator, const S: bool> NoStdStaticKey<M, S> {
         if static_branch_unlikely!(DUMMY_STATIC_KEY) {
             return;
         }
-        let jump_entry_start_addr = unsafe { core::ptr::addr_of_mut!(JUMP_ENTRY_START) };
-        let jump_entry_stop_addr = unsafe { core::ptr::addr_of_mut!(JUMP_ENTRY_STOP) };
+        let jump_entry_start_addr = core::ptr::addr_of_mut!(JUMP_ENTRY_START);
+        let jump_entry_stop_addr = core::ptr::addr_of_mut!(JUMP_ENTRY_STOP);
         let jump_entry_len =
             unsafe { jump_entry_stop_addr.offset_from(jump_entry_start_addr) as usize };
         let jump_entries =
@@ -211,8 +212,8 @@ impl<M: CodeManipulator, const S: bool> NoStdStaticKey<M, S> {
 /// Count of jump entries in __static_keys section. Note that
 /// there will be several dummy jump entries inside this section.
 pub fn jump_entries_count() {
-    let jump_entry_start_addr = unsafe { core::ptr::addr_of_mut!(JUMP_ENTRY_START) };
-    let jump_entry_stop_addr = unsafe { core::ptr::addr_of_mut!(JUMP_ENTRY_STOP) };
+    let jump_entry_start_addr = core::ptr::addr_of_mut!(JUMP_ENTRY_START);
+    let jump_entry_stop_addr = core::ptr::addr_of_mut!(JUMP_ENTRY_STOP);
     unsafe { jump_entry_stop_addr.offset_from(jump_entry_start_addr) as usize };
 }