move

Cargo.lock

@@ -2,6 +2,13 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "c"
+version = "0.1.0"
+dependencies = [
+ "libuwuc",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"

Cargo.toml

@@ -1,18 +1,9 @@
-[package]
+[workspace]
-name = "libuwuc"
+members = ["libuwuc", "c"]
-version = "0.1.0"
+resolver = "2"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [profile.dev]
 panic = "abort"
 
 [profile.release]
 panic = "abort"
-
-[dependencies]
-cfg-if = "1.0.0"
-
-[features]
-export_symbols = []

c/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "c"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["rlib"]
+
+
+[dependencies]
+libuwuc = { path = "../libuwuc" }

c/src/lib.rs

@@ -0,0 +1,11 @@
+#![no_std]
+
+mod string;
+
+// libcore seems to require this symbol, even though it's unused.
+#[no_mangle]
+fn rust_eh_personality() {
+    unsafe {
+        libuwuc::trap!();
+    }
+}

c/src/string.rs

@@ -8,11 +8,6 @@ pub(crate) unsafe extern "C" fn memset(ptr: *mut u8, constant: u8, len: usize) {
 }
 
 #[no_mangle]
-pub(crate) unsafe extern "C" fn strlen(mut s: *const u8) -> usize {
+pub(crate) unsafe extern "C" fn strlen(s: *const u8) -> usize {
-    let mut len = 0;
+    libuwuc::mem::strlen(s)
-    while s.read() != 0 {
-        len += 1;
-        s = s.add(1);
-    }
-    len
 }

example-user/Cargo.lock

@@ -2,6 +2,13 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "c"
+version = "0.1.0"
+dependencies = [
+ "libuwuc",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -12,6 +19,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 name = "example-user"
 version = "0.1.0"
 dependencies = [
+ "c",
  "libuwuc",
 ]
 

example-user/Cargo.toml

@@ -14,4 +14,5 @@ panic = "abort"
 panic = "abort"
 
 [dependencies]
-libuwuc = { path = "..", features = ["export_symbols"] }
+c = { path = "../c" }
+libuwuc = { path = "../libuwuc" }

example-user/src/main.rs

@@ -6,7 +6,7 @@ use core::ffi::c_char;
 
 use libuwuc::{println, utils::SharedThinCstr};
 
-extern crate libuwuc;
+extern crate c;
 
 #[panic_handler]
 #[cfg(not(test))]
@@ -27,11 +27,3 @@ extern "C" fn main(_argc: i32, _argv: *const *const c_char) -> i32 {
     println!("PWD={pwd:?}");
     0
 }
-
-// libcore seems to require this symbol, even though it's unused.
-#[no_mangle]
-fn rust_eh_personality() {
-    unsafe {
-        libuwuc::trap!();
-    }
-}

libuwuc/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "libuwuc"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+cfg-if = "1.0.0"

libuwuc/src/env.rs

@@ -63,7 +63,6 @@ pub fn getenv(name: SharedThinCstr) -> Option<SharedThinCstr> {
 fn getenv_inner(mut envp: EnvP, name: SharedThinCstr) -> Option<SharedThinCstr> {
     let mut eq_idx = 0;
     envp.find(|env| {
-        println!("trying {env:?}");
         // Find ENV
         // EN=x
         // ENV=x   <- this one

libuwuc/src/lib.rs

@@ -4,7 +4,7 @@
 #[cfg(test)]
 extern crate std;
 
-mod basic_mem;
+pub mod mem;
 pub mod env;
 pub mod io;
 pub mod start;

libuwuc/src/mem.rs

@@ -0,0 +1,18 @@
+#[inline]
+pub unsafe fn memset(ptr: *mut u8, constant: u8, len: usize) {
+    for i in 0..len {
+        unsafe {
+            *ptr.add(i) = constant;
+        }
+    }
+}
+
+#[inline]
+pub unsafe fn strlen(mut s: *const u8) -> usize {
+    let mut len = 0;
+    while s.read() != 0 {
+        len += 1;
+        s = s.add(1);
+    }
+    len
+}

libuwuc/src/start.rs

@@ -13,7 +13,7 @@ pub(crate) unsafe extern "C" fn start(argc: u64, argv: *const *const c_char, rsp
         fn main(argc: c_int, argv: *const *const c_char) -> c_int;
     }
 
-    crate::env::debug_env();
+    // crate::env::debug_env();
 
     let result = main(argc as i32, argv);