Removing threading

Author: lachlansneff

Cargo.toml

@@ -7,3 +7,6 @@ authors = ["Lachlan Sneff <[email protected]>"]
 
 [dependencies.nebulet_abi]
 git = "https://github.com/nebulet/abi"
+
+[profile.release]
+panic = "abort"

src/abi.rs

@@ -38,9 +38,4 @@ extern {
     // Pretty fast Exclusion
     pub fn pfex_acquire(state_ptr: *const u32);
     pub fn pfex_release(state_ptr: *const u32);
-
-    // threads
-    pub fn thread_yield();
-    pub fn thread_spawn(f: extern fn(u32), arg: u32, stack_ptr: *mut u8) -> AbiResult;
-    pub fn thread_join(id: u32) -> AbiResult;
 }

src/driver.rs

@@ -21,16 +21,14 @@ impl<T> Dma<T> {
     }
 
     pub unsafe fn zeroed() -> Result<Dma<T>> {
-        // let (sip_addr, physical_addr) = physical_alloc::<T>()?;
+        let (sip_addr, physical_addr) = physical_alloc::<T>()?;
 
-        // (sip_addr as *mut u8).write_bytes(0, mem::size_of::<T>());
-
-        // Ok(Dma {
-        //     physical_addr,
-        //     sip_addr,
-        // })
-        Dma::new(mem::zeroed())
+        (sip_addr as *mut u8).write_bytes(0, mem::size_of::<T>());
 
+        Ok(Dma {
+            physical_addr,
+            sip_addr,
+        })
     }
 
     pub fn physical(&self) -> u64 {
@@ -54,17 +52,15 @@ impl<T> DerefMut for Dma<T> {
 impl<T> Drop for Dma<T> {
     fn drop(&mut self) {
         unsafe {
-            self.sip_addr.drop_in_place();
+            // self.sip_addr.drop_in_place();
 
             // let _ = physical_unmap(self.sip_addr);
         }
     }
 }
 
 pub unsafe fn physical_map<T: Sized>(phys_addr: u64) -> Result<*mut T> {
-    let page_count = page_count::<T>();
-
-    let res: Result<u32> = abi::physical_map(phys_addr, page_count).into();
+    let res: Result<u32> = abi::physical_map(phys_addr, mem::size_of::<T>()).into();
 
     res.map(|offset| offset as _)
 }
@@ -79,16 +75,9 @@ pub unsafe fn physical_map<T: Sized>(phys_addr: u64) -> Result<*mut T> {
 
 /// Allocate some physical memory and return the physical address.
 pub unsafe fn physical_alloc<T: Sized>() -> Result<(*mut T, u64)> {
-    let page_count = page_count::<T>();
-
     let mut physical_addr = 0;
 
-    let res: Result<u32> = abi::physical_alloc(page_count, &mut physical_addr as *mut _).into();
+    let res: Result<u32> = abi::physical_alloc(mem::size_of::<T>(), &mut physical_addr as *mut _).into();
 
     res.map(|sip_addr| (sip_addr as *mut T, physical_addr))
-}
-
-fn page_count<T: Sized>() -> usize {
-    let wasm_page_size = 1 << 16;
-    (mem::size_of::<T>() + wasm_page_size - 1) / wasm_page_size
 }

src/lib.rs

@@ -18,7 +18,6 @@ mod process;
 mod channel;
 mod event;
 mod mutex;
-pub mod thread;
 mod dlmalloc;
 pub mod interrupt;
 pub mod driver;