kernel/src/arch/x86_64/interrupts.rs

@@ -83,29 +83,31 @@ 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)
+            }
+        }
+
+        // log::info!("{}", buffer);
+    }
 
     unsafe{
         EXECUTOR.send_interrupt(interrupt_type as u8);

kernel/src/holeybytes/ecah.rs

@@ -80,10 +80,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(()) => {}
@@ -250,22 +246,12 @@ pub fn handler(vm: &mut Vm, pid: &usize) {
             // Wait till interrupt
             use crate::kmain::EXECUTOR;
             let interrupt_type = vm.registers[3].cast::<u8>();
-            debug!("Interrupt subscribed: {}", interrupt_type);
+            info!("Interrupt subscribled: {}", interrupt_type);
             unsafe {
+                EXECUTOR.pause(pid.clone());
                 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);
+                    .interrupt_subscribe(pid.clone(), interrupt_type);
             }
         }
         _ => {

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,
@@ -40,7 +36,6 @@ pub struct Executor {
     tasks:      Slab<Task>,
     task_queue: Arc<SegQueue<usize>>,
     interrupt_lookup: [Option<usize>; u8::MAX as usize],
-    buffer_lookup: BTreeMap<usize, BTreeSet<usize>>,
 }
 
 impl Executor {
@@ -49,7 +44,6 @@ impl Executor {
             tasks:      Slab::new(),
             task_queue: Arc::new(SegQueue::new()),
             interrupt_lookup: [None; u8::MAX as usize],
-            buffer_lookup: BTreeMap::new(),
         }
     }
 
@@ -74,19 +68,9 @@ impl Executor {
     }
 
     pub fn interrupt_subscribe(&mut self, pid : usize, interrupt_type: u8){
-        self.pause(pid);
         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 {
@@ -124,9 +108,6 @@ impl Executor {
                             }
                             return pid;
                         });
-                        self.buffer_lookup.iter_mut().for_each(|(_, pid_set)| {
-                            pid_set.remove(&id);
-                        });
                     }
                 }
             }
@@ -139,11 +120,6 @@ impl Executor {
             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 {

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(): void {
+	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"