omfg it's fixed 🙏

.cargo/config.toml

@@ -1,3 +1,3 @@
 [alias]
-repbuild = "run --manifest-path ./repbuild/Cargo.toml -- "
+repbuild = "run --manifest-path ./repbuild/Cargo.toml -r --"
 dev = "run --manifest-path ./dev/Cargo.toml -r --"

HELP.md

@@ -1,69 +0,0 @@
-### What are the requirements?
-- A machine with [Rustc Tier 1 platform support](https://doc.rust-lang.org/nightly/rustc/platform-support.html#tier-1-with-host-tools)
-- Rustup
-- QEMU (for executing)
-- GIT CLI
-
-### How do I run ableos?
-- It is recommended to run ableos under QEMU. Here is how:
-    - Install QEMU
-    - Clone ableos
-    - Go to ableos directory
-    - Pull the limine submodule with `git submodule update --init`
-    - Run `cargo repbuild help`
-
-### How can I contribute?
-- [Contribute code](#how-do-i-contribute-code)
-- [Run ableos on your machine](#how-do-i-run-ableos)
-- Find bugs
-- Create media showing ableos
-
-### How do I contribute code?
-- Start by forking ableos
-- Write something that runs in the userspace, for example:
-    - System drivers
-    - Programs
-    - Libraries
-- Patch bugs and improve code in the kernel
-- Ensure that the code is OK to be maintained by asking in the [discord](https://discord.gg/t5Wt3K4YNA)
-- When you have finished your changes, you can submit a pull request for review [here](https://git.ablecorp.us/ableos/ableos)
-
-### repbuild and kernel compile, but QEMU isn't starting
-- Ensure you have the `qemu-desktop-{arch}` for your OS and target architecture installed
-- Try running again with `--noaccel` if you have QEMU already
-
-### I have run using repbuild but it's slow
-- Ensure release mode is enabled with the `-r` flag
-- Remove the `--noaccel` flag if you can
-- If both of these are already done, there may be a problem with thee VM, kernel, your program, or the hblang compiler
-
-### Compiler is complaining about "reg id leaked"
-- [Submit](#how-do-i-report-a-compiler-bug) an issue, reg id leaked is a bug
-
-### My program isn't running
-- Refer to [here](#i-have-run-using-repbuild-but-its-slow), it may be that your program is simply starting slowly
-- Ensure that your program has a properly written meta.toml file
-- Ensure that your program is enabled in [system_config.toml](sysdata/system_config.toml)
-- Try running again with `--noaccel`, there is a known bug with some systems that prevents programs from starting.
-
-### Kernel panic??? Huh???
-- Kernel panics can be caused by improperly using memory (e.g, writing out of bounds)
-- Kernel panics are most likely to be caused when accessing memory or using `@eca` for kernel ecalls
-- [Report](#how-do-i-report-an-ableos-bug) a kernel panic
-
-### I am running in release mode but I have no debug info
-- Add the `-d` flag for debug info
-
-### What is `@eca`? How do I use it?
-- Eca is an ecall. They are similar to syscalls
-- The `@eca` directive takes the following arguments:
-    - `@eca(ecall_number, reg_1, ..., reg_n)`
-- The various ecalls have different arguments that are given by register values
-- Most ecalls are wrapped by `stn`, for example, `random`, `buffer`, and `memory` all make use of ecalls
-- All ecalls can be found [ecah.rs](kernel/src/holeybytes/ecah.rs)
-
-### How do I report an ableos bug?
-- Submit an issue [here](https://git.ablecorp.us/ableos/ableos/issues) or report it in the [discord](https://discord.gg/t5Wt3K4YNA)
-
-### How do I report a compiler bug?
-- Submit an issue [here](https://git.ablecorp.us/ableos/holey-bytes/issues) or report it in the [discord](https://discord.gg/t5Wt3K4YNA)

README.md

@@ -10,7 +10,15 @@ Donations can be made [here on Liberapay](https://liberapay.com/AbleTheAbove) or
 <img src="https://img.shields.io/liberapay/patrons/AbleTheAbove.svg?logo=liberapay">
 
 # Compiling
-See [HELP.md](HELP.md)
+AbleOS should be able to be built on any platform which is supported by
+[Rustc Tier 1 platform support](https://doc.rust-lang.org/nightly/rustc/platform-support.html#tier-1-with-host-tools).
+
+For running AbleOS, `repbuild` uses QEMU.
+
+## Steps
+1. Ensure you have qemu installed
+2. `git submodule update --init`
+3. `cargo repbuild run`
 
 # Developing
-There is a new work in progress developer tool for hblang. (see: dev folder)
+There is a new work in progress developer tool for hblang. 

dev/src/main.rs

@@ -72,27 +72,6 @@ pub fn new(development_type: DevelopmentType, name: String) {
     let readme_contents = format!("# {}", name);
     readme_file.write_all(readme_contents.as_bytes()).unwrap();
 
-    let contents = format!(
-        "[package]
-name = \"{}\"
-authors = [\"\"]
-
-[dependants.libraries]
-
-[dependants.binaries]
-hblang.version = \"1.0.0\"
-
-[build]
-command = \"hblang src/main.hb\"
-",
-        name
-    );
-
-    let toml_path_string = format!("{}/meta.toml", project_folder_path_string);
-    let mut readme_file = std::fs::File::create(toml_path_string.clone()).unwrap();
-
-    readme_file.write_all(contents.as_bytes()).unwrap();
-
     let src_folder_path_string = format!("{}/src", project_folder_path_string);
     std::fs::create_dir(src_folder_path_string.clone()).unwrap();
 
@@ -138,8 +117,8 @@ fn build(name: String) {
     }
 }
 
-pub fn build_program(_name: String) {}
+pub fn build_program(name: String) {}
-pub fn build_library(_name: String) {}
+pub fn build_library(name: String) {}
 
 fn help() {
     println!(

flake.lock

@@ -1,96 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1732014248,
-        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1728538411,
-        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1732328983,
-        "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,30 +0,0 @@
-{
-  description = "A devShell example";
-
-  inputs = {
-    nixpkgs.url      = "github:NixOS/nixpkgs/nixos-unstable";
-    rust-overlay.url = "github:oxalica/rust-overlay";
-    flake-utils.url  = "github:numtide/flake-utils";
-  };
-
-  outputs = { self, nixpkgs, rust-overlay, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        overlays = [ (import rust-overlay) ];
-        pkgs = import nixpkgs {
-          inherit system overlays;
-        };
-
-        rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
-      in
-      with pkgs;
-      {
-        devShells.default = mkShell {
-          buildInputs = [
-            rustToolchain
-            qemu_full
-          ];
-        };
-      }
-    );
-}

kernel/.cargo/config.toml

@@ -4,3 +4,6 @@ build-std-features = ["compiler-builtins-mem"]
 
 [build]
 target = "./targets/x86_64-ableos.json"
+
+[target.'cfg(target_arch = "x86_64")']
+rustflags = ["-C", "target-feature=+rdrand"]

kernel/Cargo.toml

@@ -3,15 +3,10 @@ edition = "2021"
 name = "kernel"
 version = "0.2.0"
 
-[features]
-ktest = []
 
 [dependencies]
-# embedded-graphics = "0.8"
+embedded-graphics = "0.8"
-hbvm = { git = "https://git.ablecorp.us/AbleOS/holey-bytes.git", features = [
+hbvm.git = "https://git.ablecorp.us/ableos/holey-bytes.git"
-	"nightly",
-] }
-ktest_macro = { path = "ktest_macro" }
 log = "0.4"
 spin = "0.9"
 slab = { version = "0.4", default-features = false }
@@ -19,35 +14,42 @@ uart_16550 = { version = "0.3", features = ["nightly"] }
 xml.git = "https://git.ablecorp.us/ableos/ableos_userland"
 versioning.git = "https://git.ablecorp.us/ableos/ableos_userland"
 # able_graphics_library.git = "https://git.ablecorp.us/ableos/ableos_userland"
-hashbrown = { version = "0.15", features = ["nightly"] }
+hashbrown = { version = "0.14", features = ["nightly"] }
-limine = "0.1"
+
+[dependencies.limine]
+version = "0.1"
+#git = "https://github.com/limine-bootloader/limine-rs"
 
 [dependencies.crossbeam-queue]
 version = "0.3"
 default-features = false
 features = ["alloc", "nightly"]
 
+# [dependencies.clparse]
+# git = "https://git.ablecorp.us/ableos/ableos_userland"
+# default-features = false
+
 [dependencies.derive_more]
 version = "1"
 default-features = false
 features = [
-	"add",
+    "add",
-	"add_assign",
+    "add_assign",
-	"constructor",
+    "constructor",
-	"display",
+    "display",
-	"from",
+    "from",
-	"into",
+    "into",
-	"mul",
+    "mul",
-	"mul_assign",
+    "mul_assign",
-	"not",
+    "not",
-	"sum",
+    "sum",
 ]
 
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 x86_64 = "0.15"
 x2apic = "0.4"
-# virtio-drivers = "0.7"
+virtio-drivers = "0.7"
 
 [target.'cfg(target_arch = "riscv64")'.dependencies]
 sbi = "0.2.0"

kernel/ktest_macro/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-edition = "2021"
-name = "ktest_macro"
-version = "0.1.0"
-
-[lib]
-proc-macro = true
-
-[dependencies]
-quote = "1.0.37"
-syn = { version = "2.0.89", features = ["full"] }

kernel/ktest_macro/src/lib.rs

@@ -1,29 +0,0 @@
-extern crate proc_macro;
-extern crate quote;
-extern crate syn;
-use {
-    proc_macro::TokenStream,
-    quote::quote,
-    syn::{parse_macro_input, ItemFn}
-};
-
-#[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 static_var_name = syn::Ident::new(
-        &format!("__ktest_{}", test_name),
-        test_name.span(),
-    );
-    let out = quote! {
-        // #[cfg(feature = "ktest")]
-        #input
-
-        // #[cfg(feature = "ktest")]
-        #[unsafe(link_section = ".note.ktest")]
-        #[used]
-        pub static #static_var_name: fn() = #test_name;
-    };
-
-    TokenStream::from(out)
-}

kernel/lds/x86_64.ld

@@ -38,15 +38,7 @@ SECTIONS
 
     .data : {
         *(.data .data.*)
-        *(.got .got.*)
     } :data
-    
-    /* Add the .ktest section for test functions */
-    .note.ktest : {
-        __ktest_start = .;   /* Mark the beginning of the section */
-        *(.note.ktest)            /* Include all items in the .ktest section */
-        __ktest_end = .;     /* Mark the end of the section */
-    }
 
     .bss : {
         *(COMMON)

kernel/src/arch/aarch64/device_info_collector.rs

@@ -1,5 +1,6 @@
 use {
-    crate::{device_tree::DeviceTree, kmain::DEVICE_TREE},
+    crate::{alloc::string::ToString, device_tree::DeviceTree, kmain::DEVICE_TREE},
+    alloc::string::String,
     core::arch::asm,
     xml::XMLElement,
 };
@@ -27,7 +28,7 @@ fn collect_cpu_info(device_tree: &mut DeviceTree) {
     cpus.push(cpu);
 }
 
-fn cpu_id<'a>() -> (&'a str, u64) {
+fn cpu_id() -> (String, u64) {
     let mut cpu_id: u64;
     unsafe {
         asm!("mrs {cpu_id}, MIDR_EL1",
@@ -38,11 +39,11 @@ fn cpu_id<'a>() -> (&'a str, u64) {
     let cpu_name = match cpu_id {
         // the source of these two was a stackoverflow question
         // https://raspberrypi.stackexchange.com/questions/117175/how-do-i-read-the-cpuid-in-aarch64-asm
-        0x410FD034 => "Cortex-A53",
+        0x410FD034 => "Cortex-A53".to_string(),
-        0x410FD083 => "Cortex-A72",
+        0x410FD083 => "Cortex-A72".to_string(),
         // the source of this one was checking the cpu id :thinking:
-        0x410FD493 => "Neoverse N2",
+        0x410FD493 => "Neoverse N2".to_string(),
-        _ => "Unknown",
+        _ => "Unknown".to_string(),
     };
     log::trace!("CPU Name: {cpu_name} - CPU ID: 0x{:X}", cpu_id);
 

kernel/src/arch/aarch64/logging.rs

@@ -3,7 +3,7 @@ pub static SERIAL_CONSOLE: Mutex<SerialConsole> = Mutex::new(SerialConsole {
     uart: 0x09000000 as *mut u8,
 });
 
-pub struct SerialConsole {
+struct SerialConsole {
     uart: *mut u8,
 }
 
@@ -22,7 +22,7 @@ unsafe impl Send for SerialConsole {}
 
 pub fn log(args: core::fmt::Arguments<'_>) -> core::fmt::Result {
     SERIAL_CONSOLE.lock().write_fmt(args)?;
-    // TERMINAL_LOGGER.lock().write_fmt(args)?;
+    TERMINAL_LOGGER.lock().write_fmt(args)?;
 
     Ok(())
 }

kernel/src/arch/mod.rs

@@ -14,29 +14,3 @@ arch_cond!(
     riscv64: "riscv64",
     x86_64: "x86_64",
 );
-
-#[cfg(target_arch = "x86_64")]
-use {crate::arch::interrupts::Interrupt, alloc::string::String};
-#[cfg(target_arch = "x86_64")]
-pub struct InterruptList {
-    list: HashMap<Interrupt, String>,
-}
-#[cfg(target_arch = "x86_64")]
-use hashbrown::HashMap;
-#[cfg(target_arch = "x86_64")]
-impl InterruptList {
-    pub fn new() -> Self {
-        Self {
-            list: HashMap::new(),
-        }
-    }
-}
-#[cfg(target_arch = "x86_64")]
-use spin::{Lazy, Mutex};
-#[cfg(target_arch = "x86_64")]
-pub static INTERRUPT_LIST: Lazy<Mutex<InterruptList>> = Lazy::new(|| {
-    let mut il = InterruptList::new();
-    use crate::alloc::string::ToString;
-    il.list.insert(Interrupt::Timer, "PS/2 Mouse".to_string());
-    Mutex::new(il)
-});

kernel/src/arch/x86_64/interrupts.rs

@@ -11,9 +11,7 @@ static mut LAPIC: LocalApic = unsafe { MaybeUninit::zeroed().assume_init() };
 static mut IDT: InterruptDescriptorTable = unsafe { MaybeUninit::zeroed().assume_init() };
 
 #[repr(u8)]
-#[derive(Debug, Eq, Hash, PartialEq)]
+enum Interrupt {
-
-pub enum Interrupt {
     Timer = 32,
     ApicErr = u8::MAX - 1,
     Spurious = u8::MAX,
@@ -62,49 +60,17 @@ extern "x86-interrupt" fn page_fault(
 }
 
 extern "x86-interrupt" fn timer(_isf: InterruptStackFrame) {
-    // interrupt(Interrupt::Timer);
-
     unsafe {
         LAPIC.end_of_interrupt();
     }
 }
 
 extern "x86-interrupt" fn apic_err(_: InterruptStackFrame) {
-    interrupt(Interrupt::ApicErr);
-
     panic!("Internal APIC error");
 }
 
 extern "x86-interrupt" fn spurious(_: InterruptStackFrame) {
-    interrupt(Interrupt::Spurious);
-
     unsafe {
         LAPIC.end_of_interrupt();
     }
 }
-
-fn interrupt(interrupt_type: Interrupt) {
-    use crate::arch::INTERRUPT_LIST;
-    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)
-            }
-        }
-
-        // log::info!("{}", buffer);
-    }
-}

kernel/src/arch/x86_64/mod.rs

@@ -10,7 +10,7 @@ pub mod graphics;
 pub(crate) mod interrupts;
 pub mod logging;
 pub mod pci;
-// pub mod virtio;
+pub mod virtio;
 
 pub use {logging::log, memory::PAGE_SIZE};
 
@@ -30,11 +30,9 @@ const INITIAL_KERNEL_HEAP_SIZE: *const () = _initial_kernel_heap_size as _;
 
 #[no_mangle]
 #[naked]
-#[cfg(not(target_feature = "avx2"))]
 unsafe extern "C" fn _kernel_start() -> ! {
-    // Initialise SSE, then jump to kernel entrypoint
+    // Initialise SSE and jump to kernel entrypoint
-    core::arch::naked_asm!(
+    core::arch::asm!(
-        // Initialise SSE
         "mov rax, cr0",
         "and ax, 0xfffb",
         "or ax, 0x2",
@@ -42,74 +40,16 @@ unsafe extern "C" fn _kernel_start() -> ! {
         "mov rax, cr4",
         "or ax, 3 << 9",
         "mov cr4, rax",
-
-        // Jump to the kernel entry point
         "jmp {}",
         sym start,
+        options(noreturn),
     )
 }
 
-#[no_mangle]
-#[naked]
-#[cfg(target_feature = "avx2")]
-unsafe extern "C" fn _kernel_start() -> ! {
-    core::arch::naked_asm!(
-        // Enable protected mode and configure control registers
-        "mov rax, cr0",
-        "and ax, 0xFFFB",  // Clear CR0.EM (bit 2) for coprocessor emulation
-        "or ax, 0x2",      // Set CR0.MP (bit 1) for coprocessor monitoring
-        "mov cr0, rax",
-
-        "mov rax, cr4",
-        "or ax, (1 << 9) | (1 << 10)", // Set CR4.OSFXSR (bit 9) and CR4.OSXMMEXCPT (bit 10)
-        "mov cr4, rax",
-
-        // Enable OSXSAVE (required for AVX, AVX2, and XSAVE)
-        "mov rax, cr4",
-        "or eax, 1 << 18", // Set CR4.OSXSAVE (bit 18)
-        "mov cr4, rax",
-
-        // Enable AVX and AVX2 state saving
-        "xor rcx, rcx",
-        "xgetbv",
-        "or eax, 7",       // Enable SSE, AVX, and AVX2 state saving
-        "xsetbv",
-
-        // Check for AVX and XSAVE support
-        "mov eax, 1",
-        "cpuid",
-        "and ecx, 0x18000000",
-        "cmp ecx, 0x18000000",
-        "jne {1}",          // Jump if AVX/OSXSAVE is not supported
-
-        // Check for BMI2 and AVX2 support
-        "mov eax, 7",
-        "xor ecx, ecx",
-        "cpuid",
-        "and ebx, (1 << 8) | (1 << 5)", // Check BMI2 (bit 8) and AVX2 (bit 5)
-        "cmp ebx, (1 << 8) | (1 << 5)", // Compare to ensure both are supported
-
-        // Check for LZCNT and POPCNT support
-        "mov eax, 1",
-        "cpuid",
-        "and ecx, (1 << 5) | (1 << 23)", // Check LZCNT (bit 5) and POPCNT (bit 23)
-        "cmp ecx, (1 << 5) | (1 << 23)", // Compare to ensure both are supported
-
-        // Jump to the kernel entry point
-        "jmp {0}",
-        sym start,
-        sym oops,
-    )
-}
-
-unsafe extern "C" fn oops() -> ! {
-    panic!("your cpu is ancient >:(")
-}
-
 unsafe extern "C" fn start() -> ! {
     logging::init();
     crate::logger::init().expect("failed to set logger");
-    log::debug!("Initialising AKern {}", crate::VERSION);
+    log::info!("Initialising AKern {}", crate::VERSION);
 
     static HDHM_REQ: HhdmRequest = HhdmRequest::new(0);
     memory::init_pt(VirtAddr::new(
@@ -188,7 +128,7 @@ unsafe extern "C" fn start() -> ! {
     // TODO: Add in rdseed and rdrand as sources for randomness
     let _rand = xml::XMLElement::new("Random");
 
-    log::debug!("Getting boot modules");
+    log::trace!("Getting boot modules");
     let bm = MOD_REQ.get_response().get();
 
     let mut bootmodules = alloc::vec::Vec::new();
@@ -226,7 +166,7 @@ unsafe extern "C" fn start() -> ! {
                 break;
             }
         }
-        log::debug!("Boot module count: {:?}", bootmodules.len());
+        log::info!("Boot module count: {:?}", bootmodules.len());
         assert_eq!(bm.module_count, bootmodules.len() as u64);
     }
 
@@ -249,7 +189,6 @@ unsafe extern "C" fn start() -> ! {
 /// Spin loop
 pub fn spin_loop() -> ! {
     loop {
-        core::hint::spin_loop();
         x86_64::instructions::hlt()
     }
 }

kernel/src/arch/x86_64/pci/mod.rs

@@ -8,12 +8,13 @@ pub struct PciDeviceInfo {
     pub full_class: PciFullClass,
     pub rev_id: u8,
 }
+use crate::alloc::string::ToString;
 
 /// Enumerate PCI devices and run initialisation routines on ones we support
 pub fn init(device_tree: &mut DeviceTree) {
     device_tree
         .devices
-        .insert("Unidentified PCI", alloc::vec![]);
+        .insert("Unidentified PCI".to_string(), alloc::vec![]);
     let mut devices = alloc::vec![];
 
     for bus in 0..=255 {
@@ -46,8 +47,7 @@ pub fn init(device_tree: &mut DeviceTree) {
                 pci_info.set_attribute("id", id);
                 pci_info.set_attribute("device", device_info.device);
                 pci_info.set_attribute("vendor", vendor);
-                pci_info.set_attribute("bus", bus);
+                pci_info.set_attribute("class", device_info.full_class.to_string());
-                pci_info.set_attribute("class", device_info.full_class);
                 dev.set_child(pci_info);
                 devices.push((dev_type, dev));
             }
@@ -68,8 +68,7 @@ pub fn check_device(bus: u8, device: u8) -> Option<PciDeviceInfo> {
         return None;
     }
 
-    let (reg2, addr) = unsafe { pci_config_read_2(bus, device, 0, 0x8) };
+    let reg2 = unsafe { pci_config_read(bus, device, 0, 0x8) };
-    log::debug!("pci device-({}) addr {} is {}", device, addr, reg2);
     let class = ((reg2 >> 16) & 0x0000_FFFF) as u16;
     let pci_class = PciFullClass::from_u16(class);
     let header_type = get_header_type(bus, device, 0);
@@ -460,7 +459,9 @@ unsafe fn pci_config_read(bus: u8, device: u8, func: u8, offset: u8) -> u32 {
     let func = func as u32;
     let offset = offset as u32;
     // construct address param
-    let address = (bus << 16) | (device << 11) | (func << 8) | (offset & 0xFC) | 0x8000_0000;
+    let address =
+        ((bus << 16) | (device << 11) | (func << 8) | (offset & 0xFC) | 0x8000_0000) as u32;
+
     // write address
     Port::new(0xCF8).write(address);
 
@@ -468,20 +469,6 @@ unsafe fn pci_config_read(bus: u8, device: u8, func: u8, offset: u8) -> u32 {
     Port::new(0xCFC).read()
 }
 
-unsafe fn pci_config_read_2(bus: u8, device: u8, func: u8, offset: u8) -> (u32, u32) {
-    let bus = bus as u32;
-    let device = device as u32;
-    let func = func as u32;
-    let offset = offset as u32;
-    // construct address param
-    let address = (bus << 16) | (device << 11) | (func << 8) | (offset & 0xFC) | 0x8000_0000;
-    // write address
-    Port::new(0xCF8).write(address);
-
-    // read data
-    (Port::new(0xCFC).read(), address)
-}
-
 unsafe fn pci_config_write(bus: u8, device: u8, func: u8, offset: u8, value: u32) {
     let bus = bus as u32;
     let device = device as u32;

kernel/src/arch/x86_64/virtio/mod.rs

@@ -1,5 +1,5 @@
 use {
-    core::ptr::NonNull,
+    core::{ptr::NonNull},
     virtio_drivers::{BufferDirection, Hal, PhysAddr},
 };
 

kernel/src/device_tree/mod.rs

@@ -1,6 +1,11 @@
 //! A tree of hardware devices
 
-use {alloc::vec::Vec, core::fmt, hashbrown::HashMap};
+use {
+    crate::alloc::string::ToString,
+    alloc::{string::String, vec::Vec},
+    core::fmt,
+    hashbrown::HashMap,
+};
 
 /// A device object.
 /// TODO define device
@@ -9,11 +14,11 @@ pub type Device = xml::XMLElement;
 /// A tree of devices
 // TODO: alphabetize this list
 #[derive(Debug)]
-pub struct DeviceTree<'a> {
+pub struct DeviceTree {
     /// The device tree
-    pub devices: HashMap<&'a str, Vec<Device>>,
+    pub devices: HashMap<String, Vec<Device>>,
 }
-impl<'a> DeviceTree<'a> {
+impl DeviceTree {
     /// Build the device tree. Does not populate the device tree
     pub fn new() -> Self {
         let mut dt = Self {
@@ -42,7 +47,7 @@ impl<'a> DeviceTree<'a> {
     }
 }
 use crate::{device_tree, tab, utils::TAB};
-impl<'a> fmt::Display for DeviceTree<'a> {
+impl fmt::Display for DeviceTree {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         writeln!(f)?;
         for (device_type, devices) in &self.devices {

kernel/src/exe_format.rs

@@ -1,35 +0,0 @@
-enum Sections {
-    Header,
-    Code,
-    Data,
-    Debug,
-    Config,
-    Metadata,
-}
-
-// 64 byte header
-#[repr(packed)]
-struct AbleOsExecutableHeader {
-    magic_number: [u8; 3],
-    executable_version: u32,
-
-    code_length:     u64,
-    data_length:     u64,
-    debug_length:    u64,
-    config_length:   u64,
-    metadata_length: u64,
-}
-
-impl AbleOsExecutableHeader {
-    fn new() -> Self {
-        Self {
-            magic_number: [0x15, 0x91, 0xD2],
-            executable_version: 0,
-            code_length: 0,
-            config_length: 0,
-            data_length: 0,
-            debug_length: 0,
-            metadata_length: 0,
-        }
-    }
-}

kernel/src/holeybytes/ecah.rs

@@ -1,40 +1,21 @@
 //! Environment call handling routines
 
-use {alloc::boxed::Box, core::cell::LazyCell, hbvm::mem::Address};
+use crate::holeybytes::kernel_services::{
-
+    block_read, dt_msg_handler::dt_msg_handler, logging_service::log_msg_handler,
-use crate::{
+    service_definition_service::sds_msg_handler,
-    holeybytes::{
-        kernel_services::{
-            block_read, dt_msg_handler::dt_msg_handler, logging_service::log_msg_handler,
-            service_definition_service::sds_msg_handler,
-        },
-        ExecThread,
-    },
-    kmain::EXECUTOR,
-    task::Executor,
 };
 
 use {
     super::Vm,
     crate::{arch, ipc::buffer::IpcBuffer, kmain::IPC_BUFFERS},
-    hbvm::value::Value,
     log::{debug, error, info, trace},
 };
 
-#[cfg(target_arch = "x86_64")]
-#[inline(always)]
-unsafe fn x86_out<T: x86_64::instructions::port::PortWrite>(address: u16, value: T) {
-    x86_64::instructions::port::Port::new(address).write(value);
-}
-#[cfg(target_arch = "x86_64")]
-#[inline(always)]
-unsafe fn x86_in<T: x86_64::instructions::port::PortRead>(address: u16) -> T {
-    x86_64::instructions::port::Port::new(address).read()
-}
-
-#[inline(always)]
 pub fn handler(vm: &mut Vm) {
     let ecall_number = vm.registers[2].cast::<u64>();
+    // log::info!("eca called :pensive:");
+    // debug!("Ecall number {:?}", ecall_number);
+    //info!("Register dump: {:?}", vm.registers);
 
     match ecall_number {
         0 => {
@@ -47,9 +28,9 @@ pub fn handler(vm: &mut Vm) {
         1 => {
             // Make buffer
 
-            let bounded = match vm.registers[3] {
+            let bounded = match vm.registers[3].cast::<u64>() {
-                Value(0) => false,
+                0 => false,
-                Value(1) => true,
+                1 => true,
                 _ => {
                     panic!("Bad");
                 }
@@ -58,19 +39,22 @@ pub fn handler(vm: &mut Vm) {
             let length = vm.registers[4].cast::<u64>();
 
             let mut buffs = IPC_BUFFERS.lock();
+            let abc;
 
+            match bounded {
+                false => {
+                    abc = IpcBuffer::new(false, 0);
+                }
+                true => {
+                    abc = IpcBuffer::new(true, length);
+                }
+            };
             let buff_id = arch::hardware_random_u64();
-            buffs.insert(
+            buffs.insert(buff_id, abc);
-                buff_id,
+            info!("Buffer ID: {}", buff_id);
-                match bounded {
-                    false => IpcBuffer::new(false, 0),
-                    true => IpcBuffer::new(true, length),
-                },
-            );
             vm.registers[1] = hbvm::value::Value(buff_id);
         }
         2 => {
-            log::error!("Oops, deleting buffers is not implemented.")
             // Delete buffer
         }
         3 => {
@@ -79,6 +63,7 @@ pub fn handler(vm: &mut Vm) {
             let mem_addr = vm.registers[4].cast::<u64>();
             let length = vm.registers[5].cast::<u64>() as usize;
             trace!("IPC address: {:?}", mem_addr);
+            use alloc::vec::Vec;
 
             match buffer_id {
                 0 => match sds_msg_handler(vm, mem_addr, length) {
@@ -96,15 +81,25 @@ pub fn handler(vm: &mut Vm) {
                         Err(_) => {}
                     }
                 }
+                #[cfg(not(target_arch = "x86_64"))]
+                3 => info!("TODO: implement whatever buffer 3 does for no x86_64"),
                 #[cfg(target_arch = "x86_64")]
                 3 => {
+                    unsafe fn x86_out<T: x86_64::instructions::port::PortWrite>(
+                        address: u16,
+                        value: T,
+                    ) {
+                        x86_64::instructions::port::Port::new(address).write(value);
+                    }
+                    unsafe fn x86_in<T: x86_64::instructions::port::PortRead>(address: u16) -> T {
+                        x86_64::instructions::port::Port::new(address).read()
+                    }
                     let msg_vec = block_read(mem_addr, length);
                     let msg_type = msg_vec[0];
                     match msg_type {
                         0 => unsafe {
                             let size = msg_vec[1];
-                            let addr =
+                            let addr = u16::from_le_bytes(msg_vec[2..4].try_into().unwrap());
-                                u16::from_le_bytes(msg_vec[2..4].try_into().unwrap_unchecked());
                             let value = match size {
                                 0 => x86_in::<u8>(addr) as u64,
                                 1 => x86_in::<u16>(addr) as u64,
@@ -116,10 +111,8 @@ pub fn handler(vm: &mut Vm) {
                         },
                         1 => unsafe {
                             let size = msg_vec[1];
-                            let addr =
+                            let addr = u16::from_le_bytes(msg_vec[2..4].try_into().unwrap());
-                                u16::from_le_bytes(msg_vec[2..4].try_into().unwrap_unchecked());
+                            trace!("Setting address {}", addr);
-                            // info!("Setting address {}", addr);
-
                             match size {
                                 0 => x86_out(addr, msg_vec[4]),
                                 1 => x86_out(
@@ -140,95 +133,68 @@ pub fn handler(vm: &mut Vm) {
                 3 => unimplemented!("TODO: implement whatever buffer 3 does for no x86_64"),
                 // source of rng
                 4 => {
-                    let block = block_read(mem_addr, length);
+                    // limit to last 32 bits
-                    block.chunks_mut(8.min(length)).for_each(|chunk| {
+                    vm.registers[1] =
-                        chunk.clone_from_slice(
+                        hbvm::value::Value(crate::arch::hardware_random_u64() & 0xFFFFFFFF);
-                            &crate::arch::hardware_random_u64().to_le_bytes()[..chunk.len()],
-                        );
-                    });
-                    vm.registers[1] = hbvm::value::Value(mem_addr);
                 }
                 5 => match dt_msg_handler(vm, mem_addr, length) {
                     Ok(()) => {}
                     Err(_) => log::error!("Improper dt query"),
                 },
-                6 => unsafe {
-                    let program = block_read(mem_addr, length);
-
-                    // decode AbleOS Executable format
-                    let header = &program[0..46];
-                    let magic_slice = &header[0..3];
-                    if magic_slice != [0x15, 0x91, 0xD2] {
-                        log::error!("Invalid magic number at the start of executable.");
-                        return;
-                    }
-
-                    let executable_format_version =
-                        u32::from_le_bytes(header[3..7].try_into().unwrap());
-                    let offset = if executable_format_version == 0 {
-                        47
-                    } else {
-                        error!("Invalid executable format.");
-                        return;
-                    };
-
-                    let code_length = u64::from_le_bytes(header[7..15].try_into().unwrap());
-                    let data_length = u64::from_le_bytes(header[15..23].try_into().unwrap());
-                    let end = (code_length + data_length) as usize;
-                    log::debug!("{code_length} + {data_length} = {end}");
-
-                    let thr = ExecThread::new(&program[offset..end], Address::new(0));
-                    vm.registers[1] = Value(
-                        LazyCell::<Executor>::get_mut(&mut EXECUTOR)
-                            .unwrap()
-                            .spawn(Box::pin(async move {
-                                if let Err(e) = thr.await {
-                                    log::error!("{e:?}");
-                                }
-                            })) as u64,
-                    );
-                    log::debug!("spawned a process");
-                },
-
                 buffer_id => {
                     let mut buffs = IPC_BUFFERS.lock();
                     match buffs.get_mut(&buffer_id) {
                         Some(buff) => {
-                            let msg_vec = block_read(mem_addr, length);
+                            let mut msg_vec = Vec::with_capacity(length);
-                            buff.push(msg_vec.to_vec());
+
-                            debug!("Sent Message {:?} to Buffer({})", msg_vec, buffer_id);
+                            for x in 0..(length as isize) {
+                                let xyz = mem_addr as *const u8;
+                                let value = unsafe { xyz.offset(x).read() };
+                                msg_vec.push(value);
+                            }
+                            debug!(
+                                "Message {:?} has been sent to Buffer({})",
+                                msg_vec, buffer_id
+                            );
+                            buff.push(msg_vec);
                         }
                         None => {
                             log::error!("Access of non-existent buffer {}", buffer_id)
                         }
                     }
+                    drop(buffs);
                 }
             }
         }
         4 => {
             let buffer_id = vm.registers[3].cast::<u64>();
-            let map_ptr = vm.registers[4].cast::<u64>();
+            let mut map_ptr = vm.registers[4].cast::<u64>();
             let max_length = vm.registers[5].cast::<u64>();
 
             let mut buffs = IPC_BUFFERS.lock();
-            let buff: &mut IpcBuffer = match buffs.get_mut(&buffer_id) {
+            let buff: &mut IpcBuffer;
-                Some(buff) => buff,
-                None => panic!(
-                    "Failed to get buffer: id={buffer_id}, ptr={map_ptr}, length={max_length}"
-                ),
-            };
 
-            let msg = match buff.pop() {
+            if buffs.get_mut(&buffer_id).is_some() {
-                Ok(msg) => msg,
+                buff = buffs.get_mut(&buffer_id).unwrap();
-                Err(_) => return,
+            } else {
-            };
+                // info!("AHHH");
-            if msg.len() > unsafe { max_length.try_into().unwrap_unchecked() } {
+                vm.registers[1] = hbvm::value::Value(0);
+                return;
+            }
+            let pop = buff.pop();
+            if pop.is_err() {
+                return;
+            }
+            let msg = pop.unwrap();
+            if msg.len() > max_length.try_into().unwrap() {
                 info!("{}", max_length);
                 error!("Message is too long to map in.");
             } else {
                 unsafe {
-                    let ptr = map_ptr as *mut u8;
+                    let ptr: *mut u64 = &mut map_ptr;
-                    ptr.copy_from_nonoverlapping(msg.as_ptr(), msg.len());
+                    for (index, byte) in msg.iter().enumerate() {
+                        ptr.offset(index.try_into().unwrap()).write_bytes(*byte, 1);
+                    }
                 }
 
                 debug!("Recieve {:?} from Buffer({})", msg, buffer_id);
@@ -238,8 +204,14 @@ pub fn handler(vm: &mut Vm) {
             #[cfg(target_arch = "x86_64")]
             {
                 let r2 = vm.registers[2].cast::<u64>();
-                let x = hbvm::value::Value(unsafe { x86_in::<u8>(r2 as u16) } as u64);
+                unsafe fn x86_in(address: u16) -> u32 {
-                // info!("Read {:?} from Port {:?}", x, r2);
+                    x86_64::instructions::port::Port::new(address).read()
+                }
+                unsafe fn x86_out(address: u16, value: u32) {
+                    x86_64::instructions::port::Port::new(address).write(value);
+                }
+                let x = hbvm::value::Value(unsafe { x86_in(r2 as u16) } as u64);
+                info!("Read {:?} from Port {:?}", x, r2);
                 vm.registers[3] = x
             }
         }
@@ -254,3 +226,15 @@ pub enum LogError {
     NoMessages,
     InvalidLogFormat,
 }
+
+// use {alloc::vec, log::Record};
+// fn memory_msg_handler(vm: &mut Vm, mem_addr: u64, length: usize) -> Result<(), LogError> {
+//     let mut val = alloc::vec::Vec::new();
+//     for _ in 0..4096 {
+//         val.push(0);
+//     }
+//     info!("Block address: {:?}", val.as_ptr());
+//     vm.registers[1] = hbvm::value::Value(val.as_ptr() as u64);
+//     vm.registers[2] = hbvm::value::Value(4096);
+//     Ok(())
+// }

kernel/src/holeybytes/kernel_services/dt_msg_handler.rs

@@ -1,6 +1,9 @@
 use {
     crate::holeybytes::{kernel_services::block_read, Vm},
-    alloc::vec::Vec,
+    alloc::{
+        string::{String, ToString},
+        vec::Vec,
+    },
 };
 pub enum DtError {
     QueryFailure,
@@ -8,13 +11,14 @@ pub enum DtError {
 
 pub fn dt_msg_handler(vm: &mut Vm, mem_addr: u64, length: usize) -> Result<(), DtError> {
     let msg_vec = block_read(mem_addr, length);
-    let query_string = core::str::from_utf8(
+    let mut bytes: Vec<u8> = Vec::new();
-        msg_vec
+    for byte in msg_vec {
-            .split_once(|&byte| byte == 0)
+        if *byte == 0 {
-            .unwrap_or((msg_vec, &[]))
+            break;
-            .0,
+        }
-    )
+        bytes.push(*byte)
-    .unwrap();
+    }
+    let query_string = String::from_utf8(bytes).unwrap();
     log::trace!("Query {}", query_string);
 
     let ret = query_parse(query_string);
@@ -25,13 +29,17 @@ pub fn dt_msg_handler(vm: &mut Vm, mem_addr: u64, length: usize) -> Result<(), D
     Ok(())
 }
 
-fn query_parse(query_string: &str) -> u64 {
+fn query_parse(query_string: String) -> u64 {
-    let query = query_string.split('/').collect::<Vec<&str>>();
+    let qt_parse_step_one = query_string.split("/");
+    let mut qt_parse_step_two: Vec<String> = Vec::new();
+    for a in qt_parse_step_one {
+        qt_parse_step_two.push(a.to_string());
+    }
 
-    let first_fragment: &str = &query[0];
+    let first_fragment: &str = &qt_parse_step_two[0];
     let ret = match first_fragment {
-        "framebuffer" => framebuffer_parse(query),
+        "framebuffer" => framebuffer_parse(qt_parse_step_two),
-        "cpu" => cpu_parse(query),
+        "cpu" => cpu_parse(qt_parse_step_two),
 
         _ => 0,
     };
@@ -39,8 +47,8 @@ fn query_parse(query_string: &str) -> u64 {
     return ret;
 }
 
-fn cpu_parse(qt_parse_step_two: Vec<&str>) -> u64 {
+fn cpu_parse(qt_parse_step_two: Vec<String>) -> u64 {
-    let second_fragment: &str = qt_parse_step_two[1];
+    let second_fragment: &str = &qt_parse_step_two[1];
     match second_fragment {
         // "architecture" => {
         //     return 0;
@@ -51,14 +59,15 @@ fn cpu_parse(qt_parse_step_two: Vec<&str>) -> u64 {
     };
 }
 
-fn framebuffer_parse(qt_parse_step_two: Vec<&str>) -> u64 {
+fn framebuffer_parse(qt_parse_step_two: Vec<String>) -> u64 {
     use crate::kmain::FB_REQ;
-    let fbs = &mut FB_REQ.get_response().get().unwrap().framebuffers();
+    let fbs = &FB_REQ.get_response().get().unwrap().framebuffers();
-    let second_fragment: &str = qt_parse_step_two[1];
+
+    let second_fragment: &str = &qt_parse_step_two[1];
     match second_fragment {
         "fb0" => {
             let fb_front = &fbs[0];
-            let third_fragment: &str = qt_parse_step_two[2];
+            let third_fragment: &str = &qt_parse_step_two[2];
             let ret = match third_fragment {
                 "ptr" => {
                     let ptr = fb_front.address.as_ptr().unwrap();

kernel/src/holeybytes/kernel_services/logging_service.rs

@@ -9,30 +9,25 @@ use log::Record;
 pub fn log_msg_handler(_vm: &mut Vm, mem_addr: u64, length: usize) -> Result<(), LogError> {
     let msg_vec = block_read(mem_addr, length);
 
-    use log::Level::*;
+    let log_level = msg_vec.last().unwrap();
-    let log_level = match msg_vec[0] {
-        0 | 48 => Error,
-        1 | 49 => Warn,
-        2 | 50 => Info,
-        3 | 51 => Debug,
-        4 | 52 => Trace,
-        _ => {
-            return Err(LogError::InvalidLogFormat);
-        }
-    };
-    if log_level > log::max_level() {
-        return Ok(());
-    }
-    let strptr = u64::from_le_bytes(msg_vec[1..9].try_into().unwrap());
-    let strlen = u64::from_le_bytes(msg_vec[9..17].try_into().unwrap()) as usize;
-
-    let str = block_read(strptr, strlen);
 
     let file_name = "None";
     let line_number = 0;
 
-    match core::str::from_utf8(&str) {
+    match core::str::from_utf8(&msg_vec[..msg_vec.len()]) {
         Ok(strr) => {
+            use log::Level::*;
+            let log_level = match log_level {
+                0 | 48 => Error,
+                1 | 49 => Warn,
+                2 | 50 => Info,
+                3 | 51 => Debug,
+                4 | 52 => Trace,
+                _ => {
+                    return Err(LogError::InvalidLogFormat);
+                }
+            };
+
             log::logger().log(
                 &Record::builder()
                     .args(format_args!("{}", strr))

kernel/src/holeybytes/kernel_services/mem_serve.rs

@@ -17,28 +17,13 @@ pub enum MemoryQuotaType {
 }
 
 fn alloc_page(vm: &mut Vm, _mem_addr: u64, _length: usize) -> Result<(), MemoryServiceError> {
-    let ptr = unsafe { alloc(Layout::from_size_align_unchecked(4096, 8)) };
+    let ptr = unsafe { alloc(Layout::from_size_align_unchecked(4096, 4096)) };
     info!("Block address: {:?}", ptr);
     vm.registers[1] = hbvm::value::Value(ptr as u64);
     vm.registers[2] = hbvm::value::Value(4096);
     Ok(())
 }
 
-#[inline(always)]
-unsafe fn memset(dest: *mut u8, src: *const u8, count: usize, size: usize) {
-    let total_size = count * size;
-    src.copy_to_nonoverlapping(dest, size);
-
-    let mut copied = size;
-
-    while copied < total_size {
-        let copy_size = copied.min(total_size - copied);
-        dest.add(copied).copy_from_nonoverlapping(dest, copy_size);
-        copied += copy_size;
-    }
-}
-
-#[inline(always)]
 pub fn memory_msg_handler(
     vm: &mut Vm,
     mem_addr: u64,
@@ -47,35 +32,40 @@ pub fn memory_msg_handler(
     let msg_vec = block_read(mem_addr, length);
     let msg_type = msg_vec[0];
     match msg_type {
-        0 => unsafe {
+        0 => {
             let page_count = msg_vec[1];
+            let mptr_raw: [u8; 8] = msg_vec[2..10].try_into().unwrap();
+            let mptr: u64 = u64::from_le_bytes(mptr_raw);
 
-            let ptr = alloc(Layout::from_size_align_unchecked(
+            log::debug!("Allocating {} pages @ {:x}", page_count, mptr);
-                page_count as usize * 4096,
-                8,
-            ));
 
-            log::debug!("Allocating {} pages @ {:x}", page_count, ptr as u64);
+            let ptr = unsafe {
+                alloc(Layout::from_size_align_unchecked(
+                    page_count as usize * 4096,
+                    4096,
+                ))
+            };
 
             vm.registers[1] = hbvm::value::Value(ptr as u64);
             log::debug!("Kernel ptr: {:x}", ptr as u64);
-        },
+        }
 
-        1 => unsafe {
+        1 => {
             let page_count = msg_vec[1];
 
             let mptr_raw: [u8; 8] = msg_vec[2..10].try_into().unwrap();
             let mptr: u64 = u64::from_le_bytes(mptr_raw);
             log::debug!("Deallocating {} pages @ {:x}", page_count, mptr);
-
+            unsafe {
-            dealloc(
+                dealloc(
-                mptr as *mut u8,
+                    mptr as *mut u8,
-                Layout::from_size_align_unchecked(page_count as usize * 4096, 8),
+                    Layout::from_size_align_unchecked(page_count as usize * 4096, 4096),
-            )
+                )
-        },
+            }
+        }
         2 => {
             use MemoryQuotaType::*;
-            let quota_type = match msg_vec[1] {
+            let quota_type = match msg_vec[0] {
                 0 => NoQuota,
                 1 => SoftQuota,
                 2 => HardQuota,
@@ -92,24 +82,10 @@ pub fn memory_msg_handler(
             )
         }
         3 => {
-            let page_count = msg_vec[1];
+            let page_count = msg_vec[0];
             log::debug!(" {} pages", page_count);
         }
-        4 => unsafe {
-            let count = u32::from_le_bytes(msg_vec[1..5].try_into().unwrap_unchecked()) as usize;
-            let src = u64::from_le_bytes(msg_vec[5..13].try_into().unwrap_unchecked()) as *const u8;
-            let dest = u64::from_le_bytes(msg_vec[13..21].try_into().unwrap_unchecked()) as *mut u8;
 
-            src.copy_to_nonoverlapping(dest, count);
-        },
-        5 => unsafe {
-            let count = u32::from_le_bytes(msg_vec[1..5].try_into().unwrap_unchecked()) as usize;
-            let size = u32::from_le_bytes(msg_vec[5..9].try_into().unwrap_unchecked()) as usize;
-            let src = u64::from_le_bytes(msg_vec[9..17].try_into().unwrap_unchecked()) as *const u8;
-            let dest = u64::from_le_bytes(msg_vec[17..25].try_into().unwrap_unchecked()) as *mut u8;
-
-            memset(dest, src, count, size);
-        },
         _ => {
             log::debug!("Unknown memory service message type: {}", msg_type);
         }

kernel/src/holeybytes/kernel_services/service_definition_service.rs

@@ -22,19 +22,21 @@ pub enum ServiceError {
 pub fn sds_msg_handler(vm: &mut Vm, mem_addr: u64, length: usize) -> Result<(), ServiceError> {
     let msg_vec = block_read(mem_addr, length);
     let sds_event_type: ServiceEventType = msg_vec[0].into();
-    let strptr = u64::from_le_bytes(msg_vec[1..9].try_into().unwrap());
+
-    let strlen = u64::from_le_bytes(msg_vec[9..17].try_into().unwrap()) as usize;
+    // info!("Length {}", msg_vec.len());
-    let string_vec = block_read(strptr, strlen);
-    let string = core::str::from_utf8(string_vec).expect("Our bytes should be valid utf8");
 
     use ServiceEventType::*;
     match sds_event_type {
         CreateService => {
+            let string =
+                core::str::from_utf8(&msg_vec[1..]).expect("Our bytes should be valid utf8");
             let ret = sds_create_service(string);
             vm.registers[1] = hbvm::value::Value(ret as u64);
         }
         DeleteService => todo!(),
         SearchServices => {
+            let string =
+                core::str::from_utf8(&msg_vec[1..]).expect("Our bytes should be valid utf8");
             let ret = sds_search_service(string);
             vm.registers[1] = hbvm::value::Value(ret as u64);
         }
@@ -92,7 +94,8 @@ fn sds_create_service(protocol: &'static str) -> u64 {
     // let a: protocol::Protocol = protocol.into();
     buff_id
 }
-pub fn sds_search_service(protocol: &str) -> u64 {
+
+fn sds_search_service(protocol: &str) -> u64 {
     let services = SERVICES.lock();
     let compare = Protocol::from(protocol);
     for (bid, protocol_canidate) in &services.0 {

kernel/src/holeybytes/mem.rs

@@ -30,29 +30,30 @@ impl Memory {
 }
 
 impl hbvm::mem::Memory for Memory {
-    #[inline(always)]
+    #[inline]
     unsafe fn load(
         &mut self,
         addr: Address,
         target: *mut u8,
         count: usize,
     ) -> Result<(), hbvm::mem::LoadError> {
-        core::ptr::copy_nonoverlapping(addr.get() as *const u8, target, count);
+        if addr.get() % 4096 == 0 {}
+        core::ptr::copy(addr.get() as *const u8, target, count);
         Ok(())
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn store(
         &mut self,
         addr: Address,
         source: *const u8,
         count: usize,
     ) -> Result<(), hbvm::mem::StoreError> {
-        core::ptr::copy_nonoverlapping(source, addr.get() as *mut u8, count);
+        core::ptr::copy(source, addr.get() as *mut u8, count);
         Ok(())
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn prog_read<T: Copy>(&mut self, addr: Address) -> T {
         (addr.get() as *const T).read()
     }

kernel/src/holeybytes/mod.rs

@@ -1,5 +1,5 @@
 mod ecah;
-pub mod kernel_services;
+mod kernel_services;
 mod mem;
 
 use {
@@ -97,7 +97,7 @@ impl HandlePageFault for PageFaultHandler {
 
 #[inline(always)]
 const fn stack_layout() -> Layout {
-    unsafe { Layout::from_size_align_unchecked(STACK_SIZE, 8) }
+    unsafe { Layout::from_size_align_unchecked(STACK_SIZE, 4096) }
 }
 
 #[inline(always)]

kernel/src/ipc/buffer.rs

@@ -49,7 +49,9 @@ impl<'a> IpcBuffer<'a> {
     pub fn push(&mut self, msg: Message) {
         match &self.buffer {
             BufferTypes::Unbound(buff) => buff.push(msg),
-            BufferTypes::Bound(buff) => buff.push(msg).unwrap(),
+            BufferTypes::Bound(buff) => {
+                let _ = buff.push(msg);
+            }
         };
     }
     pub fn pop(&mut self) -> Result<Message, IpcError> {

kernel/src/ipc/protocol.rs

@@ -1,15 +1,18 @@
-use {alloc::vec::Vec, hashbrown::HashMap};
+use {
+    alloc::{string::String, vec::Vec},
+    hashbrown::HashMap,
+};
 #[derive(Debug, PartialEq, Clone)]
 pub struct Type {}
 #[derive(Debug, PartialEq, Clone)]
-pub struct Funct<'a> {
+pub struct Funct {
-    takes: Vec<&'a str>,
+    takes: Vec<String>,
-    gives: Vec<&'a str>,
+    gives: Vec<String>,
 }
 #[derive(Debug, PartialEq, Clone)]
 pub struct Protocol<'a> {
     types: HashMap<&'a str, Type>,
-    fns:   HashMap<&'a str, Funct<'a>>,
+    fns:   HashMap<&'a str, Funct>,
 }
 impl<'a> Protocol<'a> {
     pub fn void() -> Self {

kernel/src/kmain.rs

@@ -8,28 +8,17 @@ use {
         device_tree::DeviceTree,
         holeybytes::ExecThread,
         ipc::buffer::IpcBuffer,
-        task::Executor,
     },
-    alloc::boxed::Box,
-    core::cell::LazyCell,
     hashbrown::HashMap,
     hbvm::mem::Address,
     limine::{Framebuffer, FramebufferRequest, NonNullPtr},
-    log::{debug, error, trace},
+    log::{debug, trace},
     spin::{Lazy, Mutex},
 };
 
 pub fn kmain(_cmdline: &str, boot_modules: BootModules) -> ! {
     debug!("Entered kmain");
 
-    #[cfg(feature = "ktest")] {
-        use crate::ktest;
-        debug!("TESTING");
-        ktest::test_main();
-
-        loop {};
-    }
-
     // let kcmd = build_cmd("Kernel Command Line", cmdline);
     // trace!("Cmdline: {kcmd:?}");
 
@@ -61,14 +50,15 @@ pub fn kmain(_cmdline: &str, boot_modules: BootModules) -> ! {
     let fb1: &NonNullPtr<Framebuffer> = &FB_REQ.get_response().get().unwrap().framebuffers()[0];
 
     {
+        use crate::alloc::string::ToString;
         let mut dt = DEVICE_TREE.lock();
         let mut disp = xml::XMLElement::new("display_0");
 
         disp.set_attribute("width", fb1.width);
         disp.set_attribute("height", fb1.height);
-        disp.set_attribute("bpp", fb1.bpp);
+        disp.set_attribute("bits per pixel", fb1.bpp);
         disp.set_attribute("pitch", fb1.pitch);
-        dt.devices.insert("Displays", alloc::vec![disp]);
+        dt.devices.insert("Displays".to_string(), alloc::vec![disp]);
     }
     debug!("Graphics initialised");
     debug!(
@@ -76,55 +66,23 @@ pub fn kmain(_cmdline: &str, boot_modules: BootModules) -> ! {
         fb1.address.as_ptr().unwrap() as *const u8
     );
 
+    let mut executor = crate::task::Executor::new(256);
     unsafe {
-        let executor = LazyCell::<Executor>::force_mut(&mut EXECUTOR);
         for module in boot_modules.iter() {
             let cmd = module.cmd.trim_matches('"');
             let cmd_len = cmd.len() as u64;
 
-            log::info!(
+            log::info!("Spawning {} with arguments \"{}\"", module.path, cmd);
-                "Starting {}",
-                module
-                    .path
-                    .split('/')
-                    .last()
-                    .unwrap()
-                    .split('.')
-                    .next()
-                    .unwrap()
-            );
-            log::debug!("Spawning {} with arguments \"{}\"", module.path, cmd);
 
-            // decode AbleOS Executable format
+            let mut thr = ExecThread::new(&module.bytes, Address::new(0));
-            let header = &module.bytes[0..46];
-            let magic_slice = &header[0..3];
-            if magic_slice != [0x15, 0x91, 0xD2] {
-                log::error!("Invalid magic number at the start of executable.");
-                continue;
-            }
-
-            let executable_format_version = u32::from_le_bytes(header[3..7].try_into().unwrap());
-            let offset = if executable_format_version == 0 {
-                47
-            } else {
-                error!("Invalid executable format.");
-                continue;
-            };
-
-            let code_length = u64::from_le_bytes(header[7..15].try_into().unwrap());
-            let data_length = u64::from_le_bytes(header[15..23].try_into().unwrap());
-            let end = (code_length + data_length) as usize;
-            log::debug!("{code_length} + {data_length} = {end}");
-
-            let mut thr = ExecThread::new(&module.bytes[offset..end], Address::new(0));
             if cmd_len > 0 {
                 thr.set_arguments(cmd.as_ptr() as u64, cmd_len);
             }
-            executor.spawn(Box::pin(async move {
+            executor.spawn(async move {
                 if let Err(e) = thr.await {
                     log::error!("{e:?}");
                 }
-            }));
+            })
         }
 
         debug!("Random number: {}", hardware_random_u64());
@@ -135,10 +93,6 @@ pub fn kmain(_cmdline: &str, boot_modules: BootModules) -> ! {
     crate::arch::spin_loop()
 }
 
-// ! SAFETY: this is not threadsafe at all, like even a little bit.
-// ! SERIOUSLY
-pub static mut EXECUTOR: LazyCell<Executor> = LazyCell::new(|| Executor::new());
-
 pub static DEVICE_TREE: Lazy<Mutex<DeviceTree>> = Lazy::new(|| {
     let dt = DeviceTree::new();
     Mutex::new(dt)
@@ -156,3 +110,10 @@ pub static IPC_BUFFERS: Lazy<Mutex<IpcBuffers>> = Lazy::new(|| {
 
     Mutex::new(bufs)
 });
+
+#[test_case]
+fn trivial_assertion() {
+    trace!("trivial assertion... ");
+    assert_eq!(1, 1);
+    info!("[ok]");
+}

kernel/src/ktest.rs

@@ -1,38 +0,0 @@
-pub use ktest_macro::ktest;
-use log::debug;
-
-extern "C" {
-    static __ktest_start: fn();
-    static __ktest_end: fn();
-}
-
-// 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)
-//       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();
-        let mut current = 1;
-        let test_end = &__ktest_end as *const fn();        
-
-        while current_test < test_end {
-            let test_fn = *current_test;
-
-            debug!("Running test {}", current);
-            
-            test_fn();
-            debug!("Test {} passed", current);
-
-            current_test = current_test.add(1);
-            current += 1;
-        }
-    }
-}
-
-#[ktest]
-pub fn trivial_assertion() {
-    assert_eq!(1, 1);
-}

kernel/src/lib.rs

@@ -2,19 +2,19 @@
 //! Named akern.
 //! Akern is woefully undersupported at the moment but we are looking to add support improve hardware discovery and make our lives as kernel and operating system developers easier and better
 #![no_std]
-#![no_main]
 #![feature(
-    slice_split_once,
     exclusive_wrapper,
-    core_intrinsics,
+    new_uninit,
     abi_x86_interrupt,
-    lazy_get,
     alloc_error_handler,
     ptr_sub_ptr,
+    custom_test_frameworks,
     naked_functions,
-    pointer_is_aligned_to,
+    pointer_is_aligned_to
 )]
-#![allow(dead_code, internal_features, static_mut_refs)]
+#![test_runner(crate::test_runner)]
+#![cfg_attr(not(debug_assertions), allow(unused, deprecated))]
+#![allow(dead_code)]
 extern crate alloc;
 
 mod allocator;
@@ -22,7 +22,6 @@ mod arch;
 mod bootmodules;
 mod capabilities;
 mod device_tree;
-mod exe_format;
 mod handle;
 mod holeybytes;
 mod ipc;
@@ -32,10 +31,6 @@ mod memory;
 mod task;
 mod utils;
 
-// #[cfg(feature = "tests")]
-mod ktest;
-
-use alloc::string::ToString;
 use versioning::Version;
 
 /// Kernel's version
@@ -59,7 +54,15 @@ fn panic(info: &core::panic::PanicInfo) -> ! {
         ));
     }
 
-    let msg = info.message().to_string().replace("\n", "\r\n");
+    let msg = info.message();
     let _ = crate::arch::log(format_args!("{msg}\r\n"));
     loop {}
 }
+
+#[cfg(test)]
+fn test_runner(tests: &[&dyn Fn()]) {
+    println!("Running {} tests", tests.len());
+    for test in tests {
+        test();
+    }
+}

kernel/src/logger.rs

@@ -36,26 +36,13 @@ impl log::Log for Logger {
             Level::Debug => "25",
             Level::Trace => "103",
         };
-        let module = record
+        let module = record.module_path().unwrap_or_default();
-            .module_path()
+        let line = record.line().unwrap_or_default();
-            .unwrap_or_default()
+        crate::arch::log(format_args!(
-            .rsplit_once(':')
+            "\x1b[38;5;{lvl_color}m{lvl}\x1b[0m [{module}:{line}]: {}\r\n",
-            .unwrap_or_default()
+            record.args(),
-            .1;
+        ))
-        if module == "" {
+        .expect("write to serial console");
-            crate::arch::log(format_args!(
-                "\x1b[38;5;{lvl_color}m{lvl}\x1b[0m: {}\r\n",
-                record.args(),
-            ))
-            .expect("write to serial console");
-        } else {
-            let line = record.line().unwrap_or_default();
-            crate::arch::log(format_args!(
-                "\x1b[38;5;{lvl_color}m{lvl}\x1b[0m [{module}:{line}]: {}\r\n",
-                record.args(),
-            ))
-            .expect("write to serial console");
-        }
     }
 
     fn flush(&self) {}

kernel/src/task.rs

@@ -29,24 +29,24 @@ pub fn yield_now() -> impl Future<Output = ()> {
     YieldNow(false)
 }
 
-pub struct Executor {
+pub struct Executor<F: Future<Output = ()> + Send> {
-    tasks:      Slab<Task>,
+    tasks:      Slab<Task<F>>,
     task_queue: Arc<TaskQueue>,
 }
 
-impl Executor {
+impl<F: Future<Output = ()> + Send> Executor<F> {
-    pub fn new() -> Self {
+    pub fn new(size: usize) -> Self {
         Self {
-            tasks:      Slab::new(),
+            tasks:      Slab::with_capacity(size),
             task_queue: Arc::new(TaskQueue::new()),
         }
     }
 
     #[inline]
-    pub fn spawn(&mut self, future: Pin<Box<dyn Future<Output = ()> + Send>>) -> usize {
+    pub fn spawn(&mut self, future: F) {
-        let id = self.tasks.insert(Task::new(future));
+        self.task_queue
-        self.task_queue.queue.push(id);
+            .queue
-        id
+            .push(self.tasks.insert(Task::new(future)));
     }
 
     pub fn run(&mut self) {
@@ -83,17 +83,17 @@ impl Executor {
     }
 }
 
-struct Task {
+struct Task<F: Future<Output = ()> + Send> {
-    future: Pin<Box<dyn Future<Output = ()> + Send>>,
+    future: Pin<Box<F>>,
     waker:  Option<TaskWaker>,
 }
 
-impl Task {
+impl<F: Future<Output = ()> + Send> Task<F> {
     #[inline(always)]
-    pub fn new(future: Pin<Box<dyn Future<Output = ()> + Send>>) -> Self {
+    pub fn new(future: F) -> Self {
         Self {
-            future,
+            future: Box::pin(future),
-            waker: None,
+            waker:  None,
         }
     }
 

kernel/src/utils.rs

@@ -4,14 +4,15 @@
 /// Used when tab `\t` in hardware is not known and we will default to two spaces
 pub const TAB: &str = "  ";
 
+
 // NOTE: this only reduces the code duplication in source code not in generated code!
 // Written by Yours Truly: Munir
 /// A simple macro to reduce code duplication when we use TAB internally
 #[macro_export]
 macro_rules! tab {
-    ($num:expr) => {
+    ($num:expr) => { 
         TAB.repeat($num)
-    };
+    }
 }
 
 // NOTE: this only reduces the code duplication in source code not in generated code!
@@ -21,7 +22,7 @@ macro_rules! tab {
 macro_rules! device_tree {
     ($devtree:expr, $dev_type_vec:expr) => {
         for each_device_type in $dev_type_vec {
-            $devtree.devices.insert(each_device_type, Vec::new());
+            $devtree.devices.insert(each_device_type.to_string(), Vec::new());
         }
     };
 }
@@ -49,4 +50,4 @@ macro_rules! cpu_features {
         $result_vec.push(("rdseed", rdseed));
         $result_vec.push(("x2apic", x2));
     };
-}
+}

kernel/targets/aarch64-virt-ableos.json

@@ -1,6 +1,6 @@
 {
     "arch": "aarch64",
-    "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32",
+    "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
     "disable-redzone": true,
     "env": "",
     "executables": true,

kernel/targets/x86_64-ableos.json

@@ -1,22 +1,22 @@
 {
-	"llvm-target": "x86_64-unknown-none",
+    "llvm-target": "x86_64-unknown-none",
-	"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
+    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
-	"arch": "x86_64",
+    "arch": "x86_64",
-	"target-endian": "little",
+    "target-endian": "little",
-	"target-pointer-width": "64",
+    "target-pointer-width": "64",
-	"target-c-int-width": "32",
+    "target-c-int-width": "32",
-	"os": "none",
+    "os": "none",
-	"executables": true,
+    "executables": true,
-	"linker-flavor": "ld.lld",
+    "linker-flavor": "ld.lld",
-	"linker": "rust-lld",
+    "linker": "rust-lld",
-	"panic-strategy": "abort",
+    "panic-strategy": "abort",
-	"disable-redzone": true,
+    "disable-redzone": true,
-	"features": "",
+    "features": "",
-	"code-model": "kernel",
+    "code-model": "kernel",
-	"pre-link-args": {
+    "pre-link-args": {
-		"ld.lld": [
+        "ld.lld": [
-			"--gc-sections",
+            "--gc-sections",
-			"--script=kernel/lds/x86_64.ld"
+            "--script=kernel/lds/x86_64.ld"
-		]
+        ]
-	}
+    }
 }

kernel/targets/x86_64_v3-ableos.json

@@ -1,22 +0,0 @@
-{
-	"llvm-target": "x86_64-unknown-none",
-	"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
-	"arch": "x86_64",
-	"target-endian": "little",
-	"target-pointer-width": "64",
-	"target-c-int-width": "32",
-	"os": "none",
-	"executables": true,
-	"linker-flavor": "ld.lld",
-	"linker": "rust-lld",
-	"panic-strategy": "abort",
-	"disable-redzone": true,
-	"features": "+sse4.1,+avx,+aes,+fma,+popcnt,+bmi2,+avx2,+lzcnt,+xsave",
-	"code-model": "kernel",
-	"pre-link-args": {
-		"ld.lld": [
-			"--gc-sections",
-			"--script=kernel/lds/x86_64.ld"
-		]
-	}
-}

known_bugs.md

@@ -1,2 +0,0 @@
-# i did not know where to put this
-- memcpy / memset cause crash on debug builds due to ptr misalignment that is not present on release builds

repbuild/Cargo.toml

@@ -6,15 +6,24 @@ edition = "2021"
 [dependencies]
 str-reader = "0.1"
 derive_more = { version = "1", default-features = false, features = [
-	"display",
+  "add",
+  "add_assign",
+  "constructor",
+  "display",
+  "from",
+  "into",
+  "mul",
+  "mul_assign",
+  "not",
+  "sum",
 ] }
 error-stack = "0.5"
-fatfs = { version = "0.3", default-features = false, features = [
+fatfs = "0.3"
-	"std",
-	"alloc",
-] }
 toml = "0.8"
+# hbasm.git = "https://git.ablecorp.us/AbleOS/holey-bytes.git"
 hblang.git = "https://git.ablecorp.us/AbleOS/holey-bytes.git"
-log = "0.4"
+
-raw-cpuid = "11"
+[dependencies.reqwest]
-ureq = { version = "2", default-features = false, features = ["tls"] }
+version = "0.12"
+default-features = false
+features = ["rustls-tls", "blocking"]

repbuild/src/dev.rs

@@ -1,6 +1,5 @@
 #![allow(unused)]
 use std::{
-    collections::HashMap,
     fmt::format,
     fs::{read_to_string, File},
     io::{BufWriter, Write},
@@ -14,7 +13,6 @@ pub struct Package {
     name:      String,
     binaries:  Vec<String>,
     build_cmd: String,
-    args:      HashMap<String, String>,
 }
 
 impl Package {
@@ -48,79 +46,57 @@ impl Package {
         let mut binaries = vec![];
 
         for (count, (name, table)) in bin_table.into_iter().enumerate() {
+            // if count != 0 {
+            println!("{}", name);
             binaries.push(name.clone());
+            // }
         }
         let build_table = data.get("build").unwrap();
 
         let mut build_cmd: String = build_table.get("command").unwrap().as_str().unwrap().into();
         build_cmd.remove(0);
-        let mut args: HashMap<String, String> = match build_table.get("args") {
+        // build_cmd.pop();
-            None => HashMap::new(),
-            Some(v) => v
-                .as_table()
-                .unwrap()
-                .into_iter()
-                .map(|(k, v)| (k.clone(), v.to_string()))
-                .collect::<HashMap<String, String>>(),
-        };
 
         Self {
             name,
             binaries,
             build_cmd,
-            args,
         }
     }
-    pub fn build(&self, out: &mut Vec<u8>) -> std::io::Result<()> {
+    pub fn build(&self) {
         if self.binaries.contains(&"hblang".to_string()) {
             let file = self.build_cmd.split_ascii_whitespace().last().unwrap();
+
             let path = format!("sysdata/programs/{}/{}", self.name, file);
+            let mut bytes = Vec::new();
             // compile here
 
-            let mut warnings = String::new();
+            let _ = hblang::run_compiler(
-
-            hblang::run_compiler(
                 &path,
                 Options {
                     fmt: true,
-                    in_house_regalloc: true,
                     ..Default::default()
                 },
-                out,
+                &mut bytes,
-                &mut warnings,
+            );
-            )?;
+            let _ = hblang::run_compiler(&path, Default::default(), &mut bytes);
 
             match std::fs::create_dir("target/programs") {
                 Ok(_) => (),
                 Err(e) if e.kind() == std::io::ErrorKind::AlreadyExists => (),
                 Err(e) => panic!("{}", e),
             }
-
+            std::fs::write(format!("target/programs/{}.hbf", self.name), &bytes).unwrap();
-            hblang::run_compiler(
+            bytes.clear();
-                &path,
+            let _ = hblang::run_compiler(
-                Options {
-                    in_house_regalloc: true,
-                    ..Default::default()
-                },
-                out,
-                &mut warnings,
-            )?;
-            std::fs::write(format!("target/programs/{}.hbf", self.name), &out)?;
-            out.clear();
-
-            hblang::run_compiler(
                 &path,
                 Options {
                     dump_asm: true,
-                    in_house_regalloc: true,
                     ..Default::default()
                 },
-                out,
+                &mut bytes,
-                &mut warnings,
+            );
-            )?;
+            std::fs::write(format!("target/programs/{}.hba", self.name), &bytes).unwrap();
-            std::fs::write(format!("target/programs/{}.hba", self.name), &out)?;
-            out.clear();
         }
-        Ok(())
     }
 }

repbuild/src/main.rs

@@ -1,16 +1,18 @@
+// #![allow(unused)]
+
 mod dev;
 
 use {
-    core::fmt::Write as _,
     derive_more::Display,
     dev::Package,
     error_stack::{bail, report, Context, Report, Result, ResultExt},
     fatfs::{FileSystem, FormatVolumeOptions, FsOptions, ReadWriteSeek},
     std::{
+        // fmt::Display,
         fs::{self, File},
         io::{self, Write},
         path::Path,
-        process::{exit, Command, Stdio},
+        process::{exit, Command},
     },
     toml::Value,
 };
@@ -19,15 +21,11 @@ fn main() -> Result<(), Error> {
     let mut args = std::env::args();
     args.next();
 
-    log::set_logger(&hblang::Logger).unwrap();
-    log::set_max_level(log::LevelFilter::Error);
-
     match args.next().as_deref() {
         Some("build" | "b") => {
             let mut release = false;
             let mut debuginfo = false;
             let mut target = Target::X86_64;
-            let mut tests = false;
             for arg in args {
                 if arg == "-r" || arg == "--release" {
                     release = true;
@@ -37,45 +35,17 @@ fn main() -> Result<(), Error> {
                     target = Target::Riscv64Virt;
                 } else if arg == "arm64" || arg == "aarch64" || arg == "aarch64-virt" {
                     target = Target::Aarch64;
-                } else if arg == "avx2" {
-                    target = Target::X86_64Avx2;
-                } else if arg == "--ktest" {
-                    tests = true;
                 } else {
                     return Err(report!(Error::InvalidSubCom));
                 }
             }
 
-            build(release, target, debuginfo, tests).change_context(Error::Build)
+            build(release, target, debuginfo).change_context(Error::Build)
         }
-        // Some("test" | "t") => {
-        //     let mut release = false;
-        //     let mut debuginfo = false;
-        //     let mut target = Target::X86_64;
-        //     for arg in args {
-        //         if arg == "-r" || arg == "--release" {
-        //             release = true;
-        //         } else if arg == "-d" || arg == "--debuginfo" {
-        //             debuginfo = true;
-        //         } else if arg == "rv64" || arg == "riscv64" || arg == "riscv64-virt" {
-        //             target = Target::Riscv64Virt;
-        //         } else if arg == "arm64" || arg == "aarch64" || arg == "aarch64-virt" {
-        //             target = Target::Aarch64;
-        //         } else if arg == "avx2" {
-        //             target = Target::X86_64Avx2;
-        //         } else {
-        //             return Err(report!(Error::InvalidSubCom));
-        //         }
-        //     }
-
-        //     test(release, target, debuginfo).change_context(Error::Build)
-        // }
         Some("run" | "r") => {
             let mut release = false;
             let mut debuginfo = false;
             let mut target = Target::X86_64;
-            let mut tests = false;
-            let mut do_accel = true;
             for arg in args {
                 if arg == "-r" || arg == "--release" {
                     release = true;
@@ -85,19 +55,13 @@ fn main() -> Result<(), Error> {
                     target = Target::Riscv64Virt;
                 } else if arg == "arm64" || arg == "aarch64" || arg == "aarch64-virt" {
                     target = Target::Aarch64;
-                } else if arg == "--noaccel" {
-                    do_accel = false;
-                } else if arg == "avx2" {
-                    target = Target::X86_64Avx2;
-                } else if arg == "--ktest" {
-                    tests = true; 
                 } else {
                     return Err(report!(Error::InvalidSubCom));
                 }
             }
 
-            build(release, target, debuginfo, tests)?;
+            build(release, target, debuginfo)?;
-            run(release, target, do_accel)
+            run(release, target)
         }
         Some("help" | "h") => {
             println!(concat!(
@@ -107,11 +71,8 @@ fn main() -> Result<(), Error> {
                 "   help (h): Print this message\n",
                 "    run (r): Build and run AbleOS in QEMU\n\n",
                 "Options for build and run:\n",
-                "        -r / --release: build in release mode\n",
+                "        -r: build in release mode",
-                "        -d / --debuginfo: build with debug info\n",
+                "  [target]: sets target"
-                "        --noaccel: run without acceleration (e.g, no kvm)\n",
-                "        --ktest: Enables tests via ktest\n",
-                "[ rv64 / riscv64 / riscv64-virt / aarch64 / arm64 / aarch64-virt / avx2 ]: sets target"
             ),);
             Ok(())
         }
@@ -234,43 +195,21 @@ TERM_BACKDROP={}
         let modules = value.get_mut("modules").unwrap().as_table_mut().unwrap();
         // let mut real_modules = modules.clone();
 
-        let mut errors = String::new();
+        modules.into_iter().for_each(|(_, value)| {
-        let mut out = Vec::new();
+            if value.is_table() {
-
+                let path = get_path_without_boot_prefix(
-        modules
+                    value.get("path").expect("You must have `path` as a value"),
-            .into_iter()
+                )
-            .map(|(_, value)| -> Result<(), io::Error> {
+                .unwrap()
-                if value.is_table() {
+                .split(".")
-                    let path = get_path_without_boot_prefix(
+                .next()
-                        value.get("path").expect("You must have `path` as a value"),
+                .unwrap();
-                    )
+                let p = Package::load_from_file(
-                    .unwrap()
+                    format!("sysdata/programs/{}/meta.toml", path).to_owned(),
-                    .split(".")
+                );
-                    .next()
+                p.build();
-                    .unwrap();
+            }
-                    let p = Package::load_from_file(
+        });
-                        format!("sysdata/programs/{}/meta.toml", path).to_owned(),
-                    );
-                    match p.build(&mut out) {
-                        Ok(()) => {}
-                        Err(_) => {
-                            writeln!(errors, "========= while compiling {} =========", path)
-                                .unwrap();
-                            errors.push_str(core::str::from_utf8(&out).expect("no"));
-                            out.clear();
-                        }
-                    }
-                }
-                Ok(())
-            })
-            .for_each(drop);
-
-        if !errors.is_empty() {
-            let _ = writeln!(errors, "!!! STOPPING DUE TO PREVIOUS ERRORS !!!");
-            std::eprint!("{errors}");
-            continue;
-        }
-
         modules.into_iter().for_each(|(_key, value)| {
             if value.is_table() {
                 let path = value.get("path").expect("You must have `path` as a value");
@@ -339,7 +278,7 @@ fn copy_file_to_img(fpath: &str, fs: &FileSystem<File>) {
     .expect("Copy failed");
 }
 
-fn build(release: bool, target: Target, debuginfo: bool, tests: bool) -> Result<(), Error> {
+fn build(release: bool, target: Target, debuginfo: bool) -> Result<(), Error> {
     let fs = get_fs().change_context(Error::Io)?;
     let mut com = Command::new("cargo");
     com.current_dir("kernel");
@@ -351,19 +290,12 @@ fn build(release: bool, target: Target, debuginfo: bool, tests: bool) -> Result<
         com.env("RUSTFLAGS", "-Cdebug-assertions=true");
     }
 
-    if tests {
-        com.args(["--features", "ktest"]);
-    }
-
     if target == Target::Riscv64Virt {
         com.args(["--target", "targets/riscv64-virt-ableos.json"]);
     }
     if target == Target::Aarch64 {
         com.args(["--target", "targets/aarch64-virt-ableos.json"]);
     }
-    if target == Target::X86_64Avx2 {
-        com.args(["--target", "targets/x86_64_v3-ableos.json"]);
-    }
 
     match com.status() {
         Ok(s) if s.code() != Some(0) => bail!(Error::Build),
@@ -377,10 +309,6 @@ fn build(release: bool, target: Target, debuginfo: bool, tests: bool) -> Result<
             path.push_str("_x86-64");
             "target/x86_64-ableos"
         }
-        Target::X86_64Avx2 => {
-            path.push_str("_x86-64");
-            "target/x86_64_v3-ableos"
-        }
         Target::Riscv64Virt => "target/riscv64-virt-ableos",
         Target::Aarch64 => {
             path.push_str("_aarch64");
@@ -403,68 +331,25 @@ fn build(release: bool, target: Target, debuginfo: bool, tests: bool) -> Result<
     .change_context(Error::Io)
 }
 
-fn run(release: bool, target: Target, do_accel: bool) -> Result<(), Error> {
+fn run(release: bool, target: Target) -> Result<(), Error> {
-    let target_str = match target {
+    let mut com = match target {
-        Target::X86_64 | Target::X86_64Avx2 => "qemu-system-x86_64",
+        Target::X86_64 => Command::new("qemu-system-x86_64"),
-        Target::Riscv64Virt => "qemu-system-riscv64",
+        Target::Riscv64Virt => Command::new("qemu-system-riscv64"),
-        Target::Aarch64 => "qemu-system-aarch64",
+        Target::Aarch64 => Command::new("qemu-system-aarch64"),
     };
-    let (mut com, mut com2) = (Command::new(target_str), Command::new(target_str));
     let ovmf_path = fetch_ovmf(target);
-    #[cfg(target_arch = "x86_64")]
-    let accel = if do_accel {
-        let supported = String::from_utf8(
-            com2.args(["--accel", "help"])
-                .stdout(Stdio::piped())
-                .stderr(Stdio::piped())
-                .spawn()
-                .unwrap()
-                .wait_with_output()
-                .unwrap()
-                .stdout,
-        )
-        .unwrap();
-
-        let cpuid = raw_cpuid::CpuId::new();
-        let vmx = cpuid.get_feature_info().unwrap().has_vmx();
-        let svm = cpuid.get_svm_info().is_some();
-
-        if supported.contains("kvm") && (vmx || svm) {
-            "accel=kvm"
-        } else if cpuid
-            .get_processor_brand_string()
-            .filter(|a| a.as_str() == "GenuineIntel")
-            .is_some()
-            && supported.contains("hax")
-            && vmx
-        {
-            "accel=hax"
-        } else if supported.contains("whpx") {
-            "accel=whpx"
-        } else {
-            "accel=tcg"
-        }
-    } else {
-        "accel=tcg"
-    };
-    #[cfg(not(target_arch = "x86_64"))]
-    let accel = "accel=tcg";
 
     match target {
-        Target::X86_64 | Target::X86_64Avx2 => {
+        Target::X86_64 => {
             #[rustfmt::skip]
             com.args([
                 "-bios", &ovmf_path.change_context(Error::OvmfFetch)?,
                 "-drive", "file=target/disk.img,format=raw",
-                "-device", "vmware-svga",
+                "-m", "4G",
-                // "-serial", "stdio",
+                "-smp", "cores=4",
-                "-m", "2G",
+                "-enable-kvm",
-                "-smp", "1",
+                "-cpu", "host",
-                "-parallel", "none",
+                "-device", "isa-debug-exit,iobase=0xf4,iosize=0x04"
-                "-monitor", "none",
-                "-machine", accel,
-                "-cpu", "max",
-                "-device", "isa-debug-exit,iobase=0xf4,iosize=0x04",
             ]);
         }
         Target::Riscv64Virt => {
@@ -506,10 +391,9 @@ fn run(release: bool, target: Target, do_accel: bool) -> Result<(), Error> {
     }
 }
 
-
 fn fetch_ovmf(target: Target) -> Result<String, OvmfFetchError> {
     let (ovmf_url, ovmf_path) = match target {
-        Target::X86_64 | Target::X86_64Avx2 => (
+        Target::X86_64 => (
             "https://retrage.github.io/edk2-nightly/bin/RELEASEX64_OVMF.fd",
             "target/RELEASEX64_OVMF.fd",
         ),
@@ -531,12 +415,12 @@ fn fetch_ovmf(target: Target) -> Result<String, OvmfFetchError> {
         Ok(_) => return Ok(ovmf_path.to_owned()),
         Err(e) => return Err(report!(e).change_context(OvmfFetchError::Io)),
     };
-    let req = ureq::get(ovmf_url)
+    let mut bytes = reqwest::blocking::get(ovmf_url)
-        .call()
         .map_err(Report::from)
         .change_context(OvmfFetchError::Fetch)?;
 
-    std::io::copy(&mut req.into_reader(), &mut file)
+    bytes
+        .copy_to(&mut file)
         .map_err(Report::from)
         .change_context(OvmfFetchError::Io)?;
 
@@ -558,7 +442,6 @@ impl Context for OvmfFetchError {}
 #[derive(Clone, Copy, PartialEq, Eq)]
 enum Target {
     X86_64,
-    X86_64Avx2,
     Riscv64Virt,
     Aarch64,
 }

rust-toolchain.toml

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

sysdata/assets/consolefonts/tamsyn/LICENSE

@@ -1,10 +0,0 @@
-Tamsyn font is free.  You are hereby granted permission to use, copy, modify,
-and distribute it as you see fit.
-
-Tamsyn font is provided "as is" without any express or implied warranty.
-
-The author makes no representations about the suitability of this font for
-a particular purpose.
-
-In no event will the author be held liable for damages arising from the use
-of this font.

sysdata/libraries/dt_api/README.md

@@ -0,0 +1 @@
+# dt_api

sysdata/libraries/dt_api/src/lib.hb

@@ -0,0 +1,8 @@
+stn := @use("rel:../../stn/src/lib.hb");
+.{string, memory, buffer} := stn
+
+dt_get := fn(query: ^u8): int {
+	message_length := string.length(query)
+
+	return @eca(int, 3, 5, query, message_length)
+}

sysdata/libraries/horizon_api/examples/horizontal.lui

@@ -1,4 +0,0 @@
-(horizontal
-    spacing : 10
-    (label "hi")
-    (label "goodbye"))

sysdata/libraries/horizon_api/examples/label.lui

@@ -1 +0,0 @@
-(label "hello")

sysdata/libraries/horizon_api/examples/vertical.lui

@@ -1,3 +0,0 @@
-(vertical
-    (label "hello")
-    (label "hello" color:red))

sysdata/libraries/horizon_api/src/lib.hb

@@ -1,49 +1,24 @@
-stn := @use("../../stn/src/lib.hb");
+stn := @use("rel:../../stn/src/lib.hb");
-.{string, memory, buffer, log} := stn
+.{string, memory, buffer} := stn
-
-render := @use("../../../libraries/render/src/lib.hb")
-
-input := @use("../../intouch/src/lib.hb")
-
-widgets := @use("widgets/widgets.hb")
-ui := @use("ui.hb")
 
 WindowID := struct {
 	host_id: int,
 	window_id: int,
 }
 
-VoidWindowID := WindowID.(0, 0)
+create_window := fn(channel: int): void {
-
-create_window := fn(channel: int): ^render.Surface {
 	// get the horizon buffer
 	// request a new window and provide the callback buffer
 	// wait to recieve a message
 
 	windowing_system_buffer := buffer.search("XHorizon\0")
-	mem_buf := memory.request_page(1)
 
 	if windowing_system_buffer == 0 {
-		return @as(^render.Surface, idk)
 	} else {
-		// ! bad able, stop using string messages :ragey:
+		msg := "\{01}\0"
-		// msg := "\{01}\0"
+		msg_length := 2
-		// msg_length := 2
+		@eca(void, 3, windowing_system_buffer, msg, msg_length)
-
-		// @as(void, @eca(3, windowing_system_buffer, msg, msg_length))
-
-		x := 0
-		loop if x > 1000 break else x += 1
-
-		ret := buffer.recv([u8; 4096], windowing_system_buffer, mem_buf)
-		if ret == null {
-			log.info("No messages\0")
-		}
-
-		if *mem_buf == 0 {
-			log.info("No messages\0")
-		}
-
-		return @as(^render.Surface, idk)
 	}
+
+	return
 }

sysdata/libraries/horizon_api/src/ui.hb

@@ -1,47 +0,0 @@
-stn := @use("../../../libraries/stn/src/lib.hb");
-.{string, log} := stn;
-.{Vec2} := stn.math
-
-render := @use("../../../libraries/render/src/lib.hb");
-.{Surface} := render;
-.{Font} := render.text
-
-UI := struct {raw: ^u8, raw_length: uint, is_dirty: bool, surface: Surface, // Each child has their WidgetType as their first byte
-// children: ^^u8,
-}
-
-render_ui := fn(surface: Surface, ui: UI): void {
-	if ui.is_dirty {
-		render.clear(ui.surface, render.black)
-		ui.is_dirty = false
-	}
-	pos := Vec2(uint).(0, 0)
-	render.put_surface(surface, ui.surface, pos, false)
-}
-
-sexpr_parser := fn(sexpr: ^u8): UI {
-	cursor := sexpr
-	paren_balance := 0
-	loop {
-		if *cursor == 0 {
-			if paren_balance != 0 {
-				log.error("Unbalanced Parens\0")
-			}
-			break
-		} else if *cursor == 40 {
-			log.info("Open paren\0")
-			paren_balance += 1
-		} else if *cursor == 41 {
-			log.info("Closed paren\0")
-			paren_balance -= 1
-		}
-
-		cursor += 1
-	}
-
-	length := string.length(sexpr)
-
-	ui_surface := render.new_surface(100, 100)
-
-	return UI.(sexpr, length, true, ui_surface)
-}

sysdata/libraries/horizon_api/src/widgets/image.hb

@@ -1,13 +0,0 @@
-render := @use("../../../../libraries/render/src/lib.hb");
-.{Surface} := render
-
-Image := struct {
-	magic: uint,
-	is_dirty: bool,
-	surface: Surface,
-}
-
-image_from_surface := fn(surface: Surface): Image {
-	img := Image.(4, true, surface)
-	return img
-}

sysdata/libraries/horizon_api/src/widgets/label.hb

@@ -1,46 +0,0 @@
-stn := @use("../../../../libraries/stn/src/lib.hb");
-.{string, log} := stn;
-.{Vec2} := stn.math
-
-render := @use("../../../../libraries/render/src/lib.hb");
-.{Surface, Color} := render;
-.{Font} := render.text
-
-Label := struct {
-	magic: uint,
-	is_dirty: bool,
-	surface: Surface,
-	text: ^u8,
-	text_length: uint,
-	bg: Color,
-	fg: Color,
-}
-
-set_label_text := fn(label: Label, text: ^u8): void {
-	text_length := string.length(text)
-
-	label.is_dirty = true
-	label.text = text
-	label.text_length = text_length
-}
-
-render_label_to_surface := fn(surface: Surface, label: Label, font: Font, pos: Vec2(uint)): void {
-	if label.is_dirty {
-		render.clear(label.surface, label.bg)
-		render.put_text(label.surface, font, .(0, 0), label.fg, label.text)
-	}
-	render.put_surface(surface, label.surface, pos, false)
-}
-
-new_label := fn(text: ^u8): Label {
-	text_surface := render.new_surface(1024, 20)
-	text_length := string.length(text)
-	label := Label.(3, true, text_surface, text, text_length, render.black, render.white)
-	return label
-}
-
-$set_color := fn(label: Label, bg: Color, fg: Color): void {
-	label.bg = bg
-	label.fg = fg
-	label.is_dirty = true
-}

sysdata/libraries/horizon_api/src/widgets/widget_types.hb

@@ -1,7 +0,0 @@
-NoWidget := 0
-
-VerticalWidgetType := 1
-HorizontalWidgetType := 2
-
-LabelWidgetType := 3
-ImageWidgetType := 4

sysdata/libraries/horizon_api/src/widgets/widgets.hb

@@ -1,36 +0,0 @@
-// Widget types
-
-// End types
-stn := @use("../../../../libraries/stn/src/lib.hb");
-.{string, log} := stn;
-.{Vec2} := stn.math
-
-render := @use("../../../../libraries/render/src/lib.hb");
-.{Surface} := render;
-.{Font} := render.text
-
-widget_types := @use("widget_types.hb")
-label := @use("label.hb")
-image := @use("image.hb")
-
-Size := struct {
-	min_width: int,
-	max_width: int,
-	min_height: int,
-	max_height: int,
-}
-
-Vertical := packed struct {
-	magic: uint,
-	// array of children, idk
-	// use a vec or linked list or whatever
-
-	children: ^^u8,
-}
-
-Horizontal := packed struct {
-	magic: uint,
-	// array of children, idk
-	// use a vec or linked list or whatever
-	children: ^^u8,
-}

sysdata/libraries/ignim/src/application.hb

@@ -1,5 +1,5 @@
-structures := @use("structures.hb")
+structures := @use("rel:structures.hb")
-version := @use("version.hb")
+version := @use("rel:version.hb")
 
 // Refer to here https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkApplicationInfo.html
 ApplicationInfo := struct {
@@ -7,7 +7,7 @@ ApplicationInfo := struct {
 	pNext: ^int,
 	application_name: ^u8,
 	application_version: int,
-	engine_name: ^u8,
+	engine_name: int,
 	engine_version: int,
 	api_version: int,
 }

sysdata/libraries/ignim/src/instance.hb

@@ -1,8 +1,8 @@
-application := @use("application.hb");
+application := @use("rel:application.hb");
 .{ApplicationInfo} := application
 
-structures := @use("structures.hb")
+structures := @use("rel:structures.hb")
-errors := @use("errors.hb")
+errors := @use("rel:errors.hb")
 
 // https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkInstanceCreateInfo.html
 InstanceCreateInfo := struct {

sysdata/libraries/ignim/src/lib.hb

@@ -1,16 +1,16 @@
-application := @use("application.hb")
+application := @use("rel:application.hb")
 
-results := @use("results.hb")
+results := @use("rel:results.hb")
-errors := @use("errors.hb")
+errors := @use("rel:errors.hb")
 
-offsets := @use("offset.hb")
+offsets := @use("rel:offset.hb")
-extends := @use("extends.hb")
+extends := @use("rel:extends.hb")
 
-rect := @use("rect.hb")
+rect := @use("rel:rect.hb")
-structures := @use("structures.hb")
+structures := @use("rel:structures.hb")
-instance := @use("instance.hb")
+instance := @use("rel:instance.hb")
 
-version := @use("version.hb")
+version := @use("rel:version.hb")
 
 init_vulkan := fn(): int {
 	return errors.IncompatibleDriver

sysdata/libraries/ignim/src/rect.hb

@@ -1,5 +1,5 @@
-offsets := @use("offset.hb")
+offsets := @use("rel:offset.hb")
-extends := @use("extends.hb")
+extends := @use("rel:extends.hb")
 
 Rect2D := struct {
 	offset: offsets.Offset2D,

sysdata/libraries/intouch/README.md

@@ -1,20 +0,0 @@
-# intouch
-This library is exclusively focused on allowing your to get input regardless of which devices you have.
-
-Partially modeled after SDL.
-
-Current goals include
-- Interfaces
-    - PS/2
-- Device Types
-    - Keyboard
-    - Mouse
-
-Longer Term goals 
-- Interfaces
-    - USB
-    - USB-HID
-- Device Types
-    - Gamepads/controllers
-    - Drawing Tablets
-    - Microphones

sysdata/libraries/intouch/key_maps/ps2.map

@@ -1,2 +0,0 @@
-0x0D -> press Tab
-0xF0 0x0D -> release Tab

sysdata/libraries/intouch/src/events.hb

@@ -1,18 +0,0 @@
-keycodes := @use("keycodes.hb");
-.{KeyCode} := keycodes
-
-KeyEvent := packed struct {
-	up: bool,
-	just_triggered: bool,
-	key: KeyCode,
-}
-
-MouseEvent := packed struct {
-	x_change: i8,
-	y_change: i8,
-	left: bool,
-	middle: bool,
-	right: bool,
-}
-
-GamepadEvent := struct {}

sysdata/libraries/intouch/src/keycodes.hb

@@ -1,121 +0,0 @@
-/*
-Originally I was modelling this after the following(1). I have since changed my mind.
-I am now modelling it as I see fit. This is likely not the final version.
-
-1) https://www.libsdl.org/release/SDL-1.2.15/include/SDL_keysym.h
-*/
-
-KeyCode := u32
-
-// Typically this is not a keycode you will ever recieve.
-None := KeyCode.(0)
-
-Escape := KeyCode.(1)
-/* Alphabet keycodes */
-
-A := KeyCode.(2)
-B := KeyCode.(3)
-C := KeyCode.(4)
-D := KeyCode.(5)
-E := KeyCode.(6)
-F := KeyCode.(7)
-G := KeyCode.(8)
-H := KeyCode.(9)
-I := KeyCode.(10)
-J := KeyCode.(11)
-K := KeyCode.(12)
-L := KeyCode.(13)
-M := KeyCode.(14)
-N := KeyCode.(15)
-O := KeyCode.(16)
-P := KeyCode.(17)
-Q := KeyCode.(18)
-R := KeyCode.(19)
-S := KeyCode.(20)
-T := KeyCode.(21)
-U := KeyCode.(22)
-V := KeyCode.(23)
-W := KeyCode.(24)
-X := KeyCode.(25)
-Y := KeyCode.(26)
-Z := KeyCode.(27)
-
-/* Numeric keycodes*/
-
-Number0 := KeyCode.(28)
-Number1 := KeyCode.(29)
-Number2 := KeyCode.(30)
-Number3 := KeyCode.(31)
-Number4 := KeyCode.(32)
-Number5 := KeyCode.(33)
-Number6 := KeyCode.(34)
-Number7 := KeyCode.(35)
-Number8 := KeyCode.(36)
-Number9 := KeyCode.(37)
-
-KeypadNumber0 := KeyCode.(38)
-KeypadNumber1 := KeyCode.(39)
-KeypadNumber2 := KeyCode.(40)
-KeypadNumber3 := KeyCode.(41)
-KeypadNumber4 := KeyCode.(42)
-KeypadNumber5 := KeyCode.(43)
-KeypadNumber6 := KeyCode.(44)
-KeypadNumber7 := KeyCode.(45)
-KeypadNumber8 := KeyCode.(46)
-KeypadNumber9 := KeyCode.(47)
-
-KeypadPeriod := KeyCode.(48)
-KeypadDivide := KeyCode.(49)
-KeypadMultiply := KeyCode.(50)
-KeypadMinus := KeyCode.(51)
-KeypadPlus := KeyCode.(52)
-KeypadEnter := KeyCode.(53)
-KeypadEquals := KeyCode.(54)
-
-Delete := KeyCode.(55)
-/* Locking Keys */
-NumLock := KeyCode.(56)
-CapsLock := KeyCode.(57)
-ScrollLock := KeyCode.(58)
-
-/* "Alt Gr" key */
-Mode := KeyCode.(59)
-
-/* Multi-key compose key */
-Compose := KeyCode.(60)
-
-LeftAlt := KeyCode.(61)
-LeftControl := KeyCode.(62)
-LeftMeta := KeyCode.(63)
-LeftShift := KeyCode.(64)
-/* Left "Windows" key */
-LeftSuper := KeyCode.(65)
-
-RightAlt := KeyCode.(66)
-RightControl := KeyCode.(67)
-RightMeta := KeyCode.(68)
-RightShift := KeyCode.(69)
-/* Right "Windows" key */
-RightSuper := KeyCode.(70)
-
-/*
-    This block of any triggers on any press of any of the keys.
-    Typically this is the event to care about.
-*/
-AnyNumber0 := KeyCode.(71)
-AnyNumber1 := KeyCode.(72)
-AnyNumber2 := KeyCode.(73)
-AnyNumber3 := KeyCode.(74)
-AnyNumber4 := KeyCode.(75)
-AnyNumber5 := KeyCode.(76)
-AnyNumber6 := KeyCode.(77)
-AnyNumber7 := KeyCode.(78)
-AnyNumber8 := KeyCode.(79)
-AnyNumber9 := KeyCode.(80)
-
-AnyAlt := KeyCode.(81)
-AnyControl := KeyCode.(82)
-AnyMeta := KeyCode.(83)
-AnyShift := KeyCode.(84)
-/* Any "Windows" key */
-AnySuper := KeyCode.(85)

sysdata/libraries/intouch/src/lib.hb

@@ -1,36 +0,0 @@
-stn := @use("../../stn/src/lib.hb");
-.{log, buffer, memory} := stn
-keycodes := @use("keycodes.hb")
-
-events := @use("events.hb");
-.{KeyEvent, MouseEvent} := events
-
-recieve_key_event := fn(): ?KeyEvent {
-	kevent := KeyEvent.(false, false, 0)
-
-	buf_id := buffer.search("PS/2 Keyboard\0")
-
-	// Read out of the Keyboard buffer here
-	buffer.recv(KeyEvent, buf_id, &kevent)
-
-	if kevent.just_triggered {
-		return kevent
-	}
-
-	return null
-}
-
-recieve_mouse_event := fn(): ?MouseEvent {
-	mevent := MouseEvent.(0, 0, false, false, false)
-
-	buf_id := buffer.search("PS/2 Mouse\0")
-
-	// Read out of the Mouse buffer here
-	buffer.recv(MouseEvent, buf_id, &mevent)
-
-	if mevent.x_change != 0 | mevent.y_change != 0 | mevent.left | mevent.middle | mevent.right {
-		return mevent
-	}
-
-	return null
-}

sysdata/libraries/pci/src/lib.hb

@@ -1,75 +1,11 @@
-.{string, memory, buffer, log} := @use("../../stn/src/lib.hb")
-
 PCIAddress := struct {
 	bus: u8,
 	device: u8,
 	function: u8,
 }
 
-PCI_ID := struct {
+find_device := fn(vendor_id: int, device_id: int, pci_address: PCIAddress): int {
-	vendor: u16,
+	return 1
-	device: u16,
-	inner: int,
-}
-
-get_ids := fn(bus: u8, device: u8, function: u8): PCI_ID {
-	res := config_read32(bus, device, function, 0)
-	dev_id := res >> 16
-	dev_id &= 0xFFFF
-
-	vnd_id := res & 0xFFFF
-	return PCI_ID.(dev_id, vnd_id, 0)
-}
-
-PciDeviceInfo := struct {
-	header_type: u8,
-	device: u8,
-	bus: u8,
-	device_id: PCI_ID,
-	class: u16,
-	rev_id: u8,
-}
-
-calculate_address := fn(bus: u8, device: u8, function: u8, offset: u8): int {
-	address := bus << 16
-	address |= device << 11
-	address |= function << 8
-	address |= offset & 0xFC
-	address |= 0x80000000
-	return address
-}
-
-get_header_type := fn(bus: u8, device: u8, function: u8): u8 {
-	res := config_read32(bus, device, function, 0xC)
-	ret := res >> 16
-	ret &= 0xFF
-
-	return ret
-}
-
-check_device := fn(bus: u8, device: u8): PciDeviceInfo {
-	pci_id := get_ids(bus, device, 0)
-
-	if pci_id.vendor == 0xFFFF {
-		log.warn(":|\0")
-	} else {
-		log.info(":)\0")
-	}
-	address := calculate_address(bus, device, 0, 0x8)
-	reg2 := config_read32(bus, device, 0, 0x8)
-
-	class := reg2 >> 16 & 0xFFFF
-
-	header_type := get_header_type(bus, device, 0)
-
-	rev_id := reg2 & 0xFF
-	return PciDeviceInfo.(header_type, device, bus, pci_id, class, rev_id)
-}
-
-find_device := fn(vendor_id: int, device_id: int, pci_address: PCIAddress): PCI_ID {
-	pci_id := get_ids(0, 2, 0)
-
-	return pci_id
 }
 
 scan_bus := fn(): void {
@@ -77,17 +13,16 @@ scan_bus := fn(): void {
 
 config_read32 := fn(bus: u32, device: u32, func: u32, offset: u32): u32 {
 	// construct address param
-	offset_and := offset & 0xFC
+	address := bus << 16 | device << 11 | func << 8
-
+	address |= offset
-	address := bus << 16
+	address &= 0xFC
-	address |= device << 11
-	address |= func << 8
-	address |= offset_and
 	address |= 0x80000000
 
 	// write address
-	memory.outl(0xCF8, address)
+	//Port::new(0xCF8).write(address);
 
 	// read data
-	return memory.inl(0xCFC)
+	//Port::new(0xCFC).read()
+
+	return
 }

sysdata/libraries/render/TODO.md

@@ -1,27 +0,0 @@
-# Images
-- Animation
-
-# API
-- Colour operations:
-    - Alpha Composite
-    - Invert
-- Surface Operations:
-    - FlipH
-    - Resize
-    - Wrap the colour operations
-    - Tile
-    - Gradient overlay
-- Draw operations:
-    - Curve raster algorithm
-    - VGA font fast blit
-    - Polygon
-    - Rounded rects
-
-# Backend
-- SVGA Driver
-- Support whatever vulkan stuff able is cooking
-
-# Bits and bobs on the table
-- Funny 3D Renderer
-- stn.memory.swap & kernel message
-- Make memory.{copy, set} smart

sysdata/libraries/render/src/image/bmp.hb

@@ -1,49 +0,0 @@
-.{Color, Surface, new_surface, put_surface} := @use("../lib.hb");
-.{log} := @use("../../../stn/src/lib.hb")
-
-BitmapFileHeader := packed struct {
-	magic: u16,
-	size: u32,
-	reserved_1: u16,
-	reserved_2: u16,
-	offset: u32,
-}
-
-BitmapInfoHeader := packed struct {
-	size: u32,
-	width: i32,
-	height: i32,
-	planes: u16,
-	bits: u16,
-	compression: u32,
-	image_size: u32,
-	x_resolution: i32,
-	y_resolution: i32,
-	n_colours: u32,
-	important_colours: u32,
-}
-
-BitmapColorHeader := packed struct {
-	red_mask: u32,
-	green_mask: u32,
-	blue_mask: u32,
-	alpha_mask: u32,
-	color_space_type: u32,
-	unused: u32,
-}
-
-from := fn(bmp: ^u8): ?Surface {
-	file_header := @as(^BitmapFileHeader, @bitcast(bmp))
-	info_header := @as(^BitmapInfoHeader, @bitcast(bmp + @sizeof(BitmapFileHeader)))
-
-	if file_header.magic != 0x4D42 | info_header.width == 0 | info_header.height == 0 {
-		log.error("Invalid BMP image.\0")
-		return null
-	}
-
-	lhs := Surface.(@bitcast(bmp + file_header.offset), info_header.width, info_header.height, info_header.width * info_header.height)
-	rhs := new_surface(info_header.width, info_header.height)
-	put_surface(rhs, lhs, .(0, 0), true)
-
-	return rhs
-}

sysdata/libraries/render/src/image/lib.hb

@@ -1,31 +0,0 @@
-.{log} := @use("../../../stn/src/lib.hb");
-.{Surface} := @use("../lib.hb")
-bmp := @use("bmp.hb")
-qoi := @use("qoi.hb")
-$BMP := 0x4D42
-$QOI := 0x66696F71
-
-get_format := fn(file: ^u8): ?uint {
-	if *@as(^u16, @bitcast(file)) == BMP {
-		return BMP
-	} else if *@as(^u32, @bitcast(file)) == QOI {
-		return QOI
-	} else {
-		return null
-	}
-}
-
-from := fn(file: ^u8): ?Surface {
-	format := get_format(file)
-
-	if format == null {
-		log.error("Could not detect image format.\0")
-		return null
-	} else if format == BMP {
-		return bmp.from(file)
-	} else if format == QOI {
-		return qoi.from(file)
-	}
-
-	return null
-}

sysdata/libraries/render/src/image/qoi.hb

@@ -1,101 +0,0 @@
-.{Color, Surface, new_surface} := @use("../lib.hb");
-.{log} := @use("../../../stn/src/lib.hb")
-
-/* source:
-   https://github.com/phoboslab/qoi/blob/master/qoi.h */
-
-$QOI_SRGB := 0
-$QOI_LINEAR := 1
-$QOI_OP_INDEX := 0x0
-$QOI_OP_DIFF := 0x40
-$QOI_OP_LUMA := 0x80
-$QOI_OP_RUN := 0xC0
-$QOI_OP_RGB := 0xFE
-$QOI_OP_RGBA := 0xFF
-$QOI_MASK_2 := 0xC0
-$QOI_COLOR_HASH := fn(c: Color): u8 {
-	return (c.r * 3 + c.g * 5 + c.b * 7 + c.a * 11) % 64
-}
-$QOI_MAGIC := 0x716F6966
-$QOI_PIXELS_MAX := 400000000
-
-QuiteOkayHeader := packed struct {
-	magic: u32,
-	width: u32,
-	height: u32,
-	channels: u8,
-	colorspace: u8,
-}
-
-be_to_le := fn(big: u32): u32 {
-	return big >> 24 | big >> 8 & 0xFF00 | big << 8 & 0xFF0000 | big << 24
-}
-
-from := fn(qoi: ^u8): ?Surface {
-	header := @as(^QuiteOkayHeader, @bitcast(qoi))
-
-	qoi += @sizeof(QuiteOkayHeader)
-
-	width := be_to_le(header.width)
-	height := be_to_le(header.height)
-
-	if be_to_le(header.magic) != QOI_MAGIC | width == 0 | height == 0 | header.channels < 3 | header.channels > 4 {
-		log.error("Invalid QOI image.\0")
-		return null
-	}
-
-	surface := new_surface(width, height)
-	index := @as([Color; 64], idk)
-
-	run := 0
-	px := Color.(0, 0, 0, 255)
-	px_pos := 0
-
-	total_pixels := width * height
-
-	loop if px_pos >= total_pixels break else {
-		if run > 0 {
-			run -= 1
-		} else {
-			b1 := *qoi
-			qoi += 1
-
-			if b1 == QOI_OP_RGB {
-				px.r = *qoi
-				px.g = *(qoi + 1)
-				px.b = *(qoi + 2)
-				qoi += 3
-			} else if b1 == QOI_OP_RGBA {
-				px.r = *qoi
-				px.g = *(qoi + 1)
-				px.b = *(qoi + 2)
-				px.a = *(qoi + 3)
-				qoi += 4
-			} else if (b1 & QOI_MASK_2) == QOI_OP_INDEX {
-				px = index[b1 & 0x3F]
-			} else if (b1 & QOI_MASK_2) == QOI_OP_DIFF {
-				px.r = px.r + (b1 >> 4 & 0x3) - 2 & 0xFF
-				px.g = px.g + (b1 >> 2 & 0x3) - 2 & 0xFF
-				px.b = px.b + (b1 & 0x3) - 2 & 0xFF
-			} else if (b1 & QOI_MASK_2) == QOI_OP_LUMA {
-				b2 := *qoi
-				vg := (b1 & 0x3F) - 32
-
-				px.r = px.r + vg - 8 + (b2 >> 4 & 0xF) & 0xFF
-				px.g = px.g + vg & 0xFF
-				px.b = px.b + vg - 8 + (b2 & 0xF) & 0xFF
-				qoi += 1
-			} else if (b1 & QOI_MASK_2) == QOI_OP_RUN {
-				run = b1 & 0x3F
-			}
-
-			index[QOI_COLOR_HASH(px)] = px
-		};
-
-		*(surface.buf + px_pos) = px
-
-		px_pos += 1
-	}
-
-	return surface
-}

sysdata/libraries/render/src/lib.hb

@@ -1,57 +1,47 @@
-software := @use("software.hb")
+svga := @use("rel:svga.hb")
-image := @use("image/lib.hb")
+software := @use("rel:software.hb")
-text := @use("text.hb")
 
 // default mode
 mode := software
 
 init := mode.init
 doublebuffer := mode.doublebuffer
-Surface := mode.Surface
-new_surface := mode.new_surface
-surface_from_ptr := mode.surface_from_ptr
-clone_surface := mode.clone_surface
-free_surface := mode.free_surface
-index := mode.index
-indexptr := mode.indexptr
 
 // Colours
-Color := packed struct {b: u8, g: u8, r: u8, a: u8}
+Color := mode.Color
-$white := Color.(255, 255, 255, 255)
+white := mode.white
-$black := Color.(0, 0, 0, 255)
+black := mode.black
-$gray := Color.(127, 127, 127, 255)
+gray := mode.gray
-$red := Color.(0, 0, 205, 255)
+red := mode.red
-$green := Color.(0, 205, 0, 255)
+green := mode.green
-$yellow := Color.(0, 205, 205, 255)
+yellow := mode.yellow
-$blue := Color.(205, 0, 0, 255)
+blue := mode.blue
-$magenta := Color.(205, 0, 205, 255)
+magenta := mode.magenta
-$cyan := Color.(205, 205, 0, 255)
+cyan := mode.cyan
-$light_gray := Color.(229, 229, 229, 255)
+light_gray := mode.light_gray
-$light_red := Color.(0, 0, 255, 255)
+light_red := mode.light_red
-$light_green := Color.(0, 255, 0, 255)
+light_green := mode.light_green
-$light_yellow := Color.(0, 255, 255, 255)
+light_yellow := mode.light_yellow
-$light_blue := Color.(255, 0, 0, 255)
+light_blue := mode.light_blue
-$light_magenta := Color.(255, 0, 255, 255)
+light_magenta := mode.light_magenta
-$light_cyan := Color.(255, 255, 0, 255)
+light_cyan := mode.light_cyan
 
 // Drawing
 put_pixel := mode.put_pixel
 put_rect := mode.put_rect
 put_filled_rect := mode.put_filled_rect
-put_trirect := mode.put_trirect
-put_circle := mode.put_circle
-put_filled_circle := mode.put_filled_circle
-put_textured_circle := mode.put_textured_circle
 put_line := mode.put_line
-put_vline := mode.put_vline
-put_hline := mode.put_hline
 clear := mode.clear
-put_surface := mode.put_surface
-put_text := mode.put_text
-// thanks peony for these three!
-//put_trirect := mode.put_trirect
-//put_vline := mode.put_vline
-//put_hline := mode.put_hline
 
 // Display
-sync := mode.sync
+width := mode.width
+height := mode.height
+dimensions := mode.dimensions
+set_height := mode.set_height
+set_width := mode.set_width
+set_dimensions := mode.set_dimensions
+sync := mode.sync
+
+// Math
+UVec2 := struct {x: uint, y: uint}
+IVec2 := struct {x: int, y: int}

sysdata/libraries/render/src/software.hb

@@ -1,116 +1,197 @@
-.{math, memory, dt} := @use("../../stn/src/lib.hb");
+.{math, memory} := @use("../../stn/src/lib.hb");
-.{Color, text} := @use("lib.hb");
+.{dt_get} := @use("../../dt_api/src/lib.hb");
-.{get_glyph, get_glyph_unicode, Font, UNC_TABLE_SIZE} := text;
+.{IVec2} := @use("rel:lib.hb")
-.{Vec2} := math
 
-// safety: don't use before init() or you will get a memory access violation
+Color := struct {b: u8, g: u8, r: u8, a: u8}
-framebuffer := memory.dangling(Color)
+white := Color.(255, 255, 255, 255)
+black := Color.(0, 0, 0, 255)
+gray := Color.(127, 127, 127, 255)
+red := Color.(0, 0, 205, 255)
+green := Color.(0, 205, 0, 255)
+yellow := Color.(0, 205, 205, 255)
+blue := Color.(205, 0, 0, 255)
+magenta := Color.(205, 0, 205, 255)
+cyan := Color.(205, 205, 0, 255)
+light_gray := Color.(229, 229, 229, 255)
+light_red := Color.(0, 0, 255, 255)
+light_green := Color.(0, 255, 0, 255)
+light_yellow := Color.(0, 255, 255, 255)
+light_blue := Color.(255, 0, 0, 255)
+light_magenta := Color.(255, 0, 255, 255)
+light_cyan := Color.(255, 255, 0, 255)
 
-Surface := struct {
+// might not work for some resolutions, but needs to be comptime because...
+copy_pixels := 0xC000 >> 2
+
+ctx := @as(Context, idk)
+
+// some of these are redudant holdovers from fb_driver
+// will keep them for future work if necessary
+Context := struct {
+	fb: ^Color,
+	bb: ^Color,
 	buf: ^Color,
-	width: uint,
+	width: int,
-	height: uint,
+	height: int,
-	size: uint,
+	partitions: int,
+	pixels: int,
+	bb_pages: int,
+	double_buffer: bool,
 }
 
-new_surface := fn(width: uint, height: uint): Surface {
+init := fn(): void {
-	return .(
+	width := dt_get("framebuffer/fb0/width\0")
-		memory.alloc(Color, width * height),
+	height := dt_get("framebuffer/fb0/height\0")
+	// width := 1024
+	// height := 768
+	pixels := width * height
+	bytes := pixels << 2
+	partitions := pixels / copy_pixels
+	pages := 1 + bytes >> 12
+	back_buffer := create_back_buffer(pages)
+	ctx = Context.{
+		fb: dt_get("framebuffer/fb0/ptr\0"),
+		bb: back_buffer,
+		buf: back_buffer,
 		width,
 		height,
-		width * height,
+		partitions,
-	)
+		pixels,
+		bb_pages: pages,
+		double_buffer: true,
+	}
+	return
 }
 
-clone_surface := fn(surface: ^Surface): Surface {
+doublebuffer := fn(enable: bool): void {
-	new := new_surface(surface.width, surface.height)
+	if enable {
-	memory.copy(Color, surface.buf, new.buf, @intcast(surface.size))
+		ctx.buf = ctx.bb
-	return new
-}
-
-init := fn(doublebuffer: bool): Surface {
-	framebuffer = dt.get(^Color, "framebuffer/fb0/ptr\0")
-	width := dt.get(uint, "framebuffer/fb0/width\0")
-	height := dt.get(uint, "framebuffer/fb0/height\0")
-	if doublebuffer {
-		return new_surface(width, height)
 	} else {
-		return .(framebuffer, width, height, width * height)
+		ctx.buf = ctx.fb
 	}
-}
+	ctx.double_buffer = enable
-
-$clear := fn(surface: Surface, color: Color): void {
-	memory.set(Color, &color, surface.buf, surface.width * surface.height)
-}
-
-$sync := fn(surface: Surface): void {
-	memory.copy(Color, surface.buf, framebuffer, @bitcast(surface.width * surface.height))
-}
-
-$index := fn(surface: Surface, x: uint, y: uint): uint {
-	return x + surface.width * y
-}
-
-$indexptr := fn(surface: Surface, x: uint, y: uint): ^Color {
-	return surface.buf + index(surface, x, y)
-}
-
-$put_pixel := fn(surface: Surface, pos: Vec2(uint), color: Color): void {
-	return *indexptr(surface, pos.x, pos.y) = color
-}
-
-put_filled_rect := fn(surface: Surface, pos: Vec2(uint), tr: Vec2(uint), color: Color): void {
-	top_start_idx := indexptr(surface, pos.x, pos.y)
-	bottom_start_idx := indexptr(surface, pos.x, pos.y + tr.y - 1)
-	rows_to_fill := tr.y
-
-	loop if rows_to_fill <= 1 break else {
-		memory.set(Color, &color, top_start_idx, tr.x)
-		memory.set(Color, &color, bottom_start_idx, tr.x)
-
-		top_start_idx += surface.width
-		bottom_start_idx -= surface.width
-		rows_to_fill -= 2
-	}
-
-	if rows_to_fill == 1 {
-		memory.set(Color, &color, top_start_idx, tr.x)
-	}
-
 	return
 }
 
-put_rect := fn(surface: Surface, pos: Vec2(uint), tr: Vec2(uint), color: Color): void {
+create_back_buffer := fn(pages: int): ^Color {
-	start_idx := indexptr(surface, pos.x, pos.y)
+	if pages <= 0xFF {
-	end_idx := indexptr(surface, pos.x, pos.y + tr.y)
+		return @bitcast(@inline(memory.request_page, pages))
-	right_start_idx := indexptr(surface, pos.x + tr.x, pos.y)
-
-	loop if start_idx > end_idx break else {
-		*start_idx = color;
-		*right_start_idx = color
-		start_idx += surface.width
-		right_start_idx += surface.width
 	}
+	ptr := @inline(memory.request_page, 255)
+	remaining := pages - 0xFF
+	loop if remaining <= 0 break else {
+		if remaining < 0xFF {
+			memory.request_page(remaining)
+		} else {
+			memory.request_page(0xFF)
+		}
+		remaining -= 0xFF
+	}
+	return @bitcast(ptr)
+}
 
-	memory.set(Color, &color, indexptr(surface, pos.x, pos.y), @bitcast(tr.x + 1))
+clear := fn(color: Color): void {
-	memory.set(Color, &color, indexptr(surface, pos.x, pos.y + tr.y), @bitcast(tr.x + 1))
+	cursor := ctx.buf
-
+	boundary := cursor + 512
+	loop if cursor == boundary break else {
+		*cursor = color
+		cursor += 1
+	}
+	boundary += 512 * 7
+	loop if cursor == boundary break else {
+		*@as(^[Color; 512], @bitcast(cursor)) = *@as(^[Color; 512], @bitcast(ctx.buf))
+		cursor += 512
+	}
+	boundary += copy_pixels - 4096
+	loop if cursor == boundary break else {
+		*@as(^[Color; 4096], @bitcast(cursor)) = *@as(^[Color; 4096], @bitcast(ctx.buf))
+		cursor += 4096
+	}
+	boundary += (ctx.partitions - 1) * copy_pixels
+	loop if cursor == boundary break else {
+		*@as(^[Color; copy_pixels], @bitcast(cursor)) = *@as(^[Color; copy_pixels], @bitcast(ctx.buf))
+		cursor += @sizeof([u8; copy_pixels])
+	}
 	return
 }
 
-put_line_low := fn(surface: Surface, p0: Vec2(uint), p1: Vec2(uint), color: Color): void {
+sync := fn(): void {
-	dx := @as(int, @bitcast(p1.x - p0.x))
+	if ctx.double_buffer {
-	dy := @as(int, @bitcast(p1.y - p0.y))
+		bb := ctx.buf
+		fb := ctx.fb
+		boundary := bb + ctx.pixels
+		loop if bb == boundary break else {
+			*@as(^[Color; copy_pixels], @bitcast(fb)) = *@as(^[Color; copy_pixels], @bitcast(bb))
+			bb += copy_pixels
+			fb += copy_pixels
+		}
+	}
+	return
+}
+
+width := fn(): int {
+	return ctx.width
+}
+
+height := fn(): int {
+	return ctx.height
+}
+
+screenidx := fn(x: int, y: int): int {
+	return x + ctx.width * y
+}
+
+put_pixel := fn(pos: IVec2, color: Color): void {
+	*(ctx.buf + @inline(screenidx, pos.x, pos.y)) = color
+	return
+}
+
+put_filled_rect := fn(pos: IVec2, tr: IVec2, color: Color): void {
+	x := pos.x
+	y := pos.y
+	end := pos + tr
+	loop if x == end.x break else {
+		loop if y == end.y break else {
+			*(ctx.buf + @inline(screenidx, x, y)) = color
+			y += 1
+		}
+		x += 1
+		y = pos.y
+	}
+	return
+}
+
+put_rect := fn(pos: IVec2, tr: IVec2, color: Color): void {
+	x := pos.x
+	y := pos.y
+	end := pos + tr
+	loop if y == end.y break else {
+		*(ctx.buf + @inline(screenidx, x, y)) = color;
+		*(ctx.buf + @inline(screenidx, x + tr.x, y)) = color
+		y += 1
+	}
+	y = pos.y
+	loop if x == end.x break else {
+		*(ctx.buf + @inline(screenidx, x, y)) = color;
+		*(ctx.buf + @inline(screenidx, x, y + tr.y)) = color
+		x += 1
+	}
+	return
+}
+
+put_line_low := fn(p0: IVec2, p1: IVec2, color: Color): void {
+	dx := p1.x - p0.x
+	dy := p1.y - p0.y
 	yi := 1
 	if dy < 0 {
 		yi = -1
 		dy = -dy
 	}
-	D := @as(int, 2) * dy - dx
+	D := 2 * dy - dx
 	y := p0.y
 	x := p0.x
 	loop if x == p1.x break else {
-		*indexptr(surface, x, y) = color
+		*(ctx.buf + @inline(screenidx, x, y)) = color
 		if D > 0 {
 			y += yi
 			D += 2 * (dy - dx)
@@ -122,19 +203,19 @@ put_line_low := fn(surface: Surface, p0: Vec2(uint), p1: Vec2(uint), color: Colo
 	return
 }
 
-put_line_high := fn(surface: Surface, p0: Vec2(uint), p1: Vec2(uint), color: Color): void {
+put_line_high := fn(p0: IVec2, p1: IVec2, color: Color): void {
-	dx := @as(int, @bitcast(p1.x - p0.x))
+	dx := p1.x - p0.x
-	dy := @as(int, @bitcast(p1.y - p0.y))
+	dy := p1.y - p0.y
 	xi := 1
 	if dy < 0 {
 		xi = -1
 		dx = -dx
 	}
-	D := @as(int, 2) * dx - dy
+	D := 2 * dx - dy
 	x := p0.x
 	y := p0.y
 	loop if y == p1.y break else {
-		*indexptr(surface, x, y) = color
+		*(ctx.buf + @inline(screenidx, x, y)) = color
 		if D > 0 {
 			x += xi
 			D += 2 * (dx - dy)
@@ -146,327 +227,35 @@ put_line_high := fn(surface: Surface, p0: Vec2(uint), p1: Vec2(uint), color: Col
 	return
 }
 
-put_line := fn(surface: Surface, p0: Vec2(uint), p1: Vec2(uint), color: Color): void {
+put_line := fn(p0: IVec2, p1: IVec2, color: Color): void {
-	if math.abs(uint, p1.y - p0.y) < math.abs(uint, p1.x - p0.x) {
+	if @inline(math.abs, p1.y - p0.y) < @inline(math.abs, p1.x - p0.x) {
 		if p0.x > p1.x {
-			@inline(put_line_low, surface, p1, p0, color)
+			@inline(put_line_low, p1, p0, color)
 		} else {
-			@inline(put_line_low, surface, p0, p1, color)
+			@inline(put_line_low, p0, p1, color)
 		}
 	} else {
 		if p0.y > p1.y {
-			@inline(put_line_high, surface, p1, p0, color)
+			@inline(put_line_high, p1, p0, color)
 		} else {
-			@inline(put_line_high, surface, p0, p1, color)
+			@inline(put_line_high, p0, p1, color)
 		}
 	}
 	return
 }
 
-put_surface := fn(surface: Surface, top: Surface, pos: Vec2(uint), flip_v: bool): void {
+set_height := fn(new: int): void {
-	src_top_cursor := top.buf
-	src_bottom_cursor := top.buf + top.width * (top.height - 1)
-
-	dst_top_idx := indexptr(surface, pos.x, pos.y)
-	dst_bottom_idx := indexptr(surface, pos.x, pos.y + top.height - 1)
-
-	dst_increment := surface.width
-
-	if flip_v {
-		dst_increment = -dst_increment
-		tmp := dst_top_idx
-		dst_top_idx = dst_bottom_idx
-		dst_bottom_idx = tmp
-	}
-
-	rows_to_copy := top.height
-
-	loop if rows_to_copy <= 1 break else {
-		memory.copy(Color, src_top_cursor, dst_top_idx, top.width)
-		memory.copy(Color, src_bottom_cursor, dst_bottom_idx, top.width)
-
-		dst_top_idx += dst_increment
-		dst_bottom_idx -= dst_increment
-		src_top_cursor += top.width
-		src_bottom_cursor -= top.width
-		rows_to_copy -= 2
-	}
-
-	if rows_to_copy == 1 {
-		memory.copy(Color, src_top_cursor, dst_top_idx, top.width)
-	}
-
 	return
 }
 
-// peony-made
+set_width := fn(new: int): void {
-put_trirect := fn(surface: Surface, pos: Vec2(uint), size: Vec2(int), color0: Color, color1: Color): void {
-	step := Vec2(int).(1, 1)
-	if size.x < 0 {
-		step.x = -1
-	}
-	if size.y < 0 {
-		step.y /= @bitcast(size.x)
-	}
-
-	start_y := pos.y
-	target := pos + @bitcast(size)
-
-	loop if pos.x == target.x break else {
-		@inline(put_vline, surface, pos.x, pos.y, target.y, color0)
-		@inline(put_vline, surface, pos.x, pos.y, start_y, color1)
-		pos += @bitcast(step)
-	}
-
 	return
 }
 
-// peony-made
+dimensions := fn(): IVec2 {
-put_vline := fn(surface: Surface, x: uint, y0: uint, y1: uint, color: Color): void {
+	return .(ctx.width, ctx.height)
-	if y1 < y0 {
-		tmp := y0
-		y0 = y1
-		y1 = tmp
-	}
-	y := y0
-
-	loop if y == y1 break else {
-		*indexptr(surface, x, y) = color
-		y += 1
-	}
-
-	return
 }
 
-// peony-made
+set_dimensions := fn(new: IVec2): void {
-put_hline := fn(surface: Surface, y: uint, x0: uint, x1: uint, color: Color): void {
-	if x1 < x0 {
-		tmp := x0
-		x0 = x1
-		x1 = tmp
-	}
-	// x0 = math.min(x0, x1)
-	memory.set(Color, &color, indexptr(surface, x0, y), @bitcast(x1 - x0 - 1))
-
-	return
-}
-
-put_circle := fn(surface: Surface, pos: Vec2(uint), radius: uint, color: Color): void {
-	x := 0
-	y := radius
-	error := @as(int, 3) - @intcast(2 * radius);
-	*indexptr(surface, pos.x + radius, pos.y) = color;
-	*indexptr(surface, pos.x - radius, pos.y) = color;
-	*indexptr(surface, pos.x, pos.y + radius) = color;
-	*indexptr(surface, pos.x, pos.y - radius) = color
-
-	loop if y < x break else {
-		x += 1
-
-		if error > 0 {
-			y -= 1
-			error += 4 * (@intcast(x) - @intcast(y)) + 10
-		} else {
-			error += 4 * @intcast(x) + 6
-		};
-		*indexptr(surface, pos.x + x, pos.y + y) = color;
-		*indexptr(surface, pos.x + y, pos.y + x) = color;
-		*indexptr(surface, pos.x - x, pos.y + y) = color;
-		*indexptr(surface, pos.x - y, pos.y + x) = color;
-		*indexptr(surface, pos.x + x, pos.y - y) = color;
-		*indexptr(surface, pos.x + y, pos.y - x) = color;
-		*indexptr(surface, pos.x - x, pos.y - y) = color;
-		*indexptr(surface, pos.x - y, pos.y - x) = color
-	}
-
-	return
-}
-
-put_filled_circle := fn(surface: Surface, pos: Vec2(uint), radius: uint, color: Color): void {
-	x := 0
-	y := radius
-	error := @as(int, 3) - @intcast(2 * radius)
-	put_hline(surface, pos.y - x, pos.x - radius, pos.x + radius, color);
-	*indexptr(surface, pos.x, pos.y + radius) = color;
-	*indexptr(surface, pos.x, pos.y - radius) = color
-
-	loop if y < x break else {
-		x += 1
-
-		if error > 0 {
-			put_hline(surface, pos.y + y, pos.x - x, pos.x + x, color)
-			put_hline(surface, pos.y - y, pos.x - x, pos.x + x, color)
-			y -= 1
-			error += 4 * (@intcast(x) - @intcast(y)) + 10
-		} else {
-			error += 4 * @intcast(x) + 6
-		}
-		put_hline(surface, pos.y + x, pos.x - y, pos.x + y, color)
-		put_hline(surface, pos.y - x, pos.x - y, pos.x + y, color)
-	}
-
-	return
-}
-
-put_textured_circle := fn(surface: Surface, source: Surface, source_pos: Vec2(uint), pos: Vec2(uint), radius: uint): void {
-	x := 0
-	y := radius
-	error := @as(int, 3) - @intcast(2 * radius)
-	memory.copy(Color, indexptr(source, source_pos.x - y, source_pos.y), indexptr(surface, pos.x - y, pos.y), 2 * y);
-	*indexptr(surface, pos.x, pos.y + y) = *indexptr(source, source_pos.x, source_pos.y + y);
-	*indexptr(surface, pos.x, pos.y - y) = *indexptr(source, source_pos.x, source_pos.y - y)
-
-	loop if y < x break else {
-		x += 1
-
-		if error > 0 {
-			memory.copy(Color, indexptr(source, source_pos.x - x, source_pos.y + y), indexptr(surface, pos.x - x, pos.y + y), 2 * x)
-			memory.copy(Color, indexptr(source, source_pos.x - x, source_pos.y - y), indexptr(surface, pos.x - x, pos.y - y), 2 * x)
-			y -= 1
-			error += 4 * (@intcast(x) - @intcast(y)) + 10
-		} else {
-			error += 4 * @intcast(x) + 6
-		}
-		memory.copy(Color, indexptr(source, source_pos.x - y, source_pos.y + x), indexptr(surface, pos.x - y, pos.y + x), 2 * y)
-		memory.copy(Color, indexptr(source, source_pos.x - y, source_pos.y - x), indexptr(surface, pos.x - y, pos.y - x), 2 * y)
-	}
-
-	return
-}
-
-utf8_len_table := [u8].(0, 0, 2, 3)
-
-put_text := fn(surface: Surface, font: Font, pos: Vec2(uint), color: Color, str: ^u8): void {
-	cursor := Vec2(uint).(pos.x, pos.y)
-
-	max_y := surface.height - font.height
-	next_line_y := font.height + font.line_gap
-	char_advance := font.width + font.char_gap
-	surface_width := surface.width
-
-	loop if *str == 0 break else {
-		if cursor.y > max_y break
-
-		glyph_data := @as(^u8, idk)
-		code_point := @as(uint, 0)
-
-		if (*str & 0x80) == 0 {
-			if *str == 10 {
-				cursor.x = pos.x
-				cursor.y += next_line_y
-				str += 1
-				continue
-			}
-
-			if font.unicode == null {
-				if *str > font.num_glyphs {
-					str += 1
-					continue
-				}
-				glyph_data = get_glyph(font, *str)
-			} else {
-				if *str < UNC_TABLE_SIZE {
-					glyph_index := *(font.unicode + *str)
-					if glyph_index == 0xFFFF {
-						str += 1
-						continue
-					}
-					glyph_data = font.data + glyph_index * font.bytes_per_glyph
-				} else {
-					str += 1
-					continue
-				}
-			}
-			str += 1
-		} else if font.unicode != null {
-			first_byte := *str
-			num_bytes := @as(uint, 0)
-
-			num_bytes = utf8_len_table[first_byte >> 5 & 0x3]
-
-			if num_bytes == 0 {
-				str += 1
-				continue
-			}
-
-			code_point = first_byte & (0x7F >> num_bytes | 0x1F)
-
-			valid_sequence := true
-			bytes_processed := 1
-
-			loop if bytes_processed >= num_bytes break else {
-				str += 1
-				if *str == 0 | (*str & 0xC0) != 0x80 {
-					valid_sequence = false
-				}
-				if valid_sequence == false {
-					break
-				}
-				code_point = code_point << 6 | *str & 0x3F
-				bytes_processed += 1
-			}
-
-			if valid_sequence == false {
-				str += 1
-				continue
-			}
-
-			str += 1
-
-			if code_point == 10 {
-				cursor.x = pos.x
-				cursor.y += next_line_y
-				continue
-			}
-
-			if code_point >= UNC_TABLE_SIZE {
-				continue
-			}
-
-			glyph_index := *(font.unicode + code_point)
-			if glyph_index == 0xFFFF {
-				continue
-			}
-			glyph_data = font.data + glyph_index * font.bytes_per_glyph
-		}
-
-		if cursor.x + font.width >= surface_width {
-			cursor.x = pos.x
-			cursor.y += next_line_y
-		}
-
-		dest := indexptr(surface, cursor.x, cursor.y)
-		rows := font.height
-
-		loop if rows == 0 break else {
-			byte := *glyph_data
-			pixel_dest := dest
-			mask := @as(u8, 0x80)
-			bits := font.width
-
-			loop if bits == 0 break else {
-				if (byte & mask) != 0 {
-					*pixel_dest = color
-				}
-				pixel_dest += 1
-				mask >>= 1
-				if mask == 0 & bits > 0 {
-					glyph_data += 1
-					byte = *glyph_data
-					mask = 0x80
-				}
-				bits -= 1
-			}
-
-			if mask != 0x80 {
-				glyph_data += 1
-			}
-			dest += surface_width
-			rows -= 1
-		}
-
-		cursor.x += char_advance
-	}
-
 	return
 }

sysdata/libraries/render/src/svga.hb

@@ -0,0 +1,80 @@
+.{IVec2} := @use("rel:lib.hb")
+// .{pci, memory, string, log} := @use("../../stn/src/lib.hb");
+
+Color := struct {b: u8, g: u8, r: u8, a: u8}
+white := Color.(255, 255, 255, 255)
+black := Color.(0, 0, 0, 255)
+gray := Color.(127, 127, 127, 255)
+red := Color.(0, 0, 205, 255)
+green := Color.(0, 205, 0, 255)
+yellow := Color.(0, 205, 205, 255)
+blue := Color.(205, 0, 0, 255)
+magenta := Color.(205, 0, 205, 255)
+cyan := Color.(205, 205, 0, 255)
+light_gray := Color.(229, 229, 229, 255)
+light_red := Color.(0, 0, 255, 255)
+light_green := Color.(0, 255, 0, 255)
+light_yellow := Color.(0, 255, 255, 255)
+light_blue := Color.(255, 0, 0, 255)
+light_magenta := Color.(255, 0, 255, 255)
+light_cyan := Color.(255, 255, 0, 255)
+
+clear := fn(color: Color): void {
+	return
+}
+
+width := fn(): int {
+	return 0
+}
+
+height := fn(): int {
+	return 0
+}
+
+dimensions := fn(): IVec2 {
+	return .(0, 0)
+}
+
+put_pixel := fn(position: IVec2, color: Color): void {
+	return
+}
+
+put_filled_rect := fn(pos: IVec2, tr: IVec2, color: Color): void {
+	return
+}
+
+put_rect := fn(pos: IVec2, tr: IVec2, color: Color): void {
+	return
+}
+
+put_line_low := fn(p0: IVec2, p1: IVec2, color: Color): void {
+	return
+}
+// do not use, use line() instead
+put_line_high := fn(p0: IVec2, p1: IVec2, color: Color): void {
+	return
+}
+
+put_line := fn(p0: IVec2, p1: IVec2, color: Color): void {
+	return
+}
+
+set_height := fn(new: int): void {
+	return
+}
+
+set_width := fn(new: int): void {
+	return
+}
+
+set_dimensions := fn(new: IVec2): void {
+	return
+}
+
+sync := fn(): void {
+	return
+}
+
+init := fn(): void {
+	return
+}

sysdata/libraries/render/src/text.hb

@@ -1,160 +0,0 @@
-.{log, memory} := @use("../../stn/src/lib.hb")
-
-PSF1Header := packed struct {
-	magic: u16,
-	font_mode: u8,
-	character_size: u8,
-}
-
-PSF2Header := packed struct {
-	magic: u32,
-	version: u32,
-	header_size: u32,
-	flags: u32,
-	num_glyph: u32,
-	bytes_per_glyph: u32,
-	height: u32,
-	width: u32,
-}
-
-Font := struct {
-	data: ^u8,
-	width: uint,
-	height: uint,
-	num_glyphs: uint,
-	bytes_per_glyph: uint,
-	line_gap: uint,
-	char_gap: uint,
-	unicode: ?^u16,
-}
-
-font_from_psf1 := fn(psf: ^u8): ?Font {
-	header := @as(^PSF1Header, @bitcast(psf))
-	if header.magic != 0x436 {
-		log.error("failed to load psf font: not a psf1 font, idiot\0")
-		return null
-	}
-
-	psf += @sizeof(PSF1Header)
-
-	return .(
-		psf,
-		8,
-		header.character_size,
-		256,
-		header.character_size,
-		0,
-		0,
-		null,
-	)
-}
-
-font_from_psf2 := fn(psf: ^u8, unicode: bool): ?Font {
-	header := @as(^PSF2Header, @bitcast(psf))
-	if header.magic != 0x864AB572 {
-		log.error("failed to load psf font: not a psf2 font, idiot\0")
-		return null
-	}
-
-	psf += header.header_size
-
-	font := Font.(
-		psf,
-		header.width,
-		header.height,
-		header.num_glyph,
-		header.bytes_per_glyph,
-		0,
-		0,
-		null,
-	)
-	if (header.flags & 1) != 0 & unicode {
-		init_unicode(&font)
-	}
-	return font
-}
-
-$get_glyph := fn(font: Font, index: u8): ^u8 {
-	return font.data + @as(uint, index) * font.bytes_per_glyph
-}
-
-$UNC_TABLE_SIZE := 1 << 16
-
-init_unicode := fn(font: ^Font): void {
-	font.unicode = memory.alloc(u16, UNC_TABLE_SIZE)
-
-	memory.set(u16, &0xFFFF, font.unicode, UNC_TABLE_SIZE)
-
-	table := font.data + font.num_glyphs * font.bytes_per_glyph
-	curr_glyph := @as(u16, 0)
-
-	loop if curr_glyph >= font.num_glyphs break else {
-		loop {
-			byte := *table
-			table += 1
-
-			if byte == 0xFF break
-			if byte == 0xFE {
-				continue
-			}
-
-			unicode := @as(uint, 0)
-			bytes_to_read := @as(uint, 1)
-
-			if (byte & 0x80) == 0 {
-				unicode = byte
-			} else if (byte & 0xE0) == 0xC0 {
-				unicode = byte & 0x1F
-				bytes_to_read = 2
-			} else if (byte & 0xF0) == 0xE0 {
-				unicode = byte & 0xF
-				bytes_to_read = 3
-			} else if (byte & 0xF8) == 0xF0 {
-				unicode = byte & 0x7
-				bytes_to_read = 4
-			} else {
-				continue
-			}
-
-			valid := true
-			loop if bytes_to_read <= 1 break else {
-				next_byte := *table
-				if (next_byte & 0xC0) != 0x80 {
-					valid = false
-					break
-				}
-				unicode = unicode << 6 | next_byte & 0x3F
-				table += 1
-				bytes_to_read -= 1
-			}
-
-			if valid == false continue
-
-			if bytes_to_read == 4 {
-				if unicode < 0x10000 | unicode > 0x10FFFF continue
-
-				if unicode <= 0xFFFF {
-					if unicode < UNC_TABLE_SIZE {
-						*(@unwrap(font.unicode) + unicode) = curr_glyph
-					}
-				} else {
-					unicode -= 0x10000
-					high_surrogate := 0xD800 | unicode >> 10 & 0x3FF
-					low_surrogate := 0xDC00 | unicode & 0x3FF
-
-					if high_surrogate < UNC_TABLE_SIZE {
-						*(@unwrap(font.unicode) + high_surrogate) = curr_glyph
-					}
-					if low_surrogate < UNC_TABLE_SIZE {
-						*(@unwrap(font.unicode) + low_surrogate) = curr_glyph
-					}
-				}
-			} else {
-				if unicode < UNC_TABLE_SIZE {
-					*(@unwrap(font.unicode) + unicode) = curr_glyph
-				}
-			}
-		}
-		curr_glyph += 1
-	}
-}

sysdata/libraries/stn/src/acs.hb

@@ -1,31 +0,0 @@
-//! This is a reserved file for use with the AbleOS Clustering System
-
-HostID := int
-ID := int
-
-FileID := struct {
-	host_id: HostID,
-	id: ID,
-}
-
-// A DeviceID points to a specific device in the ACS.
-DeviceID := struct {
-	host_id: HostID,
-	id: ID,
-}
-DiskID := DeviceID
-
-BufferID := struct {
-	host_id: HostID,
-	id: ID,
-}
-
-ProcessID := struct {
-	host_id: HostID,
-	id: ID,
-}
-
-WindowID := struct {
-	host_id: HostID,
-	id: ID,
-}

sysdata/libraries/stn/src/buffer.hb

@@ -1,35 +1,22 @@
-string := @use("string.hb")
+string := @use("rel:string.hb")
 
-$recv := fn($Expr: type, buffer_id: uint, memory_map_location: ^Expr): void {
+receive_message := fn(buffer_id: int, memory_map_location: ^u8, length: int): ^u8 {
-	return @eca(4, buffer_id, memory_map_location, @sizeof(Expr))
+	return @eca(^u8, 4, buffer_id, memory_map_location, length)
 }
 
-$write := fn($Expr: type, buffer_id: uint, msg: ^Expr): void {
+send_message := fn(msg: ^u8, buffer_id: int, length: int): void {
-	return @eca(3, buffer_id, msg, @sizeof(Expr))
+	return @eca(void, 3, buffer_id, msg, length)
 }
 
-$recv_length := fn(length: uint, memory_map_location: ^u8, buffer_id: uint): void {
+create := fn(msg: ^u8): int {
-	return @eca(4, buffer_id, memory_map_location, length)
+	msg_length := @inline(string.length, msg);
+	*msg = 0
+	return @eca(int, 3, 0, msg, msg_length)
 }
 
-$write_length := fn(length: uint, msg: ^u8, buffer_id: uint): void {
+search := fn(msg: ^u8): int {
-	return @eca(3, buffer_id, msg, length)
+	msg_length := @inline(string.length, msg);
-}
+	*msg = 3
 
-BufferMsg := packed struct {operation: u8, msg: ^u8, msg_len: uint}
+	return @eca(int, 3, 0, msg, msg_length)
-
-create := fn(msg: ^u8): uint {
-	return @eca(3, 0, BufferMsg.(0, msg, @inline(string.length, msg)), @sizeof(BufferMsg))
-}
-
-$create_nameless := fn(): uint {
-	return @eca(1, 0)
-}
-
-$delete_buffer := fn(buffer_id: uint): void {
-	return @eca(2, buffer_id)
-}
-
-search := fn(msg: ^u8): uint {
-	return @eca(3, 0, BufferMsg.(3, msg, @inline(string.length, msg)), @sizeof(BufferMsg))
 }

sysdata/libraries/stn/src/dt.hb

@@ -1,5 +0,0 @@
-.{string} := @use("../../stn/src/lib.hb")
-
-get := fn($Expr: type, query: ^u8): Expr {
-	return @eca(3, 5, query, @inline(string.length, query))
-}

sysdata/libraries/stn/src/file_io.hb

@@ -1,31 +0,0 @@
-acs := @use("acs.hb");
-.{DiskID, FileID} := acs
-
-// Paths without a node-disk component are to be treated as local files.
-// file_path := "DID:/test\0";
-Path := struct {
-	// DiskID holds the host id
-	disk_id: DiskID,
-	length: u8,
-	data: ^u8,
-}
-
-open := fn(file_path: Path): FileID {
-}
-close := fn(file_id: FileID): int {
-}
-// This reads in page_count of pages out of the file. If file_size is less than an exact multiple of pages do something.
-// TODO: Figureout how to encode errors.
-read_pages := fn(file_id: FileID, offset: int, page_count: int): void {
-}
-
-// This writes out page_count of pages out of the file.
-write_pages := fn(file_id: FileID, offset: int, page_count: int): void {
-}
-
-// This reads out byte_count of bytes from the file.
-read_bytes := fn(file_id: FileID, offset: int, byte_count: int): void {
-}
-
-write_bytes := fn(file_id: FileID, offset: int, byte_count: int): void {
-}

sysdata/libraries/stn/src/lib.hb

@@ -1,20 +1,7 @@
-acs := @use("acs.hb")
+string := @use("rel:string.hb")
-string := @use("string.hb")
+log := @use("rel:log.hb")
-log := @use("log.hb")
+memory := @use("rel:memory.hb")
-memory := @use("memory.hb")
+buffer := @use("rel:buffer.hb")
-buffer := @use("buffer.hb")
+math := @use("rel:math.hb")
-math := @use("math.hb")
+random := @use("rel:random.hb")
-random := @use("random.hb")
+pci := @use("rel:pci.hb")
-file := @use("file_io.hb")
-dt := @use("dt.hb")
-process := @use("process.hb")
-
-panic := fn(message: ?^u8): never {
-	log.error("Error: Panic Called, Message:\0")
-	if message == null {
-		log.error("None\0")
-	} else {
-		log.error(message)
-	}
-	die
-}

sysdata/libraries/stn/src/log.hb

@@ -1,13 +1,15 @@
-string := @use("string.hb")
+string := @use("rel:string.hb")
+buffer := @use("rel:buffer.hb")
 
-LogMsg := packed struct {level: u8, string: ^u8, strlen: uint}
+log := fn(message: ^u8, level: u8): void {
-
+	message_length := @inline(string.length, message);
-log := fn(level: u8, message: ^u8): void {
+	*(message + message_length) = level
-	return @eca(3, 1, LogMsg.(level, message, @inline(string.length, message)), @sizeof(LogMsg))
+	@eca(i32, 3, 1, message, message_length + 1)
+	return
 }
 
-error := fn(message: ^u8): void return @inline(log, 0, message)
+error := fn(message: ^u8): void return log(message, 0)
-warn := fn(message: ^u8): void return @inline(log, 1, message)
+warn := fn(message: ^u8): void return log(message, 1)
-info := fn(message: ^u8): void return @inline(log, 2, message)
+info := fn(message: ^u8): void return log(message, 2)
-debug := fn(message: ^u8): void return @inline(log, 3, message)
+debug := fn(message: ^u8): void return log(message, 3)
-trace := fn(message: ^u8): void return @inline(log, 4, message)
+trace := fn(message: ^u8): void return log(message, 4)