Got rid of move for konii's PTSD

kernel/ktest_macro/src/lib.rs

@@ -1,85 +1,28 @@
 extern crate proc_macro;
 extern crate quote;
 extern crate syn;
-
 use {
     proc_macro::TokenStream,
     quote::quote,
-    syn::{parse::Parse, parse_macro_input, Expr, ItemFn, Token}
+    syn::{parse_macro_input, ItemFn}
 };
 
-struct KtestInput {
-    lhs: Expr,
-    _comma: Token![,],
-    rhs: Expr,
-}
-
-impl Parse for KtestInput {
-    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-        Ok(Self {
-            lhs: input.parse()?,
-            _comma: input.parse()?,
-            rhs: input.parse()?,
-        })
-    }
-}
-
-#[proc_macro]
-pub fn ktest_eq(item: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(item as KtestInput);
-
-    let lhs = input.lhs;
-    let rhs = input.rhs;
-
-    let out = quote! {
-        if #lhs != #rhs {
-            return Err(name);
-        }
-    };
-    TokenStream::from(out)
-}
-
-#[proc_macro]
-pub fn ktest_neq(item: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(item as KtestInput);
-
-    let lhs = input.lhs;
-    let rhs = input.rhs;
-
-    let out = quote! {
-        if #lhs == #rhs {
-            return Err(name);
-        }
-    };
-    TokenStream::from(out)
-}
-
 #[proc_macro_attribute]
 pub fn ktest(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemFn);
     let test_name = &input.sig.ident;
-    let test_string = test_name.to_string();
     let static_var_name = syn::Ident::new(
-        &format!("__ktest_{}", test_name).to_uppercase(),
+        &format!("__ktest_{}", test_name),
         test_name.span(),
     );
-
-    let block = &input.block;
     let out = quote! {
-        #[cfg(feature = "ktest")]
-        fn #test_name() -> Result<String, String> {
-            use crate::alloc::string::ToString;
-            let name = #test_string.to_string();
+        // #[cfg(feature = "ktest")]
+        #input
 
-            #block
-
-            return Ok(name);
-        }
-
-        #[cfg(feature = "ktest")]
+        // #[cfg(feature = "ktest")]
         #[unsafe(link_section = ".note.ktest")]
         #[used]
-        pub static #static_var_name: fn() -> Result<String, String> = #test_name;
+        pub static #static_var_name: fn() = #test_name;
     };
 
     TokenStream::from(out)

kernel/lds/aarch64-qemu.ld

@@ -6,11 +6,6 @@ SECTIONS
     .text.boot : { *(.text.boot) }
     .text : { *(.text) }
     .data : { *(.data) }
-    .note.ktest : {
-		__ktest_start = .;
-    	*(.note.ktest)
-    	__ktest_end = .;
-	}
     .rodata : { *(.rodata) }
     .bss : {
         *(COMMON)

kernel/src/arch/x86_64/interrupts.rs

@@ -83,31 +83,33 @@ extern "x86-interrupt" fn spurious(_: InterruptStackFrame) {
     }
 }
 
-#[allow(unused_imports)]
 fn interrupt(interrupt_type: Interrupt) {
-    use crate::{arch::INTERRUPT_LIST, kmain::EXECUTOR};
-    // let il = INTERRUPT_LIST.lock();
-    // let val = il.list.get(&interrupt_type).unwrap();
+    use crate::arch::INTERRUPT_LIST;
+    use crate::kmain::EXECUTOR;
+    let il = INTERRUPT_LIST.lock();
+    let val = il.list.get(&interrupt_type).unwrap();
 
-    // use crate::holeybytes::kernel_services::service_definition_service::sds_search_service;
-    // let buffer = sds_search_service(val);
-    // if buffer != 0 {
-    //     use {crate::kmain::IPC_BUFFERS, alloc::vec::Vec};
-    //     let mut buffs = IPC_BUFFERS.lock();
-    //     match buffs.get_mut(&buffer) {
-    //         Some(buff) => {
-    //             let mut msg_vec = Vec::new();
-    //             msg_vec.push(0xFF);
-    //             buff.push(msg_vec.to_vec());
-    //             log::debug!("Sent Message {:?} to Buffer({})", msg_vec, buffer);
-    //         }
-    //         None => {
-    //             log::error!("Access of non-existent buffer {}", buffer)
-    //         }
-    //     }
-    // }
+    use crate::holeybytes::kernel_services::service_definition_service::sds_search_service;
+    let buffer = sds_search_service(val);
+    if buffer != 0 {
+        use {crate::kmain::IPC_BUFFERS, alloc::vec::Vec};
+        let mut buffs = IPC_BUFFERS.lock();
+        match buffs.get_mut(&buffer) {
+            Some(buff) => {
+                let mut msg_vec = Vec::new();
+                msg_vec.push(0xFF);
+                buff.push(msg_vec.to_vec());
+                log::debug!("Sent Message {:?} to Buffer({})", msg_vec, buffer);
+            }
+            None => {
+                log::error!("Access of non-existent buffer {}", buffer)
+            }
+        }
 
-    unsafe {
+        // log::info!("{}", buffer);
+    }
+
+    unsafe{
         EXECUTOR.send_interrupt(interrupt_type as u8);
     }
 }

kernel/src/holeybytes/ecah.rs

@@ -1,5 +1,7 @@
 //! Environment call handling routines
 
+use log::log;
+
 use {alloc::boxed::Box, core::cell::LazyCell, hbvm::mem::Address};
 
 use crate::{
@@ -242,16 +244,13 @@ pub fn handler(vm: &mut Vm, pid: &usize) {
                 vm.registers[3] = x
             }
         }
-        6 => {
-            // Wait till interrupt
+        6 => { // Wait till interrupt
             use crate::kmain::EXECUTOR;
             let interrupt_type = vm.registers[3].cast::<u8>();
             info!("Interrupt subscribled: {}", interrupt_type);
-            unsafe {
+            unsafe{
                 EXECUTOR.pause(pid.clone());
-                LazyCell::<Executor>::get_mut(&mut EXECUTOR)
-                    .unwrap()
-                    .interrupt_subscribe(pid.clone(), interrupt_type);
+                LazyCell::<Executor>::get_mut(&mut EXECUTOR).unwrap().interrupt_subscribe(pid.clone(), interrupt_type);
             }
         }
         _ => {

kernel/src/kmain.rs

@@ -24,11 +24,8 @@ pub fn kmain(_cmdline: &str, boot_modules: BootModules) -> ! {
 
     #[cfg(feature = "ktest")]
     {
-        use {
-			crate::ktest,
-			log::info,
-		};
-        info!("Running tests");
+        use crate::ktest;
+        debug!("TESTING");
         ktest::test_main();
 
         loop {}

kernel/src/ktest.rs

@@ -1,51 +1,38 @@
-pub use ktest_macro::*;
-
-use {
-	alloc::string::String,
-	log::{error, info},
-};
+pub use ktest_macro::ktest;
+use log::debug;
 
 extern "C" {
-    static __ktest_start: fn() -> Result<String, String>;
-    static __ktest_end: fn() -> Result<String, String>;
+    static __ktest_start: fn();
+    static __ktest_end: fn();
 }
 
-// TODO: Implement ktest for arm and riscv (Later problems, see below)
+// TODO: Get test_fn linker name (may require no_mangle in macro)
+//       More info on tests (run the rest even if panic)
+//       Implement ktest for arm and riscv (Later problems, see below)
 //       Allow for arch specific tests (Leave for now)
-//       Should panic tests
-//       Test specific panic handler
+//       Allow for ktest test name attr
+//       Usefull message at the end of testing
 pub fn test_main() {
     unsafe {
-        let mut current_test = &__ktest_start as *const fn() -> Result<String, String>;
-        let test_end = &__ktest_end as *const fn() -> Result<String, String>;
-
-		let mut pass = 0;
-		let mut fail = 0;
+        let mut current_test = &__ktest_start as *const fn();
+        let mut current = 1;
+        let test_end = &__ktest_end as *const fn();        
 
         while current_test < test_end {
             let test_fn = *current_test;
 
-            let test_name = test_fn();
-            match test_name {
-                Ok(name) => {
-                    info!("Test: {} passed", name);
-                    pass += 1;
-                },
-                Err(name) => {
-                    error!("Test: {} failed", name);
-                    fail += 1;
-                }
-            }
+            debug!("Running test {}", current);
+            
+            test_fn();
+            debug!("Test {} passed", current);
 
             current_test = current_test.add(1);
+            current += 1;
         }
-
-        info!("{}/{} tests passed", pass, pass + fail);
     }
 }
 
 #[ktest]
 pub fn trivial_assertion() {
-    ktest_eq!(1, 1);
-	ktest_neq!(0, 1);
-}
+    assert_eq!(1, 1);
+}

kernel/src/lib.rs

@@ -34,10 +34,10 @@ mod memory;
 mod task;
 mod utils;
 
-#[allow(improper_ctypes, non_upper_case_globals)]
+// #[cfg(feature = "tests")]
 mod ktest;
 
-use versioning::Version;
+use {alloc::string::ToString, versioning::Version};
 
 /// Kernel's version
 pub const VERSION: Version = Version {
@@ -49,7 +49,6 @@ pub const VERSION: Version = Version {
 #[panic_handler]
 #[cfg(target_os = "none")]
 fn panic(info: &core::panic::PanicInfo) -> ! {
-    use alloc::string::ToString;
     arch::register_dump();
 
     if let Some(loc) = info.location() {

kernel/src/task.rs

@@ -33,7 +33,7 @@ pub trait Process: Future<Output = ()> + Send {}
 impl<T: Future<Output = ()> + Send> Process for T {}
 
 pub struct Executor {
-    tasks: Slab<Task>,
+    tasks:      Slab<Task>,
     task_queue: Arc<SegQueue<usize>>,
     interrupt_lookup: [Option<usize>; u8::MAX as usize],
 }
@@ -41,7 +41,7 @@ pub struct Executor {
 impl Executor {
     pub fn new() -> Self {
         Self {
-            tasks: Slab::new(),
+            tasks:      Slab::new(),
             task_queue: Arc::new(SegQueue::new()),
             interrupt_lookup: [None; u8::MAX as usize],
         }
@@ -67,7 +67,7 @@ impl Executor {
         }
     }
 
-    pub fn interrupt_subscribe(&mut self, pid: usize, interrupt_type: u8) {
+    pub fn interrupt_subscribe(&mut self, pid : usize, interrupt_type: u8){
         self.interrupt_lookup[interrupt_type as usize] = Some(pid);
     }
 
@@ -85,7 +85,7 @@ impl Executor {
             }
 
             if batch_len == 0 {
-                // break;
+                //break;
                 continue;
             }
 
@@ -100,8 +100,8 @@ impl Executor {
 
                     if let Poll::Ready(()) = task.poll(&mut cx) {
                         self.tasks.remove(id);
-                        self.interrupt_lookup.map(|pid| {
-                            if let Some(pid) = pid {
+                        self.interrupt_lookup.map(|pid|{
+                            if let Some(pid) = pid{
                                 if pid == id {
                                     return None;
                                 }
@@ -114,9 +114,9 @@ impl Executor {
         }
     }
 
-    pub fn send_interrupt(&self, interrupt: u8) {
+    pub fn send_interrupt(&self, interrupt : u8){
         let id = self.interrupt_lookup[interrupt as usize];
-        if let Some(id) = id {
+        if let Some(id) = id{
             self.unpause(id);
         }
     }

sysdata/libraries/stn/src/lib.hb

@@ -10,7 +10,6 @@ random := @use("random.hb")
 file := @use("file_io.hb")
 dt := @use("dt.hb")
 process := @use("process.hb")
-sleep := @use("sleep.hb")
 
 panic := fn(message: ?^u8): never {
 	log.error("Error: Panic Called, Message:\0")

sysdata/programs/alloc_test/README.md

@@ -0,0 +1 @@
+# alloc_test

sysdata/programs/alloc_test/meta.toml

@@ -1,6 +1,6 @@
 [package]
-name = "test"
-authors = ["koniifer", "able"]
+name = "alloc_test"
+authors = [""]
 
 [dependants.libraries]
 

sysdata/programs/alloc_test/src/main.hb

@@ -1,11 +1,11 @@
-stn := @use("../../../../../libraries/stn/src/lib.hb");
+stn := @use("../../../libraries/stn/src/lib.hb");
 .{allocators, panic, log} := stn
 
 AStruct := struct {
 	a_field: u8,
 }
 
-test := fn(): uint {
+main := fn(): void {
 	// alloc := allocators.FakeAlloc.init()
 	// astruct := alloc.alloc(AStruct, 2)
 	// if astruct.ptr != null{
@@ -26,5 +26,5 @@ test := fn(): uint {
 	// 	log.info("Allocator functioned.\0")
 	// }
 	// balloc.dealloc(bstruct_ptr, AStruct, 2)
-	return 0
+	return
 }

sysdata/programs/dt_buffer_test/README.md

@@ -0,0 +1 @@
+# dt_buffer_test

sysdata/programs/dt_buffer_test/meta.toml

@@ -0,0 +1,11 @@
+[package]
+name = "dt_buffer_test"
+authors = ["able"]
+
+[dependants.libraries]
+
+[dependants.binaries]
+hblang.version = "1.0.0"
+
+[build]
+command = "hblang src/main.hb"

sysdata/programs/dt_buffer_test/src/main.hb

@@ -0,0 +1,13 @@
+.{dt} := @use("../../../libraries/stn/src/lib.hb")
+
+main := fn(): void {
+	dt.get(void, "framebuffer/fb0/width\0")
+	dt.get(void, "cpu/cpu0/architecture\0")
+
+	// Checking if the first detected serial port is memory mapped or port mapped
+	// 0 -> memory mapped
+	// 1 -> port mapped
+	dt.get(void, "serial_ports/sp0/mapping\0")
+
+	return
+}

sysdata/programs/hash_test/meta.toml

@@ -0,0 +1,11 @@
+[package]
+name = "hash_test"
+authors = [""]
+
+[dependants.libraries]
+
+[dependants.binaries]
+hblang.version = "1.0.0"
+
+[build]
+command = "hblang src/main.hb"

sysdata/programs/hash_test/src/main.hb

@@ -1,6 +1,6 @@
-.{hashers, log, memory, string} := @use("../../../../../libraries/stn/src/lib.hb")
+.{hashers, log, memory, string} := @use("../../../libraries/stn/src/lib.hb")
 
-test := fn(): uint {
+main := fn(): void {
 	buffer := memory.request_page(1)
 	target := "abcdefghijklmnop\0"
 	strings := [^u8].("abcdefshijklmnop\0", "abcdefghijklnnop\0", "abcdefshijklmnop\0", "abcdefghijklmnop\0", "abcdefghijflmnop\0", "dbcdefghijklmnop\0", "abcdefghijklmnop\0")
@@ -28,5 +28,4 @@ test := fn(): uint {
 		log.debug(string.display_int(@bitcast(d), buffer, 16))
 		string.clear(buffer)
 	}
-	return 0
 }

sysdata/programs/processes/meta.toml

@@ -0,0 +1,11 @@
+[package]
+name = "processes"
+authors = ["koniifer"]
+
+[dependants.libraries]
+
+[dependants.binaries]
+hblang.version = "1.0.0"
+
+[build]
+command = "hblang src/main.hb"

sysdata/programs/processes/src/main.hb

@@ -1,8 +1,8 @@
-.{process, log, string, memory} := @use("../../../../../libraries/stn/src/lib.hb")
+.{process, log, string, memory} := @use("../../../libraries/stn/src/lib.hb")
 
-exe := @embed("./assets/hello_world_and_spin.hbf")
+exe := @embed("./hello_world_and_spin.hbf")
 
-test := fn(): uint {
+main := fn(): void {
 	buf := "\0\0\0\0\0\0\0"
 	loop {
 		log.info(
@@ -16,5 +16,4 @@ test := fn(): uint {
 		i := 0
 		loop if i == 1000000 break else i += 1
 	}
-	return 0
 }

sysdata/programs/serial_driver_test/meta.toml

@@ -0,0 +1,11 @@
+[package]
+name = "serial_driver_test"
+authors = ["able"]
+
+[dependants.libraries]
+
+[dependants.binaries]
+hblang.version = "1.0.0"
+
+[build]
+command = "hblang src/main.hb"

sysdata/programs/serial_driver_test/src/main.hb

@@ -0,0 +1,20 @@
+.{string, buffer} := @use("../../../libraries/stn/src/lib.hb")
+
+log_info := fn(): void {
+	a := buffer.search("XNumber\0")
+	if a == 0 {
+	} else {
+		msg := "XABC\0"
+		// inline is broked
+		// msg_length := @inline(string.length, msg)
+		msg_length := 5
+		@as(void, @eca(3, a, msg, msg_length))
+	}
+
+	return
+}
+
+main := fn(): int {
+	log_info()
+	return 0
+}

sysdata/programs/test/src/main.hb

@@ -1,7 +0,0 @@
-stn := @use("./tests/stn/lib.hb")
-serial_driver := @use("./tests/serial_driver.hb")
-
-main := fn(): uint {
-	// return serial_driver.test()
-	return stn.process.test()
-}

sysdata/programs/test/src/tests/serial_driver.hb

@@ -1,18 +0,0 @@
-.{string, buffer} := @use("../../../../libraries/stn/src/lib.hb")
-
-log_info := fn(): void {
-	a := buffer.search("XNumber\0")
-	if a == 0 {
-	} else {
-		msg := "XABC\0"
-		msg_length := string.length(msg)
-		@eca(3, a, msg, msg_length)
-	}
-
-	return
-}
-
-test := fn(): uint {
-	log_info()
-	return 0
-}

sysdata/programs/test/src/tests/stn/dt.hb

@@ -1,18 +0,0 @@
-.{dt, memory, string, log} := @use("../../../../../libraries/stn/src/lib.hb")
-
-test := fn(): uint {
-	buffer := memory.request_page(1)
-
-	log.info(string.display_int(dt.get(int, "framebuffer/fb0/width\0"), buffer, 10))
-	string.clear(buffer)
-
-	log.info(string.display_int(dt.get(int, "cpu/cpu0/architecture\0"), buffer, 10))
-	string.clear(buffer)
-
-	// 0 -> memory mapped
-	// 1 -> port mapped
-
-	log.info(string.display_int(dt.get(int, "serial_ports/sp0/mapping\0"), buffer, 10))
-
-	return 0
-}

sysdata/programs/test/src/tests/stn/lib.hb

@@ -1,5 +0,0 @@
-hashers := @use("./hashers.hb")
-allocators := @use("./allocators.hb")
-sleep := @use("./sleep.hb")
-dt := @use("./dt.hb")
-process := @use("./process.hb")

sysdata/programs/test/src/tests/stn/sleep.hb

@@ -1,8 +0,0 @@
-.{sleep, log} := @use("../../../../../libraries/stn/src/lib.hb")
-
-test := fn(): uint {
-	log.info("BEFORE\0")
-	sleep.sleep_until_interrupt(32)
-	log.info("AFTER\0")
-	return 0
-}

sysdata/programs/timer_test/meta.toml

@@ -0,0 +1,11 @@
+[package]
+name = "timer_test"
+authors = ["Talha Qamar"]
+
+[dependants.libraries]
+
+[dependants.binaries]
+hblang.version = "1.0.0"
+
+[build]
+command = "hblang src/main.hb"

sysdata/programs/timer_test/src/main.hb

@@ -0,0 +1,8 @@
+sleep := @use("../../../libraries/stn/src/sleep.hb")
+log := @use("../../../libraries/stn/src/log.hb")
+
+main := fn(): int {
+	log.info("BEFORE\0")
+	sleep.sleep_until_interrupt(32)
+	log.info("AFTER\0")
+}

sysdata/system_config.toml

@@ -28,26 +28,32 @@ resolution = "1024x768x24"
 # [boot.limine.ableos.modules.horizon]
 # path = "boot:///horizon.hbf"
 
-[boot.limine.ableos.modules.ps2_mouse_driver]
-path = "boot:///ps2_mouse_driver.hbf"
+# path = "boot:///ps2_mouse_driver.hbf"
+# [boot.limine.ableos.modules.ps2_mouse_driver]
 
 # [boot.limine.ableos.modules.ps2_keyboard_driver]
 # path = "boot:///ps2_keyboard_driver.hbf"
 
+[boot.limine.ableos.modules.timer_test]
+path = "boot:///timer_test.hbf"
+
 # [boot.limine.ableos.modules.sunset_client]
 # path = "boot:///sunset_client.hbf"
-
+# 
 # [boot.limine.ableos.modules.sunset_client_2]
 # path = "boot:///sunset_client_2.hbf"
-
-[boot.limine.ableos.modules.sdoom]
-path = "boot:///sdoom.hbf"
-
-[boot.limine.ableos.modules.sunset_server]
-path = "boot:///sunset_server.hbf"
+# 
+# [boot.limine.ableos.modules.sdoom]
+# path = "boot:///sdoom.hbf"
+# 
+# [boot.limine.ableos.modules.sunset_server]
+# path = "boot:///sunset_server.hbf"
 
 # [boot.limine.ableos.modules.pcspkr]
 # path = "boot:///pcspkr.hbf"
 
-# [boot.limine.ableos.modules.test]
-# path = "boot:///test.hbf"
+# [boot.limine.ableos.modules.alloc_test]
+# path = "boot:///alloc_test.hbf"
+
+# [boot.limine.ableos.modules.hash_test]
+# path = "boot:///hash_test.hbf"