Got rid of move for konii's PTSD

Cargo.lock

@@ -73,9 +73,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
-version = "1.2.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc"
+checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
 dependencies = [
  "shlex",
 ]
@@ -201,9 +201,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -213,12 +213,12 @@ dependencies = [
 [[package]]
 name = "hbbytecode"
 version = "0.1.0"
-source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#a2ca8d98df7f58366252b71f58450a0ab5c11bca"
+source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#a3355a59c0727e58519a94a8f65013beb9c2331b"
 
 [[package]]
 name = "hblang"
 version = "0.1.0"
-source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#a2ca8d98df7f58366252b71f58450a0ab5c11bca"
+source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#a3355a59c0727e58519a94a8f65013beb9c2331b"
 dependencies = [
  "hashbrown",
  "hbbytecode",
@@ -229,7 +229,7 @@ dependencies = [
 [[package]]
 name = "hbvm"
 version = "0.1.0"
-source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#a2ca8d98df7f58366252b71f58450a0ab5c11bca"
+source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#a3355a59c0727e58519a94a8f65013beb9c2331b"
 dependencies = [
  "hbbytecode",
 ]
@@ -401,7 +401,7 @@ dependencies = [
  "uart_16550",
  "versioning",
  "x2apic",
- "x86_64 0.15.2",
+ "x86_64 0.15.1",
  "xml",
 ]
 
@@ -421,9 +421,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.167"
+version = "0.2.164"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
+checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
 
 [[package]]
 name = "limine"
@@ -433,9 +433,9 @@ checksum = "02034f8f6b3e7bf050f310fbaf6db0018b8e54b75598d0a4c97172054752fede"
 
 [[package]]
 name = "litemap"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "lock_api"
@@ -593,9 +593,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.19"
+version = "0.23.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
+checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f"
 dependencies = [
  "log",
  "once_cell",
@@ -726,9 +726,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.90"
+version = "2.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -827,20 +827,17 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "ureq"
-version = "2.11.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30e6f97efe1fa43535ee241ee76967d3ff6ff3953ebb430d8d55c5393029e7b"
+checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
 dependencies = [
  "base64",
- "litemap",
  "log",
  "once_cell",
  "rustls",
  "rustls-pki-types",
  "url",
  "webpki-roots",
- "yoke",
- "zerofrom",
 ]
 
 [[package]]
@@ -999,7 +996,7 @@ dependencies = [
  "bitflags 1.3.2",
  "paste",
  "raw-cpuid 10.7.0",
- "x86_64 0.14.13",
+ "x86_64 0.14.12",
 ]
 
 [[package]]
@@ -1015,9 +1012,9 @@ dependencies = [
 
 [[package]]
 name = "x86_64"
-version = "0.14.13"
+version = "0.14.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c101112411baafbb4bf8d33e4c4a80ab5b02d74d2612331c61e8192fc9710491"
+checksum = "96cb6fd45bfeab6a5055c5bffdb08768bd0c069f1d946debe585bbb380a7c062"
 dependencies = [
  "bit_field",
  "bitflags 2.6.0",
@@ -1027,9 +1024,9 @@ dependencies = [
 
 [[package]]
 name = "x86_64"
-version = "0.15.2"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f042214de98141e9c8706e8192b73f56494087cc55ebec28ce10f26c5c364ae"
+checksum = "4bc79523af8abf92fb1a970c3e086c5a343f6bcc1a0eb890f575cbb3b45743df"
 dependencies = [
  "bit_field",
  "bitflags 2.6.0",
@@ -1047,9 +1044,9 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -1071,9 +1068,9 @@ dependencies = [
 
 [[package]]
 name = "zerofrom"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
 dependencies = [
  "zerofrom-derive",
 ]

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::{
@@ -80,10 +82,6 @@ pub fn handler(vm: &mut Vm, pid: &usize) {
             let length = vm.registers[5].cast::<u64>() as usize;
             trace!("IPC address: {:?}", mem_addr);
 
-            unsafe { LazyCell::<Executor>::get_mut(&mut EXECUTOR) }
-                .unwrap()
-                .send_buffer(buffer_id as usize);
-
             match buffer_id {
                 0 => match sds_msg_handler(vm, mem_addr, length) {
                     Ok(()) => {}
@@ -246,26 +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>();
-            debug!("Interrupt subscribed: {}", interrupt_type);
-            unsafe {
-                LazyCell::<Executor>::get_mut(&mut EXECUTOR)
-                    .unwrap()
-                    .interrupt_subscribe(*pid, interrupt_type);
-            }
-        }
-        7 => {
-            // Wait till buffer
-            use crate::kmain::EXECUTOR;
-            let buffer_id = vm.registers[3].cast::<u64>() as usize;
-            debug!("Buffer subscribed: {}", buffer_id);
-            unsafe {
-                LazyCell::<Executor>::get_mut(&mut EXECUTOR)
-                    .unwrap()
-                    .buffer_subscribe(*pid, buffer_id);
+            info!("Interrupt subscribled: {}", interrupt_type);
+            unsafe{
+                EXECUTOR.pause(pid.clone());
+                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

@@ -1,9 +1,5 @@
 use {
-    alloc::{
-        boxed::Box,
-        collections::{BTreeMap, BTreeSet},
-        sync::Arc,
-    },
+    alloc::{boxed::Box, sync::Arc},
     core::{
         future::Future,
         pin::Pin,
@@ -37,19 +33,17 @@ 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],
-    buffer_lookup: BTreeMap<usize, BTreeSet<usize>>,
 }
 
 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],
-            buffer_lookup: BTreeMap::new(),
         }
     }
 
@@ -73,20 +67,10 @@ impl Executor {
         }
     }
 
-    pub fn interrupt_subscribe(&mut self, pid: usize, interrupt_type: u8) {
-        self.pause(pid);
+    pub fn interrupt_subscribe(&mut self, pid : usize, interrupt_type: u8){
         self.interrupt_lookup[interrupt_type as usize] = Some(pid);
     }
 
-    pub fn buffer_subscribe(&mut self, pid: usize, buffer_id: usize) {
-        self.pause(pid);
-        if let Some(buf) = self.buffer_lookup.get_mut(&buffer_id) {
-            buf.insert(pid);
-        } else {
-            self.buffer_lookup.insert(buffer_id, BTreeSet::from([pid]));
-        }
-    }
-
     pub fn run(&mut self) {
         let mut task_batch = [0; 32];
         loop {
@@ -101,7 +85,7 @@ impl Executor {
             }
 
             if batch_len == 0 {
-                // break;
+                //break;
                 continue;
             }
 
@@ -116,34 +100,26 @@ 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;
                                 }
                             }
                             return pid;
                         });
-                        self.buffer_lookup.iter_mut().for_each(|(_, pid_set)| {
-                            pid_set.remove(&id);
-                        });
                     }
                 }
             }
         }
     }
 
-    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);
         }
     }
-    pub fn send_buffer(&self, id: usize) {
-        if let Some(buf) = self.buffer_lookup.get(&id) {
-            buf.iter().for_each(|pid| self.unpause(*pid));
-        }
-    }
 }
 
 struct Task {

rust-toolchain.toml

@@ -1,7 +1,5 @@
 [toolchain]
 # old toolchain
 # channel = "nightly-2024-07-27"
-# last stable
-# channel = "nightly-2024-11-20"
-channel = "nightly"
+channel = "nightly-2024-11-20"
 components = ["rust-src", "llvm-tools"]

sysdata/libraries/stn/src/buffer.hb

@@ -1,9 +1,5 @@
 string := @use("string.hb")
 
-$await := fn(buffer_id: uint): void {
-	return @eca(7, buffer_id)
-}
-
 $recv := fn($Expr: type, buffer_id: uint, memory_map_location: ^Expr): void {
 	return @eca(4, buffer_id, memory_map_location, @sizeof(Expr))
 }

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/libraries/sunset_proto/src/lib.hb

@@ -48,8 +48,6 @@ await_channel := fn(): Channel {
 await_message := fn($Expr: type, buffer_id: uint): Message(Expr) {
 	response := @as(?Message(Expr), null)
 	loop {
-		// awaiting here causes flickering... idk why
-		buffer.await(buffer_id)
 		buffer.recv(?Message(Expr), buffer_id, &response)
 		if response != null {
 			return @as(Message(Expr), response)
@@ -60,11 +58,9 @@ await_message := fn($Expr: type, buffer_id: uint): Message(Expr) {
 await_header := fn(buffer_id: uint): MessageHeader {
 	response := @as(?MessageHeader, null)
 	loop {
-		// awaiting here causes flickering... idk why
-		buffer.await(buffer_id)
 		buffer.recv(?MessageHeader, buffer_id, &response)
 		if response != null {
-			return @as(MessageHeader, response)
+			return @as(?MessageHeader, response)
 		}
 	}
 }

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/sunset_server/src/main.hb

@@ -91,8 +91,8 @@ main := fn(): int {
 
 		// Mouse cursor
 		{
-			render.put_filled_circle(screen, .(mouse_x, mouse_y), 10, sunset.server.DECO_COLOUR_DARKER)
-			render.put_circle(screen, .(mouse_x, mouse_y), 10, sunset.server.DECO_COLOUR)
+			render.put_filled_rect(screen, .(mouse_x, mouse_y), .(20, 20), sunset.server.DECO_COLOUR_DARKER)
+			render.put_rect(screen, .(mouse_x, mouse_y), .(20, 20), sunset.server.DECO_COLOUR)
 		}
 
 		render.sync(screen)

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.sleep.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.sunset_client]
-path = "boot:///sunset_client.hbf"
-
-[boot.limine.ableos.modules.sunset_client_2]
-path = "boot:///sunset_client_2.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.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"