Fixed leakage

I have no idea what I am doing rn

.cargo/config.toml

@@ -1,4 +0,0 @@
-[alias]
-xtask = "r -p xtask --"
-wasm-build = "b --target wasm32-unknown-unknown --profile=small -Zbuild-std=core,alloc -Zbuild-std-features=optimize_for_size,panic_immediate_abort -p"
-wasm-build-debug = "b --target wasm32-unknown-unknown --profile=small-dev -Zbuild-std=core,alloc -Zbuild-std-features=optimize_for_size -p"

.gitignore

@@ -1,15 +1 @@
-# garbage
 /target
-rustc-ice-*
-
-# sqlite
-db.sqlite
-db.sqlite-journal
-
-# assets
-/depell/src/*.gz
-/depell/src/*.wasm
-/depell/src/static-pages/*.html
-#**/*-sv.rs
-/bytecode/src/instrs.rs
-/lang/src/testcases.rs

Cargo.toml

@@ -1,48 +1,3 @@
-cargo-features = ["profile-rustflags"]
-
 [workspace]
 resolver = "2"
-members = [
-	"bytecode",
-	"vm",
-	"xrt",
-	"xtask",
-	"lang",
-	"depell",
-	"depell/wasm-fmt",
-	"depell/wasm-hbc",
-	"depell/wasm-rt",
-]
-
-[workspace.dependencies]
-hbbytecode = { path = "bytecode", default-features = false }
-hbvm = { path = "vm", default-features = false }
-hblang = { path = "lang", default-features = false }
-
-[profile.release]
-lto = true
-#debug = true
-strip = true
-codegen-units = 1
-panic = "abort"
-
-[profile.small]
-rustflags = ["-Zfmt-debug=none", "-Zlocation-detail=none"]
-inherits = "release"
-opt-level = "z"
-strip = "debuginfo"
-lto = true
-codegen-units = 1
-panic = "abort"
-
-[profile.small-dev]
-inherits = "dev"
-opt-level = "z"
-strip = "debuginfo"
-panic = "abort"
-
-[profile.fuzz]
-inherits = "dev"
-debug = true
-opt-level = 3
-panic = "abort"
+members  = ["hbasm", "hbbytecode", "hbvm"]

bytecode/Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-name = "hbbytecode"
-version = "0.1.0"
-edition = "2018"
-
-[features]
-default = ["disasm"]
-disasm = ["alloc"]
-alloc = []
-

bytecode/build.rs

@@ -1,225 +0,0 @@
-#![feature(iter_next_chunk)]
-
-use std::{collections::HashSet, fmt::Write};
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    println!("cargo:rerun-if-changed=build.rs");
-    println!("cargo:rerun-if-changed=instructions.in");
-
-    let mut generated = String::new();
-    gen_instrs(&mut generated)?;
-    std::fs::write("src/instrs.rs", generated)?;
-
-    Ok(())
-}
-
-fn gen_instrs(generated: &mut String) -> Result<(), Box<dyn std::error::Error>> {
-    writeln!(generated, "#![expect(dead_code)]")?;
-    writeln!(generated, "use crate::*;")?;
-
-    '_opcode_structs: {
-        let mut seen = HashSet::new();
-        for [.., args, _] in instructions() {
-            if !seen.insert(args) {
-                continue;
-            }
-
-            writeln!(generated, "#[derive(Clone, Copy, Debug)]")?;
-            writeln!(generated, "#[repr(packed)]")?;
-            write!(generated, "pub struct Ops{args}(")?;
-            let mut first = true;
-            for ch in args.chars().filter(|&ch| ch != 'N') {
-                if !std::mem::take(&mut first) {
-                    write!(generated, ",")?;
-                }
-                write!(generated, "pub Op{ch}")?;
-            }
-            writeln!(generated, ");")?;
-            writeln!(generated, "unsafe impl BytecodeItem for Ops{args} {{}}")?;
-        }
-    }
-
-    '_max_size: {
-        let max = instructions()
-            .map(
-                |[_, _, ty, _]| {
-                    if ty == "N" {
-                        1
-                    } else {
-                        iter_args(ty).map(arg_to_width).sum::<usize>() + 1
-                    }
-                },
-            )
-            .max()
-            .unwrap();
-
-        writeln!(generated, "pub const MAX_SIZE: usize = {max};")?;
-    }
-
-    '_encoders: {
-        for [op, name, ty, doc] in instructions() {
-            writeln!(generated, "/// {}", doc.trim_matches('"'))?;
-            let name = name.to_lowercase();
-            let args = comma_sep(
-                iter_args(ty)
-                    .enumerate()
-                    .map(|(i, c)| format!("{}{i}: {}", arg_to_name(c), arg_to_type(c))),
-            );
-            writeln!(generated, "pub fn {name}({args}) -> (usize, [u8; MAX_SIZE]) {{")?;
-            let arg_names =
-                comma_sep(iter_args(ty).enumerate().map(|(i, c)| format!("{}{i}", arg_to_name(c))));
-            writeln!(generated, "    unsafe {{ crate::encode({ty}({op}, {arg_names})) }}")?;
-            writeln!(generated, "}}")?;
-        }
-    }
-
-    '_structs: {
-        let mut seen = std::collections::HashSet::new();
-        for [_, _, ty, _] in instructions() {
-            if !seen.insert(ty) {
-                continue;
-            }
-            let types = comma_sep(iter_args(ty).map(arg_to_type).map(|s| s.to_string()));
-            writeln!(generated, "#[repr(packed)] pub struct {ty}(u8, {types});")?;
-        }
-    }
-
-    '_name_list: {
-        writeln!(generated, "pub const COUNT: u8 = {};", instructions().count())?;
-    }
-
-    let instr = "Instr";
-    let oper = "Oper";
-
-    '_instr_enum: {
-        writeln!(generated, "#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[repr(u8)]")?;
-        writeln!(generated, "pub enum {instr} {{")?;
-        for [id, name, ..] in instructions() {
-            writeln!(generated, "    {name} = {id},")?;
-        }
-        writeln!(generated, "}}")?;
-
-        writeln!(generated, "impl {instr} {{")?;
-        writeln!(generated, "    pub fn size(self) -> usize {{")?;
-        writeln!(generated, "        match self {{")?;
-        let mut instrs = instructions().collect::<Vec<_>>();
-        instrs.sort_unstable_by_key(|&[.., ty, _]| iter_args(ty).map(arg_to_width).sum::<usize>());
-        for group in instrs.chunk_by(|[.., a, _], [.., b, _]| {
-            iter_args(a).map(arg_to_width).sum::<usize>()
-                == iter_args(b).map(arg_to_width).sum::<usize>()
-        }) {
-            let ty = group[0][2];
-            for &[_, name, ..] in group {
-                writeln!(generated, "            | {instr}::{name}")?;
-            }
-            generated.pop();
-            let size = iter_args(ty).map(arg_to_width).sum::<usize>() + 1;
-            writeln!(generated, " => {size},")?;
-        }
-        writeln!(generated, "        }}")?;
-        writeln!(generated, "    }}")?;
-        writeln!(generated, "}}")?;
-    }
-
-    '_arg_kind: {
-        writeln!(generated, "#[derive(Debug, Clone, Copy, PartialEq, Eq)]")?;
-        writeln!(generated, "pub enum {oper} {{")?;
-        let mut seen = HashSet::new();
-        for ty in instructions().flat_map(|[.., ty, _]| iter_args(ty)) {
-            if !seen.insert(ty) {
-                continue;
-            }
-            writeln!(generated, "    {ty}({}),", arg_to_type(ty))?;
-        }
-        writeln!(generated, "}}")?;
-    }
-
-    '_parse_opers: {
-        writeln!(
-            generated,
-            "/// This assumes the instruction byte is still at the beginning of the buffer"
-        )?;
-        writeln!(generated, "#[cfg(feature = \"disasm\")]")?;
-        writeln!(generated, "pub fn parse_args(bytes: &mut &[u8], kind: {instr}, buf: &mut alloc::vec::Vec<{oper}>) -> Option<()> {{")?;
-        writeln!(generated, "    match kind {{")?;
-        let mut instrs = instructions().collect::<Vec<_>>();
-        instrs.sort_unstable_by_key(|&[.., ty, _]| ty);
-        for group in instrs.chunk_by(|[.., a, _], [.., b, _]| a == b) {
-            let ty = group[0][2];
-            for &[_, name, ..] in group {
-                writeln!(generated, "        | {instr}::{name}")?;
-            }
-            generated.pop();
-            writeln!(generated, " => {{")?;
-            if iter_args(ty).count() != 0 {
-                writeln!(generated, "            let data = crate::decode::<{ty}>(bytes)?;")?;
-                writeln!(
-                    generated,
-                    "            buf.extend([{}]);",
-                    comma_sep(
-                        iter_args(ty).zip(1u32..).map(|(t, i)| format!("{oper}::{t}(data.{i})"))
-                    )
-                )?;
-            } else {
-                writeln!(generated, "            crate::decode::<{ty}>(bytes)?;")?;
-            }
-
-            writeln!(generated, "        }}")?;
-        }
-        writeln!(generated, "    }}")?;
-        writeln!(generated, "    Some(())")?;
-        writeln!(generated, "}}")?;
-    }
-
-    std::fs::write("src/instrs.rs", generated)?;
-    Ok(())
-}
-
-fn comma_sep(items: impl Iterator<Item = String>) -> String {
-    items.map(|item| item.to_string()).collect::<Vec<_>>().join(", ")
-}
-
-fn instructions() -> impl Iterator<Item = [&'static str; 4]> {
-    include_str!("instructions.in")
-        .lines()
-        .filter_map(|line| line.strip_suffix(';'))
-        .map(|line| line.splitn(4, ',').map(str::trim).next_chunk().unwrap())
-}
-
-fn arg_to_type(arg: char) -> &'static str {
-    match arg {
-        'R' | 'B' => "u8",
-        'H' => "u16",
-        'W' => "u32",
-        'D' | 'A' => "u64",
-        'P' => "i16",
-        'O' => "i32",
-        _ => panic!("unknown type: {}", arg),
-    }
-}
-
-fn arg_to_width(arg: char) -> usize {
-    match arg {
-        'R' | 'B' => 1,
-        'H' => 2,
-        'W' => 4,
-        'D' | 'A' => 8,
-        'P' => 2,
-        'O' => 4,
-        _ => panic!("unknown type: {}", arg),
-    }
-}
-
-fn arg_to_name(arg: char) -> &'static str {
-    match arg {
-        'R' => "reg",
-        'B' | 'H' | 'W' | 'D' => "imm",
-        'P' | 'O' => "offset",
-        'A' => "addr",
-        _ => panic!("unknown type: {}", arg),
-    }
-}
-
-fn iter_args(ty: &'static str) -> impl Iterator<Item = char> {
-    ty.chars().filter(|c| *c != 'N')
-}

bytecode/instructions.in

@@ -1,120 +0,0 @@
-0x00, UN,       N,    "Cause an unreachable code trap"              ;
-0x01, TX,       N,    "Termiante execution"                         ;
-0x02, NOP,      N,    "Do nothing"                                  ;
-0x03, ADD8,     RRR,  "Addition (8b)"                               ;
-0x04, ADD16,    RRR,  "Addition (16b)"                              ;
-0x05, ADD32,    RRR,  "Addition (32b)"                              ;
-0x06, ADD64,    RRR,  "Addition (64b)"                              ;
-0x07, SUB8,     RRR,  "Subtraction (8b)"                            ;
-0x08, SUB16,    RRR,  "Subtraction (16b)"                           ;
-0x09, SUB32,    RRR,  "Subtraction (32b)"                           ;
-0x0A, SUB64,    RRR,  "Subtraction (64b)"                           ;
-0x0B, MUL8,     RRR,  "Multiplication (8b)"                         ;
-0x0C, MUL16,    RRR,  "Multiplication (16b)"                        ;
-0x0D, MUL32,    RRR,  "Multiplication (32b)"                        ;
-0x0E, MUL64,    RRR,  "Multiplication (64b)"                        ;
-0x0F, AND,      RRR,  "Bitand"                                      ;
-0x10, OR,       RRR,  "Bitor"                                       ;
-0x11, XOR,      RRR,  "Bitxor"                                      ;
-0x12, SLU8,     RRR,  "Unsigned left bitshift (8b)"                 ;
-0x13, SLU16,    RRR,  "Unsigned left bitshift (16b)"                ;
-0x14, SLU32,    RRR,  "Unsigned left bitshift (32b)"                ;
-0x15, SLU64,    RRR,  "Unsigned left bitshift (64b)"                ;
-0x16, SRU8,     RRR,  "Unsigned right bitshift (8b)"                ;
-0x17, SRU16,    RRR,  "Unsigned right bitshift (16b)"               ;
-0x18, SRU32,    RRR,  "Unsigned right bitshift (32b)"               ;
-0x19, SRU64,    RRR,  "Unsigned right bitshift (64b)"               ;
-0x1A, SRS8,     RRR,  "Signed right bitshift (8b)"                  ;
-0x1B, SRS16,    RRR,  "Signed right bitshift (16b)"                 ;
-0x1C, SRS32,    RRR,  "Signed right bitshift (32b)"                 ;
-0x1D, SRS64,    RRR,  "Signed right bitshift (64b)"                 ;
-0x1E, CMPU,     RRR,  "Unsigned comparsion"                         ;
-0x1F, CMPS,     RRR,  "Signed comparsion"                           ;
-0x20, DIRU8,    RRRR, "Merged divide-remainder (unsigned 8b)"       ;
-0x21, DIRU16,   RRRR, "Merged divide-remainder (unsigned 16b)"      ;
-0x22, DIRU32,   RRRR, "Merged divide-remainder (unsigned 32b)"      ;
-0x23, DIRU64,   RRRR, "Merged divide-remainder (unsigned 64b)"      ;
-0x24, DIRS8,    RRRR, "Merged divide-remainder (signed 8b)"         ;
-0x25, DIRS16,   RRRR, "Merged divide-remainder (signed 16b)"        ;
-0x26, DIRS32,   RRRR, "Merged divide-remainder (signed 32b)"        ;
-0x27, DIRS64,   RRRR, "Merged divide-remainder (signed 64b)"        ;
-0x28, NEG,      RR,   "Bit negation"                                ;
-0x29, NOT,      RR,   "Logical negation"                            ;
-0x2A, SXT8,     RR,   "Sign extend 8b to 64b"                       ;
-0x2B, SXT16,    RR,   "Sign extend 16b to 64b"                      ;
-0x2C, SXT32,    RR,   "Sign extend 32b to 64b"                      ;
-0x2D, ADDI8,    RRB,  "Addition with immediate (8b)"                ;
-0x2E, ADDI16,   RRH,  "Addition with immediate (16b)"               ;
-0x2F, ADDI32,   RRW,  "Addition with immediate (32b)"               ;
-0x30, ADDI64,   RRD,  "Addition with immediate (64b)"               ;
-0x31, MULI8,    RRB,  "Multiplication with immediate (8b)"          ;
-0x32, MULI16,   RRH,  "Multiplication with immediate (16b)"         ;
-0x33, MULI32,   RRW,  "Multiplication with immediate (32b)"         ;
-0x34, MULI64,   RRD,  "Multiplication with immediate (64b)"         ;
-0x35, ANDI,     RRD,  "Bitand with immediate"                       ;
-0x36, ORI,      RRD,  "Bitor with immediate"                        ;
-0x37, XORI,     RRD,  "Bitxor with immediate"                       ;
-0x38, SLUI8,    RRB,  "Unsigned left bitshift with immedidate (8b)" ;
-0x39, SLUI16,   RRB,  "Unsigned left bitshift with immedidate (16b)";
-0x3A, SLUI32,   RRB,  "Unsigned left bitshift with immedidate (32b)";
-0x3B, SLUI64,   RRB,  "Unsigned left bitshift with immedidate (64b)";
-0x3C, SRUI8,    RRB,  "Unsigned right bitshift with immediate (8b)" ;
-0x3D, SRUI16,   RRB,  "Unsigned right bitshift with immediate (16b)";
-0x3E, SRUI32,   RRB,  "Unsigned right bitshift with immediate (32b)";
-0x3F, SRUI64,   RRB,  "Unsigned right bitshift with immediate (64b)";
-0x40, SRSI8,    RRB,  "Signed right bitshift with immediate"        ;
-0x41, SRSI16,   RRB,  "Signed right bitshift with immediate"        ;
-0x42, SRSI32,   RRB,  "Signed right bitshift with immediate"        ;
-0x43, SRSI64,   RRB,  "Signed right bitshift with immediate"        ;
-0x44, CMPUI,    RRD,  "Unsigned compare with immediate"             ;
-0x45, CMPSI,    RRD,  "Signed compare with immediate"               ;
-0x46, CP,       RR,   "Copy register"                               ;
-0x47, SWA,      RR,   "Swap registers"                              ;
-0x48, LI8,      RB,   "Load immediate (8b)"                         ;
-0x49, LI16,     RH,   "Load immediate (16b)"                        ;
-0x4A, LI32,     RW,   "Load immediate (32b)"                        ;
-0x4B, LI64,     RD,   "Load immediate (64b)"                        ;
-0x4C, LRA,      RRO,  "Load relative address"                       ;
-0x4D, LD,       RRAH, "Load from absolute address"                  ;
-0x4E, ST,       RRAH, "Store to absolute address"                   ;
-0x4F, LDR,      RROH, "Load from relative address"                  ;
-0x50, STR,      RROH, "Store to relative address"                   ;
-0x51, BMC,      RRH,  "Copy block of memory"                        ;
-0x52, BRC,      RRB,  "Copy register block"                         ;
-0x53, JMP,      O,    "Relative jump"                               ;
-0x54, JAL,      RRO,  "Linking relative jump"                       ;
-0x55, JALA,     RRA,  "Linking absolute jump"                       ;
-0x56, JEQ,      RRP,  "Branch on equal"                             ;
-0x57, JNE,      RRP,  "Branch on nonequal"                          ;
-0x58, JLTU,     RRP,  "Branch on lesser-than (unsigned)"            ;
-0x59, JGTU,     RRP,  "Branch on greater-than (unsigned)"           ;
-0x5A, JLTS,     RRP,  "Branch on lesser-than (signed)"              ;
-0x5B, JGTS,     RRP,  "Branch on greater-than (signed)"             ;
-0x5C, ECA,      N,    "Environment call trap"                       ;
-0x5D, EBP,      N,    "Environment breakpoint"                      ;
-0x5E, FADD32,   RRR,  "Floating point addition (32b)"               ;
-0x5F, FADD64,   RRR,  "Floating point addition (64b)"               ;
-0x60, FSUB32,   RRR,  "Floating point subtraction (32b)"            ;
-0x61, FSUB64,   RRR,  "Floating point subtraction (64b)"            ;
-0x62, FMUL32,   RRR,  "Floating point multiply (32b)"               ;
-0x63, FMUL64,   RRR,  "Floating point multiply (64b)"               ;
-0x64, FDIV32,   RRR,  "Floating point division (32b)"               ;
-0x65, FDIV64,   RRR,  "Floating point division (64b)"               ;
-0x66, FMA32,    RRRR, "Float fused multiply-add (32b)"              ;
-0x67, FMA64,    RRRR, "Float fused multiply-add (64b)"              ;
-0x68, FINV32,   RR,   "Float reciprocal (32b)"                      ;
-0x69, FINV64,   RR,   "Float reciprocal (64b)"                      ;
-0x6A, FCMPLT32, RRR,  "Flaot compare less than (32b)"               ;
-0x6B, FCMPLT64, RRR,  "Flaot compare less than (64b)"               ;
-0x6C, FCMPGT32, RRR,  "Flaot compare greater than (32b)"            ;
-0x6D, FCMPGT64, RRR,  "Flaot compare greater than (64b)"            ;
-0x6E, ITF32,    RR,   "Int to 32 bit float"                         ;
-0x6F, ITF64,    RR,   "Int to 64 bit float"                         ;
-0x70, FTI32,    RRB,  "Float 32 to int"                             ;
-0x71, FTI64,    RRB,  "Float 64 to int"                             ;
-0x72, FC32T64,  RR,   "Float 64 to Float 32"                        ;
-0x73, FC64T32,  RRB,  "Float 32 to Float 64"                        ;
-0x74, LRA16,    RRP,  "Load relative immediate (16 bit)"            ;
-0x75, LDR16,    RRPH, "Load from relative address (16 bit)"         ;
-0x76, STR16,    RRPH, "Store to relative address (16 bit)"          ;
-0x77, JMP16,    P,    "Relative jump (16 bit)"                      ;

bytecode/src/lib.rs

@@ -1,283 +0,0 @@
-#![no_std]
-
-#[cfg(feature = "disasm")]
-extern crate alloc;
-
-pub use crate::instrs::*;
-use core::convert::TryFrom;
-
-mod instrs;
-
-type OpR = u8;
-
-type OpA = u64;
-type OpO = i32;
-type OpP = i16;
-
-type OpB = u8;
-type OpH = u16;
-type OpW = u32;
-type OpD = u64;
-
-/// # Safety
-/// Has to be valid to be decoded from bytecode.
-pub unsafe trait BytecodeItem {}
-unsafe impl BytecodeItem for u8 {}
-
-impl TryFrom<u8> for Instr {
-    type Error = u8;
-
-    #[inline]
-    fn try_from(value: u8) -> Result<Self, Self::Error> {
-        #[cold]
-        fn failed(value: u8) -> Result<Instr, u8> {
-            Err(value)
-        }
-
-        if value < COUNT {
-            unsafe { Ok(core::mem::transmute::<u8, Instr>(value)) }
-        } else {
-            failed(value)
-        }
-    }
-}
-
-#[inline]
-unsafe fn encode<T>(instr: T) -> (usize, [u8; instrs::MAX_SIZE]) {
-    let mut buf = [0; instrs::MAX_SIZE];
-    core::ptr::write(buf.as_mut_ptr() as *mut T, instr);
-    (core::mem::size_of::<T>(), buf)
-}
-
-#[inline]
-#[cfg(feature = "disasm")]
-fn decode<T>(binary: &mut &[u8]) -> Option<T> {
-    let (front, rest) = core::mem::take(binary).split_at_checked(core::mem::size_of::<T>())?;
-    *binary = rest;
-    unsafe { Some(core::ptr::read(front.as_ptr() as *const T)) }
-}
-
-/// Rounding mode
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-#[repr(u8)]
-pub enum RoundingMode {
-    NearestEven = 0,
-    Truncate = 1,
-    Up = 2,
-    Down = 3,
-}
-
-impl TryFrom<u8> for RoundingMode {
-    type Error = ();
-
-    fn try_from(value: u8) -> Result<Self, Self::Error> {
-        (value <= 3).then(|| unsafe { core::mem::transmute(value) }).ok_or(())
-    }
-}
-
-#[cfg(feature = "disasm")]
-#[derive(Clone, Copy)]
-pub enum DisasmItem {
-    Func,
-    Global,
-}
-
-#[cfg(feature = "disasm")]
-#[derive(Debug)]
-pub enum DisasmError<'a> {
-    InvalidInstruction(u8),
-    InstructionOutOfBounds(&'a str),
-    FmtFailed(core::fmt::Error),
-    HasOutOfBoundsJumps,
-}
-
-#[cfg(feature = "disasm")]
-impl From<core::fmt::Error> for DisasmError<'_> {
-    fn from(value: core::fmt::Error) -> Self {
-        Self::FmtFailed(value)
-    }
-}
-
-#[cfg(feature = "disasm")]
-impl core::fmt::Display for DisasmError<'_> {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        match *self {
-            DisasmError::InvalidInstruction(b) => write!(f, "invalid instruction opcode: {b}"),
-            DisasmError::InstructionOutOfBounds(name) => {
-                write!(f, "instruction would go out of bounds of {name} symbol")
-            }
-            DisasmError::FmtFailed(error) => write!(f, "fmt failed: {error}"),
-            DisasmError::HasOutOfBoundsJumps => write!(
-                f,
-                "the code contained jumps that dont got neither to a \
-                valid symbol or local insturction"
-            ),
-        }
-    }
-}
-
-#[cfg(feature = "disasm")]
-impl core::error::Error for DisasmError<'_> {}
-
-#[cfg(feature = "disasm")]
-pub fn disasm<'a>(
-    binary: &mut &[u8],
-    functions: &alloc::collections::BTreeMap<u32, (&'a str, u32, DisasmItem)>,
-    out: &mut alloc::string::String,
-    mut eca_handler: impl FnMut(&mut &[u8]),
-) -> Result<(), DisasmError<'a>> {
-    use {
-        self::instrs::Instr,
-        alloc::{
-            collections::btree_map::{BTreeMap, Entry},
-            vec::Vec,
-        },
-        core::{convert::TryInto, fmt::Write},
-    };
-
-    fn instr_from_byte(b: u8) -> Result<Instr, DisasmError<'static>> {
-        b.try_into().map_err(DisasmError::InvalidInstruction)
-    }
-
-    let mut labels = BTreeMap::<u32, u32>::default();
-    let mut buf = Vec::<instrs::Oper>::new();
-    let mut has_oob = false;
-
-    '_offset_pass: for (&off, &(name, len, kind)) in functions.iter() {
-        if matches!(kind, DisasmItem::Global) {
-            continue;
-        }
-
-        let prev = *binary;
-
-        *binary = &binary[off as usize..];
-
-        let mut label_count = 0;
-        while let Some(&byte) = binary.first() {
-            let offset: i32 = (prev.len() - binary.len()).try_into().unwrap();
-            if offset as u32 == off + len {
-                break;
-            }
-            let Ok(inst) = instr_from_byte(byte) else { break };
-            instrs::parse_args(binary, inst, &mut buf)
-                .ok_or(DisasmError::InstructionOutOfBounds(name))?;
-
-            for op in buf.drain(..) {
-                let rel = match op {
-                    instrs::Oper::O(rel) => rel,
-                    instrs::Oper::P(rel) => rel.into(),
-                    _ => continue,
-                };
-
-                let global_offset: u32 = (offset + rel).try_into().unwrap();
-                if functions.get(&global_offset).is_some() {
-                    continue;
-                }
-                label_count += match labels.entry(global_offset) {
-                    Entry::Occupied(_) => 0,
-                    Entry::Vacant(entry) => {
-                        entry.insert(label_count);
-                        1
-                    }
-                }
-            }
-
-            if matches!(inst, Instr::ECA) {
-                eca_handler(binary);
-            }
-        }
-
-        *binary = prev;
-    }
-
-    let mut ordered = functions.iter().collect::<Vec<_>>();
-    ordered.sort_unstable_by_key(|(_, (name, _, _))| name);
-
-    '_dump: for (&off, &(name, len, kind)) in ordered {
-        if matches!(kind, DisasmItem::Global) {
-            continue;
-        }
-        let prev = *binary;
-
-        writeln!(out, "{name}:")?;
-
-        *binary = &binary[off as usize..];
-        while let Some(&byte) = binary.first() {
-            let offset: i32 = (prev.len() - binary.len()).try_into().unwrap();
-            if offset as u32 == off + len {
-                break;
-            }
-            let Ok(inst) = instr_from_byte(byte) else {
-                writeln!(out, "invalid instr {byte}")?;
-                break;
-            };
-            instrs::parse_args(binary, inst, &mut buf).unwrap();
-
-            if let Some(label) = labels.get(&offset.try_into().unwrap()) {
-                write!(out, "{:>2}: ", label)?;
-            } else {
-                write!(out, "    ")?;
-            }
-
-            write!(out, "{inst:<8?} ")?;
-
-            'a: for (i, op) in buf.drain(..).enumerate() {
-                if i != 0 {
-                    write!(out, ", ")?;
-                }
-
-                let rel = 'b: {
-                    match op {
-                        instrs::Oper::O(rel) => break 'b rel,
-                        instrs::Oper::P(rel) => break 'b rel.into(),
-                        instrs::Oper::R(r) => write!(out, "r{r}")?,
-                        instrs::Oper::B(b) => write!(out, "{b}b")?,
-                        instrs::Oper::H(h) => write!(out, "{h}h")?,
-                        instrs::Oper::W(w) => write!(out, "{w}w")?,
-                        instrs::Oper::D(d) if (d as i64) < 0 => write!(out, "{}d", d as i64)?,
-                        instrs::Oper::D(d) => write!(out, "{d}d")?,
-                        instrs::Oper::A(a) => write!(out, "{a}a")?,
-                    }
-
-                    continue 'a;
-                };
-
-                let global_offset: u32 = (offset + rel).try_into().unwrap();
-                if let Some(&(name, ..)) = functions.get(&global_offset) {
-                    if name.contains('\0') {
-                        write!(out, ":{name:?}")?;
-                    } else {
-                        write!(out, ":{name}")?;
-                    }
-                } else {
-                    let local_has_oob = global_offset < off
-                        || global_offset > off + len
-                        || prev
-                            .get(global_offset as usize)
-                            .is_none_or(|&b| instr_from_byte(b).is_err());
-                    has_oob |= local_has_oob;
-                    let label = labels.get(&global_offset).unwrap();
-                    if local_has_oob {
-                        write!(out, "!!!!!!!!!{rel}")?;
-                    } else {
-                        write!(out, ":{label}")?;
-                    }
-                }
-            }
-
-            writeln!(out)?;
-
-            if matches!(inst, Instr::ECA) {
-                eca_handler(binary);
-            }
-        }
-
-        *binary = prev;
-    }
-
-    if has_oob {
-        return Err(DisasmError::HasOutOfBoundsJumps);
-    }
-
-    Ok(())
-}

depell/Cargo.toml

@@ -1,23 +0,0 @@
-[package]
-name = "depell"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-argon2 = "0.5.3"
-axum = "0.7.7"
-axum-server = { version = "0.7.1", optional = true, features = ["rustls", "tls-rustls"] }
-const_format = "0.2.33"
-getrandom = "0.2.15"
-hblang.workspace = true
-htmlm = "0.5.0"
-log = "0.4.22"
-rand_core = { version = "0.6.4", features = ["getrandom"] }
-rusqlite = { version = "0.32.1", features = ["bundled"] }
-serde = { version = "1.0.210", features = ["derive"] }
-time = "0.3.36"
-tokio = { version = "1.40.0", features = ["rt"] }
-
-[features]
-#default = ["tls"]
-tls = ["dep:axum-server"]

depell/README.md

@@ -1,14 +0,0 @@
-# Depell
-
-Depell is a website that allows users to import/post/run hblang code and create huge dependency graphs. Its currently hosted at https://depell.mlokis.tech.
-
-## Local Development
-
-Prerequirements:
-- rust nigthly toolchain: install rust from [here](https://www.rust-lang.org/tools/install)
-
-```bash
-rustup default nightly
-cargo xtask watch-depell-debug
-# browser http://localhost:8080
-```

depell/src/icons/download.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M480-320 280-520l56-58 104 104v-326h80v326l104-104 56 58-200 200ZM240-160q-33 0-56.5-23.5T160-240v-120h80v120h480v-120h80v120q0 33-23.5 56.5T720-160H240Z"/></svg>

depell/src/icons/run.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M320-200v-560l440 280-440 280Zm80-280Zm0 134 210-134-210-134v268Z"/></svg>

depell/src/index.css

@@ -1,213 +0,0 @@
-* {
-	font-family: var(--font);
-	line-height: 1.3;
-}
-
-body {
-	--primary: light-dark(white, #181A1B);
-	--secondary: light-dark(#EFEFEF, #212425);
-	--timestamp: light-dark(#555555, #AAAAAA);
-	--error: #ff3333;
-}
-
-body {
-	--small-gap: 5px;
-	--font: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-	--monospace: 'Courier New', Courier, monospace;
-
-	nav {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-
-		section:last-child {
-			display: flex;
-			gap: var(--small-gap);
-		}
-	}
-
-	main {
-		margin-top: var(--small-gap);
-		display: flex;
-		flex-direction: column;
-		gap: var(--small-gap);
-	}
-}
-
-div.preview {
-	margin: var(--small-gap) 0px;
-	display: flex;
-	flex-direction: column;
-	gap: var(--small-gap);
-
-	div.info {
-		display: flex;
-		gap: var(--small-gap);
-
-		span[apply=timestamp] {
-			color: var(--timestamp);
-		}
-	}
-
-	div.stat {
-		display: flex;
-
-		svg {
-			height: 18px;
-		}
-	}
-
-	div.code {
-		position: relative;
-
-		nav {
-			position: absolute;
-			right: 0;
-			padding: var(--small-gap);
-
-			button {
-				display: flex;
-				padding: 0;
-			}
-		}
-	}
-}
-
-svg {
-	fill: black;
-}
-
-form {
-	display: flex;
-	flex-direction: column;
-	gap: var(--small-gap);
-
-
-	.error {
-		color: var(--error);
-		text-align: center;
-	}
-
-}
-
-textarea {
-	outline: none;
-	border: none;
-	background: var(--secondary);
-	padding: var(--small-gap);
-	padding-top: calc(var(--small-gap) * 1.5);
-	font-family: var(--monospace);
-	resize: none;
-	tab-size: 4;
-}
-
-pre {
-	background: var(--secondary);
-	padding: var(--small-gap);
-	padding-top: calc(var(--small-gap) * 1.5);
-	margin: 0px;
-	font-family: var(--monospace);
-	tab-size: 4;
-	overflow-x: auto;
-	white-space: pre-wrap;
-	word-wrap: break-word;
-}
-
-input {
-	font-size: inherit;
-	outline: none;
-	border: none;
-	background: var(--secondary);
-	padding: var(--small-gap);
-}
-
-input:is(:hover, :focus) {
-	background: var(--primary);
-}
-
-button {
-	border: none;
-	outline: none;
-	font-size: inherit;
-	background: var(--secondary);
-}
-
-button:hover:not(:active) {
-	background: var(--primary);
-}
-
-code {
-	font-family: var(--monospace);
-	line-height: 1;
-}
-
-div#code-editor {
-	display: flex;
-	position: relative;
-
-	textarea {
-		flex: 1;
-	}
-
-	span#code-size {
-		position: absolute;
-		right: 2px;
-		font-size: 12px;
-	}
-}
-
-div#dep-list {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	gap: var(--small-gap);
-
-	section {
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		text-align: center;
-		gap: var(--small-gap);
-
-		div {
-			text-align: left;
-		}
-	}
-}
-
-.syn {
-	font-family: var(--monospace);
-
-	&.Comment {
-		color: #939f91;
-	}
-
-	&.Keyword {
-		color: #f85552;
-	}
-
-	&.Identifier,
-	&.Directive {
-		color: #3a94c5;
-	}
-
-	/* &.Number {} */
-
-	&.String {
-		color: #8da101;
-	}
-
-	&.Op,
-	&.Assign {
-		color: #f57d26;
-	}
-
-	&.Paren,
-	&.Bracket,
-	&.Comma,
-	&.Dot,
-	&.Ctor,
-	&.Colon {
-		color: light-dark(#5c6a72, #999999);
-	}
-}

depell/src/index.js

@@ -1,554 +0,0 @@
-/// @ts-check
-
-/** @return {never} */
-function never() { throw new Error() }
-
-/**@type{WebAssembly.Instance}*/ let hbcInstance;
-/**@type{Promise<WebAssembly.WebAssemblyInstantiatedSource>}*/ let hbcInstaceFuture;
-async function getHbcInstance() {
-	hbcInstaceFuture ??= WebAssembly.instantiateStreaming(fetch("/hbc.wasm"), {});
-	return hbcInstance ??= (await hbcInstaceFuture).instance;
-}
-
-const stack_pointer_offset = 1 << 20;
-
-/** @param {WebAssembly.Instance} instance @param {Post[]} packages @param {number} fuel
- * @returns {string} */
-function compileCode(instance, packages, fuel = 100) {
-	let {
-		INPUT, INPUT_LEN,
-		LOG_MESSAGES, LOG_MESSAGES_LEN,
-		memory, compile_and_run,
-	} = instance.exports;
-
-	if (!(true
-		&& memory instanceof WebAssembly.Memory
-		&& INPUT instanceof WebAssembly.Global
-		&& INPUT_LEN instanceof WebAssembly.Global
-		&& LOG_MESSAGES instanceof WebAssembly.Global
-		&& LOG_MESSAGES_LEN instanceof WebAssembly.Global
-		&& typeof compile_and_run === "function"
-	)) never();
-
-	const codeLength = packPosts(packages, new DataView(memory.buffer, INPUT.value));
-	new DataView(memory.buffer).setUint32(INPUT_LEN.value, codeLength, true);
-
-	runWasmFunction(instance, compile_and_run, fuel);
-	return bufToString(memory, LOG_MESSAGES, LOG_MESSAGES_LEN).trim();
-}
-
-/**@type{WebAssembly.Instance}*/ let fmtInstance;
-/**@type{Promise<WebAssembly.WebAssemblyInstantiatedSource>}*/ let fmtInstaceFuture;
-async function getFmtInstance() {
-	fmtInstaceFuture ??= WebAssembly.instantiateStreaming(fetch("/hbfmt.wasm"), {});
-	return fmtInstance ??= (await fmtInstaceFuture).instance;
-}
-
-/** @param {WebAssembly.Instance} instance @param {string} code @param {"tok" | "fmt" | "minify"} action
- * @returns {string | Uint8Array | undefined} */
-function modifyCode(instance, code, action) {
-	let {
-		INPUT, INPUT_LEN,
-		OUTPUT, OUTPUT_LEN,
-		memory, fmt, tok, minify
-	} = instance.exports;
-
-	let funs = { fmt, tok, minify };
-	let fun = funs[action];
-	if (!(true
-		&& memory instanceof WebAssembly.Memory
-		&& INPUT instanceof WebAssembly.Global
-		&& INPUT_LEN instanceof WebAssembly.Global
-		&& OUTPUT instanceof WebAssembly.Global
-		&& OUTPUT_LEN instanceof WebAssembly.Global
-		&& funs.hasOwnProperty(action)
-		&& typeof fun === "function"
-	)) never();
-
-	if (action !== "fmt") {
-		INPUT = OUTPUT;
-		INPUT_LEN = OUTPUT_LEN;
-	}
-
-	let dw = new DataView(memory.buffer);
-	dw.setUint32(INPUT_LEN.value, code.length, true);
-	new Uint8Array(memory.buffer, INPUT.value).set(new TextEncoder().encode(code));
-
-	if (!runWasmFunction(instance, fun)) {
-		return undefined;
-	}
-	if (action === "tok") {
-		return bufSlice(memory, OUTPUT, OUTPUT_LEN);
-	} else {
-		return bufToString(memory, OUTPUT, OUTPUT_LEN);
-	}
-}
-
-
-/** @param {WebAssembly.Instance} instance @param {CallableFunction} func @param {any[]} args
- * @returns {boolean} */
-function runWasmFunction(instance, func, ...args) {
-	const { PANIC_MESSAGE, PANIC_MESSAGE_LEN, memory, stack_pointer } = instance.exports;
-	if (!(true
-		&& memory instanceof WebAssembly.Memory
-		&& stack_pointer instanceof WebAssembly.Global
-	)) never();
-	const ptr = stack_pointer.value;
-	try {
-		func(...args);
-		return true;
-	} catch (error) {
-		if (error instanceof WebAssembly.RuntimeError
-			&& error.message == "unreachable"
-			&& PANIC_MESSAGE instanceof WebAssembly.Global
-			&& PANIC_MESSAGE_LEN instanceof WebAssembly.Global) {
-			console.error(bufToString(memory, PANIC_MESSAGE, PANIC_MESSAGE_LEN), error);
-		} else {
-			console.error(error);
-		}
-		stack_pointer.value = ptr;
-		return false;
-	}
-}
-
-/** @typedef {Object} Post
- * @property {string} path 
- * @property {string} code */
-
-/** @param {Post[]} posts @param {DataView} view  @returns {number} */
-function packPosts(posts, view) {
-	const enc = new TextEncoder(), buf = new Uint8Array(view.buffer, view.byteOffset);
-	let len = 0; for (const post of posts) {
-		view.setUint16(len, post.path.length, true); len += 2;
-		buf.set(enc.encode(post.path), len); len += post.path.length;
-		view.setUint16(len, post.code.length, true); len += 2;
-		buf.set(enc.encode(post.code), len); len += post.code.length;
-	}
-	return len;
-}
-
-/** @param {WebAssembly.Memory} mem
- * @param {WebAssembly.Global} ptr
- * @param {WebAssembly.Global} len
- * @return {Uint8Array} */
-function bufSlice(mem, ptr, len) {
-	return new Uint8Array(mem.buffer, ptr.value,
-		new DataView(mem.buffer).getUint32(len.value, true));
-}
-
-/** @param {WebAssembly.Memory} mem
- * @param {WebAssembly.Global} ptr
- * @param {WebAssembly.Global} len
- * @return {string} */
-function bufToString(mem, ptr, len) {
-	const res = new TextDecoder()
-		.decode(new Uint8Array(mem.buffer, ptr.value,
-			new DataView(mem.buffer).getUint32(len.value, true)));
-	new DataView(mem.buffer).setUint32(len.value, 0, true);
-	return res;
-}
-
-/** @param {HTMLElement} target */
-function wireUp(target) {
-	execApply(target);
-	cacheInputs(target);
-	bindCodeEdit(target);
-	bindTextareaAutoResize(target);
-}
-
-const importRe = /@use\s*\(\s*"(([^"]|\\")+)"\s*\)/g;
-
-/** @param {WebAssembly.Instance} fmt 
- * @param {string} code
- * @param {string[]} roots
- * @param {Post[]} buf
- * @param {Set<string>} prevRoots
- * @returns {void} */
-function loadCachedPackages(fmt, code, roots, buf, prevRoots) {
-	buf[0].code = code;
-
-	roots.length = 0;
-	let changed = false;
-	for (const match of code.matchAll(importRe)) {
-		changed ||= !prevRoots.has(match[1]);
-		roots.push(match[1]);
-	}
-
-	if (!changed) return;
-	buf.length = 1;
-	prevRoots.clear();
-
-	for (let imp = roots.pop(); imp !== undefined; imp = roots.pop()) {
-		if (prevRoots.has(imp)) continue; prevRoots.add(imp);
-
-		const fmtd = modifyCode(fmt, localStorage.getItem("package-" + imp) ?? never(), "fmt");
-		if (typeof fmtd != "string") never();
-		buf.push({ path: imp, code: fmtd });
-		for (const match of buf[buf.length - 1].code.matchAll(importRe)) {
-			roots.push(match[1]);
-		}
-	}
-}
-
-/**@type{Set<string>}*/ const prevRoots = new Set();
-/**@typedef {Object} PackageCtx
- * @property {AbortController} [cancelation]
- * @property {string[]} keyBuf
- * @property {Set<string>} prevParams
- * @property {HTMLTextAreaElement} [edit] */
-
-/** @param {string} source @param {Set<string>} importDiff @param {HTMLPreElement} errors @param {PackageCtx} ctx */
-async function fetchPackages(source, importDiff, errors, ctx) {
-	importDiff.clear();
-	for (const match of source.matchAll(importRe)) {
-		if (localStorage["package-" + match[1]]) continue;
-		importDiff.add(match[1]);
-	}
-
-	if (importDiff.size !== 0 && (ctx.prevParams.size != importDiff.size
-		|| [...ctx.prevParams.keys()].every(e => importDiff.has(e)))) {
-		if (ctx.cancelation) ctx.cancelation.abort();
-		ctx.prevParams.clear();
-		ctx.prevParams = new Set([...importDiff]);
-		ctx.cancelation = new AbortController();
-
-		ctx.keyBuf.length = 0;
-		ctx.keyBuf.push(...importDiff.keys());
-
-		errors.textContent = "fetching: " + ctx.keyBuf.join(", ");
-
-		await fetch(`/code`, {
-			method: "POST",
-			signal: ctx.cancelation.signal,
-			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify(ctx.keyBuf),
-		}).then(async e => {
-			try {
-				const json = await e.json();
-				if (e.status == 200) {
-					for (const [key, value] of Object.entries(json)) {
-						localStorage["package-" + key] = value;
-					}
-					const missing = ctx.keyBuf.filter(i => json[i] === undefined);
-					if (missing.length !== 0) {
-						errors.textContent = "deps not found: " + missing.join(", ");
-					} else {
-						ctx.cancelation = undefined;
-						ctx.edit?.dispatchEvent(new InputEvent("input"));
-					}
-				}
-			} catch (er) {
-				errors.textContent = "completely failed to fetch ("
-					+ e.status + "): " + ctx.keyBuf.join(", ");
-				console.error(e, er);
-			}
-		});
-	}
-
-}
-
-/** @param {HTMLElement} target */
-async function bindCodeEdit(target) {
-	const edit = target.querySelector("#code-edit");
-	if (!(edit instanceof HTMLTextAreaElement)) return;
-
-	const codeSize = target.querySelector("#code-size");
-	const errors = target.querySelector("#compiler-output");
-	if (!(true
-		&& codeSize instanceof HTMLSpanElement
-		&& errors instanceof HTMLPreElement
-	)) never();
-
-	const MAX_CODE_SIZE = parseInt(codeSize.innerHTML);
-	if (Number.isNaN(MAX_CODE_SIZE)) never();
-
-	const hbc = await getHbcInstance(), fmt = await getFmtInstance();
-	let importDiff = new Set();
-	/**@type{Post[]}*/
-	const packages = [{ path: "local.hb", code: "" }];
-	const debounce = 100;
-	let timeout = 0;
-	const ctx = { keyBuf: [], prevParams: new Set(), edit };
-
-	prevRoots.clear();
-
-	const onInput = () => {
-		fetchPackages(edit.value, importDiff, errors, ctx);
-
-		if (ctx.cancelation && importDiff.size !== 0) {
-			return;
-		}
-
-		loadCachedPackages(fmt, edit.value, ctx.keyBuf, packages, prevRoots);
-
-		errors.textContent = compileCode(hbc, packages);
-		const minified_size = modifyCode(fmt, edit.value, "minify")?.length;
-		if (minified_size) {
-			codeSize.textContent = (MAX_CODE_SIZE - minified_size) + "";
-			const perc = Math.min(100, Math.floor(100 * (minified_size / MAX_CODE_SIZE)));
-			codeSize.style.color = `color-mix(in srgb, light-dark(black, white), var(--error) ${perc}%)`;
-		}
-		timeout = 0;
-	};
-
-	edit.addEventListener("input", () => {
-		if (timeout) clearTimeout(timeout);
-		timeout = setTimeout(onInput, debounce)
-	});
-	edit.dispatchEvent(new InputEvent("input"));
-}
-
-/**
- * @type {Array<string>}
- * to be synched with `enum TokenGroup` in bytecode/src/fmt.rs */
-const TOK_CLASSES = [
-	'Blank',
-	'Comment',
-	'Keyword',
-	'Identifier',
-	'Directive',
-	'Number',
-	'String',
-	'Op',
-	'Assign',
-	'Paren',
-	'Bracket',
-	'Colon',
-	'Comma',
-	'Dot',
-	'Ctor',
-];
-
-/** @type {{ [key: string]: (el: HTMLElement) => void | Promise<void> }} */
-const applyFns = {
-	timestamp: (el) => {
-		const timestamp = el.innerText;
-		const date = new Date(parseInt(timestamp) * 1000);
-		el.innerText = date.toLocaleString();
-	},
-	fmt,
-};
-
-/**
- * @param {HTMLElement} target */
-async function fmt(target) {
-	const code = target.innerText;
-	const instance = await getFmtInstance();
-	const decoder = new TextDecoder('utf-8');
-	const fmt = modifyCode(instance, code, 'fmt');
-	if (typeof fmt !== "string") return;
-	const codeBytes = new TextEncoder().encode(fmt);
-	const tok = modifyCode(instance, fmt, 'tok');
-	if (!(tok instanceof Uint8Array)) return;
-	target.innerHTML = '';
-	let start = 0;
-	let kind = tok[0];
-	for (let ii = 1; ii <= tok.length; ii += 1) {
-		// split over same tokens and buffer end
-		if (tok[ii] === kind && ii < tok.length) {
-			continue;
-		}
-		const text = decoder.decode(codeBytes.subarray(start, ii));
-		const textNode = document.createTextNode(text);;
-		if (kind === 0) {
-			target.appendChild(textNode);
-		} else {
-			const el = document.createElement('span');
-			el.classList.add('syn');
-			el.classList.add(TOK_CLASSES[kind]);
-			el.appendChild(textNode);
-			target.appendChild(el);
-		}
-		if (ii == tok.length) {
-			break;
-		}
-		start = ii;
-		kind = tok[ii];
-	}
-}
-
-/** @param {HTMLElement} target */
-function execApply(target) {
-	const proises = [];
-	for (const elem of target.querySelectorAll('[apply]')) {
-		if (!(elem instanceof HTMLElement)) continue;
-		const funcname = elem.getAttribute('apply') ?? never();
-		const vl = applyFns[funcname](elem);
-		if (vl instanceof Promise) proises.push(vl);
-	}
-	if (target === document.body) {
-		Promise.all(proises).then(() => document.body.hidden = false);
-	}
-}
-
-/** @param {HTMLElement} target */
-function bindTextareaAutoResize(target) {
-	for (const textarea of target.querySelectorAll("textarea")) {
-		if (!(textarea instanceof HTMLTextAreaElement)) never();
-
-		const taCssMap = window.getComputedStyle(textarea);
-		const padding = parseInt(taCssMap.getPropertyValue('padding-top') ?? "0")
-			+ parseInt(taCssMap.getPropertyValue('padding-top') ?? "0");
-		textarea.style.height = "auto";
-		textarea.style.height = (textarea.scrollHeight - padding) + "px";
-		textarea.style.overflowY = "hidden";
-		textarea.addEventListener("input", function() {
-			let top = window.scrollY;
-			textarea.style.height = "auto";
-			textarea.style.height = (textarea.scrollHeight - padding) + "px";
-			window.scrollTo({ top });
-		});
-
-		textarea.onkeydown = (ev) => {
-			if (ev.key === "Tab") {
-				ev.preventDefault();
-				document.execCommand('insertText', false, "\t");
-			}
-		}
-	}
-}
-
-/** @param {HTMLElement} target */
-function cacheInputs(target) {
-	/**@type {HTMLFormElement}*/ let form;
-	for (form of target.querySelectorAll('form')) {
-		const path = form.getAttribute('hx-post') || form.getAttribute('hx-delete');
-		if (!path) {
-			console.warn('form does not have a hx-post or hx-delete attribute', form);
-			continue;
-		}
-
-		for (const input of form.elements) {
-			if (input instanceof HTMLInputElement || input instanceof HTMLTextAreaElement) {
-				if ('password submit button'.includes(input.type)) continue;
-				const key = path + input.name;
-				input.value = localStorage.getItem(key) ?? '';
-				input.addEventListener("input", () => localStorage.setItem(key, input.value));
-			} else {
-				console.warn("unhandled form element: ", input);
-			}
-		}
-	}
-}
-
-/** @param {string} [path]  */
-function updateTab(path) {
-	console.log(path);
-	for (const elem of document.querySelectorAll("button[hx-push-url]")) {
-		if (elem instanceof HTMLButtonElement)
-			elem.disabled =
-				elem.getAttribute("hx-push-url") === path
-				|| elem.getAttribute("hx-push-url") === window.location.pathname;
-	}
-}
-
-if (window.location.hostname === 'localhost') {
-	let id; setInterval(async () => {
-		let new_id = await fetch('/hot-reload').then(reps => reps.text());
-		id ??= new_id;
-		if (id !== new_id) window.location.reload();
-	}, 300);
-
-	(async function test() {
-		{
-			const code = "main:=fn():void{return}";
-			const inst = await getFmtInstance()
-			const fmtd = modifyCode(inst, code, "fmt") ?? never();
-			if (typeof fmtd !== "string") never();
-			const prev = modifyCode(inst, fmtd, "minify") ?? never();
-			if (code != prev) console.error(code, prev);
-		}
-		{
-			const posts = [{
-				path: "foo.hb",
-				code: "main:=fn():int{return 42}",
-			}];
-			const res = compileCode(await getHbcInstance(), posts, 1) ?? never();
-			const expected = "exit code: 42";
-			if (expected != res) console.error(expected, res);
-		}
-	})()
-}
-
-document.body.addEventListener('htmx:afterSwap', (ev) => {
-	if (!(ev.target instanceof HTMLElement)) never();
-	wireUp(ev.target);
-	if (ev.target.tagName == "MAIN" || ev.target.tagName == "BODY")
-		updateTab(ev['detail'].pathInfo.finalRequestPath);
-});
-
-getFmtInstance().then(inst => {
-	document.body.addEventListener('htmx:configRequest', (ev) => {
-		const details = ev['detail'];
-		if (details.path === "/post" && details.verb === "post") {
-			details.parameters['code'] = modifyCode(inst, details.parameters['code'], "minify");
-		}
-	});
-
-	/** @param {string} query @param {string} target @returns {number} */
-	function fuzzyCost(query, target) {
-		let qi = 0, bi = 0, cost = 0, matched = false;
-		while (qi < query.length) {
-			if (query.charAt(qi) === target.charAt(bi++)) {
-				matched = true;
-				qi++;
-			} else {
-				cost++;
-			}
-			if (bi === target.length) (bi = 0, qi++);
-		}
-		return cost + (matched ? 0 : 100 * target.length);
-	}
-
-	let deps = undefined;
-	/** @param {HTMLInputElement} input @returns {void} */
-	function filterCodeDeps(input) {
-		deps ??= document.getElementById("deps");
-		if (!(deps instanceof HTMLElement)) never();
-		if (input.value === "") {
-			deps.textContent = "results show here...";
-			return;
-		}
-		deps.innerHTML = "";
-		for (const root of [...prevRoots.keys()]
-			.sort((a, b) => fuzzyCost(input.value, a) - fuzzyCost(input.value, b))) {
-			const pane = document.createElement("div");
-			const code = modifyCode(inst, localStorage["package-" + root], "fmt");
-			pane.innerHTML = `<div>${root}</div><pre>${code}</pre>`;
-			deps.appendChild(pane);
-		}
-		if (deps.innerHTML === "") {
-			deps.textContent = "no results";
-		}
-	}
-
-	Object.assign(window, { filterCodeDeps });
-});
-
-/** @param {HTMLElement} target  */
-function runPost(target) {
-	while (!target.matches("div[class=preview]")) target = target.parentElement ?? never();
-	const code = target.querySelector("pre[apply=fmt]");
-	if (!(code instanceof HTMLPreElement)) never();
-	const output = target.querySelector("pre[id=compiler-output]");
-	if (!(output instanceof HTMLPreElement)) never();
-
-	Promise.all([getHbcInstance(), getFmtInstance()]).then(async ([hbc, fmt]) => {
-		const ctx = { keyBuf: [], prevParams: new Set() };
-		await fetchPackages(code.innerText ?? never(), new Set(), output, ctx);
-		const posts = [{ path: "this", code: "" }];
-		loadCachedPackages(fmt, code.innerText ?? never(), ctx.keyBuf, posts, new Set());
-		output.textContent = compileCode(hbc, posts);
-		output.hidden = false;
-	});
-
-	let author = encodeURIComponent(target.dataset.author ?? never());
-	let name = encodeURIComponent(target.dataset.name ?? never());
-	fetch(`/post/run?author=${author}&name=${name}`, { method: "POST" })
-}
-
-Object.assign(window, { runPost });
-
-updateTab();
-wireUp(document.body);
-

depell/src/migrations/1.sql

@@ -1 +0,0 @@
-

depell/src/schema.sql

@@ -1,55 +0,0 @@
-PRAGMA foreign_keys = ON;
-
-CREATE TABLE IF NOT EXISTS user(
-	name TEXT NOT NULL,
-	password_hash TEXT NOT NULL,
-	PRIMARY KEY (name)
-) WITHOUT ROWID;
-
-CREATE TABLE IF NOT EXISTS session(
-	id BLOB NOT NULL,
-	username TEXT NOT NULL,
-	expiration INTEGER NOT NULL,
-	FOREIGN KEY (username) REFERENCES user (name)
-	PRIMARY KEY (username)
-) WITHOUT ROWID;
-
-CREATE UNIQUE INDEX IF NOT EXISTS
-	session_id ON session (id);
-
-CREATE TABLE IF NOT EXISTS post(
-	name TEXT NOT NULL,
-	author TEXT,
-	timestamp INTEGER,
-	code TEXT NOT NULL,
-	FOREIGN KEY (author) REFERENCES user(name) ON DELETE SET NULL,
-	PRIMARY KEY (author, name)
-);
-
-CREATE INDEX IF NOT EXISTS
-	post_timestamp ON post(timestamp DESC);
-
-CREATE TABLE IF NOT EXISTS import(
-	from_name TEXT NOT NULL,
-	from_author TEXT,
-	to_name TEXT NOT NULL,
-	to_author TEXT,
-	FOREIGN KEY (from_name, from_author) REFERENCES post(name, author),
-	FOREIGN KEY (to_name, to_author) REFERENCES post(name, author)
-);
-
-CREATE INDEX IF NOT EXISTS
-	dependencies ON import(from_name, from_author);
-
-CREATE INDEX IF NOT EXISTS
-	dependants ON import(to_name, to_author);
-
-CREATE TABLE IF NOT EXISTS run(
-	code_name TEXT NOT NULL,
-	code_author TEXT NOT NULL,
-	runner TEXT NOT NULL,
-	FOREIGN KEY (code_name, code_author) REFERENCES post(name, author),
-	FOREIGN KEY (runner) REFERENCES user(name),
-	PRIMARY KEY (code_name, code_author, runner)
-);
-

depell/src/static-pages/developing-hblang.md

@@ -1,61 +0,0 @@
-# The journey to an optimizing compiler
-
-It's been years since I was continuously trying to make a compiler to implement language of my dreams. Problem was tho that I wanted something similar to Rust, which if you did not know, `rustc` far exceeded the one million lines of code mark some time ago, so implementing such language would take me years if not decades, but I still tired it.
-
-Besides being extremely ambitions, the problem with my earliest attempts at making a compiler, is that literally nobody, not even me, was using the language, and so retroactively I am confident, what I implemented was a complex test-case implementation, and not a compiler. I often fall into a trap of implementing edge cases instead of an algorithm that would handle not only the very few thing the tests do but also all the other stuff that users of the language would try.
-
-Another part of why I was failing for all that time, is that I did the hardest thing first without understanding the core concepts involved in translating written language to IR, god forbid assembly. I wasted a lot of time like this, but at least I learned Rust well. At some point I found a job where I started developing a decentralized network and that fully drawn me away from language development.
-
-## Completely new approach
-
-At some point the company I was working for started having financial issues and they were unable to pay me. During that period, I discovered that my love for networking was majorly fueled by the monetary gains associated with it. I burned out, and started to look for things to do with the free time.
-
-One could say timing was perfect because [`ableos`](https://git.ablecorp.us/AbleOS/ableos) was desperately in need of a sane programming language that compiles to the home made VM ISA used for all software ran in `ableos`, but there was nobody crazy enough to do this. I got terribly nerd sniped, tho I don't regret it. Process of making a language for `ableos` was completely different. Firstly, it needed to be done asap, the lack of a good language blocked everyone form writing drivers for `ableos`, secondly, the moment the language is at least a little bit usable, people other then me will start using it, and lastly, the ISA the language compiles to very simple to emit, understand, and run.
-
-### Urgency is a bliss
-
-I actually managed to make the language somewhat work in one week, mainly because my mind set changed. I no longer spent a lot of time designing syntax for elegance, I designed it so that it incredibly easy to parse, meaning I can spent minimal effort implementing the parser, and fully focus on the hard problem of translating AST to instructions. Surprisingly, making everything an expression and not enforcing any arbitrary rules, makes the code you can write incredibly flexible and (most) people love it. One of the decisions I made to save time (or maybe it was an accident) was to make `,;` not enforced, meaning, you are allowed to write delimiters in lists but, as long as it does not change the intent of the code, you can leave them out. In practice, you actually don't need semicolons, unless the next line starts with something sticky like `*x`, int that case you put a semicolon on the previous line to tell the parser where the current expression ends.
-
-### Only the problem I care about
-
-Its good to note that writing a parser is no longer interesting for me. I wrote many parsers before and writing one no longer feel rewarding, but more like a chore. The real problem I was excited about was translating AST to instructions, I always ended up overcomplicating this step wit edge cases for every possible scenario that can happen in code, for which there are infinite. But why did I succeed this time? Well all the friction related to getting something that I can execute was so low, I could iterate quickly and realize what I am doing wrong before I burn out. In a week I managed to understand what I was failing to do for years, partly because of all the previous suffering, but mainly because it was so easy to pivot and try new things. And so I managed to make my first single pass compiler, and people immediately started using it.
-
-### Don't implement features nobody asked for
-
-Immediately after someone else then me wrote something in `hb` stuff started breaking, over the course of a month I kept fixing bugs and adding new features just fine, and more people started to use the language. All was good and well until I looked into the code. It was incredibly cursed, full of tricks to work around the compiler not doing any optimizations. At that moment I realized the whole compiler after parser needs to be rewritten, I had to implement optimizations, otherwise people wont be able to write readable code that runs fast. All of the features I have added up until now, were a technical dept now. Unless they are all working with optimizations, can't compile the existing code. Yes, if feature exists, be sure as hell it will be used.
-
-It took around 4 months to reimplement everything make make the optimal code look like what you are used to in other languages. I am really thankful for [sea of nodes](https://github.com/SeaOfNodes), and all the amazing work Cliff Click and others do to make demystify optimizers, It would have taken much longer to for me to figure all the principles out without the exhaustive [tutorial](https://github.com/SeaOfNodes/Simple?tab=readme-ov-file).
-
-## How my understanding of optimizations changed
-
-### Optimizations allow us to scale software
-
-I need to admit, before writing a single pass compiler and later upgrading it to optimizing one, I thought optimizations only affect the quality of final assembly emitted by the compiler. It never occur to me that what the optimizations actually do, is reduce the impact of how you decide to write the code. In a single pass compiler (with zero optimizations), the machine code reflects:
-
-- order of operations as written in code
-- whether the value was stored in intermediate locations
-- exact structure of the control flow and at which point the operations are placed
-- how many times is something recomputed
-- operations that only help to convey intent for the reader of the source code
-- and more I can't think of...
-
-If you took some code you wrote and then modified it to obfuscate these aspects (in reference to the original code), you would to a subset of what optimizing compiler does. Of course, a good compiler would try hard to improve the metrics its optimizing for, it would:
-
-- reorder operations to allow the CPU to parallelize them
-- remove needless stores, or store values directly to places you cant express in code
-- pull operations out of the loops and into the branches (if it can)
-- find all common sub-expressions and compute them only once
-- fold constants as much as possible and use obscure tricks to replace slow instructions if any of the operands are constant
-- and more...
-
-In the end, compiler optimizations try to reduce correlation between how the code happens to be written and how well it performs, which is extremely important when you want humans to read the code.
-
-### Optimizing compilers know more then you
-
-Optimizing code is a search problem, an optimizer searches the code for patterns that can be rewritten so something more practical for the computer, while preserving the observable behavior of the program. This means it needs enough context about the code to not make a mistake. In fact, the optimizer has so much context, it is able to determine your code is useless. But wait, didn't you write the code because you needed it to do something? Maybe your intention was to break out of the loop after you are done, but the optimizer looked at the code and said, "great, we are so lucky that this integer is always small enough to miss this check by one, DELETE", and then he goes "jackpot, since this loop is now infinite, we don't need this code after it, DELETE". Notice that the optimizer is eager to delete dead code, it did not ask you "Brah, why did you place all your code after an infinite loop?". This is just an example, there are many more cases where modern optimizers just delete all your code because they proven it does something invalid without running it.
-
-Its stupid but its the world we live in, optimizers are usually a black box you import and feed it the code in a format they understand, they then proceed to optimize it, and if they find a glaring bug they wont tell you, god forbid, they will just molest the code in unspecified ways and spit out whats left. Before writing an optimizer, I did no know this can happen and I did not know this is a problem I pay for with my time, spent figuring out why noting is happening when I run the program.
-
-But wait its worse! Since optimizers wont ever share the fact you are stupid, we end up with other people painstakingly writing complex linters, that will do a shitty job detecting things that matter, and instead whine about style and other bullcrap (and they suck even at that). If the people who write linters and people who write optimizers swapped the roles, I would be ranting about optimizers instead.
-
-And so, this is the area where I want to innovate, lets report the dead code to the frontend, and let the compiler frontend filter out the noise and show relevant information in the diagnostics. Refuse to compile the program if you `i /= 0`. Refuse to compile if you `arr[arr.len]`. This is the level of stupid optimizer sees, once it normalizes your code, but proceeds to protect your feelings. My goal so for hblang to relay this to you as much as possible. If we can query for optimizations, we can query for bugs too.

depell/src/static-pages/post.md

@@ -1,8 +0,0 @@
-### About posting code
-
-If you are unfammiliar with [hblang](https://git.ablecorp.us/AbleOS/holey-bytes), refer to the **hblang/README.md** or vizit [mlokis'es posts](/profile/mlokis). Preferably don't edit the code here.
-
-### Extra textarea features
-
-- proper tab behaviour
-- snap to previous tab boundary on "empty" lines

depell/src/static-pages/welcome.md

@@ -1,11 +0,0 @@
-## Welcome to depell
-
-Depell (dependency hell) is a simple "social" media site, except that all you can post is [hblang](https://git.ablecorp.us/AbleOS/holey-bytes) code. Instead of likes you run the program, and instead of mentions you import the program as dependency. Run counts even when ran indirectly.
-
-The backend only serves the code and frontend compiles and runs it locally. All posts are immutable.
-
-## Security?
-
-All code runs in WASM (inside a holey-bytes VM until hblang compiles to wasm) and is controlled by JavaScript. WASM
-cant do any form of IO without going trough JavaScript so as long as JS import does not allow wasm to execute
-arbitrary JS code, WASM can act as a container inside the JS.

depell/wasm-fmt/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-name = "wasm-hbfmt"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-hblang = { workspace = true, features = ["no_log"] }
-wasm-rt = { version = "0.1.0", path = "../wasm-rt" }

depell/wasm-fmt/src/lib.rs

@@ -1,42 +0,0 @@
-#![no_std]
-#![feature(str_from_raw_parts)]
-#![feature(alloc_error_handler)]
-
-use hblang::{fmt, parser};
-
-wasm_rt::decl_runtime!(128 * 1024, 1024 * 4);
-
-const MAX_OUTPUT_SIZE: usize = 1024 * 10;
-wasm_rt::decl_buffer!(MAX_OUTPUT_SIZE, MAX_OUTPUT, OUTPUT, OUTPUT_LEN);
-
-const MAX_INPUT_SIZE: usize = 1024 * 4;
-wasm_rt::decl_buffer!(MAX_INPUT_SIZE, MAX_INPUT, INPUT, INPUT_LEN);
-
-#[no_mangle]
-unsafe extern "C" fn fmt() {
-    ALLOCATOR.reset();
-
-    let code = core::str::from_raw_parts(core::ptr::addr_of!(INPUT).cast(), INPUT_LEN);
-
-    let arena = parser::Arena::with_capacity(code.len() * parser::SOURCE_TO_AST_FACTOR);
-    let mut ctx = parser::Ctx::default();
-    let exprs = parser::Parser::parse(&mut ctx, code, "source.hb", &mut parser::no_loader, &arena);
-
-    let mut f = wasm_rt::Write(&mut OUTPUT[..]);
-    fmt::fmt_file(exprs, code, &mut f).unwrap();
-    OUTPUT_LEN = MAX_OUTPUT_SIZE - f.0.len();
-}
-
-#[no_mangle]
-unsafe extern "C" fn tok() {
-    let code = core::slice::from_raw_parts_mut(
-        core::ptr::addr_of_mut!(OUTPUT).cast(), OUTPUT_LEN);
-    OUTPUT_LEN = fmt::get_token_kinds(code);
-}
-
-#[no_mangle]
-unsafe extern "C" fn minify() {
-    let code = core::str::from_raw_parts_mut(
-        core::ptr::addr_of_mut!(OUTPUT).cast(), OUTPUT_LEN);
-    OUTPUT_LEN = fmt::minify(code);
-}

depell/wasm-hbc/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "wasm-hbc"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-hblang = { workspace = true, features = [] }
-hbvm.workspace = true
-log = { version = "0.4.22", features = ["release_max_level_error"] }
-wasm-rt = { version = "0.1.0", path = "../wasm-rt", features = ["log"] }
-

depell/wasm-hbc/src/lib.rs

@@ -1,128 +0,0 @@
-#![feature(alloc_error_handler)]
-#![feature(slice_take)]
-#![no_std]
-
-use {
-    alloc::{string::String, vec::Vec},
-    core::ffi::CStr,
-    hblang::{
-        backend::hbvm::HbvmBackend,
-        son::{Codegen, CodegenCtx},
-        ty::Module,
-        Ent,
-    },
-};
-
-extern crate alloc;
-
-const ARENA_CAP: usize = 128 * 16 * 1024;
-wasm_rt::decl_runtime!(ARENA_CAP, 1024 * 4);
-
-const MAX_INPUT_SIZE: usize = 32 * 4 * 1024;
-wasm_rt::decl_buffer!(MAX_INPUT_SIZE, MAX_INPUT, INPUT, INPUT_LEN);
-
-#[no_mangle]
-unsafe fn compile_and_run(mut fuel: usize) {
-    ALLOCATOR.reset();
-
-    _ = log::set_logger(&wasm_rt::Logger);
-    log::set_max_level(log::LevelFilter::Error);
-
-    struct File<'a> {
-        path: &'a str,
-        code: &'a mut str,
-    }
-
-    let mut root = 0;
-
-    let files = {
-        let mut input_bytes =
-            core::slice::from_raw_parts_mut(core::ptr::addr_of_mut!(INPUT).cast::<u8>(), INPUT_LEN);
-
-        let mut files = Vec::with_capacity(32);
-        while let Some((&mut path_len, rest)) = input_bytes.split_first_chunk_mut() {
-            let (path, rest) = rest.split_at_mut(u16::from_le_bytes(path_len) as usize);
-            let (&mut code_len, rest) = rest.split_first_chunk_mut().unwrap();
-            let (code, rest) = rest.split_at_mut(u16::from_le_bytes(code_len) as usize);
-            files.push(File {
-                path: core::str::from_utf8_unchecked(path),
-                code: core::str::from_utf8_unchecked_mut(code),
-            });
-            input_bytes = rest;
-        }
-
-        let root_path = files[root].path;
-        hblang::quad_sort(&mut files, |a, b| a.path.cmp(b.path));
-        root = files.binary_search_by_key(&root_path, |p| p.path).unwrap();
-
-        files
-    };
-
-    let mut ctx = CodegenCtx::default();
-
-    let files = {
-        let paths = files.iter().map(|f| f.path).collect::<Vec<_>>();
-        let mut loader = |path: &str, _: &str, kind| match kind {
-            hblang::parser::FileKind::Module => Ok(paths.binary_search(&path).unwrap()),
-            hblang::parser::FileKind::Embed => Err("embeds are not supported".into()),
-        };
-        files
-            .into_iter()
-            .map(|f| {
-                hblang::parser::Ast::new(
-                    f.path,
-                    // since 'free' does nothing this is fine
-                    String::from_raw_parts(f.code.as_mut_ptr(), f.code.len(), f.code.len()),
-                    &mut ctx.parser,
-                    &mut loader,
-                )
-            })
-            .collect::<Vec<_>>()
-    };
-
-    let mut ct = {
-        let mut backend = HbvmBackend::default();
-        Codegen::new(&mut backend, &files, &mut ctx).generate(Module::new(root));
-
-        if !ctx.parser.errors.borrow().is_empty() {
-            log::error!("{}", ctx.parser.errors.borrow());
-            return;
-        }
-
-        let mut c = Codegen::new(&mut backend, &files, &mut ctx);
-        c.assemble_comptime()
-    };
-
-    while fuel != 0 {
-        match ct.vm.run() {
-            Ok(hbvm::VmRunOk::End) => {
-                log::error!("exit code: {}", ct.vm.read_reg(1).0 as i64);
-                break;
-            }
-            Ok(hbvm::VmRunOk::Ecall) => {
-                let kind = ct.vm.read_reg(2).0;
-                match kind {
-                    0 => {
-                        let str = ct.vm.read_reg(3).0;
-                        let str = unsafe { CStr::from_ptr(str as _) };
-                        log::error!("{}", str.to_str().unwrap());
-                    }
-                    unknown => log::error!("unknown ecall: {unknown}"),
-                }
-            }
-            Ok(hbvm::VmRunOk::Timer) => {
-                fuel -= 1;
-                if fuel == 0 {
-                    log::error!("program timed out");
-                }
-            }
-            Ok(hbvm::VmRunOk::Breakpoint) => todo!(),
-            Err(e) => {
-                log::error!("vm error: {e}");
-                break;
-            }
-        }
-    }
-
-    //log::error!("memory consumption: {}b / {}b", ALLOCATOR.used(), ARENA_CAP);
-}

depell/wasm-rt/Cargo.toml

@@ -1,7 +0,0 @@
-[package]
-name = "wasm-rt"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-log = { version = "0.4.22", optional = true }

depell/wasm-rt/src/lib.rs

@@ -1,162 +0,0 @@
-#![feature(alloc_error_handler)]
-#![feature(pointer_is_aligned_to)]
-#![feature(slice_take)]
-#![no_std]
-
-use core::{
-    alloc::{GlobalAlloc, Layout},
-    cell::UnsafeCell,
-};
-
-extern crate alloc;
-
-#[macro_export]
-macro_rules! decl_buffer {
-    ($cap:expr, $export_cap:ident, $export_base:ident, $export_len:ident) => {
-        #[no_mangle]
-        static $export_cap: usize = $cap;
-        #[no_mangle]
-        static mut $export_base: [u8; $cap] = [0; $cap];
-        #[no_mangle]
-        static mut $export_len: usize = 0;
-    };
-}
-
-#[macro_export]
-macro_rules! decl_runtime {
-    ($memory_size:expr, $max_panic_size:expr) => {
-        #[cfg(debug_assertions)]
-        #[no_mangle]
-        static mut PANIC_MESSAGE: [u8; $max_panic_size] = [0; $max_panic_size];
-        #[cfg(debug_assertions)]
-        #[no_mangle]
-        static mut PANIC_MESSAGE_LEN: usize = 0;
-
-        #[cfg(target_arch = "wasm32")]
-        #[panic_handler]
-        pub fn handle_panic(_info: &core::panic::PanicInfo) -> ! {
-            #[cfg(debug_assertions)]
-            {
-                unsafe {
-                    use core::fmt::Write;
-                    let mut f = $crate::Write(&mut PANIC_MESSAGE[..]);
-                    _ = writeln!(f, "{}", _info);
-                    PANIC_MESSAGE_LEN = $max_panic_size - f.0.len();
-                }
-            }
-
-            core::arch::wasm32::unreachable();
-        }
-
-        #[global_allocator]
-        static ALLOCATOR: $crate::ArenaAllocator<{ $memory_size }> = $crate::ArenaAllocator::new();
-
-        #[cfg(target_arch = "wasm32")]
-        #[alloc_error_handler]
-        fn alloc_error(_: core::alloc::Layout) -> ! {
-            #[cfg(debug_assertions)]
-            {
-                unsafe {
-                    use core::fmt::Write;
-                    let mut f = $crate::Write(&mut PANIC_MESSAGE[..]);
-                    _ = writeln!(f, "out of memory");
-                    PANIC_MESSAGE_LEN = $max_panic_size - f.0.len();
-                }
-            }
-
-            core::arch::wasm32::unreachable()
-        }
-    };
-}
-
-#[cfg(feature = "log")]
-pub struct Logger;
-
-#[cfg(feature = "log")]
-impl log::Log for Logger {
-    fn enabled(&self, _: &log::Metadata) -> bool {
-        true
-    }
-
-    fn log(&self, record: &log::Record) {
-        if self.enabled(record.metadata()) {
-            const MAX_LOG_MESSAGE: usize = 1024 * 8;
-            #[no_mangle]
-            static mut LOG_MESSAGES: [u8; MAX_LOG_MESSAGE] = [0; MAX_LOG_MESSAGE];
-            #[no_mangle]
-            static mut LOG_MESSAGES_LEN: usize = 0;
-
-            unsafe {
-                use core::fmt::Write;
-                let mut f = Write(&mut LOG_MESSAGES[LOG_MESSAGES_LEN..]);
-                _ = writeln!(f, "{}", record.args());
-                LOG_MESSAGES_LEN = MAX_LOG_MESSAGE - f.0.len();
-            }
-        }
-    }
-
-    fn flush(&self) {}
-}
-
-pub struct ArenaAllocator<const SIZE: usize> {
-    arena: UnsafeCell<[u8; SIZE]>,
-    head: UnsafeCell<*mut u8>,
-}
-
-impl<const SIZE: usize> ArenaAllocator<SIZE> {
-    #[expect(clippy::new_without_default)]
-    pub const fn new() -> Self {
-        ArenaAllocator {
-            arena: UnsafeCell::new([0; SIZE]),
-            head: UnsafeCell::new(core::ptr::null_mut()),
-        }
-    }
-
-    #[expect(clippy::missing_safety_doc)]
-    pub unsafe fn reset(&self) {
-        (*self.head.get()) = self.arena.get().cast::<u8>().add(SIZE);
-    }
-
-    pub fn used(&self) -> usize {
-        unsafe { self.arena.get() as usize + SIZE - (*self.head.get()) as usize }
-    }
-}
-
-unsafe impl<const SIZE: usize> Sync for ArenaAllocator<SIZE> {}
-
-unsafe impl<const SIZE: usize> GlobalAlloc for ArenaAllocator<SIZE> {
-    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        let size = layout.size();
-        let align = layout.align();
-
-        let until = self.arena.get() as *mut u8;
-
-        let new_head = (*self.head.get()).sub(size);
-        let aligned_head = (new_head as usize & !(align - 1)) as *mut u8;
-        debug_assert!(aligned_head.is_aligned_to(align));
-
-        if until > aligned_head {
-            return core::ptr::null_mut();
-        }
-
-        *self.head.get() = aligned_head;
-        aligned_head
-    }
-
-    unsafe fn dealloc(&self, _ptr: *mut u8, _layout: Layout) {
-        /* lol */
-    }
-}
-
-pub struct Write<'a>(pub &'a mut [u8]);
-
-impl core::fmt::Write for Write<'_> {
-    fn write_str(&mut self, s: &str) -> core::fmt::Result {
-        if let Some(m) = self.0.take_mut(..s.len()) {
-            m.copy_from_slice(s.as_bytes());
-            Ok(())
-        } else {
-            Err(core::fmt::Error)
-        }
-    }
-}

examples/asm/hello-name.hba

@@ -1,100 +0,0 @@
-jmp entry
-
-puts:
--- Write string to console
---  r2: [IN] *const u8  String pointer
---  r3: [IN] usize      String length
-
-    li8     r1, 0x1         -- Write syscall
-    brc     r2, r3, 2       -- Copy parameters
-    li8     r2, 0x1         -- STDOUT
-    eca
-
-    jal     r0, r31, 0
-
-gets:
--- Read string until end of buffer or LF
---  r2: [IN] *mut u8    Buffer
---  r3: [IN] usize      Buffer length
-
-    -- Register allocations:
-    --  r33: *mut u8    Buffer end
-    --  r34: u8         Immediate char
-    --  r35: u8         Const [0x0A = LF]
-
-    li8     r35, 0x0A
-    add64   r33, r2, r3
-
-    -- Setup syscall
-    li8     r2, 0x1         -- Stdin
-    cp      r3, r2
-    li8     r4, 0x1         -- Read one char
-
-    jeq     r3, r33, end
-    loop:
-        li8     r1, 0x1     -- Read syscall
-        eca
-        addi64  r3, r3, 1
-        ld      r34, r3, 0, 1
-        jeq     r34, r35, end
-        jne     r3, r33, loop
-    
-    end:
-        -- Set copied amount
-        sub64   r1, r33, r3
-        addi64  r1, -1
-        jal     r0, r31, 0
-
-alloc-pages:
--- Allocate pages
---  r1: [OUT] *mut u8   Pointer to page
---  r2: [IN]  u16       Page count
-
-    muli16  r3, r2, 4096    -- page count
-    li8     r1, 0x9         -- mmap syscall
-    li8     r2, 0x0         -- no address set, kernel chosen
-    li8     r4, 0x2         -- PROT_WRITE
-    li8     r5, 0x20        -- MAP_ANONYMOUS
-    li64    r6, -1          -- Doesn't map file
-    li8     r7, 0x0         -- Doesn't map file
-    eca
-
-    jal     r0, r31, 0
-
-entry:
--- Program entrypoint
-
-    -- Register allocations:
-    -- r32: *mut u8     Buffer
-    -- r36: usize       Read buffer length
-
-    -- Allocate one page (4096 KiB)
-    li8     r2, 1
-    jal     r31, 0, alloc-pages
-    cp      r32, r1
-
-    -- Print message
-    lra16   r2, r0, #enter-your-name
-    li8     r3, 17
-    jal     r31, r0, puts
-
-    -- Read name
-    cp      r2, r32
-    li16    r3, 4096
-    jal     r31, r0, gets
-    cp      r36, r1
-
-    -- Print your name is
-    lra16   r2, r0, #your-name-is
-    li8     r3, 15
-    jal     r31, r0, puts
-
-    -- And now print the name
-    cp      r2, r32
-    cp      r3, r36
-    jal     r31, r0, puts
-
-    tx
-
-#enter-your-name: "Enter your name: "
-#your-name-is   : "\nYour name is: "

hbasm/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "hbasm"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+ariadne    = "0.3"
+bytemuck   = "1.13"
+hashbrown  = "0.14"
+hbbytecode = { path = "../hbbytecode" }
+literify   = "0.1"
+paste      = "1.0"
+
+[dependencies.lasso]
+version = "0.7"
+default-features = false
+features = ["no-std"]
+
+[dependencies.logos]
+version = "0.13"
+default-features = false
+features = ["export_derive"]

hbasm/assets/ecall.hbasm

@@ -0,0 +1,11 @@
+addi r1, r0, 1024
+addi r2, r1, 1024
+addi r3, r2, 1024
+addi r4, r3, 1024
+addi r5, r4, 1024
+addi r6, r5, 1024
+addi r7, r6, 1024
+addi r8, r7, 1024
+addi r9, r8, 1024
+
+ecall

hbasm/assets/inf_loop.hbasm

@@ -0,0 +1,2 @@
+L:
+ jal r0, r0, L

hbasm/assets/memory.hbasm

@@ -0,0 +1,3 @@
+li r20, 1010
+st r20, r24, 0, 1
+addi r24, r0, 10

hbasm/assets/serial_driver.hbasm

@@ -0,0 +1,18 @@
+jmp r0, start
+start:
+    jmp r0, init_serial_port
+
+-- Uses r20 to set the port
+init_serial_port:
+    add r20, r30, r10
+    li r20, 00
+
+   -- outb(PORT + 1, 0x00);    // Disable all interrupts
+   -- outb(PORT + 3, 0x80);    // Enable DLAB (set baud rate divisor)
+   -- outb(PORT + 0, 0x03);    // Set divisor to 3 (lo byte) 38400 baud
+   -- outb(PORT + 1, 0x00);    //                  (hi byte)
+   -- outb(PORT + 3, 0x03);    // 8 bits, no parity, one stop bit
+   -- outb(PORT + 2, 0xC7);    // Enable FIFO, clear them, with 14-byte threshold
+   -- outb(PORT + 4, 0x0B);    // IRQs enabled, RTS/DSR set
+   -- outb(PORT + 4, 0x1E);    // Set in loopback mode, test the serial chip
+   -- outb(PORT + 0, 0xAE);    // Test serial chip (send byte 0xAE and check if serial returns same byte)

hbasm/src/lib.rs

@@ -0,0 +1,104 @@
+//! Holey Bytes Assembler
+//!
+//! Some people claim:
+//! > Write programs to handle text streams, because that is a universal interface.
+//!
+//! We at AbleCorp believe that nice programatic API is nicer than piping some text
+//! into a program. It's less error-prone and faster.
+//!
+//! So this crate contains both assembleer with API for programs and a text assembler
+//! for humans to write
+
+#![no_std]
+
+extern crate alloc;
+
+mod macros;
+
+use {
+    alloc::{vec, vec::Vec},
+    hashbrown::HashSet,
+};
+
+/// Assembler
+///
+/// - Opcode-generic, instruction-type-specific methods are named `i_param_<type>`
+///     - You likely won't need to use them, but they are here, just in case :)
+/// - Instruction-specific methods are named `i_<instruction>`
+pub struct Assembler {
+    pub buf: Vec<u8>,
+    pub sub: HashSet<usize>,
+}
+
+impl Default for Assembler {
+    fn default() -> Self {
+        Self {
+            buf: vec![0; 4],
+            sub: Default::default(),
+        }
+    }
+}
+
+hbbytecode::invoke_with_def!(macros::text::gen_text);
+
+impl Assembler {
+    hbbytecode::invoke_with_def!(macros::asm::impl_asm);
+
+    /// Append 12 zeroes (UN) at the end and add magic to the begining
+    ///
+    /// # HoleyBytes lore
+    ///
+    /// In reference HBVM implementation checks are done in
+    /// a separate phase before execution.
+    ///
+    /// This way execution will be much faster as they have to
+    /// be done only once.
+    ///
+    /// There was an issue. You cannot statically check register values and
+    /// `JAL` instruction could hop at the end of program to some byte, which
+    /// will be interpreted as some valid opcode and VM in attempt to decode
+    /// the instruction performed out-of-bounds read which leads to undefined behaviour.
+    ///
+    /// Several options were considered to overcome this, but inserting some data at
+    /// program's end which when executed would lead to undesired behaviour, though
+    /// not undefined behaviour.
+    ///
+    /// Newly created `UN` (as UNreachable) was chosen as
+    /// - It was a good idea to add some equivalent to `ud2` anyways
+    /// - It was chosen to be zero
+    /// - What if you somehow reached that code, it will appropriately bail :)
+    /// - (yes, originally `NOP` was considered)
+    ///
+    /// Why 12 bytes? That's the size of largest instruction parameter part.
+    pub fn finalise(&mut self) {
+        self.buf.extend([0; 12]);
+        self.buf[0..4].copy_from_slice(&0xAB1E0B_u32.to_le_bytes());
+    }
+}
+
+/// Immediate value
+///
+/// # Implementor notice
+/// It should insert exactly 8 bytes, otherwise output will be malformed.
+/// This is not checked in any way
+pub trait Imm {
+    /// Insert immediate value
+    fn insert(&self, asm: &mut Assembler);
+}
+
+/// Implement immediate values
+macro_rules! impl_imm_le_bytes {
+    ($($ty:ty),* $(,)?) => {
+        $(
+            impl Imm for $ty {
+                #[inline(always)]
+                fn insert(&self, asm: &mut Assembler) {
+                    // Convert to little-endian bytes, insert.
+                    asm.buf.extend(self.to_le_bytes());
+                }
+            }
+        )*
+    };
+}
+
+impl_imm_le_bytes!(u64, i64, f64);

hbasm/src/macros/asm.rs

@@ -0,0 +1,89 @@
+//! Macros to generate [`crate::Assembler`]
+
+/// Incremental token-tree muncher to implement specific instruction
+/// functions based on generic function for instruction type
+macro_rules! impl_asm_opcodes {
+    ( // End case
+        $generic:ident
+        ($($param_i:ident: $param_ty:ty),*)
+        => []
+    ) => {};
+
+    (
+        $generic:ident
+        ($($param_i:ident: $param_ty:ty),*)
+        => [$opcode:ident, $($rest:tt)*]
+    ) => {
+        // Instruction-specific function
+        paste::paste! {
+            #[inline(always)]
+            pub fn [<i_ $opcode:lower>](&mut self, $($param_i: $param_ty),*) {
+                self.$generic(hbbytecode::opcode::$opcode, $($param_i),*)
+            }
+        }
+
+        // And recurse!
+        macros::asm::impl_asm_opcodes!(
+            $generic($($param_i: $param_ty),*)
+            => [$($rest)*]
+        );
+    };
+}
+
+/// Numeric value insert
+macro_rules! impl_asm_insert {
+    // Immediate - this is trait-based,
+    // the insertion is delegated to its implementation
+    ($self:expr, $id:ident, I) => {
+        Imm::insert(&$id, $self)
+    };
+
+    // Length - cannot be more than 2048
+    ($self:expr, $id:ident, L) => {{
+        assert!($id <= 2048);
+        $self.buf.extend($id.to_le_bytes())
+    }};
+
+    // Other numbers, just insert their bytes, little endian
+    ($self:expr, $id:ident, $_:ident) => {
+        $self.buf.extend($id.to_le_bytes())
+    };
+}
+
+/// Implement assembler
+macro_rules! impl_asm {
+    (
+        $(
+            $ityn:ident
+            ($($param_i:ident: $param_ty:ident),* $(,)?)
+            => [$($opcode:ident),* $(,)?],
+        )*
+    ) => {
+        paste::paste! {
+            $(
+                // Opcode-generic functions specific for instruction types
+                pub fn [<i_param_ $ityn>](&mut self, opcode: u8, $($param_i: macros::asm::ident_map_ty!($param_ty)),*) {
+                    self.buf.push(opcode);
+                    $(macros::asm::impl_asm_insert!(self, $param_i, $param_ty);)*
+                }
+
+                // Generate opcode-specific functions calling the opcode-generic ones
+                macros::asm::impl_asm_opcodes!(
+                    [<i_param_ $ityn>]($($param_i: macros::asm::ident_map_ty!($param_ty)),*)
+                    => [$($opcode,)*]
+                );
+            )*
+        }
+    };
+}
+
+/// Map operand type to Rust type
+#[rustfmt::skip]
+macro_rules! ident_map_ty {
+    (R)         => { u8 };       // Register is just u8
+    (I)         => { impl Imm }; // Immediate is anything implementing the trait
+    (L)         => { u16 };      // Copy count
+    ($id:ident) => { $id };      // Anything else → identity map
+}
+
+pub(crate) use {ident_map_ty, impl_asm, impl_asm_insert, impl_asm_opcodes};

hbasm/src/macros/mod.rs

@@ -0,0 +1,6 @@
+//! And here the land of macros begin.
+//!
+//! They do not bite, really. Have you seen what Yandros is writing?
+
+pub mod asm;
+pub mod text;

hbasm/src/macros/text.rs

@@ -0,0 +1,293 @@
+//! Macros to generate text-code assembler at [`crate::text`]
+// Refering in module which generates a module to that module — is that even legal? :D
+
+/// Generate text code based assembler
+macro_rules! gen_text {
+    (
+        $(
+            $ityn:ident
+            ($($param_i:ident: $param_ty:ident),* $(,)?)
+            => [$($opcode:ident),* $(,)?],
+        )*
+    ) => {
+        /// # Text assembler
+        /// Text assembler generated simply calls methods in the [`crate::Assembler`] type.
+        /// 
+        /// # Syntax
+        /// ```text
+        /// instruction op1, op2, …
+        /// …
+        /// ```
+        /// - Opcode names are lowercase
+        /// - Registers are prefixed with `r` followed by number
+        /// - Operands are separated by `,`
+        /// - Instructions are separated by either line feed or `;` (αυτό δεν είναι ερωτηματικό!)
+        /// - Labels are defined by their names followed by colon `label:`
+        /// - Labels are referenced simply by their names
+        /// - Immediates are numbers, can be negative, floats are not yet supported
+        pub mod text {
+            use {
+                crate::{
+                    Assembler,
+                    macros::text::*,
+                },
+                hashbrown::HashMap,
+                lasso::{Key, Rodeo, Spur},
+                logos::{Lexer, Logos, Span},
+            };
+
+            paste::paste!(literify::literify! {
+                /// Assembly token
+                #[derive(Clone, Copy, Debug, PartialEq, Eq, Logos)]
+                #[logos(extras = Rodeo)]
+                #[logos(skip r"[ \t\t]+")]
+                #[logos(skip r"-- .*")]
+                pub enum Token {
+                    $($(#[token(~([<$opcode:lower>]), |_| hbbytecode::opcode::[<$opcode:upper>])])*)*
+                    Opcode(u8),
+
+                    #[regex("[0-9]+", |l| l.slice().parse().ok())]
+                    #[regex(
+                        "-[0-9]+",
+                        |lexer| {
+                            Some(u64::from_ne_bytes(lexer.slice().parse::<i64>().ok()?.to_ne_bytes()))
+                        },
+                    )] Integer(u64),
+
+                    #[regex(
+                        "r[0-9]+",
+                        |lexer| match lexer.slice()[1..].parse() {
+                            Ok(n) => Some(n),
+                            _ => None
+                        },
+                    )] Register(u8),
+
+                    #[regex(
+                        r"\p{XID_Start}\p{XID_Continue}*:",
+                        |lexer| lexer.extras.get_or_intern(&lexer.slice()[..lexer.slice().len() - 1]),
+                    )] Label(Spur),
+
+                    #[regex(
+                        r"\p{XID_Start}\p{XID_Continue}*",
+                        |lexer| lexer.extras.get_or_intern(lexer.slice()),
+                    )] Symbol(Spur),
+
+                    #[token("\n")]
+                    #[token(";")] ISep,
+                    #[token(",")] PSep,
+                }
+            });
+
+            /// Type of error
+            #[derive(Copy, Clone, Debug, PartialEq, Eq)]
+            pub enum ErrorKind {
+                UnexpectedToken,
+                InvalidToken,
+                UnexpectedEnd,
+                InvalidSymbol,
+            }
+
+            /// Text assembly error
+            #[derive(Clone, Debug, PartialEq, Eq)]
+            pub struct Error {
+                pub kind: ErrorKind,
+                pub span: Span,
+            }
+
+            /// Parse code and insert instructions
+            pub fn assemble(asm: &mut Assembler, code: &str) -> Result<(), Error> {
+                pub struct TextAsm<'a> {
+                    asm: &'a mut Assembler,
+                    lexer: Lexer<'a, Token>,
+                    symloc: HashMap<Spur, usize>,
+                }
+
+                impl<'a> TextAsm<'a> {
+                    fn next(&mut self) -> Result<Token, ErrorKind> {
+                        match self.lexer.next() {
+                            Some(Ok(t))   => Ok(t),
+                            Some(Err(())) => Err(ErrorKind::InvalidToken),
+                            None          => Err(ErrorKind::UnexpectedEnd),
+                        }
+                    }
+
+                    #[inline(always)]
+                    fn run(&mut self) -> Result<(), ErrorKind> {
+                        loop {
+                            match self.lexer.next() {
+                                // Got an opcode
+                                Some(Ok(Token::Opcode(op))) => {
+                                    match op {
+                                        // Special-cased
+                                        hbbytecode::opcode::BRC => {
+                                            param_extract_itm!(
+                                                self,
+                                                p0: R,
+                                                p1: R,
+                                                p2: u8
+                                            );
+
+                                            self.asm.i_param_bbb(op, p0, p1, p2);
+                                        },
+
+                                        // Take all the opcodes and match them to their corresponding functions
+                                        $(
+                                            #[allow(unreachable_patterns)]
+                                            $(hbbytecode::opcode::$opcode)|* => paste::paste!({
+                                                param_extract_itm!(self, $($param_i: $param_ty),*);
+                                                self.asm.[<i_param_ $ityn>](op, $($param_i),*);
+                                            }),
+                                        )*
+
+                                        // Already matched in Logos, should not be able to obtain
+                                        // invalid opcode.
+                                        _ => unreachable!(),
+                                    }
+                                }
+                                // Insert label to table
+                                Some(Ok(Token::Label(lbl))) => {
+                                    self.symloc.insert(lbl, self.asm.buf.len());
+                                }
+                                // Instruction separator (LF, ;)
+                                Some(Ok(Token::ISep)) => (),
+                                Some(Ok(_))           => return Err(ErrorKind::UnexpectedToken),
+                                Some(Err(()))         => return Err(ErrorKind::InvalidToken),
+                                None                  => return Ok(()),
+                            }
+                        }
+                    }
+                }
+
+                let mut asm = TextAsm {
+                    asm,
+                    lexer: Token::lexer(code),
+                    symloc: HashMap::default(),
+                };
+
+                asm.run()
+                    .map_err(|kind| Error { kind, span: asm.lexer.span() })?;
+
+                // Walk table and substitute labels
+                // for their addresses
+                for &loc in &asm.asm.sub {
+                    // Extract indices from the code and get addresses from table
+                    let val = asm.symloc
+                        .get(
+                            &Spur::try_from_usize(bytemuck::pod_read_unaligned::<u64>(
+                                &asm.asm.buf[loc..loc + core::mem::size_of::<u64>()]) as _
+                            ).unwrap()
+                        )
+                        .ok_or(Error { kind: ErrorKind::InvalidSymbol, span: 0..0 })?
+                        .to_le_bytes();
+
+                    // New address
+                    asm.asm.buf[loc..]
+                        .iter_mut()
+                        .zip(val)
+                        .for_each(|(dst, src)| *dst = src);
+                }
+
+                Ok(())
+            }
+
+            // Fun fact: this is a little hack
+            // It may slow the things a little bit down, but
+            // it made the macro to be made pretty nice.
+            // 
+            // If you have any idea how to get rid of this,
+            // contributions are welcome :)
+            // I *likely* won't try anymore.
+            enum InternalImm {
+                Const(u64),
+                Named(Spur),
+            }
+
+            impl $crate::Imm for InternalImm {
+                #[inline]
+                fn insert(&self, asm: &mut Assembler) {
+                    match self {
+                        // Constant immediate, just put it in
+                        Self::Const(a) => a.insert(asm),
+                        // Label
+                        Self::Named(a) => {
+                            // Insert to the sub table that substitution will be
+                            // requested
+                            asm.sub.insert(asm.buf.len());
+                            // Insert value from interner in place
+                            asm.buf.extend((a.into_usize() as u64).to_le_bytes());
+                        },
+                    }
+                }
+            }
+        }
+    };
+}
+
+/// Extract item by pattern, otherwise return [`ErrorKind::UnexpectedToken`]
+macro_rules! extract_pat {
+    ($self:expr, $pat:pat) => {
+        let $pat = $self.next()?
+            else { return Err(ErrorKind::UnexpectedToken) };
+    };
+}
+
+/// Generate extract macro
+macro_rules! gen_extract {
+    // Integer types have same body
+    ($($int:ident),* $(,)?) => {
+        /// Extract operand from code
+        macro_rules! extract {
+            // Register (require prefixing with r)
+            ($self:expr, R, $id:ident) => {
+                extract_pat!($self, Token::Register($id));
+            };
+
+            ($self:expr, L, $id:ident) => {
+                extract_pat!($self, Token::Integer($id));
+                if $id > 2048 {
+                    return Err(ErrorKind::InvalidToken);
+                }
+
+                let $id = u16::try_from($id).unwrap();
+            };
+
+            // Immediate
+            ($self:expr, I, $id:ident) => {
+                let $id = match $self.next()? {
+                    // Either straight up integer
+                    Token::Integer(a) => InternalImm::Const(a),
+                    // …or a label
+                    Token::Symbol(a) => InternalImm::Named(a),
+                    _ => return Err(ErrorKind::UnexpectedToken),
+                };
+            };
+
+            // Get $int, if not fitting, the token is claimed invalid
+            $(($self:expr, $int, $id:ident) => {
+                extract_pat!($self, Token::Integer($id));
+                let $id = $int::try_from($id).map_err(|_| ErrorKind::InvalidToken)?;
+            });*;
+        }
+    };
+}
+
+gen_extract!(u8, u16, u32);
+
+/// Parameter extract incremental token-tree muncher
+/// 
+/// What else would it mean?
+macro_rules! param_extract_itm {
+    ($self:expr, $($id:ident: $ty:ident)? $(, $($tt:tt)*)?) => {
+        // Extract pattern
+        $(extract!($self, $ty, $id);)?
+        $(
+            // Require operand separator
+            extract_pat!($self, Token::PSep);
+            // And go to the next (recursive)
+            // …munch munch… yummy token trees.
+            param_extract_itm!($self, $($tt)*);
+        )?
+    };
+}
+
+pub(crate) use {extract, extract_pat, gen_text, param_extract_itm};

hbasm/src/main.rs

@@ -0,0 +1,56 @@
+use std::io::Write;
+
+use hbasm::Assembler;
+
+use {
+    ariadne::{ColorGenerator, Label, Report, ReportKind, Source},
+    std::{
+        error::Error,
+        io::{stdin, Read},
+    },
+};
+
+fn main() -> Result<(), Box<dyn Error>> {
+    let mut code = String::new();
+    stdin().read_to_string(&mut code)?;
+
+    let mut assembler = Assembler::default();
+    if let Err(e) = hbasm::text::assemble(&mut assembler, &code) {
+        let mut colors = ColorGenerator::new();
+
+        let e_code = match e.kind {
+            hbasm::text::ErrorKind::UnexpectedToken => 1,
+            hbasm::text::ErrorKind::InvalidToken => 2,
+            hbasm::text::ErrorKind::UnexpectedEnd => 3,
+            hbasm::text::ErrorKind::InvalidSymbol => 4,
+        };
+        let message = match e.kind {
+            hbasm::text::ErrorKind::UnexpectedToken => "This token is not expected!",
+            hbasm::text::ErrorKind::InvalidToken => "The token is not valid!",
+            hbasm::text::ErrorKind::UnexpectedEnd => {
+                "The assembler reached the end of input unexpectedly!"
+            }
+            hbasm::text::ErrorKind::InvalidSymbol => {
+                "This referenced symbol doesn't have a corresponding label!"
+            }
+        };
+        let a = colors.next();
+
+        Report::build(ReportKind::Error, "engine_internal", e.span.clone().start)
+            .with_code(e_code)
+            .with_message(format!("{:?}", e.kind))
+            .with_label(
+                Label::new(("engine_internal", e.span))
+                    .with_message(message)
+                    .with_color(a),
+            )
+            .finish()
+            .eprint(("engine_internal", Source::from(&code)))
+            .unwrap();
+    } else {
+        assembler.finalise();
+        std::io::stdout().lock().write_all(&assembler.buf).unwrap();
+    }
+
+    Ok(())
+}

hbbytecode/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "hbbytecode"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]

hbbytecode/hbbytecode.h

@@ -13,16 +13,15 @@
 static_assert(CHAR_BIT == 8, "Cursed architectures are not supported");
 
 enum hbbc_Opcode: uint8_t {
-    hbbc_Op_UN    , hbbc_Op_TX   , hbbc_Op_NOP   , hbbc_Op_ADD   , hbbc_Op_SUB   , hbbc_Op_MUL   ,
-    hbbc_Op_AND   , hbbc_Op_OR   , hbbc_Op_XOR   , hbbc_Op_SL    , hbbc_Op_SR    , hbbc_Op_SRS   ,
-    hbbc_Op_CMP   , hbbc_Op_CMPU , hbbc_Op_DIR   , hbbc_Op_NEG   , hbbc_Op_NOT   , hbbc_Op_ADDI  , 
-    hbbc_Op_MULI  , hbbc_Op_ANDI , hbbc_Op_ORI   , hbbc_Op_XORI  , hbbc_Op_SLI   , hbbc_Op_SRI   ,
-    hbbc_Op_SRSI  , hbbc_Op_CMPI , hbbc_Op_CMPUI , hbbc_Op_CP    , hbbc_Op_SWA   , hbbc_Op_LI    ,
-    hhbc_Op_LRA   , hbbc_Op_LD   , hbbc_Op_ST    , hbbc_Op_LDR   , hhbc_Op_STR   , hbbc_Op_BMC   ,
-    hbbc_Op_BRC   , hbbc_Op_JMP  , hbbc_Op_JMPR  , hbbc_Op_JAL   , hbbc_Op_JALR  , hbbc_Op_JEQ   ,
-    hbbc_Op_JNE   , hbbc_Op_JLT  , hbbc_Op_JGT   , hbbc_Op_JLTU  , hbbc_Op_JGTU  , hbbc_Op_ECALL ,
-    hbbc_Op_ADDF  , hbbc_Op_SUBF , hbbc_Op_MULF  , hbbc_Op_DIRF  , hbbc_Op_FMAF  , hbbc_Op_NEGF  ,
-    hbbc_Op_ITF   , hbbc_Op_FTI  , hbbc_Op_ADDFI , hbbc_Op_MULFI ,
+    hbbc_Op_UN   , hbbc_Op_TX   , hbbc_Op_NOP   , hbbc_Op_ADD   , hbbc_Op_SUB  , hbbc_Op_MUL   ,
+    hbbc_Op_AND  , hbbc_Op_OR   , hbbc_Op_XOR   , hbbc_Op_SL    , hbbc_Op_SR   , hbbc_Op_SRS   ,
+    hbbc_Op_CMP  , hbbc_Op_CMPU , hbbc_Op_DIR   , hbbc_Op_NEG   , hbbc_Op_NOT  , hbbc_Op_ADDI  , 
+    hbbc_Op_MULI , hbbc_Op_ANDI , hbbc_Op_ORI   , hbbc_Op_XORI  , hbbc_Op_SLI  , hbbc_Op_SRI   ,
+    hbbc_Op_SRSI , hbbc_Op_CMPI , hbbc_Op_CMPUI , hbbc_Op_CP    , hbbc_Op_SWA  , hbbc_Op_LI    ,
+    hbbc_Op_LD   , hbbc_Op_ST   , hbbc_Op_BMC   , hbbc_Op_BRC   , hbbc_Op_JMP  , hbbc_Op_JEQ   ,
+    hbbc_Op_JNE  , hbbc_Op_JLT  , hbbc_Op_JGT   , hbbc_Op_JLTU  , hbbc_Op_JGTU , hbbc_Op_ECALL ,
+    hbbc_Op_ADDF , hbbc_Op_SUBF , hbbc_Op_MULF  , hbbc_Op_DIRF  , hbbc_Op_FMAF , hbbc_Op_NEGF  ,
+    hbbc_Op_ITF  , hbbc_Op_FTI  , hbbc_Op_ADDFI , hbbc_Op_MULFI ,
 } typedef hbbc_Opcode;
 
 static_assert(sizeof(hbbc_Opcode) == 1);
@@ -43,12 +42,6 @@ struct hbbc_ParamBBDH
     typedef hbbc_ParamBBDH;
     static_assert(sizeof(hbbc_ParamBBDH) == 96 / 8);
 
-struct hbbc_ParamBBWH
-    { uint8_t _0; uint8_t _1; uint32_t _2; uint16_t _3; }
-    typedef hbbc_ParamBBWH;
-    static_assert(sizeof(hbbc_ParamBBWH) == 64 / 8);
-
-
 struct hbbc_ParamBBD
     { uint8_t _0; uint8_t _1; uint64_t _2; }
     typedef hbbc_ParamBBD;

hbbytecode/src/gen_valider.rs

@@ -0,0 +1,170 @@
+//! Generate HoleyBytes code validator
+
+macro_rules! gen_valider {
+    (
+        $(
+            $ityn:ident
+            ($($param_i:ident: $param_ty:ident),* $(,)?)
+            => [$($opcode:ident),* $(,)?],
+        )*
+    ) => {
+        #[allow(unreachable_code)]
+        pub mod valider {
+            //! Validate if program is sound to execute
+
+            /// Program validation error kind
+            #[derive(Clone, Copy, Debug, PartialEq, Eq)]
+            pub enum ErrorKind {
+                /// Unknown opcode
+                InvalidInstruction,
+                /// VM doesn't implement this valid opcode
+                Unimplemented,
+                /// Attempted to copy over register boundary
+                RegisterArrayOverflow,
+                /// Program is not validly terminated
+                InvalidEnd,
+                /// Program misses magic
+                MissingMagic
+            }
+
+            /// Error
+            #[derive(Clone, Copy, Debug, PartialEq, Eq)]
+            pub struct Error {
+                /// Kind
+                pub kind:  ErrorKind,
+                /// Location in bytecode
+                pub index: usize,
+            }
+
+            /// Perform bytecode validation. If it passes, the program should be
+            /// sound to execute.
+            pub fn validate(mut program: &[u8]) -> Result<(), Error> {
+                // Validate magic
+                if program.get(0..4) != Some(&0xAB1E0B_u32.to_le_bytes()) {
+                    return Err(Error {
+                        kind: ErrorKind::MissingMagic,
+                        index: 0,
+                    });
+                }
+
+                // Program has to end with 12 zeroes, if there is less than
+                // 12 bytes, program is invalid.
+                if program.len() < 12 {
+                    return Err(Error {
+                        kind:  ErrorKind::InvalidEnd,
+                        index: 0,
+                    });
+                }
+
+                // Verify that program ends with 12 zeroes
+                for (index, item) in program.iter().enumerate().skip(program.len() - 12) {
+                    if *item != 0 {
+                        return Err(Error {
+                            kind: ErrorKind::InvalidEnd,
+                            index,
+                        });
+                    }
+                }
+
+                let start = program;
+                program = &program[4..];
+                loop {
+                    use crate::opcode::*;
+                    program = match program {
+                        // End of program
+                        [] => return Ok(()),
+
+                        // Memory load/store cannot go out-of-bounds register array
+                        //         B   B  D1 D2 D3 D4 D5 D6 D7 D8    H1      H2
+                        [LD..=ST, reg, _, _, _, _, _, _, _, _, _, count_0, count_1, ..]
+                            if usize::from(*reg) * 8
+                                + usize::from(u16::from_le_bytes([*count_0, *count_1]))
+                                > 2048 =>
+                        {
+                            return Err(Error {
+                                kind:  ErrorKind::RegisterArrayOverflow,
+                                index: (program.as_ptr() as usize) - (start.as_ptr() as usize),
+                            });
+                        }
+
+                        // Block register copy cannot go out-of-bounds register array
+                        [BRC, src, dst, count, ..]
+                            if src.checked_add(*count).is_none()
+                                || dst.checked_add(*count).is_none() =>
+                        {
+                            return Err(Error {
+                                kind:  ErrorKind::RegisterArrayOverflow,
+                                index: (program.as_ptr() as usize) - (start.as_ptr() as usize),
+                            });
+                        }
+
+                        $(
+                            $crate::gen_valider::inst_chk!(
+                                rest, $ityn, $($opcode),*
+                            )
+                        )|* => rest,
+
+                        // The plebs
+                        _ => {
+                            return Err(Error {
+                                kind:  ErrorKind::InvalidInstruction,
+                                index: (program.as_ptr() as usize) - (start.as_ptr() as usize),
+                            })
+                        }
+                    }
+                }
+            }
+        }
+    };
+}
+
+/// Generate instruction check pattern
+macro_rules! inst_chk {
+    // Sadly this has hardcoded instruction types,
+    // as I cannot generate parts of patterns+
+
+    ($rest:ident, bbbb, $($opcode:ident),*) => {
+        //             B  B  B  B
+        [$($opcode)|*, _, _, _, _, $rest @ ..]
+    };
+
+    ($rest:ident, bbb, $($opcode:ident),*) => {
+        //             B  B  B
+        [$($opcode)|*, _, _, _, $rest @ ..]
+    };
+
+    ($rest:ident, bbdh, $($opcode:ident),*) => {
+        //             B  B  D1 D2 D3 D4 D5 D6 D7 D8 H1 H2
+        [$($opcode)|*, _, _, _, _, _, _, _, _, _, _, _, _, $rest @ ..]
+    };
+
+    ($rest:ident, bbd, $($opcode:ident),*) => {
+        //             B  B  D1 D2 D3 D4 D5 D6 D7 D8
+        [$($opcode)|*, _, _, _, _, _, _, _, _, _, _, $rest @ ..]
+    };
+
+    ($rest:ident, bbw, $($opcode:ident),*) => {
+        //             B  B  W1 W2 W3 W4
+        [$($opcode)|*, _, _, _, _, _, _, $rest @ ..]
+    };
+
+    ($rest:ident, bb, $($opcode:ident),*) => {
+        //             B  B
+        [$($opcode)|*, _, _, $rest @ ..]
+    };
+
+    ($rest:ident, bd, $($opcode:ident),*) => {
+        //             B  D1 D2 D3 D4 D5 D6 D7 D8
+        [$($opcode)|*, _, _, _, _, _, _, _, _, _, $rest @ ..]
+    };
+
+    ($rest:ident, n, $($opcode:ident),*) => {
+        [$($opcode)|*, $rest @ ..]
+    };
+
+    ($_0:ident, $($_1:ident),*) => {
+        compile_error!("Invalid instruction type");
+    }
+}
+
+pub(crate) use {gen_valider, inst_chk};

hbbytecode/src/lib.rs

@@ -0,0 +1,162 @@
+#![no_std]
+
+mod gen_valider;
+
+macro_rules! constmod {
+    ($vis:vis $mname:ident($repr:ty) {
+        $(#![doc = $mdoc:literal])?
+        $($cname:ident = $val:expr $(,$doc:literal)?;)*
+    }) => {
+        $(#[doc = $mdoc])?
+        $vis mod $mname {
+            $(
+                $(#[doc = $doc])?
+                pub const $cname: $repr = $val;
+            )*
+        }
+    };
+}
+
+#[allow(rustdoc::invalid_rust_codeblocks)]
+/// Invoke macro with bytecode definition
+/// # Input syntax
+/// ```no_run
+/// macro!(
+///     INSTRUCTION_TYPE(p0: TYPE, p1: TYPE, …)
+///         => [INSTRUCTION_A, INSTRUCTION_B, …],
+///     …
+/// );
+/// ```
+/// - Instruction type determines opcode-generic, instruction-type-specific
+///   function. Name: `i_param_INSTRUCTION_TYPE`
+/// - Per-instructions there will be generated opcode-specific functions calling the generic ones
+/// - Operand types
+///     - R: Register (u8)
+///     - I: Immediate
+///     - L: Memory load / store size (u16)
+///     - Other types are identity-mapped
+///
+/// # BRC special-case
+/// BRC's 3rd operand is plain byte, not a register. Encoding is the same, but for some cases it may matter.
+///
+/// Please, if you distinguish in your API between byte and register, special case this one.
+///
+/// Sorry for that :(
+#[macro_export]
+macro_rules! invoke_with_def {
+    ($macro:path) => {
+        $macro!(
+            bbbb(p0: R, p1: R, p2: R, p3: R)
+                => [DIR, DIRF, FMAF],
+            bbb(p0: R, p1: R, p2: R)
+                => [ADD, SUB, MUL, AND, OR, XOR, SL, SR, SRS, CMP, CMPU, BRC, ADDF, SUBF, MULF],
+            bbdh(p0: R, p1: R, p2: I, p3: L)
+                => [LD, ST],
+            bbd(p0: R, p1: R, p2: I)
+                => [ADDI, MULI, ANDI, ORI, XORI, CMPI, CMPUI, BMC, JAL, JEQ, JNE, JLT, JGT, JLTU,
+                    JGTU, ADDFI, MULFI],
+            bbw(p0: R, p1: R, p2: u32)
+                => [SLI, SRI, SRSI],
+            bb(p0: R, p1: R)
+                => [NEG, NOT, CP, SWA, NEGF, ITF, FTI],
+            bd(p0: R, p1: I)
+                => [LI],
+            n()
+                => [UN, TX, NOP, ECALL],
+        );
+    };
+}
+
+invoke_with_def!(gen_valider::gen_valider);
+
+constmod!(pub opcode(u8) {
+    //! Opcode constant module
+
+    UN  = 0, "N; Raises a trap";
+    TX  = 1, "N; Terminate execution";
+    NOP = 2, "N; Do nothing";
+
+    ADD  = 3,  "BBB; #0 ← #1 + #2";
+    SUB  = 4,  "BBB; #0 ← #1 - #2";
+    MUL  = 5,  "BBB; #0 ← #1 × #2";
+    AND  = 6,  "BBB; #0 ← #1 & #2";
+    OR   = 7,  "BBB; #0 ← #1 | #2";
+    XOR  = 8,  "BBB; #0 ← #1 ^ #2";
+    SL   = 9,  "BBB; #0 ← #1 « #2";
+    SR   = 10,  "BBB; #0 ← #1 » #2";
+    SRS  = 11,  "BBB; #0 ← #1 » #2 (signed)";
+    CMP  = 12, "BBB; #0 ← #1 <=> #2";
+    CMPU = 13, "BBB; #0 ← #1 <=> #2 (unsigned)";
+    DIR  = 14, "BBBB; #0 ← #2 / #3, #1 ← #2 % #3";
+    NEG  = 15, "BB; #0 ← -#1";
+    NOT  = 16, "BB; #0 ← !#1";
+
+    ADDI  = 17, "BBD; #0 ← #1 + imm #2";
+    MULI  = 18, "BBD; #0 ← #1 × imm #2";
+    ANDI  = 19, "BBD; #0 ← #1 & imm #2";
+    ORI   = 20, "BBD; #0 ← #1 | imm #2";
+    XORI  = 21, "BBD; #0 ← #1 ^ imm #2";
+    SLI   = 22, "BBW; #0 ← #1 « imm #2";
+    SRI   = 23, "BBW; #0 ← #1 » imm #2";
+    SRSI  = 24, "BBW; #0 ← #1 » imm #2 (signed)";
+    CMPI  = 25, "BBD; #0 ← #1 <=> imm #2";
+    CMPUI = 26, "BBD; #0 ← #1 <=> imm #2 (unsigned)";
+
+    CP  = 27, "BB; Copy #0 ← #1";
+    SWA = 28, "BB; Swap #0 and #1";
+    LI  = 29, "BD; #0 ← imm #1";
+    LD  = 30, "BBDB; #0 ← [#1 + imm #3], imm #4 bytes, overflowing";
+    ST  = 31, "BBDB; [#1 + imm #3] ← #0, imm #4 bytes, overflowing";
+    BMC = 32, "BBD; [#0] ← [#1], imm #2 bytes";
+    BRC = 33, "BBB; #0 ← #1, imm #2 registers";
+
+    JAL   = 34, "BD;  Copy PC to #0 and unconditional jump [#1 + imm #2]";
+    JEQ   = 35, "BBD; if #0 = #1 → jump imm #2";
+    JNE   = 36, "BBD; if #0 ≠ #1 → jump imm #2";
+    JLT   = 37, "BBD; if #0 < #1 → jump imm #2";
+    JGT   = 38, "BBD; if #0 > #1 → jump imm #2";
+    JLTU  = 39, "BBD; if #0 < #1 → jump imm #2 (unsigned)";
+    JGTU  = 40, "BBD; if #0 > #1 → jump imm #2 (unsigned)";
+    ECALL = 41, "N; Issue system call";
+
+    ADDF = 42, "BBB; #0 ← #1 +. #2";
+    SUBF = 43, "BBB; #0 ← #1 -. #2";
+    MULF = 44, "BBB; #0 ← #1 +. #2";
+    DIRF = 45, "BBBB; #0 ← #2 / #3, #1 ← #2 % #3";
+    FMAF = 46, "BBBB; #0 ← (#1 * #2) + #3";
+    NEGF = 47, "BB; #0 ← -#1";
+    ITF  = 48, "BB; #0 ← #1 as float";
+    FTI  = 49, "BB; #0 ← #1 as int";
+
+    ADDFI = 50, "BBD; #0 ← #1 +. imm #2";
+    MULFI = 51, "BBD; #0 ← #1 *. imm #2";
+});
+
+#[repr(packed)]
+pub struct ParamBBBB(pub u8, pub u8, pub u8, pub u8);
+#[repr(packed)]
+pub struct ParamBBB(pub u8, pub u8, pub u8);
+#[repr(packed)]
+pub struct ParamBBDH(pub u8, pub u8, pub u64, pub u16);
+#[repr(packed)]
+pub struct ParamBBD(pub u8, pub u8, pub u64);
+#[repr(packed)]
+pub struct ParamBBW(pub u8, pub u8, pub u32);
+#[repr(packed)]
+pub struct ParamBB(pub u8, pub u8);
+#[repr(packed)]
+pub struct ParamBD(pub u8, pub u64);
+
+/// # Safety
+/// Has to be valid to be decoded from bytecode.
+pub unsafe trait ProgramVal {}
+unsafe impl ProgramVal for ParamBBBB {}
+unsafe impl ProgramVal for ParamBBB {}
+unsafe impl ProgramVal for ParamBBDH {}
+unsafe impl ProgramVal for ParamBBD {}
+unsafe impl ProgramVal for ParamBBW {}
+unsafe impl ProgramVal for ParamBB {}
+unsafe impl ProgramVal for ParamBD {}
+unsafe impl ProgramVal for u64 {}
+unsafe impl ProgramVal for u8 {} // Opcode
+unsafe impl ProgramVal for () {}

hbvm/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "hbvm"
+version = "0.1.0"
+edition = "2021"
+
+[profile.release]
+lto = true
+
+[features]
+default = ["alloc"]
+alloc   = []
+nightly = []
+
+[dependencies]
+delegate          = "0.9"
+derive_more       = "0.99"
+hbbytecode.path   = "../hbbytecode"
+paste             = "1.0"
+sealed            = "0.5"
+static_assertions = "1.0"

hbvm/fuzz/.gitignore

@@ -2,4 +2,4 @@ target
 artifacts
 corpus
 coverage
-Cargo.lock
+Cargo.lock

hbvm/fuzz/Cargo.toml

@@ -13,6 +13,9 @@ libfuzzer-sys = "0.4"
 [dependencies.hbvm]
 path = ".."
 
+[dependencies.hbbytecode]
+path = "../../hbbytecode"
+
 # Prevent this from interfering with workspaces
 [workspace]
 members = ["."]

hbvm/fuzz/fuzz_targets/vm.rs

@@ -0,0 +1,82 @@
+#![no_main]
+
+use {
+    hbbytecode::valider::validate,
+    hbvm::{
+        mem::softpaging::{
+            paging::{PageTable, Permission},
+            HandlePageFault, PageSize, SoftPagedMem,
+        },
+        MemoryAccessReason, Vm,
+    },
+    libfuzzer_sys::fuzz_target,
+};
+
+fuzz_target!(|data: &[u8]| {
+    if validate(data).is_ok() {
+        let mut vm = unsafe {
+            Vm::<_, 16384>::new(
+                SoftPagedMem::<_, true> {
+                    pf_handler: TestTrapHandler,
+                    program:    data,
+                    root_pt:    Box::into_raw(Default::default()),
+                    icache:     Default::default(),
+                },
+                0,
+            )
+        };
+
+        // Alloc and map some memory
+        let pages = [
+            alloc_and_map(&mut vm.memory, 0),
+            alloc_and_map(&mut vm.memory, 4096),
+        ];
+
+        // Run VM
+        let _ = vm.run();
+
+        // Unmap and dealloc the memory
+        for (i, page) in pages.into_iter().enumerate() {
+            unmap_and_dealloc(&mut vm.memory, page, i as u64 * 4096);
+        }
+
+        let _ = unsafe { Box::from_raw(vm.memory.root_pt) };
+    }
+});
+
+fn alloc_and_map(memory: &mut SoftPagedMem<TestTrapHandler>, at: u64) -> *mut u8 {
+    let ptr = Box::into_raw(Box::<Page>::default()).cast();
+    unsafe {
+        memory
+            .map(ptr, at, Permission::Write, PageSize::Size4K)
+            .unwrap()
+    };
+    ptr
+}
+
+fn unmap_and_dealloc(memory: &mut SoftPagedMem<TestTrapHandler>, ptr: *mut u8, from: u64) {
+    memory.unmap(from).unwrap();
+    let _ = unsafe { Box::from_raw(ptr.cast::<Page>()) };
+}
+
+#[repr(align(4096))]
+struct Page([u8; 4096]);
+impl Default for Page {
+    fn default() -> Self {
+        unsafe { std::mem::MaybeUninit::zeroed().assume_init() }
+    }
+}
+
+struct TestTrapHandler;
+impl HandlePageFault for TestTrapHandler {
+    fn page_fault(
+        &mut self,
+        _: MemoryAccessReason,
+        _: &mut PageTable,
+        _: u64,
+        _: PageSize,
+        _: *mut u8,
+    ) -> bool {
+        false
+    }
+}

hbvm/src/bmc.rs

@@ -0,0 +1,155 @@
+//! Block memory copier state machine
+
+use {
+    super::{Memory, MemoryAccessReason, VmRunError},
+    core::{mem::MaybeUninit, task::Poll},
+};
+
+/// Buffer size (defaults to 4 KiB, a smallest page size on most platforms)
+const BUF_SIZE: usize = 4096;
+
+/// Buffer of possibly uninitialised bytes, aligned to [`BUF_SIZE`]
+#[repr(align(4096))]
+struct AlignedBuf([MaybeUninit<u8>; BUF_SIZE]);
+
+/// State for block memory copy
+pub struct BlockCopier {
+    /// Source address
+    src:       u64,
+    /// Destination address
+    dst:       u64,
+    /// How many buffer sizes to copy?
+    n_buffers: usize,
+    /// …and what remainds after?
+    rem:       usize,
+}
+
+impl BlockCopier {
+    /// Construct a new one
+    #[inline]
+    pub fn new(src: u64, dst: u64, count: usize) -> Self {
+        Self {
+            src,
+            dst,
+            n_buffers: count / BUF_SIZE,
+            rem: count % BUF_SIZE,
+        }
+    }
+
+    /// Copy one block
+    ///
+    /// # Safety
+    /// - Same as for [`Memory::load`] and [`Memory::store`]
+    pub unsafe fn poll(&mut self, memory: &mut impl Memory) -> Poll<Result<(), BlkCopyError>> {
+        // Safety: Assuming uninit of array of MaybeUninit is sound
+        let mut buf = AlignedBuf(MaybeUninit::uninit().assume_init());
+
+        // We have at least one buffer size to copy
+        if self.n_buffers != 0 {
+            if let Err(e) = act(
+                memory,
+                self.src,
+                self.dst,
+                buf.0.as_mut_ptr().cast(),
+                BUF_SIZE,
+            ) {
+                return Poll::Ready(Err(e));
+            }
+
+            // Bump source and destination address
+            //
+            // If we are over the address space, bail.
+            match self.src.checked_add(BUF_SIZE as u64) {
+                Some(n) => self.src = n,
+                None => return Poll::Ready(Err(BlkCopyError::OutOfBounds)),
+            };
+
+            match self.dst.checked_add(BUF_SIZE as u64) {
+                Some(n) => self.dst = n,
+                None => return Poll::Ready(Err(BlkCopyError::OutOfBounds)),
+            };
+
+            self.n_buffers -= 1;
+
+            return if self.n_buffers + self.rem == 0 {
+                // If there is nothing left, we are done
+                Poll::Ready(Ok(()))
+            } else {
+                // Otherwise let's advice to run it again
+                Poll::Pending
+            };
+        }
+
+        if self.rem != 0 {
+            if let Err(e) = act(
+                memory,
+                self.src,
+                self.dst,
+                buf.0.as_mut_ptr().cast(),
+                self.rem,
+            ) {
+                return Poll::Ready(Err(e));
+            }
+        }
+
+        Poll::Ready(Ok(()))
+    }
+}
+
+/// Load to buffer and store from buffer
+#[inline]
+unsafe fn act(
+    memory: &mut impl Memory,
+    src: u64,
+    dst: u64,
+    buf: *mut u8,
+    count: usize,
+) -> Result<(), BlkCopyError> {
+    // Load to buffer
+    memory
+        .load(src, buf, count)
+        .map_err(|super::LoadError(addr)| BlkCopyError::Access {
+            access_reason: MemoryAccessReason::Load,
+            addr,
+        })?;
+
+    // Store from buffer
+    memory
+        .store(dst, buf, count)
+        .map_err(|super::StoreError(addr)| BlkCopyError::Access {
+            access_reason: MemoryAccessReason::Store,
+            addr,
+        })?;
+
+    Ok(())
+}
+
+/// Error occured when copying a block of memory
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum BlkCopyError {
+    /// Memory access error
+    Access {
+        /// Kind of access
+        access_reason: MemoryAccessReason,
+        /// VM Address
+        addr: u64,
+    },
+    /// Address out of bounds
+    OutOfBounds,
+}
+
+impl From<BlkCopyError> for VmRunError {
+    fn from(value: BlkCopyError) -> Self {
+        match value {
+            BlkCopyError::Access {
+                access_reason: MemoryAccessReason::Load,
+                addr,
+            } => Self::LoadAccessEx(addr),
+            BlkCopyError::Access {
+                access_reason: MemoryAccessReason::Store,
+                addr,
+            } => Self::StoreAccessEx(addr),
+            BlkCopyError::OutOfBounds => Self::AddrOutOfBounds,
+        }
+    }
+}

hbvm/src/lib.rs

@@ -0,0 +1,558 @@
+//! HoleyBytes Virtual Machine
+//!
+//! # Alloc feature
+//! - Enabled by default
+//! - Provides mapping / unmapping, as well as [`Default`] and [`Drop`]
+//!   implementations for soft-paged memory implementation
+
+// # General safety notice:
+// - Validation has to assure there is 256 registers (r0 - r255)
+// - Instructions have to be valid as specified (values and sizes)
+// - Mapped pages should be at least 4 KiB
+
+#![no_std]
+#![cfg_attr(feature = "nightly", feature(fn_align))]
+#![warn(missing_docs, clippy::missing_docs_in_private_items)]
+
+#[cfg(feature = "alloc")]
+extern crate alloc;
+
+pub mod mem;
+pub mod value;
+
+mod bmc;
+
+use {
+    bmc::BlockCopier,
+    core::{cmp::Ordering, mem::size_of, ops},
+    derive_more::Display,
+    hbbytecode::{
+        ParamBB, ParamBBB, ParamBBBB, ParamBBD, ParamBBDH, ParamBBW, ParamBD, ProgramVal,
+    },
+    value::{Value, ValueVariant},
+};
+
+/// HoleyBytes Virtual Machine
+pub struct Vm<Mem, const TIMER_QUOTIENT: usize> {
+    /// Holds 256 registers
+    ///
+    /// Writing to register 0 is considered undefined behaviour
+    /// in terms of HoleyBytes program execution
+    pub registers: [Value; 256],
+
+    /// Memory implementation
+    pub memory: Mem,
+
+    /// Program counter
+    pub pc: usize,
+
+    /// Program timer
+    timer: usize,
+
+    /// Saved block copier
+    copier: Option<BlockCopier>,
+}
+
+impl<Mem, const TIMER_QUOTIENT: usize> Vm<Mem, TIMER_QUOTIENT>
+where
+    Mem: Memory,
+{
+    /// Create a new VM with program and trap handler
+    ///
+    /// # Safety
+    /// Program code has to be validated
+    pub unsafe fn new(memory: Mem, entry: u64) -> Self {
+        Self {
+            registers: [Value::from(0_u64); 256],
+            memory,
+            pc: entry as _,
+            timer: 0,
+            copier: None,
+        }
+    }
+
+    /// Execute program
+    ///
+    /// Program can return [`VmRunError`] if a trap handling failed
+    #[cfg_attr(feature = "nightly", repr(align(4096)))]
+    pub fn run(&mut self) -> Result<VmRunOk, VmRunError> {
+        use hbbytecode::opcode::*;
+        loop {
+            // Big match
+            //
+            // Contribution guide:
+            // - Zero register shall never be overwitten. It's value has to always be 0.
+            //     - Prefer `Self::read_reg` and `Self::write_reg` functions
+            // - Extract parameters using `param!` macro
+            // - Prioritise speed over code size
+            //     - Memory is cheap, CPUs not that much
+            // - Do not heap allocate at any cost
+            //     - Yes, user-provided trap handler may allocate,
+            //       but that is not our »fault«.
+            // - Unsafe is kinda must, but be sure you have validated everything
+            //     - Your contributions have to pass sanitizers and Miri
+            // - Strictly follow the spec
+            //     - The spec does not specify how you perform actions, in what order,
+            //       just that the observable effects have to be performed in order and
+            //       correctly.
+            // - Yes, we assume you run 64 bit CPU. Else ?conradluget a better CPU
+            //   sorry 8 bit fans, HBVM won't run on your Speccy :(
+            unsafe {
+                match self
+                    .memory
+                    .prog_read::<u8>(self.pc as _)
+                    .ok_or(VmRunError::ProgramFetchLoadEx(self.pc as _))?
+                {
+                    UN => {
+                        self.decode::<()>();
+                        return Err(VmRunError::Unreachable);
+                    }
+                    TX => {
+                        self.decode::<()>();
+                        return Ok(VmRunOk::End);
+                    }
+                    NOP => self.decode::<()>(),
+                    ADD => self.binary_op(u64::wrapping_add),
+                    SUB => self.binary_op(u64::wrapping_sub),
+                    MUL => self.binary_op(u64::wrapping_mul),
+                    AND => self.binary_op::<u64>(ops::BitAnd::bitand),
+                    OR => self.binary_op::<u64>(ops::BitOr::bitor),
+                    XOR => self.binary_op::<u64>(ops::BitXor::bitxor),
+                    SL => self.binary_op(|l, r| u64::wrapping_shl(l, r as u32)),
+                    SR => self.binary_op(|l, r| u64::wrapping_shr(l, r as u32)),
+                    SRS => self.binary_op(|l, r| i64::wrapping_shl(l, r as u32)),
+                    CMP => {
+                        // Compare a0 <=> a1
+                        // < → -1
+                        // > →  1
+                        // = →  0
+
+                        let ParamBBB(tg, a0, a1) = self.decode();
+                        self.write_reg(
+                            tg,
+                            self.read_reg(a0)
+                                .cast::<i64>()
+                                .cmp(&self.read_reg(a1).cast::<i64>())
+                                as i64,
+                        );
+                    }
+                    CMPU => {
+                        // Unsigned comparsion
+                        let ParamBBB(tg, a0, a1) = self.decode();
+                        self.write_reg(
+                            tg,
+                            self.read_reg(a0)
+                                .cast::<u64>()
+                                .cmp(&self.read_reg(a1).cast::<u64>())
+                                as i64,
+                        );
+                    }
+                    NOT => {
+                        // Logical negation
+                        let ParamBB(tg, a0) = self.decode();
+                        self.write_reg(tg, !self.read_reg(a0).cast::<u64>());
+                    }
+                    NEG => {
+                        // Bitwise negation
+                        let ParamBB(tg, a0) = self.decode();
+                        self.write_reg(
+                            tg,
+                            match self.read_reg(a0).cast::<u64>() {
+                                0 => 1_u64,
+                                _ => 0,
+                            },
+                        );
+                    }
+                    DIR => {
+                        // Fused Division-Remainder
+                        let ParamBBBB(dt, rt, a0, a1) = self.decode();
+                        let a0 = self.read_reg(a0).cast::<u64>();
+                        let a1 = self.read_reg(a1).cast::<u64>();
+                        self.write_reg(dt, a0.checked_div(a1).unwrap_or(u64::MAX));
+                        self.write_reg(rt, a0.checked_rem(a1).unwrap_or(u64::MAX));
+                    }
+                    ADDI => self.binary_op_imm(u64::wrapping_add),
+                    MULI => self.binary_op_imm(u64::wrapping_sub),
+                    ANDI => self.binary_op_imm::<u64>(ops::BitAnd::bitand),
+                    ORI => self.binary_op_imm::<u64>(ops::BitOr::bitor),
+                    XORI => self.binary_op_imm::<u64>(ops::BitXor::bitxor),
+                    SLI => self.binary_op_ims(u64::wrapping_shl),
+                    SRI => self.binary_op_ims(u64::wrapping_shr),
+                    SRSI => self.binary_op_ims(i64::wrapping_shr),
+                    CMPI => {
+                        let ParamBBD(tg, a0, imm) = self.decode();
+                        self.write_reg(
+                            tg,
+                            self.read_reg(a0)
+                                .cast::<i64>()
+                                .cmp(&Value::from(imm).cast::<i64>())
+                                as i64,
+                        );
+                    }
+                    CMPUI => {
+                        let ParamBBD(tg, a0, imm) = self.decode();
+                        self.write_reg(tg, self.read_reg(a0).cast::<u64>().cmp(&imm) as i64);
+                    }
+                    CP => {
+                        let ParamBB(tg, a0) = self.decode();
+                        self.write_reg(tg, self.read_reg(a0));
+                    }
+                    SWA => {
+                        // Swap registers
+                        let ParamBB(r0, r1) = self.decode();
+                        match (r0, r1) {
+                            (0, 0) => (),
+                            (dst, 0) | (0, dst) => self.write_reg(dst, 0_u64),
+                            (r0, r1) => {
+                                core::ptr::swap(
+                                    self.registers.get_unchecked_mut(usize::from(r0)),
+                                    self.registers.get_unchecked_mut(usize::from(r1)),
+                                );
+                            }
+                        }
+                    }
+                    LI => {
+                        let ParamBD(tg, imm) = self.decode();
+                        self.write_reg(tg, imm);
+                    }
+                    LD => {
+                        // Load. If loading more than register size, continue on adjecent registers
+                        let ParamBBDH(dst, base, off, count) = self.decode();
+                        let n: u8 = match dst {
+                            0 => 1,
+                            _ => 0,
+                        };
+
+                        self.memory.load(
+                            self.ldst_addr_uber(dst, base, off, count, n)?,
+                            self.registers
+                                .as_mut_ptr()
+                                .add(usize::from(dst) + usize::from(n))
+                                .cast(),
+                            usize::from(count).saturating_sub(n.into()),
+                        )?;
+                    }
+                    ST => {
+                        // Store. Same rules apply as to LD
+                        let ParamBBDH(dst, base, off, count) = self.decode();
+                        self.memory.store(
+                            self.ldst_addr_uber(dst, base, off, count, 0)?,
+                            self.registers.as_ptr().add(usize::from(dst)).cast(),
+                            count.into(),
+                        )?;
+                    }
+                    BMC => {
+                        // Block memory copy
+                        match if let Some(copier) = &mut self.copier {
+                            // There is some copier, poll.
+                            copier.poll(&mut self.memory)
+                        } else {
+                            // There is none, make one!
+                            let ParamBBD(src, dst, count) = self.decode();
+
+                            // So we are still on BMC on next cycle
+                            self.pc -= size_of::<ParamBBD>() + 1;
+
+                            self.copier = Some(BlockCopier::new(
+                                self.read_reg(src).cast(),
+                                self.read_reg(dst).cast(),
+                                count as _,
+                            ));
+
+                            self.copier
+                                .as_mut()
+                                .unwrap_unchecked() // SAFETY: We just assigned there
+                                .poll(&mut self.memory)
+                        } {
+                            // We are done, shift program counter
+                            core::task::Poll::Ready(Ok(())) => {
+                                self.copier = None;
+                                self.pc += size_of::<ParamBBD>() + 1;
+                            }
+                            // Error, shift program counter (for consistency)
+                            // and yield error
+                            core::task::Poll::Ready(Err(e)) => {
+                                self.pc += size_of::<ParamBBD>() + 1;
+                                return Err(e.into());
+                            }
+                            // Not done yet, proceed to next cycle
+                            core::task::Poll::Pending => (),
+                        }
+                    }
+                    BRC => {
+                        // Block register copy
+                        let ParamBBB(src, dst, count) = self.decode();
+                        if src.checked_add(count).is_none() || dst.checked_add(count).is_none() {
+                            return Err(VmRunError::RegOutOfBounds);
+                        }
+
+                        core::ptr::copy(
+                            self.registers.get_unchecked(usize::from(src)),
+                            self.registers.get_unchecked_mut(usize::from(dst)),
+                            usize::from(count),
+                        );
+                    }
+                    JAL => {
+                        // Jump and link. Save PC after this instruction to
+                        // specified register and jump to reg + offset.
+                        let ParamBBD(save, reg, offset) = self.decode();
+                        self.write_reg(save, self.pc as u64);
+                        self.pc =
+                            (self.read_reg(reg).cast::<u64>().saturating_add(offset)) as usize;
+                    }
+                    // Conditional jumps, jump only to immediates
+                    JEQ => self.cond_jmp::<u64>(Ordering::Equal),
+                    JNE => {
+                        let ParamBBD(a0, a1, jt) = self.decode();
+                        if self.read_reg(a0).cast::<u64>() != self.read_reg(a1).cast::<u64>() {
+                            self.pc = jt as usize;
+                        }
+                    }
+                    JLT => self.cond_jmp::<u64>(Ordering::Less),
+                    JGT => self.cond_jmp::<u64>(Ordering::Greater),
+                    JLTU => self.cond_jmp::<i64>(Ordering::Less),
+                    JGTU => self.cond_jmp::<i64>(Ordering::Greater),
+                    ECALL => {
+                        self.decode::<()>();
+
+                        // So we don't get timer interrupt after ECALL
+                        if TIMER_QUOTIENT != 0 {
+                            self.timer = self.timer.wrapping_add(1);
+                        }
+                        return Ok(VmRunOk::Ecall);
+                    }
+                    ADDF => self.binary_op::<f64>(ops::Add::add),
+                    SUBF => self.binary_op::<f64>(ops::Sub::sub),
+                    MULF => self.binary_op::<f64>(ops::Mul::mul),
+                    DIRF => {
+                        let ParamBBBB(dt, rt, a0, a1) = self.decode();
+                        let a0 = self.read_reg(a0).cast::<f64>();
+                        let a1 = self.read_reg(a1).cast::<f64>();
+                        self.write_reg(dt, a0 / a1);
+                        self.write_reg(rt, a0 % a1);
+                    }
+                    FMAF => {
+                        let ParamBBBB(dt, a0, a1, a2) = self.decode();
+                        self.write_reg(
+                            dt,
+                            self.read_reg(a0).cast::<f64>() * self.read_reg(a1).cast::<f64>()
+                                + self.read_reg(a2).cast::<f64>(),
+                        );
+                    }
+                    NEGF => {
+                        let ParamBB(dt, a0) = self.decode();
+                        self.write_reg(dt, -self.read_reg(a0).cast::<f64>());
+                    }
+                    ITF => {
+                        let ParamBB(dt, a0) = self.decode();
+                        self.write_reg(dt, self.read_reg(a0).cast::<i64>() as f64);
+                    }
+                    FTI => {
+                        let ParamBB(dt, a0) = self.decode();
+                        self.write_reg(dt, self.read_reg(a0).cast::<f64>() as i64);
+                    }
+                    ADDFI => self.binary_op_imm::<f64>(ops::Add::add),
+                    MULFI => self.binary_op_imm::<f64>(ops::Mul::mul),
+                    op => return Err(VmRunError::InvalidOpcode(op)),
+                }
+            }
+
+            if TIMER_QUOTIENT != 0 {
+                self.timer = self.timer.wrapping_add(1);
+                if self.timer % TIMER_QUOTIENT == 0 {
+                    return Ok(VmRunOk::Timer);
+                }
+            }
+        }
+    }
+
+    /// Decode instruction operands
+    #[inline(always)]
+    unsafe fn decode<T: ProgramVal>(&mut self) -> T {
+        let pc1 = self.pc + 1;
+        let data = self.memory.prog_read_unchecked::<T>(pc1 as _);
+        self.pc += 1 + size_of::<T>();
+        data
+    }
+
+    /// Perform binary operating over two registers
+    #[inline(always)]
+    unsafe fn binary_op<T: ValueVariant>(&mut self, op: impl Fn(T, T) -> T) {
+        let ParamBBB(tg, a0, a1) = self.decode();
+        self.write_reg(
+            tg,
+            op(self.read_reg(a0).cast::<T>(), self.read_reg(a1).cast::<T>()),
+        );
+    }
+
+    /// Perform binary operation over register and immediate
+    #[inline(always)]
+    unsafe fn binary_op_imm<T: ValueVariant>(&mut self, op: impl Fn(T, T) -> T) {
+        let ParamBBD(tg, reg, imm) = self.decode();
+        self.write_reg(
+            tg,
+            op(self.read_reg(reg).cast::<T>(), Value::from(imm).cast::<T>()),
+        );
+    }
+
+    /// Perform binary operation over register and shift immediate
+    #[inline(always)]
+    unsafe fn binary_op_ims<T: ValueVariant>(&mut self, op: impl Fn(T, u32) -> T) {
+        let ParamBBW(tg, reg, imm) = self.decode();
+        self.write_reg(tg, op(self.read_reg(reg).cast::<T>(), imm));
+    }
+
+    /// Jump at `#3` if ordering on `#0 <=> #1` is equal to expected
+    #[inline(always)]
+    unsafe fn cond_jmp<T: ValueVariant + Ord>(&mut self, expected: Ordering) {
+        let ParamBBD(a0, a1, ja) = self.decode();
+        if self
+            .read_reg(a0)
+            .cast::<T>()
+            .cmp(&self.read_reg(a1).cast::<T>())
+            == expected
+        {
+            self.pc = ja as usize;
+        }
+    }
+
+    /// Read register
+    #[inline(always)]
+    unsafe fn read_reg(&self, n: u8) -> Value {
+        *self.registers.get_unchecked(n as usize)
+    }
+
+    /// Write a register.
+    /// Writing to register 0 is no-op.
+    #[inline(always)]
+    unsafe fn write_reg(&mut self, n: u8, value: impl Into<Value>) {
+        if n != 0 {
+            *self.registers.get_unchecked_mut(n as usize) = value.into();
+        }
+    }
+
+    /// Load / Store Address check-computation überfunction
+    #[inline(always)]
+    unsafe fn ldst_addr_uber(
+        &self,
+        dst: u8,
+        base: u8,
+        offset: u64,
+        size: u16,
+        adder: u8,
+    ) -> Result<u64, VmRunError> {
+        let reg = dst.checked_add(adder).ok_or(VmRunError::RegOutOfBounds)?;
+
+        if usize::from(reg) * 8 + usize::from(size) > 2048 {
+            Err(VmRunError::RegOutOfBounds)
+        } else {
+            self.read_reg(base)
+                .cast::<u64>()
+                .checked_add(offset)
+                .and_then(|x| x.checked_add(adder.into()))
+                .ok_or(VmRunError::AddrOutOfBounds)
+        }
+    }
+}
+
+/// Virtual machine halt error
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+#[repr(u8)]
+pub enum VmRunError {
+    /// Tried to execute invalid instruction
+    InvalidOpcode(u8),
+
+    /// Unhandled load access exception
+    LoadAccessEx(u64),
+
+    /// Unhandled instruction load access exception
+    ProgramFetchLoadEx(u64),
+
+    /// Unhandled store access exception
+    StoreAccessEx(u64),
+
+    /// Register out-of-bounds access
+    RegOutOfBounds,
+
+    /// Address out-of-bounds
+    AddrOutOfBounds,
+
+    /// Reached unreachable code
+    Unreachable,
+}
+
+/// Virtual machine halt ok
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub enum VmRunOk {
+    /// Program has eached its end
+    End,
+
+    /// Program was interrupted by a timer
+    Timer,
+
+    /// Environment call
+    Ecall,
+}
+
+/// Load-store memory access
+pub trait Memory {
+    /// Load data from memory on address
+    ///
+    /// # Safety
+    /// - Shall not overrun the buffer
+    unsafe fn load(&mut self, addr: u64, target: *mut u8, count: usize) -> Result<(), LoadError>;
+
+    /// Store data to memory on address
+    ///
+    /// # Safety
+    /// - Shall not overrun the buffer
+    unsafe fn store(
+        &mut self,
+        addr: u64,
+        source: *const u8,
+        count: usize,
+    ) -> Result<(), StoreError>;
+
+    /// Read from program memory to execute
+    ///
+    /// # Safety
+    /// - Data read have to be valid
+    unsafe fn prog_read<T: ProgramVal>(&mut self, addr: u64) -> Option<T>;
+
+    /// Read from program memory to exectue
+    ///
+    /// # Safety
+    /// - You have to be really sure that these bytes are there, understand?
+    unsafe fn prog_read_unchecked<T: ProgramVal>(&mut self, addr: u64) -> T;
+}
+
+/// Unhandled load access trap
+#[derive(Clone, Copy, Display, Debug, PartialEq, Eq)]
+#[display(fmt = "Load access error at address {_0:#x}")]
+pub struct LoadError(pub u64);
+
+/// Unhandled store access trap
+#[derive(Clone, Copy, Display, Debug, PartialEq, Eq)]
+#[display(fmt = "Store access error at address {_0:#x}")]
+pub struct StoreError(pub u64);
+
+/// Reason to access memory
+#[derive(Clone, Copy, Display, Debug, PartialEq, Eq)]
+pub enum MemoryAccessReason {
+    /// Memory was accessed for load (read)
+    Load,
+    /// Memory was accessed for store (write)
+    Store,
+}
+
+impl From<LoadError> for VmRunError {
+    fn from(value: LoadError) -> Self {
+        Self::LoadAccessEx(value.0)
+    }
+}
+
+impl From<StoreError> for VmRunError {
+    fn from(value: StoreError) -> Self {
+        Self::StoreAccessEx(value.0)
+    }
+}

hbvm/src/main.rs

@@ -0,0 +1,78 @@
+use {
+    hbbytecode::valider::validate,
+    hbvm::{
+        mem::softpaging::{paging::PageTable, HandlePageFault, PageSize, SoftPagedMem},
+        MemoryAccessReason, Vm,
+    },
+    std::io::{stdin, Read},
+};
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let mut prog = vec![];
+    stdin().read_to_end(&mut prog)?;
+
+    if let Err(e) = validate(&prog) {
+        eprintln!("Program validation error: {e:?}");
+        return Ok(());
+    } else {
+        unsafe {
+            let mut vm = Vm::<_, 0>::new(
+                SoftPagedMem::<_, true> {
+                    pf_handler: TestTrapHandler,
+                    program:    &prog,
+                    root_pt:    Box::into_raw(Default::default()),
+                    icache:     Default::default(),
+                },
+                4,
+            );
+            let data = {
+                let ptr = std::alloc::alloc_zeroed(std::alloc::Layout::from_size_align_unchecked(
+                    4096, 4096,
+                ));
+                if ptr.is_null() {
+                    panic!("Alloc error tbhl");
+                }
+                ptr
+            };
+
+            vm.memory
+                .map(
+                    data,
+                    8192,
+                    hbvm::mem::softpaging::paging::Permission::Write,
+                    PageSize::Size4K,
+                )
+                .unwrap();
+
+            println!("Program interrupt: {:?}", vm.run());
+            println!("{:?}", vm.registers);
+
+            std::alloc::dealloc(
+                data,
+                std::alloc::Layout::from_size_align_unchecked(4096, 4096),
+            );
+            vm.memory.unmap(8192).unwrap();
+            let _ = Box::from_raw(vm.memory.root_pt);
+        }
+    }
+    Ok(())
+}
+
+pub fn time() -> u32 {
+    9
+}
+
+#[derive(Default)]
+struct TestTrapHandler;
+impl HandlePageFault for TestTrapHandler {
+    fn page_fault(
+        &mut self,
+        _: MemoryAccessReason,
+        _: &mut PageTable,
+        _: u64,
+        _: PageSize,
+        _: *mut u8,
+    ) -> bool {
+        false
+    }
+}

hbvm/src/mem/mod.rs

@@ -0,0 +1,3 @@
+//! Memory implementations
+
+pub mod softpaging;

hbvm/src/mem/softpaging/icache.rs

@@ -2,7 +2,6 @@
 
 use {
     super::{lookup::AddrPageLookuper, paging::PageTable, PageSize},
-    crate::mem::Address,
     core::{
         mem::{size_of, MaybeUninit},
         ptr::{copy_nonoverlapping, NonNull},
@@ -13,7 +12,7 @@ use {
 #[derive(Clone, Debug)]
 pub struct ICache {
     /// Current page address base
-    base: Address,
+    base: u64,
     /// Curent page pointer
     data: Option<NonNull<u8>>,
     /// Current page size
@@ -25,7 +24,7 @@ pub struct ICache {
 impl Default for ICache {
     fn default() -> Self {
         Self {
-            base: Address::NULL,
+            base: Default::default(),
             data: Default::default(),
             size: PageSize::Size4K,
             mask: Default::default(),
@@ -38,57 +37,54 @@ impl ICache {
     ///
     /// # Safety
     /// `T` should be valid to read from instruction memory
-    pub(super) unsafe fn fetch<T>(
-        &mut self,
-        addr: Address,
-        root_pt: *const PageTable,
-    ) -> Option<T> {
+    pub(super) unsafe fn fetch<T>(&mut self, addr: u64, root_pt: *const PageTable) -> Option<T> {
         let mut ret = MaybeUninit::<T>::uninit();
 
-        let pbase =
-            self.data.or_else(|| unsafe { self.fetch_page(self.base + self.size, root_pt) })?;
+        let pbase = self
+            .data
+            .or_else(|| self.fetch_page(self.base.checked_add(self.size as _)?, root_pt))?;
 
         // Get address base
-        let base = addr.map(|x| x & self.mask);
+        let base = addr & self.mask;
 
         // Base not matching, fetch anew
         if base != self.base {
-            unsafe { self.fetch_page(base, root_pt) }?;
+            self.fetch_page(base, root_pt)?;
         };
 
-        let offset = addr.get() & !self.mask;
+        let offset = addr & !self.mask;
         let requ_size = size_of::<T>();
 
         // Page overflow
-        let rem = (offset as usize).saturating_add(requ_size).saturating_sub(self.size as _);
+        let rem = (offset as usize)
+            .saturating_add(requ_size)
+            .saturating_sub(self.size as _);
         let first_copy = requ_size.saturating_sub(rem);
 
         // Copy non-overflowing part
-        unsafe { copy_nonoverlapping(pbase.as_ptr(), ret.as_mut_ptr().cast::<u8>(), first_copy) };
+        copy_nonoverlapping(pbase.as_ptr(), ret.as_mut_ptr().cast::<u8>(), first_copy);
 
         // Copy overflow
         if rem != 0 {
-            let pbase = unsafe { self.fetch_page(self.base + self.size, root_pt) }?;
+            let pbase = self.fetch_page(self.base.checked_add(self.size as _)?, root_pt)?;
 
             // Unlikely, unsupported scenario
             if rem > self.size as _ {
                 return None;
             }
 
-            unsafe {
-                copy_nonoverlapping(
-                    pbase.as_ptr(),
-                    ret.as_mut_ptr().cast::<u8>().add(first_copy),
-                    rem,
-                )
-            };
+            copy_nonoverlapping(
+                pbase.as_ptr(),
+                ret.as_mut_ptr().cast::<u8>().add(first_copy),
+                rem,
+            );
         }
 
-        Some(unsafe { ret.assume_init() })
+        Some(ret.assume_init())
     }
 
     /// Fetch a page
-    unsafe fn fetch_page(&mut self, addr: Address, pt: *const PageTable) -> Option<NonNull<u8>> {
+    unsafe fn fetch_page(&mut self, addr: u64, pt: *const PageTable) -> Option<NonNull<u8>> {
         let res = AddrPageLookuper::new(addr, 0, pt).next()?.ok()?;
         if !super::perm_check::executable(res.perm) {
             return None;
@@ -101,7 +97,7 @@ impl ICache {
             _ => return None,
         };
         self.data = Some(NonNull::new(res.ptr)?);
-        self.base = addr.map(|x| x & self.mask);
+        self.base = addr & self.mask;
         self.data
     }
 }

hbvm/src/mem/softpaging/lookup.rs

@@ -1,18 +1,15 @@
 //! Address lookup
 
-use {
-    super::{
-        addr_extract_index,
-        paging::{PageTable, Permission},
-        PageSize,
-    },
-    crate::mem::addr::Address,
+use super::{
+    addr_extract_index,
+    paging::{PageTable, Permission},
+    PageSize,
 };
 
 /// Good result from address split
 pub struct AddrPageLookupOk {
     /// Virtual address
-    pub vaddr: Address,
+    pub vaddr: u64,
 
     /// Pointer to the start for perform operation
     pub ptr: *mut u8,
@@ -27,7 +24,7 @@ pub struct AddrPageLookupOk {
 /// Errornous address split result
 pub struct AddrPageLookupError {
     /// Address of failure
-    pub addr: Address,
+    pub addr: u64,
 
     /// Requested page size
     pub size: PageSize,
@@ -36,7 +33,7 @@ pub struct AddrPageLookupError {
 /// Address splitter into pages
 pub struct AddrPageLookuper {
     /// Current address
-    addr: Address,
+    addr: u64,
 
     /// Size left
     size: usize,
@@ -48,13 +45,17 @@ pub struct AddrPageLookuper {
 impl AddrPageLookuper {
     /// Create a new page lookuper
     #[inline]
-    pub const fn new(addr: Address, size: usize, pagetable: *const PageTable) -> Self {
-        Self { addr, size, pagetable }
+    pub const fn new(addr: u64, size: usize, pagetable: *const PageTable) -> Self {
+        Self {
+            addr,
+            size,
+            pagetable,
+        }
     }
 
     /// Bump address by size X
     pub fn bump(&mut self, page_size: PageSize) {
-        self.addr += page_size;
+        self.addr += page_size as u64;
         self.size = self.size.saturating_sub(page_size as _);
     }
 }
@@ -75,8 +76,9 @@ impl Iterator for AddrPageLookuper {
             for lvl in (0..5).rev() {
                 // Get an entry
                 unsafe {
-                    let entry =
-                        (*current_pt).table.get_unchecked(addr_extract_index(self.addr, lvl));
+                    let entry = (*current_pt)
+                        .table
+                        .get_unchecked(addr_extract_index(self.addr, lvl));
 
                     let ptr = entry.ptr();
                     match entry.permission() {

hbvm/src/mem/softpaging/mapping.rs

@@ -6,11 +6,11 @@ use {
         paging::{PageTable, Permission, PtEntry, PtPointedData},
         PageSize, SoftPagedMem,
     },
-    crate::{mem::addr::Address, utils::impl_display},
     alloc::boxed::Box,
+    derive_more::Display,
 };
 
-impl<A, const OUT_PROG_EXEC: bool> SoftPagedMem<'_, A, OUT_PROG_EXEC> {
+impl<'p, A,  const OUT_PROG_EXEC: bool> SoftPagedMem<'p, A, OUT_PROG_EXEC> {
     /// Maps host's memory into VM's memory
     ///
     /// # Safety
@@ -20,7 +20,7 @@ impl<A, const OUT_PROG_EXEC: bool> SoftPagedMem<'_, A, OUT_PROG_EXEC> {
     pub unsafe fn map(
         &mut self,
         host: *mut u8,
-        target: Address,
+        target: u64,
         perm: Permission,
         pagesize: PageSize,
     ) -> Result<(), MapError> {
@@ -35,8 +35,9 @@ impl<A, const OUT_PROG_EXEC: bool> SoftPagedMem<'_, A, OUT_PROG_EXEC> {
 
         // Walk pagetable levels
         for lvl in (lookup_depth + 1..5).rev() {
-            let entry =
-                unsafe { (*current_pt).table.get_unchecked_mut(addr_extract_index(target, lvl)) };
+            let entry = (*current_pt)
+                .table
+                .get_unchecked_mut(addr_extract_index(target, lvl));
 
             let ptr = entry.ptr();
             match entry.permission() {
@@ -44,11 +45,13 @@ impl<A, const OUT_PROG_EXEC: bool> SoftPagedMem<'_, A, OUT_PROG_EXEC> {
                 // No worries! Let's create one (allocates).
                 Permission::Empty => {
                     // Increase children count
-                    unsafe { *current_pt }.childen += 1;
+                    (*current_pt).childen += 1;
 
-                    let table = Box::into_raw(Box::new(PtPointedData { pt: PageTable::default() }));
+                    let table = Box::into_raw(Box::new(PtPointedData {
+                        pt: PageTable::default(),
+                    }));
 
-                    unsafe { core::ptr::write(entry, PtEntry::new(table, Permission::Node)) };
+                    core::ptr::write(entry, PtEntry::new(table, Permission::Node));
                     current_pt = table as _;
                 }
                 // Continue walking
@@ -59,9 +62,9 @@ impl<A, const OUT_PROG_EXEC: bool> SoftPagedMem<'_, A, OUT_PROG_EXEC> {
             }
         }
 
-        let node = unsafe {
-            (*current_pt).table.get_unchecked_mut(addr_extract_index(target, lookup_depth))
-        };
+        let node = (*current_pt)
+            .table
+            .get_unchecked_mut(addr_extract_index(target, lookup_depth));
 
         // Check if node is not mapped
         if node.permission() != Permission::Empty {
@@ -69,10 +72,8 @@ impl<A, const OUT_PROG_EXEC: bool> SoftPagedMem<'_, A, OUT_PROG_EXEC> {
         }
 
         // Write entry
-        unsafe {
-            (*current_pt).childen += 1;
-            core::ptr::write(node, PtEntry::new(host.cast(), perm));
-        }
+        (*current_pt).childen += 1;
+        core::ptr::write(node, PtEntry::new(host.cast(), perm));
 
         Ok(())
     }
@@ -81,14 +82,17 @@ impl<A, const OUT_PROG_EXEC: bool> SoftPagedMem<'_, A, OUT_PROG_EXEC> {
     ///
     /// If errors, it only means there is no entry to unmap and in most cases
     /// just should be ignored.
-    pub fn unmap(&mut self, addr: Address) -> Result<(), NothingToUnmap> {
+    pub fn unmap(&mut self, addr: u64) -> Result<(), NothingToUnmap> {
         let mut current_pt = self.root_pt;
         let mut page_tables = [core::ptr::null_mut(); 5];
 
         // Walk page table in reverse
         for lvl in (0..5).rev() {
-            let entry =
-                unsafe { (*current_pt).table.get_unchecked_mut(addr_extract_index(addr, lvl)) };
+            let entry = unsafe {
+                (*current_pt)
+                    .table
+                    .get_unchecked_mut(addr_extract_index(addr, lvl))
+            };
 
             let ptr = entry.ptr();
             match entry.permission() {
@@ -137,25 +141,22 @@ impl<A, const OUT_PROG_EXEC: bool> SoftPagedMem<'_, A, OUT_PROG_EXEC> {
 }
 
 /// Error mapping
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[derive(Clone, Copy, Display, Debug, PartialEq, Eq)]
 pub enum MapError {
     /// Entry was already mapped
+    #[display(fmt = "There is already a page mapped on specified address")]
     AlreadyMapped,
     /// When walking a page entry was
     /// encounterd.
+    #[display(fmt = "There was a page mapped on the way instead of node")]
     PageOnNode,
 }
 
-impl_display!(for MapError => match {
-    Self::AlreadyMapped => "There is already a page mapped on specified address";
-    Self::PageOnNode    => "There was a page mapped on the way instead of node";
-});
-
 /// There was no entry in page table to unmap
 ///
 /// No worry, don't panic, nothing bad has happened,
 /// but if you are 120% sure there should be something,
 /// double-check your addresses.
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Display, Debug)]
+#[display(fmt = "There was no entry to unmap")]
 pub struct NothingToUnmap;
-impl_display!(for NothingToUnmap => "There is no entry to unmap");

hbvm/src/mem/softpaging/mod.rs

@@ -1,5 +1,9 @@
 //! Platform independent, software paged memory implementation
 
+use core::mem::size_of;
+
+use self::icache::ICache;
+
 pub mod icache;
 pub mod lookup;
 pub mod paging;
@@ -8,50 +12,43 @@ pub mod paging;
 pub mod mapping;
 
 use {
-    super::{addr::Address, LoadError, Memory, MemoryAccessReason, StoreError},
-    core::mem::size_of,
-    icache::ICache,
+    crate::{LoadError, Memory, MemoryAccessReason, StoreError},
     lookup::{AddrPageLookupError, AddrPageLookupOk, AddrPageLookuper},
     paging::{PageTable, Permission},
 };
 
 /// HoleyBytes software paged memory
-///
+/// 
 /// - `OUT_PROG_EXEC`: set to `false` to disable executing program
 ///   not contained in initially provided program, even the pages
 ///   are executable
 #[derive(Clone, Debug)]
 pub struct SoftPagedMem<'p, PfH, const OUT_PROG_EXEC: bool = true> {
     /// Root page table
-    pub root_pt: *mut PageTable,
+    pub root_pt:    *mut PageTable,
     /// Page fault handler
     pub pf_handler: PfH,
     /// Program memory segment
-    pub program: &'p [u8],
+    pub program:    &'p [u8],
     /// Program instruction cache
-    pub icache: ICache,
+    pub icache:     ICache,
 }
 
-impl<PfH: HandlePageFault, const OUT_PROG_EXEC: bool> Memory
-    for SoftPagedMem<'_, PfH, OUT_PROG_EXEC>
+impl<'p, PfH: HandlePageFault, const OUT_PROG_EXEC: bool> Memory
+    for SoftPagedMem<'p, PfH, OUT_PROG_EXEC>
 {
     /// Load value from an address
     ///
     /// # Safety
     /// Applies same conditions as for [`core::ptr::copy_nonoverlapping`]
-    unsafe fn load(
-        &mut self,
-        addr: Address,
-        target: *mut u8,
-        count: usize,
-    ) -> Result<(), LoadError> {
+    unsafe fn load(&mut self, addr: u64, target: *mut u8, count: usize) -> Result<(), LoadError> {
         self.memory_access(
             MemoryAccessReason::Load,
             addr,
             target,
             count,
             perm_check::readable,
-            |src, dst, count| unsafe { core::ptr::copy_nonoverlapping(src, dst, count) },
+            |src, dst, count| core::ptr::copy_nonoverlapping(src, dst, count),
         )
         .map_err(LoadError)
     }
@@ -62,7 +59,7 @@ impl<PfH: HandlePageFault, const OUT_PROG_EXEC: bool> Memory
     /// Applies same conditions as for [`core::ptr::copy_nonoverlapping`]
     unsafe fn store(
         &mut self,
-        addr: Address,
+        addr: u64,
         source: *const u8,
         count: usize,
     ) -> Result<(), StoreError> {
@@ -72,61 +69,75 @@ impl<PfH: HandlePageFault, const OUT_PROG_EXEC: bool> Memory
             source.cast_mut(),
             count,
             perm_check::writable,
-            |dst, src, count| unsafe { core::ptr::copy_nonoverlapping(src, dst, count) },
+            |dst, src, count| core::ptr::copy_nonoverlapping(src, dst, count),
         )
         .map_err(StoreError)
     }
 
     #[inline(always)]
-    unsafe fn prog_read<T>(&mut self, addr: Address) -> T {
-        if OUT_PROG_EXEC && addr.truncate_usize() > self.program.len() {
-            return unsafe { self.icache.fetch::<T>(addr, self.root_pt) }
-                .unwrap_or_else(|| unsafe { core::mem::zeroed() });
+    unsafe fn prog_read<T>(&mut self, addr: u64) -> Option<T> {
+        if OUT_PROG_EXEC && addr as usize > self.program.len() {
+            return self.icache.fetch::<T>(addr, self.root_pt);
         }
 
-        let addr = addr.truncate_usize();
+        let addr = addr as usize;
         self.program
             .get(addr..addr + size_of::<T>())
-            .map(|x| unsafe { x.as_ptr().cast::<T>().read() })
-            .unwrap_or_else(|| unsafe { core::mem::zeroed() })
+            .map(|x| x.as_ptr().cast::<T>().read())
+    }
+
+    #[inline(always)]
+    unsafe fn prog_read_unchecked<T>(&mut self, addr: u64) -> T {
+        if OUT_PROG_EXEC && addr as usize > self.program.len() {
+            return self
+                .icache
+                .fetch::<T>(addr as _, self.root_pt)
+                .unwrap_or_else(|| core::mem::zeroed());
+        }
+
+        self.program.as_ptr().add(addr as _).cast::<T>().read()
     }
 }
 
-impl<PfH: HandlePageFault, const OUT_PROG_EXEC: bool> SoftPagedMem<'_, PfH, OUT_PROG_EXEC> {
+impl<'p, PfH: HandlePageFault, const OUT_PROG_EXEC: bool> SoftPagedMem<'p, PfH, OUT_PROG_EXEC> {
     // Everyone behold, the holy function, the god of HBVM memory accesses!
 
     /// Split address to pages, check their permissions and feed pointers with offset
     /// to a specified function.
     ///
     /// If page is not found, execute page fault trap handler.
+    #[allow(clippy::too_many_arguments)] // Silence peasant
     fn memory_access(
         &mut self,
         reason: MemoryAccessReason,
-        src: Address,
+        src: u64,
         mut dst: *mut u8,
         len: usize,
         permission_check: fn(Permission) -> bool,
         action: fn(*mut u8, *mut u8, usize),
-    ) -> Result<(), Address> {
+    ) -> Result<(), u64> {
         // Memory load from program section
-        let (src, len) = if src.truncate_usize() < self.program.len() as _ {
+        let (src, len) = if src < self.program.len() as _ {
             // Allow only loads
             if reason != MemoryAccessReason::Load {
                 return Err(src);
             }
 
             // Determine how much data to copy from here
-            let to_copy = len.clamp(0, self.program.len().saturating_sub(src.truncate_usize()));
+            let to_copy = len.clamp(0, self.program.len().saturating_sub(src as _));
 
             // Perform action
             action(
-                unsafe { self.program.as_ptr().add(src.truncate_usize()).cast_mut() },
+                unsafe { self.program.as_ptr().add(src as _).cast_mut() },
                 dst,
                 to_copy,
             );
 
             // Return shifted from what we've already copied
-            (src.saturating_add(to_copy as u64), len.saturating_sub(to_copy))
+            (
+                src.saturating_add(to_copy as _),
+                len.saturating_sub(to_copy),
+            )
         } else {
             (src, len) // Nothing weird!
         };
@@ -141,7 +152,12 @@ impl<PfH: HandlePageFault, const OUT_PROG_EXEC: bool> SoftPagedMem<'_, PfH, OUT_
         loop {
             match pspl.next() {
                 // Page is found
-                Some(Ok(AddrPageLookupOk { vaddr, ptr, size, perm })) => {
+                Some(Ok(AddrPageLookupOk {
+                    vaddr,
+                    ptr,
+                    size,
+                    perm,
+                })) => {
                     if !permission_check(perm) {
                         return Err(vaddr);
                     }
@@ -180,9 +196,8 @@ impl<PfH: HandlePageFault, const OUT_PROG_EXEC: bool> SoftPagedMem<'_, PfH, OUT_
 ///
 /// The level shall not be larger than 4, otherwise
 /// the output of the function is unspecified (yes, it can also panic :)
-pub fn addr_extract_index(addr: Address, lvl: u8) -> usize {
+pub fn addr_extract_index(addr: u64, lvl: u8) -> usize {
     debug_assert!(lvl <= 4);
-    let addr = addr.get();
     usize::try_from((addr >> (lvl * 8 + 12)) & ((1 << 8) - 1)).expect("?conradluget a better CPU")
 }
 
@@ -211,22 +226,6 @@ impl PageSize {
     }
 }
 
-impl core::ops::Add<PageSize> for Address {
-    type Output = Self;
-
-    #[inline(always)]
-    fn add(self, rhs: PageSize) -> Self::Output {
-        self + (rhs as u64)
-    }
-}
-
-impl core::ops::AddAssign<PageSize> for Address {
-    #[inline(always)]
-    fn add_assign(&mut self, rhs: PageSize) {
-        *self = Self::new(self.get().wrapping_add(rhs as u64));
-    }
-}
-
 /// Permisison checks
 pub mod perm_check {
     use super::paging::Permission;
@@ -234,7 +233,10 @@ pub mod perm_check {
     /// Page is readable
     #[inline(always)]
     pub const fn readable(perm: Permission) -> bool {
-        matches!(perm, Permission::Readonly | Permission::Write | Permission::Exec)
+        matches!(
+            perm,
+            Permission::Readonly | Permission::Write | Permission::Exec
+        )
     }
 
     /// Page is writable
@@ -261,7 +263,7 @@ pub trait HandlePageFault {
         &mut self,
         reason: MemoryAccessReason,
         pagetable: &mut PageTable,
-        vaddr: Address,
+        vaddr: u64,
         size: PageSize,
         dataptr: *mut u8,
     ) -> bool

hbvm/src/mem/softpaging/paging.rs

@@ -62,13 +62,16 @@ pub struct PageTable {
     /// How much entries are in use
     pub childen: u8,
     /// Entries
-    pub table: [PtEntry; 256],
+    pub table:   [PtEntry; 256],
 }
 
 impl Default for PageTable {
     fn default() -> Self {
         // SAFETY: It's fine, zeroed page table entry is valid (= empty)
-        Self { childen: 0, table: unsafe { MaybeUninit::zeroed().assume_init() } }
+        Self {
+            childen: 0,
+            table:   unsafe { MaybeUninit::zeroed().assume_init() },
+        }
     }
 }
 
@@ -77,7 +80,7 @@ impl Default for PageTable {
 #[repr(C, align(4096))]
 pub union PtPointedData {
     /// Node - next page table
-    pub pt: PageTable,
+    pub pt:   PageTable,
     /// Leaf
     pub page: u8,
 }

hbvm/src/value.rs

@@ -0,0 +1,79 @@
+//! HoleyBytes register value definition
+
+use sealed::sealed;
+
+/// Define [`Value`] union
+///
+/// # Safety
+/// Union variants have to be sound to byte-reinterpretate
+/// between each other. Otherwise the behaviour is undefined.
+macro_rules! value_def {
+    ($($ty:ident),* $(,)?) => {
+        /// HBVM register value
+        #[derive(Copy, Clone)]
+        #[repr(packed)]
+        pub union Value {
+            $(
+                #[doc = concat!(stringify!($ty), " type")]
+                pub $ty: $ty
+            ),*
+        }
+
+
+        $(
+            impl From<$ty> for Value {
+                #[inline]
+                fn from(value: $ty) -> Self {
+                    Self { $ty: value }
+                }
+            }
+
+            static_assertions::const_assert_eq!(
+                core::mem::size_of::<$ty>(),
+                core::mem::size_of::<Value>(),
+            );
+
+            #[sealed]
+            unsafe impl ValueVariant for $ty {}
+        )*
+    };
+}
+
+impl Value {
+    /// Byte reinterpret value to target variant
+    #[inline]
+    pub fn cast<V: ValueVariant>(self) -> V {
+        /// Evil.
+        /// 
+        /// Transmute cannot be performed with generic type
+        /// as size is unknown, so union is used.
+        /// 
+        /// # Safety
+        /// If [`ValueVariant`] implemented correctly, it's fine :)
+        /// 
+        /// :ferrisClueless:
+        union Transmute<Variant: ValueVariant> {
+            /// Self
+            src:     Value,
+            /// Target variant
+            variant: Variant,
+        }
+
+        unsafe { Transmute { src: self }.variant }
+    }
+}
+
+/// # Safety
+/// - N/A, not to be implemented manually
+#[sealed]
+pub unsafe trait ValueVariant: Copy + Into<Value> {}
+
+value_def!(u64, i64, f64);
+static_assertions::const_assert_eq!(core::mem::size_of::<Value>(), 8);
+
+impl core::fmt::Debug for Value {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        // Print formatted as hexadecimal, unsigned integer
+        write!(f, "{:x}", self.cast::<u64>())
+    }
+}

lang/Cargo.toml

@@ -1,23 +0,0 @@
-[package]
-name = "hblang"
-version = "0.1.0"
-edition = "2021"
-
-[[bin]]
-name = "hbc"
-path = "src/main.rs"
-
-[[bin]]
-name = "fuzz"
-path = "src/fuzz_main.rs"
-
-[dependencies]
-hbbytecode = { workspace = true, features = ["disasm"] }
-hbvm = { workspace = true, features = ["nightly", "alloc"] }
-hashbrown = { version = "0.15.0", default-features = false, features = ["raw-entry"] }
-log = "0.4.22"
-
-[features]
-default = ["std"]
-std = []
-no_log = ["log/max_level_off"]

lang/build.rs

@@ -1,35 +0,0 @@
-use std::{fmt::Write, iter};
-
-fn main() {
-    const TEST_FILE: &str = "src/testcases.rs";
-    const INPUT: &str = include_str!("./README.md");
-
-    let mut out = String::new();
-    for (name, code) in block_iter(INPUT) {
-        let name = name.replace(' ', "_");
-        _ = writeln!(
-            out,
-            "#[test] fn {name}() {{ run_codegen_test(\"{name}\", r##\"{code}\"##) }}"
-        );
-    }
-
-    std::fs::write(TEST_FILE, out).unwrap();
-}
-
-fn block_iter(mut input: &str) -> impl Iterator<Item = (&str, &str)> {
-    const CASE_PREFIX: &str = "#### ";
-    const CASE_SUFFIX: &str = "\n```hb";
-
-    iter::from_fn(move || loop {
-        let pos = input.find(CASE_PREFIX)?;
-        input = unsafe { input.get_unchecked(pos + CASE_PREFIX.len()..) };
-        let Some((test_name, rest)) = input.split_once(CASE_SUFFIX) else { continue };
-        if !test_name.chars().all(|c| c.is_alphanumeric() || c == '_') {
-            continue;
-        }
-        input = rest;
-        let (body, rest) = input.split_once("```").unwrap_or((input, ""));
-        input = rest;
-        break Some((test_name, body));
-    })
-}

lang/command-help.txt

@@ -1,5 +0,0 @@
---fmt                  - format all imported source files
---fmt-stdout           - dont write the formatted file but print it
---dump-asm             - output assembly instead of raw code, (the assembly is more for debugging the compiler)
---threads <1...>       - number of extra threads compiler can use [default: 0]
---path-resolver <name> - choose between builtin path resolvers, options are: ableos

lang/src/backend/hbvm.rs

@@ -1,902 +0,0 @@
-use {
-    super::{AssemblySpec, Backend},
-    crate::{
-        lexer::TokenKind,
-        nodes::{Kind, Nid, Nodes, MEM},
-        parser,
-        ty::{self, Loc, Module, Offset, Size, Types},
-        utils::{EntSlice, EntVec},
-    },
-    alloc::{boxed::Box, collections::BTreeMap, string::String, vec::Vec},
-    core::{assert_matches::debug_assert_matches, mem, ops::Range},
-    hbbytecode::{self as instrs, *},
-    reg::Reg,
-};
-
-mod regalloc;
-
-mod reg {
-    pub const STACK_PTR: Reg = 254;
-    pub const ZERO: Reg = 0;
-    pub const RET: Reg = 1;
-    pub const RET_ADDR: Reg = 31;
-
-    pub type Reg = u8;
-}
-
-fn write_reloc(doce: &mut [u8], offset: usize, value: i64, size: u16) {
-    let value = value.to_ne_bytes();
-    doce[offset..offset + size as usize].copy_from_slice(&value[..size as usize]);
-}
-
-#[derive(Clone, Copy)]
-struct TypedReloc {
-    target: ty::Id,
-    reloc: Reloc,
-}
-
-// TODO: make into bit struct (width: u2, sub_offset: u3, offset: u27)
-#[derive(Clone, Copy, Debug)]
-struct Reloc {
-    offset: Offset,
-    sub_offset: u8,
-    width: u8,
-}
-
-impl Reloc {
-    fn new(offset: usize, sub_offset: u8, width: u8) -> Self {
-        Self { offset: offset as u32, sub_offset, width }
-    }
-
-    fn apply_jump(mut self, code: &mut [u8], to: u32, from: u32) -> i64 {
-        self.offset += from;
-        let offset = to as i64 - self.offset as i64;
-        self.write_offset(code, offset);
-        offset
-    }
-
-    fn write_offset(&self, code: &mut [u8], offset: i64) {
-        let bytes = offset.to_ne_bytes();
-        let slice = &mut code[self.offset as usize + self.sub_offset as usize..];
-        slice[..self.width as usize].copy_from_slice(&bytes[..self.width as usize]);
-    }
-}
-
-struct FuncDt {
-    offset: Offset,
-    // TODO: change to indices into common vec
-    relocs: Vec<TypedReloc>,
-    code: Vec<u8>,
-}
-
-impl Default for FuncDt {
-    fn default() -> Self {
-        Self { offset: u32::MAX, relocs: Default::default(), code: Default::default() }
-    }
-}
-
-struct GlobalDt {
-    offset: Offset,
-}
-
-impl Default for GlobalDt {
-    fn default() -> Self {
-        Self { offset: u32::MAX }
-    }
-}
-
-#[derive(Default)]
-struct Assembler {
-    frontier: Vec<ty::Id>,
-    globals: Vec<ty::Global>,
-    funcs: Vec<ty::Func>,
-}
-
-#[derive(Default)]
-pub struct HbvmBackend {
-    funcs: EntVec<ty::Func, FuncDt>,
-    globals: EntVec<ty::Global, GlobalDt>,
-    asm: Assembler,
-    ralloc: regalloc::Res,
-
-    ret_relocs: Vec<Reloc>,
-    relocs: Vec<TypedReloc>,
-    jump_relocs: Vec<(Nid, Reloc)>,
-    code: Vec<u8>,
-    offsets: Vec<Offset>,
-}
-
-impl HbvmBackend {
-    fn emit(&mut self, instr: (usize, [u8; instrs::MAX_SIZE])) {
-        emit(&mut self.code, instr);
-    }
-}
-
-impl Backend for HbvmBackend {
-    fn assemble_bin(&mut self, entry: ty::Func, types: &Types, to: &mut Vec<u8>) {
-        to.extend([0u8; HEADER_SIZE]);
-
-        binary_prelude(to);
-        let AssemblySpec { code_length, data_length, entry } =
-            self.assemble_reachable(entry, types, to);
-
-        let exe = AbleOsExecutableHeader {
-            magic_number: [0x15, 0x91, 0xD2],
-            executable_version: 0,
-            code_length,
-            data_length,
-            debug_length: 0,
-            config_length: 0,
-            metadata_length: 0,
-        };
-        Reloc::new(HEADER_SIZE, 3, 4).apply_jump(to, entry, 0);
-
-        unsafe { *to.as_mut_ptr().cast::<AbleOsExecutableHeader>() = exe }
-    }
-
-    fn assemble_reachable(
-        &mut self,
-        from: ty::Func,
-        types: &Types,
-        to: &mut Vec<u8>,
-    ) -> AssemblySpec {
-        debug_assert!(self.asm.frontier.is_empty());
-        debug_assert!(self.asm.funcs.is_empty());
-        debug_assert!(self.asm.globals.is_empty());
-
-        self.globals.shadow(types.ins.globals.len());
-
-        self.asm.frontier.push(from.into());
-        while let Some(itm) = self.asm.frontier.pop() {
-            match itm.expand() {
-                ty::Kind::Func(func) => {
-                    let fuc = &mut self.funcs[func];
-                    debug_assert!(!fuc.code.is_empty());
-                    if fuc.offset != u32::MAX {
-                        continue;
-                    }
-                    fuc.offset = 0;
-                    self.asm.funcs.push(func);
-                    self.asm.frontier.extend(fuc.relocs.iter().map(|r| r.target));
-                }
-                ty::Kind::Global(glob) => {
-                    let glb = &mut self.globals[glob];
-                    if glb.offset != u32::MAX {
-                        continue;
-                    }
-                    glb.offset = 0;
-                    self.asm.globals.push(glob);
-                }
-                _ => unreachable!(),
-            }
-        }
-
-        let init_len = to.len();
-
-        for &func in &self.asm.funcs {
-            let fuc = &mut self.funcs[func];
-            fuc.offset = to.len() as _;
-            debug_assert!(!fuc.code.is_empty());
-            to.extend(&fuc.code);
-        }
-
-        let code_length = to.len() - init_len;
-
-        for global in self.asm.globals.drain(..) {
-            self.globals[global].offset = to.len() as _;
-            to.extend(&types.ins.globals[global].data);
-        }
-
-        let data_length = to.len() - code_length - init_len;
-
-        for func in self.asm.funcs.drain(..) {
-            let fuc = &self.funcs[func];
-            for rel in &fuc.relocs {
-                let offset = match rel.target.expand() {
-                    ty::Kind::Func(fun) => self.funcs[fun].offset,
-                    ty::Kind::Global(glo) => self.globals[glo].offset,
-                    _ => unreachable!(),
-                };
-                rel.reloc.apply_jump(to, offset, fuc.offset);
-            }
-        }
-
-        AssemblySpec {
-            code_length: code_length as _,
-            data_length: data_length as _,
-            entry: self.funcs[from].offset,
-        }
-    }
-
-    fn disasm<'a>(
-        &'a self,
-        mut sluce: &[u8],
-        eca_handler: &mut dyn FnMut(&mut &[u8]),
-        types: &'a Types,
-        files: &'a EntSlice<Module, parser::Ast>,
-        output: &mut String,
-    ) -> Result<(), hbbytecode::DisasmError<'a>> {
-        use hbbytecode::DisasmItem;
-        let functions = types
-            .ins
-            .funcs
-            .iter()
-            .zip(self.funcs.iter())
-            .filter(|(_, f)| f.offset != u32::MAX)
-            .map(|(f, fd)| {
-                let name = if f.file != Module::default() {
-                    let file = &files[f.file];
-                    file.ident_str(f.name)
-                } else {
-                    "target_fn"
-                };
-                (fd.offset, (name, fd.code.len() as u32, DisasmItem::Func))
-            })
-            .chain(
-                types
-                    .ins
-                    .globals
-                    .iter()
-                    .zip(self.globals.iter())
-                    .filter(|(_, g)| g.offset != u32::MAX)
-                    .map(|(g, gd)| {
-                        let name = if g.file == Module::default() {
-                            core::str::from_utf8(&g.data).unwrap_or("invalid utf-8")
-                        } else {
-                            let file = &files[g.file];
-                            file.ident_str(g.name)
-                        };
-                        (gd.offset, (name, g.data.len() as Size, DisasmItem::Global))
-                    }),
-            )
-            .collect::<BTreeMap<_, _>>();
-        hbbytecode::disasm(&mut sluce, &functions, output, eca_handler)
-    }
-
-    fn emit_ct_body(
-        &mut self,
-        id: ty::Func,
-        nodes: &Nodes,
-        tys: &Types,
-        files: &EntSlice<Module, parser::Ast>,
-    ) {
-        self.emit_body(id, nodes, tys, files);
-        let fd = &mut self.funcs[id];
-        fd.code.truncate(fd.code.len() - instrs::jala(0, 0, 0).0);
-        emit(&mut fd.code, instrs::tx());
-    }
-
-    fn emit_body(
-        &mut self,
-        id: ty::Func,
-        nodes: &Nodes,
-        tys: &Types,
-        files: &EntSlice<Module, parser::Ast>,
-    ) {
-        let sig = tys.ins.funcs[id].sig;
-
-        debug_assert!(self.code.is_empty());
-
-        self.offsets.clear();
-        self.offsets.resize(nodes.len(), Offset::MAX);
-
-        let mut stack_size = 0;
-        '_compute_stack: {
-            let mems = &nodes[MEM].outputs;
-            for &stck in mems.iter() {
-                if !matches!(nodes[stck].kind, Kind::Stck | Kind::Arg) {
-                    debug_assert_matches!(
-                        nodes[stck].kind,
-                        Kind::Phi
-                            | Kind::Return { .. }
-                            | Kind::Load
-                            | Kind::Call { .. }
-                            | Kind::Stre
-                            | Kind::Join
-                    );
-                    continue;
-                }
-                stack_size += tys.size_of(nodes[stck].ty);
-                self.offsets[stck as usize] = stack_size;
-            }
-            for &stck in mems.iter() {
-                if !matches!(nodes[stck].kind, Kind::Stck | Kind::Arg) {
-                    continue;
-                }
-                self.offsets[stck as usize] = stack_size - self.offsets[stck as usize];
-            }
-        }
-
-        let (saved, tail) = self.emit_body_code(nodes, sig, tys, files);
-
-        if let Some(last_ret) = self.ret_relocs.last()
-            && last_ret.offset as usize == self.code.len() - 5
-            && self
-                .jump_relocs
-                .last()
-                .is_none_or(|&(r, _)| self.offsets[r as usize] as usize != self.code.len())
-        {
-            self.code.truncate(self.code.len() - 5);
-            self.ret_relocs.pop();
-        }
-
-        for (nd, rel) in self.jump_relocs.drain(..) {
-            let offset = self.offsets[nd as usize];
-            rel.apply_jump(&mut self.code, offset, 0);
-        }
-
-        let end = self.code.len();
-        for ret_rel in self.ret_relocs.drain(..) {
-            ret_rel.apply_jump(&mut self.code, end as _, 0);
-        }
-
-        let mut stripped_prelude_size = 0;
-        '_close_function: {
-            let pushed = (saved as i64 + !tail as i64) * 8;
-            let stack = stack_size as i64;
-
-            let add_len = instrs::addi64(0, 0, 0).0;
-            let st_len = instrs::st(0, 0, 0, 0).0;
-
-            match (pushed, stack) {
-                (0, 0) => {
-                    stripped_prelude_size = add_len + st_len;
-                    self.code.drain(0..stripped_prelude_size);
-                    break '_close_function;
-                }
-                (0, stack) => {
-                    write_reloc(&mut self.code, 3, -stack, 8);
-                    stripped_prelude_size = st_len;
-                    let end = add_len + st_len;
-                    self.code.drain(add_len..end);
-                    self.emit(instrs::addi64(reg::STACK_PTR, reg::STACK_PTR, stack as _));
-                    break '_close_function;
-                }
-                _ => {}
-            }
-
-            write_reloc(&mut self.code, 3, -(pushed + stack), 8);
-            write_reloc(&mut self.code, 3 + 8 + 3, stack, 8);
-            write_reloc(&mut self.code, 3 + 8 + 3 + 8, pushed, 2);
-
-            self.emit(instrs::ld(
-                reg::RET_ADDR + tail as u8,
-                reg::STACK_PTR,
-                stack as _,
-                pushed as _,
-            ));
-            self.emit(instrs::addi64(reg::STACK_PTR, reg::STACK_PTR, (pushed + stack) as _));
-        }
-        self.relocs.iter_mut().for_each(|r| r.reloc.offset -= stripped_prelude_size as u32);
-        if sig.ret != ty::Id::NEVER {
-            self.emit(instrs::jala(reg::ZERO, reg::RET_ADDR, 0));
-        }
-
-        self.funcs.shadow(tys.ins.funcs.len());
-        self.funcs[id].code = mem::take(&mut self.code);
-        self.funcs[id].relocs = mem::take(&mut self.relocs);
-
-        debug_assert_eq!(self.ret_relocs.len(), 0);
-        debug_assert_eq!(self.relocs.len(), 0);
-        debug_assert_eq!(self.jump_relocs.len(), 0);
-        debug_assert_eq!(self.code.len(), 0);
-    }
-}
-
-impl Nodes {
-    fn cond_op(&self, cnd: Nid) -> CondRet {
-        let Kind::BinOp { op } = self[cnd].kind else { return None };
-        if self.is_unlocked(cnd) {
-            return None;
-        }
-        op.cond_op(self[self[cnd].inputs[1]].ty)
-    }
-
-    fn strip_offset(&self, region: Nid) -> (Nid, Offset) {
-        if matches!(self[region].kind, Kind::BinOp { op: TokenKind::Add | TokenKind::Sub })
-            && self.is_locked(region)
-            && let Kind::CInt { value } = self[self[region].inputs[2]].kind
-        {
-            (self[region].inputs[1], value as _)
-        } else {
-            (region, 0)
-        }
-    }
-
-    fn is_never_used(&self, nid: Nid, tys: &Types) -> bool {
-        let node = &self[nid];
-        match node.kind {
-            Kind::CInt { value: 0 } => false,
-            Kind::CInt { value: 1.. } => node.outputs.iter().all(|&o| {
-                matches!(self[o].kind, Kind::BinOp { op }
-                        if op.imm_binop(self[o].ty).is_some()
-                            && self.is_const(self[o].inputs[2])
-                            && op.cond_op(self[o].ty).is_none())
-            }),
-            Kind::BinOp { op: TokenKind::Mul } if node.ty.is_float() => {
-                node.outputs.iter().all(|&n| {
-                    self[n].kind == Kind::BinOp { op: TokenKind::Add } && self[n].inputs[1] == nid
-                })
-            }
-            Kind::BinOp { op: TokenKind::Add | TokenKind::Sub } => {
-                (self.is_locked(node.inputs[1]) && !self[node.inputs[1]].ty.is_float())
-                    || (self.is_const(node.inputs[2])
-                        && node.outputs.iter().all(|&n| self.uses_direct_offset_of(n, nid, tys)))
-            }
-            Kind::BinOp { op } => {
-                op.cond_op(self[node.inputs[1]].ty).is_some()
-                    && node.outputs.iter().all(|&n| self[n].kind == Kind::If)
-            }
-            Kind::Stck if tys.size_of(node.ty) == 0 => true,
-            Kind::Stck | Kind::Arg => node.outputs.iter().all(|&n| {
-                self.uses_direct_offset_of(n, nid, tys)
-                    || (matches!(self[n].kind, Kind::BinOp { op: TokenKind::Add })
-                        && self.is_never_used(n, tys))
-            }),
-            Kind::Load { .. } => node.ty.loc(tys) == Loc::Stack,
-            _ => false,
-        }
-    }
-
-    fn uses_direct_offset_of(&self, user: Nid, target: Nid, tys: &Types) -> bool {
-        let node = &self[user];
-        ((node.kind == Kind::Stre && node.inputs[2] == target)
-            || (node.kind == Kind::Load && node.inputs[1] == target))
-            && (node.ty.loc(tys) == Loc::Reg
-               //  this means the struct is actually loaded into a register so no BMC needed
-                || (node.kind == Kind::Load
-                    && !matches!(tys.parama(node.ty).0, Some(PLoc::Ref(..)))
-                    && node.outputs.iter().all(|&o| matches!(self[o].kind, Kind::Call { .. } | Kind::Return { .. }))))
-    }
-}
-
-impl HbvmBackend {
-    fn extend(
-        &mut self,
-        base: ty::Id,
-        dest: ty::Id,
-        reg: Reg,
-        tys: &Types,
-        files: &EntSlice<Module, parser::Ast>,
-    ) {
-        if reg == 0 {
-            return;
-        }
-
-        let (bsize, dsize) = (tys.size_of(base), tys.size_of(dest));
-        debug_assert!(bsize <= 8, "{}", ty::Display::new(tys, files, base));
-        debug_assert!(dsize <= 8, "{}", ty::Display::new(tys, files, dest));
-        if bsize == dsize {
-            return Default::default();
-        }
-        self.emit(match (base.is_signed(), dest.is_signed()) {
-            (true, true) => {
-                let op = [instrs::sxt8, instrs::sxt16, instrs::sxt32][bsize.ilog2() as usize];
-                op(reg, reg)
-            }
-            _ => {
-                let mask = (1u64 << (bsize * 8)) - 1;
-                instrs::andi(reg, reg, mask)
-            }
-        });
-    }
-}
-
-type CondRet = Option<(fn(u8, u8, i16) -> EncodedInstr, bool)>;
-
-impl TokenKind {
-    fn cmp_against(self) -> Option<u64> {
-        Some(match self {
-            Self::Le | Self::Gt => 1,
-            Self::Ne | Self::Eq => 0,
-            Self::Ge | Self::Lt => (-1i64) as _,
-            _ => return None,
-        })
-    }
-
-    fn float_cmp(self, ty: ty::Id) -> Option<fn(u8, u8, u8) -> EncodedInstr> {
-        if !ty.is_float() {
-            return None;
-        }
-        let size = ty.simple_size().unwrap();
-
-        let ops = match self {
-            Self::Gt => [instrs::fcmpgt32, instrs::fcmpgt64],
-            Self::Lt => [instrs::fcmplt32, instrs::fcmplt64],
-            _ => return None,
-        };
-
-        Some(ops[size.ilog2() as usize - 2])
-    }
-
-    fn cond_op(self, ty: ty::Id) -> CondRet {
-        let signed = ty.is_signed();
-        Some((
-            match self {
-                Self::Eq => instrs::jne,
-                Self::Ne => instrs::jeq,
-                _ if ty.is_float() => return None,
-                Self::Le if signed => instrs::jgts,
-                Self::Le => instrs::jgtu,
-                Self::Lt if signed => instrs::jlts,
-                Self::Lt => instrs::jltu,
-                Self::Ge if signed => instrs::jlts,
-                Self::Ge => instrs::jltu,
-                Self::Gt if signed => instrs::jgts,
-                Self::Gt => instrs::jgtu,
-                _ => return None,
-            },
-            matches!(self, Self::Lt | Self::Gt),
-        ))
-    }
-
-    fn binop(self, ty: ty::Id) -> Option<fn(u8, u8, u8) -> EncodedInstr> {
-        let size = ty.simple_size().unwrap_or_else(|| panic!("{:?}", ty.expand()));
-        if ty.is_integer() || ty == ty::Id::BOOL || ty.is_pointer() {
-            macro_rules! div { ($($op:ident),*) => {[$(|a, b, c| $op(a, 0, b, c)),*]}; }
-            macro_rules! rem { ($($op:ident),*) => {[$(|a, b, c| $op(0, a, b, c)),*]}; }
-            let signed = ty.is_signed();
-
-            let ops = match self {
-                Self::Add => [add8, add16, add32, add64],
-                Self::Sub => [sub8, sub16, sub32, sub64],
-                Self::Mul => [mul8, mul16, mul32, mul64],
-                Self::Div if signed => div!(dirs8, dirs16, dirs32, dirs64),
-                Self::Div => div!(diru8, diru16, diru32, diru64),
-                Self::Mod if signed => rem!(dirs8, dirs16, dirs32, dirs64),
-                Self::Mod => rem!(diru8, diru16, diru32, diru64),
-                Self::Band => return Some(and),
-                Self::Bor => return Some(or),
-                Self::Xor => return Some(xor),
-                Self::Shl => [slu8, slu16, slu32, slu64],
-                Self::Shr if signed => [srs8, srs16, srs32, srs64],
-                Self::Shr => [sru8, sru16, sru32, sru64],
-                _ => return None,
-            };
-
-            Some(ops[size.ilog2() as usize])
-        } else {
-            debug_assert!(ty.is_float(), "{self} {ty:?}");
-            let ops = match self {
-                Self::Add => [fadd32, fadd64],
-                Self::Sub => [fsub32, fsub64],
-                Self::Mul => [fmul32, fmul64],
-                Self::Div => [fdiv32, fdiv64],
-                _ => return None,
-            };
-            Some(ops[size.ilog2() as usize - 2])
-        }
-    }
-
-    fn imm_binop(self, ty: ty::Id) -> Option<fn(u8, u8, u64) -> EncodedInstr> {
-        macro_rules! def_op {
-            ($name:ident |$a:ident, $b:ident, $c:ident| $($tt:tt)*) => {
-                macro_rules! $name {
-                    ($$($$op:ident),*) => {
-                        [$$(
-                            |$a, $b, $c: u64| $$op($($tt)*),
-                        )*]
-                    }
-                }
-            };
-        }
-
-        if ty.is_float() {
-            return None;
-        }
-
-        def_op!(basic_op | a, b, c | a, b, c as _);
-        def_op!(sub_op | a, b, c | a, b, c.wrapping_neg() as _);
-
-        let signed = ty.is_signed();
-        let ops = match self {
-            Self::Add => basic_op!(addi8, addi16, addi32, addi64),
-            Self::Sub => sub_op!(addi8, addi16, addi32, addi64),
-            Self::Mul => basic_op!(muli8, muli16, muli32, muli64),
-            Self::Band => return Some(andi),
-            Self::Bor => return Some(ori),
-            Self::Xor => return Some(xori),
-            Self::Shr if signed => basic_op!(srsi8, srsi16, srsi32, srsi64),
-            Self::Shr => basic_op!(srui8, srui16, srui32, srui64),
-            Self::Shl => basic_op!(slui8, slui16, slui32, slui64),
-            _ => return None,
-        };
-
-        let size = ty.simple_size().unwrap();
-        Some(ops[size.ilog2() as usize])
-    }
-
-    fn unop(&self, dst: ty::Id, src: ty::Id, tys: &Types) -> Option<fn(u8, u8) -> EncodedInstr> {
-        let src_idx = tys.size_of(src).ilog2() as usize;
-        Some(match self {
-            Self::Sub => [
-                |a, b| sub8(a, reg::ZERO, b),
-                |a, b| sub16(a, reg::ZERO, b),
-                |a, b| sub32(a, reg::ZERO, b),
-                |a, b| sub64(a, reg::ZERO, b),
-            ][src_idx],
-            Self::Not => instrs::not,
-            Self::Float if dst.is_float() && src.is_integer() => {
-                debug_assert_matches!(
-                    (dst.simple_size(), src.simple_size()),
-                    (Some(4 | 8), Some(8))
-                );
-                [instrs::itf32, instrs::itf64][dst.simple_size().unwrap().ilog2() as usize - 2]
-            }
-            Self::Number if src.is_float() && dst.is_integer() => {
-                [|a, b| instrs::fti32(a, b, 1), |a, b| instrs::fti64(a, b, 1)][src_idx - 2]
-            }
-            Self::Number if src.is_signed() && (dst.is_integer() || dst.is_pointer()) => {
-                [instrs::sxt8, instrs::sxt16, instrs::sxt32][src_idx]
-            }
-            Self::Number
-                if (src.is_unsigned() || src == ty::Id::BOOL)
-                    && (dst.is_integer() || dst.is_pointer()) =>
-            {
-                [
-                    |a, b| instrs::andi(a, b, 0xff),
-                    |a, b| instrs::andi(a, b, 0xffff),
-                    |a, b| instrs::andi(a, b, 0xffffffff),
-                ][src_idx]
-            }
-            Self::Float if dst.is_float() && src.is_float() => {
-                [instrs::fc32t64, |a, b| instrs::fc64t32(a, b, 1)][src_idx - 2]
-            }
-            _ => return None,
-        })
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-enum PLoc {
-    Reg(Reg, u16),
-    WideReg(Reg, u16),
-    Ref(Reg, u32),
-}
-
-impl PLoc {
-    fn reg(self) -> u8 {
-        match self {
-            PLoc::Reg(r, _) | PLoc::WideReg(r, _) | PLoc::Ref(r, _) => r,
-        }
-    }
-}
-
-struct ParamAlloc(Range<Reg>);
-
-impl ParamAlloc {
-    pub fn next(&mut self, ty: ty::Id, tys: &Types) -> Option<PLoc> {
-        Some(match tys.size_of(ty) {
-            0 => return None,
-            size @ 1..=8 => PLoc::Reg(self.0.next().unwrap(), size as _),
-            size @ 9..=16 => PLoc::WideReg(self.0.next_chunk::<2>().unwrap()[0], size as _),
-            size @ 17.. => PLoc::Ref(self.0.next().unwrap(), size),
-        })
-    }
-}
-
-impl Types {
-    fn parama(&self, ret: ty::Id) -> (Option<PLoc>, ParamAlloc) {
-        let mut iter = ParamAlloc(1..12);
-        let ret = iter.next(ret, self);
-        iter.0.start += ret.is_none() as u8;
-        (ret, iter)
-    }
-}
-
-type EncodedInstr = (usize, [u8; instrs::MAX_SIZE]);
-fn emit(out: &mut Vec<u8>, (len, instr): EncodedInstr) {
-    out.extend_from_slice(&instr[..len]);
-}
-
-fn binary_prelude(to: &mut Vec<u8>) {
-    emit(to, instrs::jal(reg::RET_ADDR, reg::ZERO, 0));
-    emit(to, instrs::tx());
-}
-
-#[derive(Default)]
-pub struct LoggedMem {
-    pub mem: hbvm::mem::HostMemory,
-    logger: hbvm::mem::InstrLogger,
-}
-
-impl hbvm::mem::Memory for LoggedMem {
-    unsafe fn load(
-        &mut self,
-        addr: hbvm::mem::Address,
-        target: *mut u8,
-        count: usize,
-    ) -> Result<(), hbvm::mem::LoadError> {
-        log::trace!(
-            "load: {:x} {}",
-            addr.get(),
-            AsHex(core::slice::from_raw_parts(addr.get() as *const u8, count))
-        );
-        self.mem.load(addr, target, count)
-    }
-
-    unsafe fn store(
-        &mut self,
-        addr: hbvm::mem::Address,
-        source: *const u8,
-        count: usize,
-    ) -> Result<(), hbvm::mem::StoreError> {
-        log::trace!(
-            "store: {:x} {}",
-            addr.get(),
-            AsHex(core::slice::from_raw_parts(source, count))
-        );
-        self.mem.store(addr, source, count)
-    }
-
-    unsafe fn prog_read<T: Copy + 'static>(&mut self, addr: hbvm::mem::Address) -> T {
-        self.mem.prog_read(addr)
-    }
-
-    fn log_instr(&mut self, at: hbvm::mem::Address, regs: &[hbvm::value::Value]) {
-        log::trace!("read-typed: {:x}: {}", at.get(), unsafe {
-            self.logger.display_instr(at, regs)
-        });
-    }
-}
-
-struct AsHex<'a>(&'a [u8]);
-
-impl core::fmt::Display for AsHex<'_> {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        for &b in self.0 {
-            write!(f, "{b:02x}")?;
-        }
-        Ok(())
-    }
-}
-
-const VM_STACK_SIZE: usize = 1024 * 64;
-
-pub struct Comptime {
-    pub vm: hbvm::Vm<LoggedMem, { 1024 * 10 }>,
-    stack: Box<[u8; VM_STACK_SIZE]>,
-    pub code: Vec<u8>,
-    depth: usize,
-}
-
-impl Comptime {
-    pub fn run(&mut self, ret_loc: &mut [u8], offset: u32) -> u64 {
-        self.vm.write_reg(reg::RET, ret_loc.as_mut_ptr() as u64);
-        let prev_pc = self.push_pc(offset);
-        loop {
-            match self.vm.run().expect("TODO") {
-                hbvm::VmRunOk::End => break,
-                hbvm::VmRunOk::Timer => todo!(),
-                hbvm::VmRunOk::Ecall => todo!(),
-                hbvm::VmRunOk::Breakpoint => todo!(),
-            }
-        }
-        self.pop_pc(prev_pc);
-
-        if let len @ 1..=8 = ret_loc.len() {
-            ret_loc.copy_from_slice(&self.vm.read_reg(reg::RET).0.to_ne_bytes()[..len])
-        }
-
-        self.vm.read_reg(reg::RET).0
-    }
-
-    pub fn reset(&mut self) {
-        let ptr = unsafe { self.stack.as_mut_ptr().cast::<u8>().add(VM_STACK_SIZE) as u64 };
-        self.vm.registers.fill(hbvm::value::Value(0));
-        self.vm.write_reg(reg::STACK_PTR, ptr);
-        self.vm.pc = hbvm::mem::Address::new(self.code.as_ptr() as u64 + HEADER_SIZE as u64);
-    }
-
-    fn push_pc(&mut self, offset: Offset) -> hbvm::mem::Address {
-        let entry = &mut self.code[offset as usize] as *mut _ as _;
-        core::mem::replace(&mut self.vm.pc, hbvm::mem::Address::new(entry))
-            - self.code.as_ptr() as usize
-    }
-
-    fn pop_pc(&mut self, prev_pc: hbvm::mem::Address) {
-        self.vm.pc = prev_pc + self.code.as_ptr() as usize;
-    }
-
-    pub fn clear(&mut self) {
-        self.code.clear();
-    }
-
-    #[must_use]
-    pub fn active(&self) -> bool {
-        self.depth != 0
-    }
-
-    pub fn activate(&mut self) {
-        self.depth += 1;
-    }
-
-    pub fn deactivate(&mut self) {
-        self.depth -= 1;
-    }
-}
-
-impl Default for Comptime {
-    fn default() -> Self {
-        let mut stack = Box::<[u8; VM_STACK_SIZE]>::new_uninit();
-        let mut vm = hbvm::Vm::default();
-        let ptr = unsafe { stack.as_mut_ptr().cast::<u8>().add(VM_STACK_SIZE) as u64 };
-        vm.write_reg(reg::STACK_PTR, ptr);
-        Self { vm, stack: unsafe { stack.assume_init() }, code: Default::default(), depth: 0 }
-    }
-}
-
-const HEADER_SIZE: usize = core::mem::size_of::<AbleOsExecutableHeader>();
-
-#[repr(packed)]
-#[expect(dead_code)]
-pub struct AbleOsExecutableHeader {
-    magic_number: [u8; 3],
-    executable_version: u32,
-
-    code_length: u64,
-    data_length: u64,
-    debug_length: u64,
-    config_length: u64,
-    metadata_length: u64,
-}
-
-#[cfg(test)]
-pub fn test_run_vm(out: &[u8], output: &mut String) {
-    use core::{ffi::CStr, fmt::Write};
-
-    let mut stack = [0_u64; 1024 * 20];
-
-    let mut vm = unsafe {
-        hbvm::Vm::<_, { 1024 * 100 }>::new(
-            LoggedMem::default(),
-            hbvm::mem::Address::new(out.as_ptr() as u64).wrapping_add(HEADER_SIZE),
-        )
-    };
-
-    vm.write_reg(reg::STACK_PTR, unsafe { stack.as_mut_ptr().add(stack.len()) } as u64);
-
-    let stat = loop {
-        match vm.run() {
-            Ok(hbvm::VmRunOk::End) => break Ok(()),
-            Ok(hbvm::VmRunOk::Ecall) => match vm.read_reg(2).0 {
-                37 => writeln!(
-                    output,
-                    "{}",
-                    unsafe { CStr::from_ptr(vm.read_reg(3).0 as _) }.to_str().unwrap()
-                )
-                .unwrap(),
-                1 => writeln!(output, "ev: Ecall").unwrap(), // compatibility with a test
-                69 => {
-                    let [size, align] = [vm.read_reg(3).0 as usize, vm.read_reg(4).0 as usize];
-                    let layout = core::alloc::Layout::from_size_align(size, align).unwrap();
-                    let ptr = unsafe { alloc::alloc::alloc(layout) };
-                    vm.write_reg(1, ptr as u64);
-                }
-                96 => {
-                    let [ptr, size, align] = [
-                        vm.read_reg(3).0 as usize,
-                        vm.read_reg(4).0 as usize,
-                        vm.read_reg(5).0 as usize,
-                    ];
-
-                    let layout = core::alloc::Layout::from_size_align(size, align).unwrap();
-                    unsafe { alloc::alloc::dealloc(ptr as *mut u8, layout) };
-                }
-                3 => vm.write_reg(1, 42),
-                8 => {}
-                unknown => writeln!(output, "unknown ecall: {unknown:?}").unwrap(),
-            },
-            Ok(hbvm::VmRunOk::Timer) => {
-                writeln!(output, "timed out").unwrap();
-                break Ok(());
-            }
-            Ok(ev) => writeln!(output, "ev: {:?}", ev).unwrap(),
-            Err(e) => break Err(e),
-        }
-    };
-
-    writeln!(output, "code size: {}", out.len() - HEADER_SIZE).unwrap();
-    writeln!(output, "ret: {:?}", vm.read_reg(1).0).unwrap();
-    writeln!(output, "status: {:?}", stat).unwrap();
-}

lang/src/fmt.rs

@@ -1,675 +0,0 @@
-use {
-    crate::{
-        lexer::{self, Lexer, TokenKind},
-        parser::{
-            self, CommentOr, CtorField, EnumField, Expr, FieldList, ListKind, Poser, Radix,
-            StructField, UnionField,
-        },
-    },
-    core::{
-        fmt::{self},
-        mem,
-    },
-};
-
-pub fn display_radix(radix: Radix, mut value: u64, buf: &mut [u8; 64]) -> &str {
-    fn conv_radix(d: u8) -> u8 {
-        match d {
-            0..=9 => d + b'0',
-            _ => d - 10 + b'A',
-        }
-    }
-
-    for (i, b) in buf.iter_mut().enumerate().rev() {
-        let d = (value % radix as u64) as u8;
-        value /= radix as u64;
-        *b = conv_radix(d);
-        if value == 0 {
-            return unsafe { core::str::from_utf8_unchecked(&buf[i..]) };
-        }
-    }
-
-    unreachable!()
-}
-
-#[repr(u8)]
-enum TokenGroup {
-    Blank,
-    Comment,
-    Keyword,
-    Identifier,
-    Directive,
-    Number,
-    String,
-    Op,
-    Assign,
-    Paren,
-    Bracket,
-    Colon,
-    Comma,
-    Dot,
-    Ctor,
-}
-
-impl TokenKind {
-    fn to_higlight_group(self) -> TokenGroup {
-        use {TokenGroup as TG, TokenKind::*};
-        match self {
-            BSlash | Pound | Eof | Ct => TG::Blank,
-            Comment => TG::Comment,
-            Directive => TG::Directive,
-            Colon => TG::Colon,
-            Semi | Comma => TG::Comma,
-            Dot => TG::Dot,
-            Ctor | Arr | Tupl | TArrow | Range => TG::Ctor,
-            LParen | RParen => TG::Paren,
-            LBrace | RBrace | LBrack | RBrack => TG::Bracket,
-            Number | Float => TG::Number,
-            Under | CtIdent | Ident => TG::Identifier,
-            Tick | Tilde | Que | Not | Mod | Band | Bor | Xor | Mul | Add | Sub | Div | Shl
-            | Shr | Or | And | Lt | Gt | Eq | Le | Ge | Ne => TG::Op,
-            Decl | Assign | BorAss | XorAss | BandAss | AddAss | SubAss | MulAss | DivAss
-            | ModAss | ShrAss | ShlAss => TG::Assign,
-            DQuote | Quote => TG::String,
-            Slf | Defer | Return | If | Else | Loop | Break | Continue | Fn | Idk | Die
-            | Struct | Packed | True | False | Null | Match | Enum | Union | CtLoop => TG::Keyword,
-        }
-    }
-}
-
-pub fn get_token_kinds(mut source: &mut [u8]) -> usize {
-    let len = source.len();
-    loop {
-        let src = unsafe { core::str::from_utf8_unchecked(source) };
-        let mut token = lexer::Lexer::new(src).eat();
-        match token.kind {
-            TokenKind::Eof => break,
-            // ???
-            TokenKind::CtIdent | TokenKind::Directive => token.start -= 1,
-            _ => {}
-        }
-        let start = token.start as usize;
-        let end = token.end as usize;
-        source[..start].fill(0);
-        source[start..end].fill(token.kind.to_higlight_group() as u8);
-        source = &mut source[end..];
-    }
-    len
-}
-
-pub fn minify(source: &mut str) -> usize {
-    fn needs_space(c: u8) -> bool {
-        matches!(c, b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9' | 127..)
-    }
-
-    let mut writer = source.as_mut_ptr();
-    let mut reader = &source[..];
-    let mut prev_needs_whitecpace = false;
-    let mut prev_needs_newline = false;
-    loop {
-        let mut token = lexer::Lexer::new(reader).eat();
-        match token.kind {
-            TokenKind::Eof => break,
-            TokenKind::CtIdent | TokenKind::CtLoop | TokenKind::Directive => token.start -= 1,
-            _ => {}
-        }
-
-        let cpy_len = token.range().len();
-
-        let mut prefix = 0;
-        if prev_needs_whitecpace && needs_space(reader.as_bytes()[token.start as usize]) {
-            prefix = b' ';
-            debug_assert!(token.start != 0, "{reader}");
-        }
-        prev_needs_whitecpace = needs_space(reader.as_bytes()[token.end as usize - 1]);
-
-        let inbetween_new_lines =
-            reader[..token.start as usize].bytes().filter(|&b| b == b'\n').count()
-                + token.kind.precedence().is_some() as usize;
-        let extra_prefix_new_lines = if inbetween_new_lines > 1 {
-            1 + token.kind.precedence().is_none() as usize
-        } else {
-            prev_needs_newline as usize
-        };
-
-        if token.kind == TokenKind::Comment && reader.as_bytes()[token.end as usize - 1] != b'/' {
-            prev_needs_newline = true;
-            prev_needs_whitecpace = false;
-        } else {
-            prev_needs_newline = false;
-        }
-
-        let sstr = reader[token.start as usize..].as_ptr();
-        reader = &reader[token.end as usize..];
-        unsafe {
-            if extra_prefix_new_lines != 0 {
-                for _ in 0..extra_prefix_new_lines {
-                    writer.write(b'\n');
-                    writer = writer.add(1);
-                }
-            } else if prefix != 0 {
-                writer.write(prefix);
-                writer = writer.add(1);
-            }
-            writer.copy_from(sstr, cpy_len);
-            writer = writer.add(cpy_len);
-        }
-    }
-
-    unsafe { writer.sub_ptr(source.as_mut_ptr()) }
-}
-
-pub struct Formatter<'a> {
-    source: &'a str,
-    depth: usize,
-}
-
-// we exclusively use `write_str` to reduce bloat
-impl<'a> Formatter<'a> {
-    pub fn new(source: &'a str) -> Self {
-        Self { source, depth: 0 }
-    }
-
-    fn fmt_list<T: Poser, F: core::fmt::Write>(
-        &mut self,
-        f: &mut F,
-        trailing: bool,
-        end: &str,
-        sep: &str,
-        list: &[T],
-        fmt: impl Fn(&mut Self, &T, &mut F) -> fmt::Result,
-    ) -> fmt::Result {
-        self.fmt_list_low(f, trailing, end, sep, list, |s, v, f| {
-            fmt(s, v, f)?;
-            Ok(true)
-        })
-    }
-
-    fn fmt_list_low<T: Poser, F: core::fmt::Write>(
-        &mut self,
-        f: &mut F,
-        trailing: bool,
-        end: &str,
-        sep: &str,
-        list: &[T],
-        fmt: impl Fn(&mut Self, &T, &mut F) -> Result<bool, fmt::Error>,
-    ) -> fmt::Result {
-        if !trailing {
-            let mut first = true;
-            for expr in list {
-                if !core::mem::take(&mut first) {
-                    f.write_str(sep)?;
-                    f.write_str(" ")?;
-                }
-                first = !fmt(self, expr, f)?;
-            }
-            return f.write_str(end);
-        }
-
-        if !end.is_empty() {
-            writeln!(f)?;
-        }
-
-        self.depth += !end.is_empty() as usize;
-        let mut already_indented = end.is_empty();
-        let res = (|| {
-            for (i, stmt) in list.iter().enumerate() {
-                if !mem::take(&mut already_indented) {
-                    for _ in 0..self.depth {
-                        f.write_str("\t")?;
-                    }
-                }
-                let add_sep = fmt(self, stmt, f)?;
-                if add_sep {
-                    f.write_str(sep)?;
-                }
-                if let Some(expr) = list.get(i + 1)
-                    && let Some(prev) = self.source.get(..expr.posi() as usize)
-                {
-                    if sep.is_empty() && prev.trim_end().ends_with(';') {
-                        f.write_str(";")?;
-                    }
-                    if count_trailing_newlines(prev) > 1 {
-                        f.write_str("\n")?;
-                    }
-                }
-                if add_sep {
-                    f.write_str("\n")?;
-                }
-            }
-            Ok(())
-        })();
-        self.depth -= !end.is_empty() as usize;
-
-        if !end.is_empty() {
-            for _ in 0..self.depth {
-                f.write_str("\t")?;
-            }
-            f.write_str(end)?;
-        }
-        res
-    }
-
-    fn fmt_paren<F: core::fmt::Write>(
-        &mut self,
-        expr: &Expr,
-        f: &mut F,
-        cond: impl FnOnce(&Expr) -> bool,
-    ) -> fmt::Result {
-        if cond(expr) {
-            f.write_str("(")?;
-            self.fmt(expr, f)?;
-            f.write_str(")")
-        } else {
-            self.fmt(expr, f)
-        }
-    }
-
-    fn fmt_fields<F: core::fmt::Write, T: Poser + Copy>(
-        &mut self,
-        f: &mut F,
-        keyword: &str,
-        trailing_comma: bool,
-        fields: FieldList<T>,
-        fmt: impl Fn(&mut Self, &T, &mut F) -> Result<(), fmt::Error>,
-    ) -> fmt::Result {
-        f.write_str(keyword)?;
-        f.write_str(" {")?;
-        self.fmt_list_low(f, trailing_comma, "}", ",", fields, |s, field, f| {
-            match field {
-                CommentOr::Or(Ok(field)) => fmt(s, field, f)?,
-                CommentOr::Or(Err(scope)) => {
-                    s.fmt_list(f, true, "", "", scope, Self::fmt)?;
-                    return Ok(false);
-                }
-                CommentOr::Comment { literal, .. } => {
-                    f.write_str(literal)?;
-                    f.write_str("\n")?;
-                }
-            }
-            Ok(field.or().is_some())
-        })
-    }
-
-    pub fn fmt<F: core::fmt::Write>(&mut self, expr: &Expr, f: &mut F) -> fmt::Result {
-        macro_rules! impl_parenter {
-            ($($name:ident => $pat:pat,)*) => {
-                $(
-                    let $name = |e: &Expr| matches!(e, $pat);
-                )*
-            };
-        }
-
-        impl_parenter! {
-            unary => Expr::BinOp { .. },
-            postfix => Expr::UnOp { .. } | Expr::BinOp { .. },
-            consecutive => Expr::UnOp { .. },
-        }
-
-        match *expr {
-            Expr::Defer { value, .. } => {
-                f.write_str("defer ")?;
-                self.fmt(value, f)
-            }
-            Expr::Slf { .. } => f.write_str("Self"),
-            Expr::String { literal, .. } => f.write_str(literal),
-            Expr::Char { literal, .. } => f.write_str(literal),
-            Expr::Comment { literal, .. } => f.write_str(literal),
-            Expr::Mod { path, .. } => write!(f, "@use(\"{path}\")"),
-            Expr::Embed { path, .. } => write!(f, "@embed(\"{path}\")"),
-            Expr::Field { target, name: field, .. } => {
-                self.fmt_paren(target, f, postfix)?;
-                f.write_str(".")?;
-                f.write_str(field)
-            }
-            Expr::Range { start, end, .. } => {
-                if let Some(start) = start {
-                    self.fmt(start, f)?;
-                }
-                f.write_str("..")?;
-                if let Some(end) = end {
-                    self.fmt(end, f)?;
-                }
-                Ok(())
-            }
-            Expr::Directive { name, args, .. } => {
-                f.write_str("@")?;
-                f.write_str(name)?;
-                f.write_str("(")?;
-                self.fmt_list(f, false, ")", ",", args, Self::fmt)
-            }
-            Expr::Struct { fields, trailing_comma, packed, .. } => {
-                if packed {
-                    f.write_str("packed ")?;
-                }
-
-                self.fmt_fields(
-                    f,
-                    "struct",
-                    trailing_comma,
-                    fields,
-                    |s, StructField { name, ty, default_value, .. }, f| {
-                        f.write_str(name)?;
-                        f.write_str(": ")?;
-                        s.fmt(ty, f)?;
-                        if let Some(deva) = default_value {
-                            f.write_str(" = ")?;
-                            s.fmt(deva, f)?;
-                        }
-                        Ok(())
-                    },
-                )
-            }
-            Expr::Union { fields, trailing_comma, .. } => self.fmt_fields(
-                f,
-                "union",
-                trailing_comma,
-                fields,
-                |s, UnionField { name, ty, .. }, f| {
-                    f.write_str(name)?;
-                    f.write_str(": ")?;
-                    s.fmt(ty, f)
-                },
-            ),
-            Expr::Enum { variants, trailing_comma, .. } => self.fmt_fields(
-                f,
-                "enum",
-                trailing_comma,
-                variants,
-                |_, EnumField { name, .. }, f| f.write_str(name),
-            ),
-            Expr::Ctor { ty, fields, trailing_comma, .. } => {
-                if let Some(ty) = ty {
-                    self.fmt_paren(ty, f, postfix)?;
-                }
-                f.write_str(".{")?;
-                self.fmt_list(
-                    f,
-                    trailing_comma,
-                    "}",
-                    ",",
-                    fields,
-                    |s: &mut Self, CtorField { name, value, .. }: &_, f| {
-                        f.write_str(name)?;
-                        if !matches!(value, &Expr::Ident { id, .. } if *name == &self.source[id.range()]) {
-                            f.write_str(": ")?;
-                            s.fmt(value, f)?;
-                        }
-                        Ok(())
-                    },
-                )
-            }
-            Expr::List {
-                pos,
-                kind: term,
-                ty: Some(&Expr::Slice { pos: spos, size: Some(&Expr::Number { value, .. }), item }),
-                fields,
-                trailing_comma,
-            } if value as usize == fields.len() => self.fmt(
-                &Expr::List {
-                    pos,
-                    kind: term,
-                    ty: Some(&Expr::Slice { pos: spos, size: None, item }),
-                    fields,
-                    trailing_comma,
-                },
-                f,
-            ),
-            Expr::List { ty, kind: term, fields, trailing_comma, .. } => {
-                if let Some(ty) = ty {
-                    self.fmt_paren(ty, f, postfix)?;
-                }
-                let (start, end) = match term {
-                    ListKind::Tuple => (".(", ")"),
-                    ListKind::Array => (".[", "]"),
-                };
-                f.write_str(start)?;
-                self.fmt_list(f, trailing_comma, end, ",", fields, Self::fmt)
-            }
-            Expr::Slice { item, size, .. } => {
-                f.write_str("[")?;
-                if let Some(size) = size {
-                    self.fmt(size, f)?;
-                }
-                f.write_str("]")?;
-                self.fmt_paren(item, f, unary)
-            }
-            Expr::Index { base, index } => {
-                self.fmt_paren(base, f, postfix)?;
-                f.write_str("[")?;
-                self.fmt(index, f)?;
-                f.write_str("]")
-            }
-            Expr::UnOp { op, val, .. } => {
-                f.write_str(op.name())?;
-                self.fmt_paren(val, f, unary)
-            }
-            Expr::Break { .. } => f.write_str("break"),
-            Expr::Continue { .. } => f.write_str("continue"),
-            Expr::If { cond, then, else_, .. } => {
-                f.write_str("if ")?;
-                self.fmt(cond, f)?;
-                f.write_str(" ")?;
-                self.fmt_paren(then, f, consecutive)?;
-                if let Some(e) = else_ {
-                    f.write_str(" else ")?;
-                    self.fmt(e, f)?;
-                }
-                Ok(())
-            }
-            Expr::Match { value, branches, .. } => {
-                f.write_str("match ")?;
-                self.fmt(value, f)?;
-                f.write_str(" {")?;
-                self.fmt_list(f, true, "}", ",", branches, |s, br, f| {
-                    s.fmt(&br.pat, f)?;
-                    f.write_str(" => ")?;
-                    s.fmt(&br.body, f)
-                })
-            }
-            Expr::Loop { body, unrolled, .. } => {
-                f.write_str(if unrolled { "$loop " } else { "loop " })?;
-                self.fmt(body, f)
-            }
-            Expr::Closure { ret, body, args, .. } => {
-                f.write_str("fn(")?;
-                self.fmt_list(f, false, "", ",", args, |s, arg, f| {
-                    if arg.is_ct {
-                        f.write_str("$")?;
-                    }
-                    f.write_str(arg.name)?;
-                    f.write_str(": ")?;
-                    s.fmt(&arg.ty, f)
-                })?;
-                f.write_str("): ")?;
-                self.fmt(ret, f)?;
-                f.write_str(" ")?;
-                self.fmt_paren(body, f, consecutive)?;
-                Ok(())
-            }
-            Expr::Call { func, args, trailing_comma } => {
-                self.fmt_paren(func, f, postfix)?;
-                f.write_str("(")?;
-                self.fmt_list(f, trailing_comma, ")", ",", args, Self::fmt)
-            }
-            Expr::Return { val: Some(val), .. } => {
-                f.write_str("return ")?;
-                self.fmt(val, f)
-            }
-            Expr::Return { val: None, .. } => f.write_str("return"),
-            Expr::Wildcard { .. } => f.write_str("_"),
-            Expr::Ident { pos, is_ct, .. } => {
-                if is_ct {
-                    f.write_str("$")?;
-                }
-                f.write_str(&self.source[Lexer::restore(self.source, pos).eat().range()])
-            }
-            Expr::Block { stmts, .. } => {
-                f.write_str("{")?;
-                self.fmt_list(f, true, "}", "", stmts, Self::fmt)
-            }
-            Expr::Number { value, radix, .. } => {
-                f.write_str(match radix {
-                    Radix::Decimal => "",
-                    Radix::Hex => "0x",
-                    Radix::Octal => "0o",
-                    Radix::Binary => "0b",
-                })?;
-                let mut buf = [0u8; 64];
-                f.write_str(display_radix(radix, value as u64, &mut buf))
-            }
-            Expr::Float { pos, .. } => {
-                f.write_str(&self.source[Lexer::restore(self.source, pos).eat().range()])
-            }
-            Expr::Bool { value, .. } => f.write_str(if value { "true" } else { "false" }),
-            Expr::Idk { .. } => f.write_str("idk"),
-            Expr::Die { .. } => f.write_str("die"),
-            Expr::Null { .. } => f.write_str("null"),
-            Expr::BinOp {
-                left,
-                op: TokenKind::Assign,
-                right: &Expr::BinOp { left: lleft, op, right, .. },
-                ..
-            } if left.pos() == lleft.pos() => {
-                self.fmt(left, f)?;
-                f.write_str(" ")?;
-                f.write_str(op.name())?;
-                f.write_str("= ")?;
-                self.fmt(right, f)
-            }
-            Expr::BinOp { right, op, left, .. } => {
-                let prec_miss_left = |e: &Expr| {
-                    matches!(
-                        e, Expr::BinOp { op: lop, .. } if op.precedence() > lop.precedence()
-                    )
-                };
-                let prec_miss_right = |e: &Expr| {
-                    matches!(
-                        e, Expr::BinOp { op: lop, .. }
-                            if (op.precedence() == lop.precedence() && !op.is_comutative())
-                                || op.precedence() > lop.precedence()
-                    )
-                };
-
-                self.fmt_paren(left, f, prec_miss_left)?;
-                if let Some(mut prev) = self.source.get(..right.pos() as usize) {
-                    prev = prev.trim_end();
-                    let estimate_bound =
-                        prev.rfind(|c: char| c.is_ascii_whitespace()).map_or(prev.len(), |i| i + 1);
-                    let exact_bound = lexer::Lexer::new(&prev[estimate_bound..]).last().start;
-                    prev = &prev[..exact_bound as usize + estimate_bound];
-                    if count_trailing_newlines(prev) > 0 {
-                        f.write_str("\n")?;
-                        for _ in 0..self.depth + 1 {
-                            f.write_str("\t")?;
-                        }
-                        f.write_str(op.name())?;
-                        f.write_str(" ")?;
-                    } else {
-                        if op != TokenKind::Colon {
-                            f.write_str(" ")?;
-                        }
-                        f.write_str(op.name())?;
-                        f.write_str(" ")?;
-                    }
-                } else {
-                    f.write_str(" ")?;
-                    f.write_str(op.name())?;
-                    f.write_str(" ")?;
-                }
-                self.fmt_paren(right, f, prec_miss_right)
-            }
-        }
-    }
-}
-
-pub fn count_trailing_newlines(source: &str) -> usize {
-    source[source.trim_end().len()..].bytes().filter(|&c| c == b'\n').count()
-}
-
-impl core::fmt::Display for parser::Ast {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt_file(self.exprs(), &self.file, f)
-    }
-}
-
-pub fn fmt_file(exprs: &[Expr], file: &str, f: &mut impl fmt::Write) -> fmt::Result {
-    for (i, expr) in exprs.iter().enumerate() {
-        Formatter::new(file).fmt(expr, f)?;
-        if let Some(expr) = exprs.get(i + 1)
-            && let Some(prefix) = file.get(..expr.pos() as usize)
-        {
-            if prefix.trim_end().ends_with(';') {
-                f.write_str(";")?;
-            }
-
-            if count_trailing_newlines(prefix) > 1 {
-                f.write_str("\n")?;
-            }
-        }
-
-        if i + 1 != exprs.len() {
-            writeln!(f)?;
-        }
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-pub mod test {
-    use {
-        crate::parser::{self, Ctx},
-        alloc::borrow::ToOwned,
-        std::{fmt::Write, string::String},
-    };
-
-    pub fn format(ident: &str, input: &str) {
-        let mut minned = input.to_owned();
-        let len = crate::fmt::minify(&mut minned);
-        minned.truncate(len);
-
-        let mut ctx = Ctx::default();
-        let ast = parser::Ast::new(ident, minned, &mut ctx, &mut parser::no_loader);
-        log::info!("{}", ctx.errors.borrow());
-        let mut output = String::new();
-        write!(output, "{ast}").unwrap();
-
-        let input_path = format!("formatter_{ident}.expected");
-        let output_path = format!("formatter_{ident}.actual");
-        std::fs::write(&input_path, input).unwrap();
-        std::fs::write(&output_path, output).unwrap();
-
-        let success = std::process::Command::new("diff")
-            .arg("-u")
-            .arg("--color")
-            .arg(&input_path)
-            .arg(&output_path)
-            .status()
-            .unwrap()
-            .success();
-        std::fs::remove_file(&input_path).unwrap();
-        std::fs::remove_file(&output_path).unwrap();
-        assert!(success, "test failed");
-    }
-
-    macro_rules! test {
-        ($($name:ident => $input:expr;)*) => {$(
-            #[test]
-            fn $name() {
-                format(stringify!($name), $input);
-            }
-        )*};
-    }
-
-    test! {
-        comments => "// comment\n// comment\n\n// comment\n\n\
-            /* comment */\n/* comment */\n\n/* comment */";
-        some_ordinary_code => "loft := fn(): int return loft(1, 2, 3)";
-        some_arg_per_line_code => "loft := fn(): int return loft(\
-            \n\t1,\n\t2,\n\t3,\n)";
-        some_ordinary_struct => "loft := fn(): int return loft.{a: 1, b: 2}";
-        some_ordinary_fild_per_lin_struct => "loft := fn(): int return loft.{\
-            \n\ta: 1,\n\tb: 2,\n}";
-        code_block => "loft := fn(): int {\n\tloft()\n\treturn 1\n}";
-    }
-}

lang/src/fs.rs

@@ -1,449 +0,0 @@
-use {
-    crate::{
-        backend::hbvm::HbvmBackend,
-        parser::{Ast, Ctx, FileKind},
-        son::{self},
-        ty, FnvBuildHasher,
-    },
-    alloc::{string::String, vec::Vec},
-    core::{fmt::Write, num::NonZeroUsize, ops::Deref},
-    hashbrown::hash_map,
-    std::{
-        borrow::ToOwned,
-        collections::VecDeque,
-        eprintln,
-        ffi::OsStr,
-        io::{self, Write as _},
-        path::{Path, PathBuf},
-        string::ToString,
-        sync::Mutex,
-    },
-};
-
-type HashMap<K, V> = hashbrown::HashMap<K, V, FnvBuildHasher>;
-
-pub struct Logger;
-
-impl log::Log for Logger {
-    fn enabled(&self, _: &log::Metadata) -> bool {
-        true
-    }
-
-    fn log(&self, record: &log::Record) {
-        if self.enabled(record.metadata()) {
-            eprintln!("{}", record.args())
-        }
-    }
-
-    fn flush(&self) {}
-}
-
-pub const ABLEOS_PATH_RESOLVER: PathResolver =
-    &|mut path: &str, mut from: &str, tmp: &mut PathBuf| {
-        tmp.clear();
-
-        path = match path {
-            "stn" => {
-                from = "";
-                "./sysdata/libraries/stn/src/lib.hb"
-            }
-            _ => path,
-        };
-
-        match path.split_once(':') {
-            Some(("lib", p)) => tmp.extend(["./sysdata/libraries", p, "src/lib.hb"]),
-            Some(("stn", p)) => {
-                tmp.extend(["./sysdata/libraries/stn/src", &(p.to_owned() + ".hb")])
-            }
-            Some(("sysdata", p)) => tmp.extend(["./sysdata", p]),
-            None => match Path::new(from).parent() {
-                Some(parent) => tmp.extend([parent, Path::new(path)]),
-                None => tmp.push(path),
-            },
-            _ => panic!("path: '{path}' is invalid: unexpected ':'"),
-        };
-        tmp.canonicalize().map_err(|source| CantLoadFile { path: std::mem::take(tmp), source })
-    };
-
-#[derive(Default)]
-pub struct Options<'a> {
-    pub fmt: bool,
-    pub fmt_stdout: bool,
-    pub dump_asm: bool,
-    pub extra_threads: usize,
-    pub resolver: Option<PathResolver<'a>>,
-}
-
-impl<'a> Options<'a> {
-    pub fn from_args(
-        args: &[&str],
-        out: &mut Vec<u8>,
-        resolvers: &'a [(&str, PathResolver)],
-    ) -> std::io::Result<Self> {
-        if args.contains(&"--help") || args.contains(&"-h") {
-            writeln!(out, "Usage: hbc [OPTIONS...] <FILE>")?;
-            writeln!(out, include_str!("../command-help.txt"))?;
-            return Err(std::io::ErrorKind::Other.into());
-        }
-
-        Ok(Options {
-            fmt: args.contains(&"--fmt"),
-            fmt_stdout: args.contains(&"--fmt-stdout"),
-            dump_asm: args.contains(&"--dump-asm"),
-            extra_threads: args
-                .iter()
-                .position(|&a| a == "--threads")
-                .map(|i| {
-                    args[i + 1].parse::<NonZeroUsize>().map_err(|e| {
-                        writeln!(out, "--threads expects non zero integer: {e}")
-                            .err()
-                            .unwrap_or(std::io::ErrorKind::Other.into())
-                    })
-                })
-                .transpose()?
-                .map_or(1, NonZeroUsize::get)
-                - 1,
-            resolver: args
-                .iter()
-                .position(|&a| a == "--path-resolver")
-                .map(|i| {
-                    resolvers.iter().find(|&&(n, _)| args[i + 1] == n).map(|&(_, r)| r).ok_or_else(
-                        || {
-                            writeln!(
-                                out,
-                                "--path-resolver can only be one of: {}",
-                                resolvers
-                                    .iter()
-                                    .map(|&(n, _)| n)
-                                    .intersperse(", ")
-                                    .collect::<String>()
-                            )
-                            .err()
-                            .unwrap_or(std::io::ErrorKind::Other.into())
-                        },
-                    )
-                })
-                .transpose()?,
-        })
-    }
-}
-
-pub fn run_compiler(
-    root_file: &str,
-    options: Options,
-    out: &mut Vec<u8>,
-    warnings: &mut String,
-) -> std::io::Result<()> {
-    let parsed = parse_from_fs(
-        options.extra_threads,
-        root_file,
-        options.resolver.unwrap_or(&default_resolve),
-    )?;
-
-    if (options.fmt || options.fmt_stdout) && !parsed.errors.is_empty() {
-        *out = parsed.errors.into_bytes();
-        return Err(std::io::Error::other("fmt fialed (errors are in out)"));
-    }
-
-    if options.fmt {
-        let mut output = String::new();
-        for ast in parsed.ast {
-            write!(output, "{ast}").unwrap();
-            if ast.file.deref().trim() != output.as_str().trim() {
-                std::fs::write(&*ast.path, &output)?;
-            }
-            output.clear();
-        }
-    } else if options.fmt_stdout {
-        write!(out, "{}", &parsed.ast[0])?;
-    } else {
-        let mut backend = HbvmBackend::default();
-
-        let mut ctx = crate::son::CodegenCtx::default();
-        *ctx.parser.errors.get_mut() = parsed.errors;
-        let mut codegen = son::Codegen::new(&mut backend, &parsed.ast, &mut ctx);
-        codegen.push_embeds(parsed.embeds);
-        codegen.generate(ty::Module::MAIN);
-
-        *warnings = core::mem::take(&mut *codegen.warnings.borrow_mut());
-
-        if !codegen.errors.borrow().is_empty() {
-            drop(codegen);
-            *out = ctx.parser.errors.into_inner().into_bytes();
-            return Err(std::io::Error::other("compilation faoled (errors are in out)"));
-        }
-
-        codegen.assemble(out);
-
-        if options.dump_asm {
-            let mut disasm = String::new();
-            let err = codegen.disasm(&mut disasm, out).map_err(|e| io::Error::other(e.to_string()));
-            *out = disasm.into_bytes();
-            err?
-        }
-    }
-
-    Ok(())
-}
-
-struct TaskQueue<T> {
-    inner: Mutex<TaskQueueInner<T>>,
-}
-
-impl<T> TaskQueue<T> {
-    fn new(max_waiters: usize) -> Self {
-        Self { inner: Mutex::new(TaskQueueInner::new(max_waiters)) }
-    }
-
-    pub fn push(&self, message: T) {
-        self.extend([message]);
-    }
-
-    pub fn extend(&self, messages: impl IntoIterator<Item = T>) {
-        self.inner.lock().unwrap().push(messages);
-    }
-
-    pub fn pop(&self) -> Option<T> {
-        TaskQueueInner::pop(&self.inner)
-    }
-}
-
-enum TaskSlot<T> {
-    Waiting,
-    Delivered(T),
-    Closed,
-}
-
-struct TaskQueueInner<T> {
-    max_waiters: usize,
-    messages: VecDeque<T>,
-    parked: VecDeque<(*mut TaskSlot<T>, std::thread::Thread)>,
-}
-
-unsafe impl<T: Send> Send for TaskQueueInner<T> {}
-unsafe impl<T: Send + Sync> Sync for TaskQueueInner<T> {}
-
-impl<T> TaskQueueInner<T> {
-    fn new(max_waiters: usize) -> Self {
-        Self { max_waiters, messages: Default::default(), parked: Default::default() }
-    }
-
-    fn push(&mut self, messages: impl IntoIterator<Item = T>) {
-        for msg in messages {
-            if let Some((dest, thread)) = self.parked.pop_front() {
-                unsafe { *dest = TaskSlot::Delivered(msg) };
-                thread.unpark();
-            } else {
-                self.messages.push_back(msg);
-            }
-        }
-    }
-
-    fn pop(s: &Mutex<Self>) -> Option<T> {
-        let mut res = TaskSlot::Waiting;
-        {
-            let mut s = s.lock().unwrap();
-            if let Some(msg) = s.messages.pop_front() {
-                return Some(msg);
-            }
-
-            if s.max_waiters == s.parked.len() + 1 {
-                for (dest, thread) in s.parked.drain(..) {
-                    unsafe { *dest = TaskSlot::Closed };
-                    thread.unpark();
-                }
-                return None;
-            }
-
-            s.parked.push_back((&mut res, std::thread::current()));
-        }
-
-        loop {
-            std::thread::park();
-
-            let _s = s.lock().unwrap();
-            match core::mem::replace(&mut res, TaskSlot::Waiting) {
-                TaskSlot::Delivered(msg) => return Some(msg),
-                TaskSlot::Closed => return None,
-                TaskSlot::Waiting => {}
-            }
-        }
-    }
-}
-
-pub struct Loaded {
-    ast: Vec<Ast>,
-    embeds: Vec<Vec<u8>>,
-    errors: String,
-}
-
-fn default_resolve(path: &str, from: &str, tmp: &mut PathBuf) -> Result<PathBuf, CantLoadFile> {
-    tmp.clear();
-    match Path::new(from).parent() {
-        Some(parent) => tmp.extend([parent, Path::new(path)]),
-        None => tmp.push(path),
-    };
-
-    tmp.canonicalize().map_err(|source| CantLoadFile { path: std::mem::take(tmp), source })
-}
-
-/// fn(path, from, tmp)
-pub type PathResolver<'a> =
-    &'a (dyn Fn(&str, &str, &mut PathBuf) -> Result<PathBuf, CantLoadFile> + Send + Sync);
-
-#[derive(Debug)]
-pub struct CantLoadFile {
-    pub path: PathBuf,
-    pub source: io::Error,
-}
-
-impl core::fmt::Display for CantLoadFile {
-    fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-        write!(f, "can't load file: {}", display_rel_path(&self.path),)
-    }
-}
-
-impl core::error::Error for CantLoadFile {
-    fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
-        Some(&self.source)
-    }
-}
-
-impl From<CantLoadFile> for io::Error {
-    fn from(e: CantLoadFile) -> Self {
-        io::Error::new(io::ErrorKind::InvalidData, e)
-    }
-}
-
-pub fn parse_from_fs(
-    extra_threads: usize,
-    root: &str,
-    resolve: PathResolver,
-) -> io::Result<Loaded> {
-    type Task = (usize, PathBuf);
-
-    let seen_modules = Mutex::new(HashMap::<PathBuf, usize>::default());
-    let seen_embeds = Mutex::new(HashMap::<PathBuf, usize>::default());
-    let tasks = TaskQueue::<Task>::new(extra_threads + 1);
-    let ast = Mutex::new(Vec::<io::Result<Ast>>::new());
-    let embeds = Mutex::new(Vec::<Vec<u8>>::new());
-
-    let loader = |path: &str, from: &str, kind: FileKind, tmp: &mut _| {
-        let mut physiscal_path = resolve(path, from, tmp)?;
-
-        match kind {
-            FileKind::Module => {
-                let id = {
-                    let mut seen = seen_modules.lock().unwrap();
-                    let len = seen.len();
-                    match seen.entry(physiscal_path) {
-                        hash_map::Entry::Occupied(entry) => {
-                            return Ok(*entry.get());
-                        }
-                        hash_map::Entry::Vacant(entry) => {
-                            physiscal_path = entry.insert_entry(len as _).key().clone();
-                            len
-                        }
-                    }
-                };
-
-                if !physiscal_path.exists() {
-                    return Err(io::Error::new(
-                        io::ErrorKind::NotFound,
-                        format!("can't find file: {}", display_rel_path(&physiscal_path)),
-                    ));
-                }
-
-                tasks.push((id, physiscal_path));
-                Ok(id)
-            }
-            FileKind::Embed => {
-                let id = {
-                    let mut seen = seen_embeds.lock().unwrap();
-                    let len = seen.len();
-                    match seen.entry(physiscal_path) {
-                        hash_map::Entry::Occupied(entry) => {
-                            return Ok(*entry.get());
-                        }
-                        hash_map::Entry::Vacant(entry) => {
-                            physiscal_path = entry.insert_entry(len as _).key().clone();
-                            len
-                        }
-                    }
-                };
-
-                let content = std::fs::read(&physiscal_path).map_err(|e| {
-                    io::Error::new(
-                        e.kind(),
-                        format!(
-                            "can't load embed file: {}: {e}",
-                            display_rel_path(&physiscal_path)
-                        ),
-                    )
-                })?;
-                let mut embeds = embeds.lock().unwrap();
-                if id >= embeds.len() {
-                    embeds.resize(id + 1, Default::default());
-                }
-                embeds[id] = content;
-                Ok(id)
-            }
-        }
-    };
-
-    let execute_task = |ctx: &mut _, (_, path): Task, tmp: &mut _| {
-        let path = path.to_str().ok_or_else(|| {
-            io::Error::new(
-                io::ErrorKind::InvalidData,
-                format!("path contains invalid characters: {}", display_rel_path(&path)),
-            )
-        })?;
-        Ok(Ast::new(path, std::fs::read_to_string(path)?, ctx, &mut |path, from, kind| {
-            loader(path, from, kind, tmp).map_err(|e| e.to_string())
-        }))
-    };
-
-    let thread = || {
-        let mut ctx = Ctx::default();
-        let mut tmp = PathBuf::new();
-        while let Some(task @ (indx, ..)) = tasks.pop() {
-            let res = execute_task(&mut ctx, task, &mut tmp);
-            let mut ast = ast.lock().unwrap();
-            let len = ast.len().max(indx + 1);
-            ast.resize_with(len, || Err(io::ErrorKind::InvalidData.into()));
-            ast[indx] = res;
-        }
-        ctx.errors.into_inner()
-    };
-
-    let path = Path::new(root).canonicalize().map_err(|e| {
-        io::Error::new(e.kind(), format!("can't canonicalize root file path ({root})"))
-    })?;
-    seen_modules.lock().unwrap().insert(path.clone(), 0);
-    tasks.push((0, path));
-
-    let errors = if extra_threads == 0 {
-        thread()
-    } else {
-        std::thread::scope(|s| {
-            (0..extra_threads + 1)
-                .map(|_| s.spawn(thread))
-                .collect::<Vec<_>>()
-                .into_iter()
-                .map(|t| t.join().unwrap())
-                .collect::<String>()
-        })
-    };
-
-    Ok(Loaded {
-        ast: ast.into_inner().unwrap().into_iter().collect::<io::Result<Vec<_>>>()?,
-        embeds: embeds.into_inner().unwrap(),
-        errors,
-    })
-}
-
-pub fn display_rel_path(path: &(impl AsRef<OsStr> + ?Sized)) -> std::path::Display {
-    static CWD: std::sync::LazyLock<PathBuf> =
-        std::sync::LazyLock::new(|| std::env::current_dir().unwrap_or_default());
-    std::path::Path::new(path).strip_prefix(&*CWD).unwrap_or(std::path::Path::new(path)).display()
-}

lang/src/fuzz.rs

@@ -1,142 +0,0 @@
-use {
-    crate::{
-        backend::hbvm::HbvmBackend,
-        lexer::TokenKind,
-        parser,
-        son::{Codegen, CodegenCtx},
-        ty::Module,
-    },
-    alloc::string::String,
-    core::{fmt::Write, hash::BuildHasher, ops::Range},
-};
-
-#[derive(Default)]
-struct Rand(pub u64);
-
-impl Rand {
-    pub fn next(&mut self) -> u64 {
-        self.0 = crate::FnvBuildHasher::default().hash_one(self.0);
-        self.0
-    }
-
-    pub fn range(&mut self, min: u64, max: u64) -> u64 {
-        self.next() % (max - min) + min
-    }
-
-    fn bool(&mut self) -> bool {
-        self.next() % 2 == 0
-    }
-}
-
-#[derive(Default)]
-struct FuncGen {
-    rand: Rand,
-    buf: String,
-    vars: u64,
-}
-
-impl FuncGen {
-    fn gen(&mut self, seed: u64) -> &str {
-        self.rand = Rand(seed);
-        self.buf.clear();
-        self.buf.push_str("main := fn(): void ");
-        self.block().unwrap();
-        &self.buf
-    }
-
-    fn block(&mut self) -> core::fmt::Result {
-        let prev_vars = self.vars;
-        self.buf.push('{');
-        for _ in 0..self.rand.range(1, 10) {
-            self.stmt()?;
-        }
-        self.buf.push('}');
-        self.vars = prev_vars;
-
-        Ok(())
-    }
-
-    fn stmt(&mut self) -> core::fmt::Result {
-        match self.rand.range(0, 100) {
-            0..4 => _ = self.block(),
-            4..10 => {
-                write!(self.buf, "var{} := ", self.vars)?;
-                self.expr()?;
-                self.vars += 1;
-            }
-
-            10..20 if self.vars != 0 => {
-                write!(self.buf, "var{} = ", self.rand.range(0, self.vars))?;
-                self.expr()?;
-            }
-            20..23 => {
-                self.buf.push_str("if ");
-                self.expr()?;
-                self.block()?;
-                if self.rand.bool() {
-                    self.buf.push_str(" else ");
-                    self.block()?;
-                }
-            }
-            _ => {
-                self.buf.push_str("return ");
-                self.expr()?;
-            }
-        }
-
-        self.buf.push(';');
-        Ok(())
-    }
-
-    fn expr(&mut self) -> core::fmt::Result {
-        match self.rand.range(0, 100) {
-            0..80 => {
-                write!(self.buf, "{}", self.rand.next())
-            }
-            80..90 if self.vars != 0 => {
-                write!(self.buf, "var{}", self.rand.range(0, self.vars))
-            }
-            80..100 => {
-                self.expr()?;
-                let ops = [
-                    TokenKind::Add,
-                    TokenKind::Sub,
-                    TokenKind::Mul,
-                    TokenKind::Div,
-                    TokenKind::Shl,
-                    TokenKind::Eq,
-                    TokenKind::Ne,
-                    TokenKind::Lt,
-                    TokenKind::Gt,
-                    TokenKind::Le,
-                    TokenKind::Ge,
-                    TokenKind::Band,
-                    TokenKind::Bor,
-                    TokenKind::Xor,
-                    TokenKind::Mod,
-                    TokenKind::Shr,
-                ];
-                let op = ops[self.rand.range(0, ops.len() as u64) as usize];
-                write!(self.buf, " {op} ")?;
-                self.expr()
-            }
-            _ => unreachable!(),
-        }
-    }
-}
-
-pub fn fuzz(seed_range: Range<u64>) {
-    let mut gen = FuncGen::default();
-    let mut ctx = CodegenCtx::default();
-    for i in seed_range {
-        ctx.clear();
-        let src = gen.gen(i);
-        let parsed = parser::Ast::new("fuzz", src, &mut ctx.parser, &mut parser::no_loader);
-
-        assert!(ctx.parser.errors.get_mut().is_empty());
-
-        let mut backend = HbvmBackend::default();
-        let mut cdg = Codegen::new(&mut backend, core::slice::from_ref(&parsed), &mut ctx);
-        cdg.generate(Module::MAIN);
-    }
-}

lang/src/fuzz_main.rs

@@ -1,3 +0,0 @@
-fn main() {
-    hblang::fuzz::fuzz(0..1000000);
-}

lang/src/lexer.rs

@@ -1,625 +0,0 @@
-const fn ascii_mask(chars: &[u8]) -> u128 {
-    let mut eq = 0;
-    let mut i = 0;
-    while i < chars.len() {
-        let b = chars[i];
-        eq |= 1 << b;
-        i += 1;
-    }
-    eq
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub struct Token {
-    pub kind: TokenKind,
-    pub start: u32,
-    pub end: u32,
-}
-
-impl Token {
-    pub fn range(&self) -> core::ops::Range<usize> {
-        self.start as usize..self.end as usize
-    }
-}
-
-macro_rules! gen_token_kind {
-    ($(
-        #[$atts:meta])*
-        $vis:vis enum $name:ident {
-            #[patterns] $(
-                $pattern:ident,
-            )*
-            #[keywords] $(
-                $keyword:ident = $keyword_lit:literal,
-            )*
-            #[const_keywords] $(
-                $const_keyword:ident = $const_keyword_lit:literal,
-            )*
-            #[punkt] $(
-                $punkt:ident = $punkt_lit:literal,
-            )*
-            #[ops] $(
-                #[$prec:ident] $(
-                    $op:ident = $op_lit:literal $(=> $assign:ident)?,
-                )*
-            )*
-        }
-    ) => {
-        impl core::fmt::Display for $name {
-            fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
-                f.write_str(self.name())
-            }
-        }
-
-        impl $name {
-            pub const OPS: &[Self] = &[$($(Self::$op),*),*];
-
-            pub fn name(&self) -> &str {
-                let sf = unsafe { &*(self as *const _ as *const u8) } ;
-                match *self {
-                    $( Self::$pattern => concat!('<', stringify!($pattern), '>'), )*
-                    $( Self::$keyword => stringify!($keyword_lit), )*
-                    $( Self::$const_keyword => concat!('$', $const_keyword_lit), )*
-                    $( Self::$punkt   => stringify!($punkt_lit),   )*
-                    $($( Self::$op    => $op_lit,
-                      $(Self::$assign => concat!($op_lit, "="),)?)*)*
-                    _ => unsafe { core::str::from_utf8_unchecked(core::slice::from_ref(&sf)) },
-                }
-            }
-
-            #[inline(always)]
-            pub fn precedence(&self) -> Option<u8> {
-                Some(match self {
-                    $($(Self::$op => ${ignore($prec)} ${index(1)},
-                      $(Self::$assign => 0,)?)*)*
-                    _ => return None,
-                } + 1)
-            }
-
-            #[allow(non_upper_case_globals)]
-            fn from_ident(ident: &[u8]) -> Self {
-                $(const $keyword: &[u8] = $keyword_lit.as_bytes();)*
-                match ident {
-                    $($keyword => Self::$keyword,)*
-                    _ => Self::Ident,
-                }
-            }
-
-            #[allow(non_upper_case_globals)]
-            fn from_ct_ident(ident: &[u8]) -> Self {
-                $(const $const_keyword: &[u8] = $const_keyword_lit.as_bytes();)*
-                match ident {
-                    $($const_keyword => Self::$const_keyword,)*
-                    _ => Self::CtIdent,
-                }
-            }
-        }
-    };
-}
-
-#[derive(PartialEq, Eq, Clone, Copy, Hash, PartialOrd, Ord)]
-#[repr(u8)]
-pub enum TokenKind {
-    Not = b'!',
-    DQuote = b'"',
-    Pound = b'#',
-    CtIdent = b'$',
-    Mod = b'%',
-    Band = b'&',
-    Quote = b'\'',
-    LParen = b'(',
-    RParen = b')',
-    Mul = b'*',
-    Add = b'+',
-    Comma = b',',
-    Sub = b'-',
-    Dot = b'.',
-    Div = b'/',
-    // Unused = 2-6
-    Shl = b'<' - 5,
-    // Unused = 8
-    Shr = b'>' - 5,
-    Colon = b':',
-    Semi = b';',
-    Lt = b'<',
-    Assign = b'=',
-    Gt = b'>',
-    Que = b'?',
-    Directive = b'@',
-
-    Comment,
-
-    Ident,
-    Number,
-    Float,
-    Eof,
-
-    Ct,
-
-    Ctor,
-    Tupl,
-    Arr,
-    TArrow,
-    Range,
-
-    Or,
-    And,
-
-    // Unused = R-Z
-    LBrack = b'[',
-    BSlash = b'\\',
-    RBrack = b']',
-    Xor = b'^',
-    Under = b'_',
-    Tick = b'`',
-
-    Slf,
-    Return,
-    If,
-    Match,
-    Else,
-    Loop,
-    Break,
-    Continue,
-    Fn,
-    Struct,
-    Packed,
-    Enum,
-    Union,
-    True,
-    False,
-    Null,
-    Idk,
-    Die,
-    Defer,
-
-    CtLoop,
-
-    // Unused = a-z
-    LBrace = b'{',
-    Bor = b'|',
-    RBrace = b'}',
-    Tilde = b'~',
-
-    Decl = b':' + 128,
-    Eq = b'=' + 128,
-    Ne = b'!' + 128,
-    Le = b'<' + 128,
-    Ge = b'>' + 128,
-
-    BorAss = b'|' + 128,
-    AddAss = b'+' + 128,
-    SubAss = b'-' + 128,
-    MulAss = b'*' + 128,
-    DivAss = b'/' + 128,
-    ModAss = b'%' + 128,
-    XorAss = b'^' + 128,
-    BandAss = b'&' + 128,
-    ShrAss = b'>' - 5 + 128,
-    ShlAss = b'<' - 5 + 128,
-}
-
-impl core::fmt::Debug for TokenKind {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        core::fmt::Display::fmt(self, f)
-    }
-}
-
-impl TokenKind {
-    pub fn ass_op(self) -> Option<Self> {
-        let id = (self as u8).saturating_sub(128);
-        if ascii_mask(b"|+-*/%^&79") & (1u128 << id) == 0 {
-            return None;
-        }
-        Some(unsafe { core::mem::transmute::<u8, Self>(id) })
-    }
-
-    pub fn is_comutative(self) -> bool {
-        use TokenKind as S;
-        matches!(self, S::Eq | S::Ne | S::Bor | S::Xor | S::Band | S::Add | S::Mul)
-    }
-
-    pub fn is_compatison(self) -> bool {
-        matches!(self, Self::Lt | Self::Gt | Self::Ge | Self::Le | Self::Ne | Self::Eq)
-    }
-
-    pub fn is_supported_float_op(self) -> bool {
-        matches!(
-            self,
-            Self::Add
-                | Self::Sub
-                | Self::Mul
-                | Self::Div
-                | Self::Eq
-                | Self::Ne
-                | Self::Le
-                | Self::Ge
-                | Self::Lt
-                | Self::Gt
-        )
-    }
-
-    pub fn apply_binop(self, a: i64, b: i64, float: bool) -> i64 {
-        if float {
-            debug_assert!(self.is_supported_float_op());
-            let [a, b] = [f64::from_bits(a as _), f64::from_bits(b as _)];
-            let res = match self {
-                Self::Add => a + b,
-                Self::Sub => a - b,
-                Self::Mul => a * b,
-                Self::Div => a / b,
-                Self::Eq => return (a == b) as i64,
-                Self::Ne => return (a != b) as i64,
-                Self::Lt => return (a < b) as i64,
-                Self::Gt => return (a > b) as i64,
-                Self::Le => return (a >= b) as i64,
-                Self::Ge => return (a <= b) as i64,
-                _ => todo!("floating point op: {self}"),
-            };
-
-            return res.to_bits() as _;
-        }
-
-        match self {
-            Self::Add => a.wrapping_add(b),
-            Self::Sub => a.wrapping_sub(b),
-            Self::Mul => a.wrapping_mul(b),
-            Self::Div if b == 0 => 0,
-            Self::Div => a.wrapping_div(b),
-            Self::Shl => a.wrapping_shl(b as _),
-            Self::Eq => (a == b) as i64,
-            Self::Ne => (a != b) as i64,
-            Self::Lt => (a < b) as i64,
-            Self::Gt => (a > b) as i64,
-            Self::Le => (a >= b) as i64,
-            Self::Ge => (a <= b) as i64,
-            Self::Band => a & b,
-            Self::Bor => a | b,
-            Self::Xor => a ^ b,
-            Self::Mod if b == 0 => 0,
-            Self::Mod => a.wrapping_rem(b),
-            Self::Shr => a.wrapping_shr(b as _),
-            s => todo!("{s}"),
-        }
-    }
-
-    pub fn is_homogenous(&self) -> bool {
-        self.precedence() != Self::Eq.precedence()
-            && self.precedence() != Self::Gt.precedence()
-            && self.precedence() != Self::Eof.precedence()
-    }
-
-    pub fn apply_unop(&self, value: i64, float: bool) -> i64 {
-        match self {
-            Self::Sub if float => (-f64::from_bits(value as _)).to_bits() as _,
-            Self::Sub => value.wrapping_neg(),
-            Self::Not => (value == 0) as _,
-            Self::Float if float => value,
-            Self::Float => (value as f64).to_bits() as _,
-            Self::Number if float => f64::from_bits(value as _) as _,
-            Self::Number => value,
-            s => todo!("{s}"),
-        }
-    }
-
-    pub fn closing(&self) -> Option<TokenKind> {
-        Some(match self {
-            Self::Ctor => Self::RBrace,
-            Self::Tupl => Self::RParen,
-            Self::LParen => Self::RParen,
-            Self::LBrack => Self::RBrack,
-            Self::LBrace => Self::RBrace,
-            _ => return None,
-        })
-    }
-}
-
-gen_token_kind! {
-    pub enum TokenKind {
-        #[patterns]
-        CtIdent,
-        Ident,
-        Number,
-        Float,
-        Eof,
-        Directive,
-        #[keywords]
-        Slf       = "Self",
-        Return    = "return",
-        If        = "if",
-        Match     = "match",
-        Else      = "else",
-        Loop      = "loop",
-        Break     = "break",
-        Continue  = "continue",
-        Fn        = "fn",
-        Struct    = "struct",
-        Packed    = "packed",
-        Enum      = "enum",
-        Union     = "union",
-        True      = "true",
-        False     = "false",
-        Null      = "null",
-        Idk       = "idk",
-        Die       = "die",
-        Defer     = "defer",
-        Under     = "_",
-        #[const_keywords]
-        CtLoop = "loop",
-        #[punkt]
-        Ctor   = ".{",
-        Tupl   = ".(",
-        Arr    = ".[",
-        TArrow = "=>",
-        Range  = "..",
-        // #define OP: each `#[prec]` delimeters a level of precedence from lowest to highest
-        #[ops]
-        #[prec]
-        // this also includess all `<op>=` tokens
-        Decl   = ":=",
-        Assign = "=",
-        #[prec]
-        Or = "||",
-        #[prec]
-        And = "&&",
-        #[prec]
-        Bor = "|" => BorAss,
-        #[prec]
-        Xor = "^" => XorAss,
-        #[prec]
-        Band = "&" => BandAss,
-        #[prec]
-        Eq = "==",
-        Ne = "!=",
-        #[prec]
-        Le = "<=",
-        Ge = ">=",
-        Lt = "<",
-        Gt = ">",
-        #[prec]
-        Shl = "<<" => ShlAss,
-        Shr = ">>" => ShrAss,
-        #[prec]
-        Add = "+" => AddAss,
-        Sub = "-" => SubAss,
-        #[prec]
-        Mul = "*" => MulAss,
-        Div = "/" => DivAss,
-        Mod = "%" => ModAss,
-    }
-}
-
-pub struct Lexer<'a> {
-    pos: u32,
-    source: &'a [u8],
-}
-
-impl<'a> Lexer<'a> {
-    pub fn new(input: &'a str) -> Self {
-        Self::restore(input, 0)
-    }
-
-    pub fn uses(input: &'a str) -> impl Iterator<Item = &'a str> {
-        let mut s = Self::new(input);
-        core::iter::from_fn(move || loop {
-            let t = s.eat();
-            if t.kind == TokenKind::Eof {
-                return None;
-            }
-            if t.kind == TokenKind::Directive
-                && s.slice(t.range()) == "use"
-                && s.eat().kind == TokenKind::LParen
-            {
-                let t = s.eat();
-                if t.kind == TokenKind::DQuote {
-                    return Some(&s.slice(t.range())[1..t.range().len() - 1]);
-                }
-            }
-        })
-    }
-
-    pub fn restore(input: &'a str, pos: u32) -> Self {
-        Self { pos, source: input.as_bytes() }
-    }
-
-    pub fn source(&self) -> &'a str {
-        unsafe { core::str::from_utf8_unchecked(self.source) }
-    }
-
-    pub fn slice(&self, tok: core::ops::Range<usize>) -> &'a str {
-        unsafe { core::str::from_utf8_unchecked(&self.source[tok]) }
-    }
-
-    pub fn taste(&self) -> Token {
-        Lexer { pos: self.pos, source: self.source }.eat()
-    }
-
-    fn peek_n<const N: usize>(&self) -> Option<&[u8; N]> {
-        if core::intrinsics::unlikely(self.pos as usize + N > self.source.len()) {
-            None
-        } else {
-            Some(unsafe {
-                self.source
-                    .get_unchecked(self.pos as usize..self.pos as usize + N)
-                    .first_chunk()
-                    .unwrap_unchecked()
-            })
-        }
-    }
-
-    fn peek(&self) -> Option<u8> {
-        if core::intrinsics::unlikely(self.pos >= self.source.len() as u32) {
-            None
-        } else {
-            Some(unsafe { *self.source.get_unchecked(self.pos as usize) })
-        }
-    }
-
-    fn advance(&mut self) -> Option<u8> {
-        let c = self.peek()?;
-        self.pos += 1;
-        Some(c)
-    }
-
-    pub fn last(&mut self) -> Token {
-        let mut token = self.eat();
-        loop {
-            let next = self.eat();
-            if next.kind == TokenKind::Eof {
-                break;
-            }
-            token = next;
-        }
-        token
-    }
-
-    pub fn eat(&mut self) -> Token {
-        use TokenKind as T;
-        loop {
-            let mut start = self.pos;
-
-            let Some(c) = self.advance() else {
-                return Token { kind: T::Eof, start, end: self.pos };
-            };
-
-            let advance_ident = |s: &mut Self| {
-                while let Some(b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9' | b'_' | 127..) = s.peek() {
-                    s.advance();
-                }
-            };
-
-            let identity = |s: u8| unsafe { core::mem::transmute::<u8, T>(s) };
-
-            let kind = match c {
-                ..=b' ' => continue,
-                b'0' if self.advance_if(b'x') => {
-                    while let Some(b'0'..=b'9' | b'A'..=b'F' | b'a'..=b'f') = self.peek() {
-                        self.advance();
-                    }
-                    T::Number
-                }
-                b'0' if self.advance_if(b'b') => {
-                    while let Some(b'0' | b'1') = self.peek() {
-                        self.advance();
-                    }
-                    T::Number
-                }
-                b'0' if self.advance_if(b'o') => {
-                    while let Some(b'0'..=b'7') = self.peek() {
-                        self.advance();
-                    }
-                    T::Number
-                }
-                b'0'..=b'9' => {
-                    while let Some(b'0'..=b'9') = self.peek() {
-                        self.advance();
-                    }
-
-                    if self
-                        .peek_n()
-                        .map_or_else(|| self.peek() == Some(b'.'), |&[a, b]| a == b'.' && b != b'.')
-                    {
-                        self.pos += 1;
-                        while let Some(b'0'..=b'9') = self.peek() {
-                            self.advance();
-                        }
-                        T::Float
-                    } else {
-                        T::Number
-                    }
-                }
-                b'a'..=b'z' | b'A'..=b'Z' | b'_' | 127.. => {
-                    advance_ident(self);
-                    let ident = &self.source[start as usize..self.pos as usize];
-                    T::from_ident(ident)
-                }
-                b'"' | b'\'' => loop {
-                    match self.advance() {
-                        Some(b'\\') => _ = self.advance(),
-                        Some(nc) if nc == c => break identity(c),
-                        Some(_) => {}
-                        None => break T::Eof,
-                    }
-                },
-                b'/' if self.advance_if(b'/') => {
-                    while let Some(l) = self.peek()
-                        && l != b'\n'
-                    {
-                        self.pos += 1;
-                    }
-
-                    let end = self.source[..self.pos as usize]
-                        .iter()
-                        .rposition(|&b| !b.is_ascii_whitespace())
-                        .map_or(self.pos, |i| i as u32 + 1);
-
-                    return Token { kind: T::Comment, start, end };
-                }
-                b'/' if self.advance_if(b'*') => {
-                    let mut depth = 1;
-                    while let Some(l) = self.advance() {
-                        match l {
-                            b'/' if self.advance_if(b'*') => depth += 1,
-                            b'*' if self.advance_if(b'/') => match depth {
-                                1 => break,
-                                _ => depth -= 1,
-                            },
-                            _ => {}
-                        }
-                    }
-                    T::Comment
-                }
-                b'.' if self.advance_if(b'{') => T::Ctor,
-                b'.' if self.advance_if(b'(') => T::Tupl,
-                b'.' if self.advance_if(b'[') => T::Arr,
-                b'.' if self.advance_if(b'.') => T::Range,
-                b'=' if self.advance_if(b'>') => T::TArrow,
-                b'&' if self.advance_if(b'&') => T::And,
-                b'|' if self.advance_if(b'|') => T::Or,
-                b'$' if self.advance_if(b':') => T::Ct,
-                b'@' => {
-                    start += 1;
-                    advance_ident(self);
-                    identity(c)
-                }
-                b'$' => {
-                    start += 1;
-                    advance_ident(self);
-                    let ident = &self.source[start as usize..self.pos as usize];
-                    T::from_ct_ident(ident)
-                }
-                b'<' | b'>' if self.advance_if(c) => {
-                    identity(c - 5 + 128 * self.advance_if(b'=') as u8)
-                }
-                b':' | b'=' | b'!' | b'<' | b'>' | b'|' | b'+' | b'-' | b'*' | b'/' | b'%'
-                | b'^' | b'&'
-                    if self.advance_if(b'=') =>
-                {
-                    identity(c + 128)
-                }
-                _ => identity(c),
-            };
-
-            return Token { kind, start, end: self.pos };
-        }
-    }
-
-    fn advance_if(&mut self, arg: u8) -> bool {
-        if self.peek() == Some(arg) {
-            self.advance();
-            true
-        } else {
-            false
-        }
-    }
-}
-
-pub fn line_col(bytes: &[u8], pos: u32) -> (usize, usize) {
-    bytes[..pos as usize]
-        .split(|&b| b == b'\n')
-        .map(<[u8]>::len)
-        .enumerate()
-        .last()
-        .map(|(line, col)| (line + 1, col + 1))
-        .unwrap_or((1, 1))
-}

lang/src/lib.rs

@@ -1,523 +0,0 @@
-#![feature(
-    iter_array_chunks,
-    assert_matches,
-    let_chains,
-    if_let_guard,
-    macro_metavar_expr,
-    anonymous_lifetime_in_impl_trait,
-    core_intrinsics,
-    never_type,
-    unwrap_infallible,
-    slice_partition_dedup,
-    portable_simd,
-    iter_collect_into,
-    ptr_metadata,
-    slice_ptr_get,
-    slice_take,
-    map_try_insert,
-    extract_if,
-    ptr_internals,
-    iter_intersperse,
-    str_from_raw_parts,
-    ptr_sub_ptr,
-    slice_from_ptr_range,
-    iter_next_chunk,
-    pointer_is_aligned_to,
-    maybe_uninit_fill,
-    array_chunks,
-    array_windows
-)]
-#![warn(clippy::dbg_macro)]
-#![expect(internal_features)]
-#![no_std]
-
-#[cfg(feature = "std")]
-pub use fs::*;
-pub use utils::Ent;
-use {self::ty::Builtin, alloc::vec::Vec};
-
-#[macro_use]
-extern crate alloc;
-
-#[cfg(any(feature = "std", test))]
-extern crate std;
-
-#[cfg(test)]
-#[macro_export]
-macro_rules! run_tests {
-    ($runner:path: $($name:ident;)*) => {$(
-        #[test]
-        fn $name() {
-            $crate::run_test(core::any::type_name_of_val(&$name), stringify!($name), $crate::README, $runner);
-        }
-    )*};
-}
-
-pub mod fmt;
-#[cfg(any(feature = "std", test))]
-pub mod fs;
-pub mod fuzz;
-pub mod lexer;
-pub mod nodes;
-pub mod parser;
-pub mod son;
-pub mod ty;
-
-pub mod backend {
-    use {
-        crate::{
-            nodes::Nodes,
-            parser,
-            ty::{self, Module, Types},
-            utils::EntSlice,
-        },
-        alloc::{string::String, vec::Vec},
-    };
-
-    pub mod hbvm;
-
-    pub struct AssemblySpec {
-        pub entry: u32,
-        pub code_length: u64,
-        pub data_length: u64,
-    }
-
-    pub trait Backend {
-        fn assemble_reachable(
-            &mut self,
-            from: ty::Func,
-            types: &Types,
-            to: &mut Vec<u8>,
-        ) -> AssemblySpec;
-        fn disasm<'a>(
-            &'a self,
-            sluce: &[u8],
-            eca_handler: &mut dyn FnMut(&mut &[u8]),
-            types: &'a Types,
-            files: &'a EntSlice<Module, parser::Ast>,
-            output: &mut String,
-        ) -> Result<(), hbbytecode::DisasmError<'a>>;
-        fn emit_body(
-            &mut self,
-            id: ty::Func,
-            ci: &Nodes,
-            tys: &Types,
-            files: &EntSlice<Module, parser::Ast>,
-        );
-
-        fn emit_ct_body(
-            &mut self,
-            id: ty::Func,
-            ci: &Nodes,
-            tys: &Types,
-            files: &EntSlice<Module, parser::Ast>,
-        ) {
-            self.emit_body(id, ci, tys, files);
-        }
-
-        fn assemble_bin(&mut self, from: ty::Func, types: &Types, to: &mut Vec<u8>) {
-            self.assemble_reachable(from, types, to);
-        }
-    }
-}
-
-mod utils;
-
-mod debug {
-    use core::fmt::Debug;
-
-    pub fn panicking() -> bool {
-        #[cfg(feature = "std")]
-        {
-            std::thread::panicking()
-        }
-        #[cfg(not(feature = "std"))]
-        {
-            false
-        }
-    }
-
-    #[cfg(all(debug_assertions, feature = "std"))]
-    pub type Trace = std::rc::Rc<(std::backtrace::Backtrace, std::string::String)>;
-    #[cfg(not(all(debug_assertions, feature = "std")))]
-    pub type Trace = ();
-
-    pub fn trace(_hint: impl Debug) -> Trace {
-        #[cfg(all(debug_assertions, feature = "std"))]
-        {
-            std::rc::Rc::new((std::backtrace::Backtrace::capture(), format!("{_hint:?}")))
-        }
-        #[cfg(not(all(debug_assertions, feature = "std")))]
-        {}
-    }
-}
-
-mod ctx_map {
-    use core::hash::BuildHasher;
-
-    pub type Hash = u64;
-    pub type HashBuilder = core::hash::BuildHasherDefault<IdentityHasher>;
-
-    #[derive(Default)]
-    pub struct IdentityHasher(u64);
-
-    impl core::hash::Hasher for IdentityHasher {
-        fn finish(&self) -> u64 {
-            self.0
-        }
-
-        fn write(&mut self, _: &[u8]) {
-            unimplemented!()
-        }
-
-        fn write_u64(&mut self, i: u64) {
-            self.0 = i;
-        }
-    }
-
-    #[derive(Clone)]
-    pub struct Key<T> {
-        pub value: T,
-        pub hash: Hash,
-    }
-
-    impl<T> core::hash::Hash for Key<T> {
-        fn hash<H: core::hash::Hasher>(&self, state: &mut H) {
-            state.write_u64(self.hash);
-        }
-    }
-
-    pub trait CtxEntry {
-        type Ctx: ?Sized;
-        type Key<'a>: Eq + core::hash::Hash;
-
-        fn key<'a>(&self, ctx: &'a Self::Ctx) -> Self::Key<'a>;
-    }
-
-    #[derive(Clone)]
-    pub struct CtxMap<T> {
-        inner: hashbrown::HashMap<Key<T>, (), HashBuilder>,
-    }
-
-    impl<T> Default for CtxMap<T> {
-        fn default() -> Self {
-            Self { inner: Default::default() }
-        }
-    }
-
-    impl<T: CtxEntry> CtxMap<T> {
-        pub fn entry<'a, 'b>(
-            &'a mut self,
-            key: T::Key<'b>,
-            ctx: &'b T::Ctx,
-        ) -> (hashbrown::hash_map::RawEntryMut<'a, Key<T>, (), HashBuilder>, Hash) {
-            let hash = crate::FnvBuildHasher::default().hash_one(&key);
-            (self.inner.raw_entry_mut().from_hash(hash, |k| k.value.key(ctx) == key), hash)
-        }
-
-        pub fn get<'a>(&self, key: T::Key<'a>, ctx: &'a T::Ctx) -> Option<&T> {
-            let hash = crate::FnvBuildHasher::default().hash_one(&key);
-            self.inner
-                .raw_entry()
-                .from_hash(hash, |k| k.value.key(ctx) == key)
-                .map(|(k, _)| &k.value)
-        }
-
-        pub fn clear(&mut self) {
-            self.inner.clear();
-        }
-
-        pub fn remove(&mut self, value: &T, ctx: &T::Ctx) -> Option<T> {
-            let (entry, _) = self.entry(value.key(ctx), ctx);
-            match entry {
-                hashbrown::hash_map::RawEntryMut::Occupied(o) => Some(o.remove_entry().0.value),
-                hashbrown::hash_map::RawEntryMut::Vacant(_) => None,
-            }
-        }
-
-        pub fn insert<'a>(&mut self, key: T::Key<'a>, value: T, ctx: &'a T::Ctx) {
-            let (entry, hash) = self.entry(key, ctx);
-            match entry {
-                hashbrown::hash_map::RawEntryMut::Occupied(_) => unreachable!(),
-                hashbrown::hash_map::RawEntryMut::Vacant(v) => {
-                    _ = v.insert(Key { hash, value }, ())
-                }
-            }
-        }
-
-        pub fn get_or_insert<'a>(
-            &mut self,
-            key: T::Key<'a>,
-            ctx: &'a mut T::Ctx,
-            with: impl FnOnce(&'a mut T::Ctx) -> T,
-        ) -> &mut T {
-            let (entry, hash) = self.entry(key, unsafe { &mut *(&mut *ctx as *mut _) });
-            match entry {
-                hashbrown::hash_map::RawEntryMut::Occupied(o) => &mut o.into_key_value().0.value,
-                hashbrown::hash_map::RawEntryMut::Vacant(v) => {
-                    &mut v.insert(Key { hash, value: with(ctx) }, ()).0.value
-                }
-            }
-        }
-    }
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Debug)]
-pub struct Ident(u32);
-
-impl Ident {
-    pub const INVALID: Self = Self(u32::MAX);
-    const LEN_BITS: u32 = 6;
-
-    pub fn len(self) -> u32 {
-        self.0 & ((1 << Self::LEN_BITS) - 1)
-    }
-
-    pub fn is_type(self) -> bool {
-        ty::Builtin::try_from(self) == Ok(ty::Builtin::TYPE)
-    }
-
-    pub fn is_empty(self) -> bool {
-        self.len() == 0
-    }
-
-    pub fn is_null(self) -> bool {
-        (self.0 >> Self::LEN_BITS) == 0
-    }
-
-    pub fn pos(self) -> u32 {
-        (self.0 >> Self::LEN_BITS).saturating_sub(1)
-    }
-
-    pub fn new(pos: u32, len: u32) -> Option<Self> {
-        (len < (1 << Self::LEN_BITS)).then_some(((pos + 1) << Self::LEN_BITS) | len).map(Self)
-    }
-
-    pub fn range(self) -> core::ops::Range<usize> {
-        let (len, pos) = (self.len() as usize, self.pos() as usize);
-        pos..pos + len
-    }
-
-    fn builtin(builtin: Builtin) -> Ident {
-        Self(builtin.index() as _)
-    }
-}
-
-fn endoce_string(
-    literal: &str,
-    str: &mut Vec<u8>,
-    report: impl Fn(&core::str::Bytes, &str),
-) -> Option<usize> {
-    let report = |bytes: &core::str::Bytes, msg: &_| {
-        report(bytes, msg);
-        None::<u8>
-    };
-
-    let decode_braces = |str: &mut Vec<u8>, bytes: &mut core::str::Bytes| {
-        while let Some(b) = bytes.next()
-            && b != b'}'
-        {
-            let c = bytes.next().or_else(|| report(bytes, "incomplete escape sequence"))?;
-            let decode = |b: u8| {
-                Some(match b {
-                    b'0'..=b'9' => b - b'0',
-                    b'a'..=b'f' => b - b'a' + 10,
-                    b'A'..=b'F' => b - b'A' + 10,
-                    _ => report(bytes, "expected hex digit or '}'")?,
-                })
-            };
-            str.push(decode(b)? << 4 | decode(c)?);
-        }
-
-        Some(())
-    };
-
-    let mut bytes = literal.bytes();
-    let mut char_len = 0;
-    while let Some(b) = bytes.next() {
-        char_len += 1;
-        if b != b'\\' {
-            str.push(b);
-            continue;
-        }
-        let b = match bytes.next().or_else(|| report(&bytes, "incomplete escape sequence"))? {
-            b'n' => b'\n',
-            b'r' => b'\r',
-            b't' => b'\t',
-            b'\\' => b'\\',
-            b'\'' => b'\'',
-            b'"' => b'"',
-            b'0' => b'\0',
-            b'{' => {
-                decode_braces(str, &mut bytes);
-                continue;
-            }
-            _ => report(&bytes, "unknown escape sequence, expected [nrt\\\"'{0]")?,
-        };
-        str.push(b);
-    }
-
-    Some(char_len)
-}
-
-pub fn quad_sort<T>(mut slice: &mut [T], mut cmp: impl FnMut(&T, &T) -> core::cmp::Ordering) {
-    while let Some(it) = slice.take_first_mut() {
-        for ot in &mut *slice {
-            if cmp(it, ot) == core::cmp::Ordering::Greater {
-                core::mem::swap(it, ot);
-            }
-        }
-    }
-    debug_assert!(slice.is_sorted_by(|a, b| cmp(a, b) != core::cmp::Ordering::Greater));
-}
-
-type FnvBuildHasher = core::hash::BuildHasherDefault<FnvHasher>;
-
-struct FnvHasher(u64);
-
-impl core::hash::Hasher for FnvHasher {
-    fn finish(&self) -> u64 {
-        self.0
-    }
-
-    fn write(&mut self, bytes: &[u8]) {
-        self.0 = bytes.iter().fold(self.0, |hash, &byte| {
-            let mut hash = hash;
-            hash ^= byte as u64;
-            hash = hash.wrapping_mul(0x100000001B3);
-            hash
-        });
-    }
-}
-
-impl Default for FnvHasher {
-    fn default() -> Self {
-        Self(0xCBF29CE484222325)
-    }
-}
-
-#[cfg(test)]
-pub fn run_test(
-    name: &str,
-    ident: &str,
-    input: &str,
-    test: fn(&str, &str, &mut alloc::string::String),
-) {
-    use std::{
-        io::Write,
-        path::PathBuf,
-        string::{String, ToString},
-    };
-
-    let filter = std::env::var("PT_FILTER").unwrap_or_default();
-    if !filter.is_empty() && !name.contains(&filter) {
-        return;
-    }
-
-    let mut output = String::new();
-    {
-        struct DumpOut<'a>(&'a mut String);
-        impl Drop for DumpOut<'_> {
-            fn drop(&mut self) {
-                if std::thread::panicking() {
-                    std::println!("{}", self.0);
-                }
-            }
-        }
-
-        let dump = DumpOut(&mut output);
-        test(ident, input, dump.0);
-    }
-
-    let mut root = PathBuf::from(
-        std::env::var("PT_TEST_ROOT")
-            .unwrap_or(concat!(env!("CARGO_MANIFEST_DIR"), "/tests").to_string()),
-    );
-    root.push(name.replace("::", "_").replace(concat!(env!("CARGO_PKG_NAME"), "_"), ""));
-    root.set_extension("txt");
-
-    let expected = std::fs::read_to_string(&root).unwrap_or_default();
-
-    if output == expected {
-        return;
-    }
-
-    if std::env::var("PT_UPDATE").is_ok() {
-        std::fs::write(&root, output).unwrap();
-        return;
-    }
-
-    if !root.exists() {
-        std::fs::create_dir_all(root.parent().unwrap()).unwrap();
-        std::fs::write(&root, vec![]).unwrap();
-    }
-
-    let mut proc = std::process::Command::new("diff")
-        .arg("-u")
-        .arg("--color")
-        .arg(&root)
-        .arg("-")
-        .stdin(std::process::Stdio::piped())
-        .stdout(std::process::Stdio::inherit())
-        .spawn()
-        .unwrap();
-
-    proc.stdin.as_mut().unwrap().write_all(output.as_bytes()).unwrap();
-
-    proc.wait().unwrap();
-
-    panic!("test failed");
-}
-
-#[cfg(test)]
-fn test_parse_files(
-    ident: &str,
-    input: &str,
-    ctx: &mut parser::Ctx,
-) -> (Vec<parser::Ast>, Vec<Vec<u8>>) {
-    use {
-        self::parser::FileKind,
-        std::{borrow::ToOwned, string::ToString},
-    };
-
-    let mut module_map = Vec::new();
-    let mut embed_map = Vec::new();
-    let mut last_start = 0;
-    let mut last_module_name = "test.hb";
-    for (i, m) in input.match_indices("// in module: ") {
-        if last_module_name.ends_with(".hb") {
-            fmt::test::format(ident, input[last_start..i].trim());
-            module_map.push((last_module_name, &input[last_start..i]));
-        } else {
-            embed_map.push((last_module_name, &input[last_start..i]));
-        }
-        let (module_name, _) = input[i + m.len()..].split_once('\n').unwrap();
-        last_module_name = module_name;
-        last_start = i + m.len() + module_name.len() + 1;
-    }
-    if last_module_name.ends_with(".hb") {
-        fmt::test::format(ident, input[last_start..].trim());
-        module_map.push((last_module_name, &input[last_start..]));
-    } else {
-        embed_map.push((last_module_name, &input[last_start..]));
-    }
-
-    let mut loader = |path: &str, _: &str, kind| match kind {
-        FileKind::Module => module_map
-            .iter()
-            .position(|&(name, _)| name == path)
-            .ok_or("Module Not Found".to_string()),
-        FileKind::Embed => embed_map
-            .iter()
-            .position(|&(name, _)| name == path)
-            .ok_or("Embed Not Found".to_string()),
-    };
-
-    (
-        module_map
-            .iter()
-            .map(|&(path, content)| parser::Ast::new(path, content.to_owned(), ctx, &mut loader))
-            .collect(),
-        embed_map.iter().map(|&(_, content)| content.to_owned().into_bytes()).collect(),
-    )
-}

lang/src/main.rs

@@ -1,31 +0,0 @@
-#[cfg(feature = "std")]
-fn main() {
-    use std::io::Write;
-
-    fn run(out: &mut Vec<u8>, warnings: &mut String) -> std::io::Result<()> {
-        let args = std::env::args().collect::<Vec<_>>();
-        let args = args.iter().map(String::as_str).collect::<Vec<_>>();
-        let resolvers = &[("ableos", hblang::ABLEOS_PATH_RESOLVER)];
-        let opts = hblang::Options::from_args(&args, out, resolvers)?;
-        let file = args.iter().filter(|a| !a.starts_with('-')).nth(1).copied().unwrap_or("main.hb");
-
-        hblang::run_compiler(file, opts, out, warnings)
-    }
-
-    log::set_logger(&hblang::fs::Logger).unwrap();
-    log::set_max_level(log::LevelFilter::Error);
-
-    let mut out = Vec::new();
-    let mut warnings = String::new();
-    match run(&mut out, &mut warnings) {
-        Ok(_) => {
-            std::io::stderr().write_all(warnings.as_bytes()).unwrap();
-            std::io::stdout().write_all(&out).unwrap()
-        }
-        Err(_) => {
-            std::io::stderr().write_all(warnings.as_bytes()).unwrap();
-            std::io::stderr().write_all(&out).unwrap();
-            std::process::exit(1);
-        }
-    }
-}

lang/src/utils.rs

@@ -1,689 +0,0 @@
-use {
-    alloc::alloc,
-    core::{
-        alloc::Layout,
-        fmt::Debug,
-        hint::unreachable_unchecked,
-        marker::PhantomData,
-        mem::MaybeUninit,
-        ops::{Deref, DerefMut, Not, Range},
-        ptr::Unique,
-    },
-};
-
-fn decide(b: bool, name: &'static str) -> Result<(), &'static str> {
-    b.then_some(()).ok_or(name)
-}
-
-pub fn is_snake_case(str: &str) -> Result<(), &'static str> {
-    decide(str.bytes().all(|c| matches!(c, b'a'..=b'z' | b'0'..=b'9' | b'_')), "snake_case")
-}
-
-pub fn is_pascal_case(str: &str) -> Result<(), &'static str> {
-    decide(
-        str.as_bytes()[0].is_ascii_uppercase() && str.bytes().all(|c| c.is_ascii_alphanumeric()),
-        "PascalCase",
-    )
-}
-
-pub fn is_screaming_case(str: &str) -> Result<(), &'static str> {
-    decide(str.bytes().all(|c| matches!(c, b'A'..=b'Z' | b'0'..=b'9' | b'_')), "SCREAMING_CASE")
-}
-
-type Nid = u16;
-type BitSetUnit = usize;
-
-pub union BitSet {
-    inline: BitSetUnit,
-    alloced: Unique<AllocedBitSet>,
-}
-
-impl Debug for BitSet {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        f.debug_list().entries(self.iter()).finish()
-    }
-}
-
-impl Clone for BitSet {
-    fn clone(&self) -> Self {
-        if self.is_inline() {
-            Self { inline: unsafe { self.inline } }
-        } else {
-            let (data, _) = self.data_and_len();
-            let (layout, _) = Self::layout(data.len());
-            unsafe {
-                let ptr = alloc::alloc(layout);
-                ptr.copy_from_nonoverlapping(self.alloced.as_ptr() as _, layout.size());
-                Self { alloced: Unique::new_unchecked(ptr as _) }
-            }
-        }
-    }
-}
-
-impl Drop for BitSet {
-    fn drop(&mut self) {
-        if !self.is_inline() {
-            unsafe {
-                let cap = self.alloced.as_ref().cap;
-                alloc::dealloc(self.alloced.as_ptr() as _, Self::layout(cap).0);
-            }
-        }
-    }
-}
-
-impl Default for BitSet {
-    fn default() -> Self {
-        Self { inline: Self::FLAG }
-    }
-}
-
-impl BitSet {
-    const FLAG: BitSetUnit = 1 << (Self::UNIT - 1);
-    const INLINE_ELEMS: usize = Self::UNIT - 1;
-    pub const UNIT: usize = core::mem::size_of::<BitSetUnit>() * 8;
-
-    pub fn with_capacity(len: usize) -> Self {
-        let mut s = Self::default();
-        s.reserve(len);
-        s
-    }
-
-    fn is_inline(&self) -> bool {
-        unsafe { self.inline & Self::FLAG != 0 }
-    }
-
-    fn data_and_len(&self) -> (&[BitSetUnit], usize) {
-        unsafe {
-            if self.is_inline() {
-                (core::slice::from_ref(&self.inline), Self::INLINE_ELEMS)
-            } else {
-                let small_vec = self.alloced.as_ref();
-                (
-                    core::slice::from_raw_parts(
-                        &small_vec.data as *const _ as *const BitSetUnit,
-                        small_vec.cap,
-                    ),
-                    small_vec.cap * Self::UNIT,
-                )
-            }
-        }
-    }
-
-    fn data_mut_and_len(&mut self) -> (&mut [BitSetUnit], usize) {
-        unsafe {
-            if self.is_inline() {
-                (core::slice::from_mut(&mut self.inline), INLINE_ELEMS)
-            } else {
-                let small_vec = self.alloced.as_mut();
-                (
-                    core::slice::from_raw_parts_mut(
-                        &mut small_vec.data as *mut _ as *mut BitSetUnit,
-                        small_vec.cap,
-                    ),
-                    small_vec.cap * Self::UNIT,
-                )
-            }
-        }
-    }
-
-    fn indexes(index: usize) -> (usize, usize) {
-        (index / Self::UNIT, index % Self::UNIT)
-    }
-
-    pub fn get(&self, index: Nid) -> bool {
-        let index = index as usize;
-        let (data, len) = self.data_and_len();
-        if index >= len {
-            return false;
-        }
-        let (elem, bit) = Self::indexes(index);
-        (unsafe { *data.get_unchecked(elem) }) & (1 << bit) != 0
-    }
-
-    pub fn set(&mut self, index: Nid) -> bool {
-        let index = index as usize;
-        let (mut data, len) = self.data_mut_and_len();
-        if core::intrinsics::unlikely(index >= len) {
-            self.grow((index + 1).next_power_of_two().max(4 * Self::UNIT));
-            (data, _) = self.data_mut_and_len();
-        }
-
-        let (elem, bit) = Self::indexes(index);
-        debug_assert!(elem < data.len(), "{} < {}", elem, data.len());
-        let elem = unsafe { data.get_unchecked_mut(elem) };
-        let prev = *elem;
-        *elem |= 1 << bit;
-        *elem != prev
-    }
-
-    fn grow(&mut self, size: usize) {
-        debug_assert!(size.is_power_of_two());
-        let slot_count = size / Self::UNIT;
-        let (layout, off) = Self::layout(slot_count);
-        let (ptr, prev_len) = unsafe {
-            if self.is_inline() {
-                let ptr = alloc::alloc(layout);
-                *ptr.add(off).cast::<BitSetUnit>() = self.inline & !Self::FLAG;
-                (ptr, 1)
-            } else {
-                let prev_len = self.alloced.as_ref().cap;
-                let (prev_layout, _) = Self::layout(prev_len);
-                (alloc::realloc(self.alloced.as_ptr() as _, prev_layout, layout.size()), prev_len)
-            }
-        };
-        unsafe {
-            MaybeUninit::fill(
-                core::slice::from_raw_parts_mut(
-                    ptr.add(off).cast::<MaybeUninit<BitSetUnit>>().add(prev_len),
-                    slot_count - prev_len,
-                ),
-                0,
-            );
-            *ptr.cast::<usize>() = slot_count;
-            core::ptr::write(self, Self { alloced: Unique::new_unchecked(ptr as _) });
-        }
-    }
-
-    fn layout(slot_count: usize) -> (core::alloc::Layout, usize) {
-        unsafe {
-            core::alloc::Layout::new::<AllocedBitSet>()
-                .extend(Layout::array::<BitSetUnit>(slot_count).unwrap_unchecked())
-                .unwrap_unchecked()
-        }
-    }
-
-    pub fn iter(&self) -> BitSetIter {
-        if self.is_inline() {
-            BitSetIter { index: 0, current: unsafe { self.inline & !Self::FLAG }, remining: &[] }
-        } else {
-            let &[current, ref remining @ ..] = self.data_and_len().0 else {
-                unsafe { unreachable_unchecked() }
-            };
-            BitSetIter { index: 0, current, remining }
-        }
-    }
-
-    pub fn clear(&mut self, len: usize) {
-        self.reserve(len);
-        self.clear_as_is();
-    }
-
-    pub fn clear_as_is(&mut self) {
-        if self.is_inline() {
-            unsafe { self.inline &= Self::FLAG };
-        } else {
-            self.data_mut_and_len().0.fill(0);
-        }
-    }
-
-    pub fn approx_unit_cap(&self) -> usize {
-        self.data_and_len().0.len()
-    }
-
-    pub fn units<'a>(&'a self, slot: &'a mut BitSetUnit) -> &'a [BitSetUnit] {
-        if self.is_inline() {
-            *slot = unsafe { self.inline } & !Self::FLAG;
-            core::slice::from_ref(slot)
-        } else {
-            self.data_and_len().0
-        }
-    }
-
-    pub fn units_mut(&mut self) -> Option<&mut [BitSetUnit]> {
-        self.is_inline().not().then(|| self.data_mut_and_len().0)
-    }
-
-    pub fn reserve(&mut self, len: usize) {
-        if len > self.data_and_len().1 {
-            self.grow(len.next_power_of_two().max(4 * Self::UNIT));
-        }
-    }
-
-    pub fn set_range(&mut self, proj_range: Range<usize>) {
-        if proj_range.is_empty() {
-            return;
-        }
-
-        self.reserve(proj_range.end);
-        let (units, _) = self.data_mut_and_len();
-
-        if proj_range.start / Self::UNIT == (proj_range.end - 1) / Self::UNIT {
-            debug_assert!(proj_range.len() <= Self::UNIT);
-            let mask = ((1 << proj_range.len()) - 1) << (proj_range.start % Self::UNIT);
-            units[proj_range.start / Self::UNIT] |= mask;
-        } else {
-            let fill_range = proj_range.start.div_ceil(Self::UNIT)..proj_range.end / Self::UNIT;
-            units[fill_range].fill(BitSetUnit::MAX);
-
-            let prefix_len = Self::UNIT - proj_range.start % Self::UNIT;
-            let prefix_mask = ((1 << prefix_len) - 1) << (proj_range.start % Self::UNIT);
-            units[proj_range.start / Self::UNIT] |= prefix_mask;
-
-            let postfix_len = proj_range.end % Self::UNIT;
-            let postfix_mask = (1 << postfix_len) - 1;
-            units[proj_range.end / Self::UNIT] |= postfix_mask;
-        }
-    }
-}
-
-pub struct BitSetIter<'a> {
-    index: usize,
-    current: BitSetUnit,
-    remining: &'a [BitSetUnit],
-}
-
-impl Iterator for BitSetIter<'_> {
-    type Item = usize;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        while self.current == 0 {
-            self.current = *self.remining.take_first()?;
-            self.index += 1;
-        }
-
-        let sub_idx = self.current.trailing_zeros() as usize;
-        self.current &= self.current - 1;
-        Some(self.index * BitSet::UNIT + sub_idx)
-    }
-}
-
-struct AllocedBitSet {
-    cap: usize,
-    data: [BitSetUnit; 0],
-}
-
-#[cfg(test)]
-#[test]
-fn test_small_bit_set() {
-    use std::vec::Vec;
-
-    let mut sv = BitSet::default();
-
-    sv.set(10);
-    debug_assert!(sv.get(10));
-    sv.set(100);
-    debug_assert!(sv.get(100));
-    sv.set(10000);
-    debug_assert!(sv.get(10000));
-    debug_assert_eq!(sv.iter().collect::<Vec<_>>(), &[10, 100, 10000]);
-    sv.clear(10000);
-    debug_assert_eq!(sv.iter().collect::<Vec<_>>(), &[]);
-}
-
-pub union Vc {
-    inline: InlineVc,
-    alloced: AllocedVc,
-}
-
-impl Default for Vc {
-    fn default() -> Self {
-        Vc { inline: InlineVc { elems: MaybeUninit::uninit(), cap: Default::default() } }
-    }
-}
-
-impl Debug for Vc {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        self.as_slice().fmt(f)
-    }
-}
-
-impl FromIterator<Nid> for Vc {
-    fn from_iter<T: IntoIterator<Item = Nid>>(iter: T) -> Self {
-        let mut slf = Self::default();
-        for i in iter {
-            slf.push(i);
-        }
-        slf
-    }
-}
-
-const INLINE_ELEMS: usize = VC_SIZE / 2 - 1;
-const VC_SIZE: usize = 16;
-
-impl Vc {
-    fn is_inline(&self) -> bool {
-        unsafe { self.inline.cap <= INLINE_ELEMS as Nid }
-    }
-
-    fn layout(&self) -> Option<core::alloc::Layout> {
-        unsafe {
-            self.is_inline().not().then(|| {
-                core::alloc::Layout::array::<Nid>(self.alloced.cap as _).unwrap_unchecked()
-            })
-        }
-    }
-
-    pub fn len(&self) -> usize {
-        unsafe {
-            if self.is_inline() {
-                self.inline.cap as _
-            } else {
-                self.alloced.len as _
-            }
-        }
-    }
-
-    fn len_mut(&mut self) -> &mut Nid {
-        unsafe {
-            if self.is_inline() {
-                &mut self.inline.cap
-            } else {
-                &mut self.alloced.len
-            }
-        }
-    }
-
-    fn as_ptr(&self) -> *const Nid {
-        unsafe {
-            match self.is_inline() {
-                true => self.inline.elems.as_ptr().cast(),
-                false => self.alloced.base.as_ptr(),
-            }
-        }
-    }
-
-    fn as_mut_ptr(&mut self) -> *mut Nid {
-        unsafe {
-            match self.is_inline() {
-                true => self.inline.elems.as_mut_ptr().cast(),
-                false => self.alloced.base.as_ptr(),
-            }
-        }
-    }
-
-    pub fn as_slice(&self) -> &[Nid] {
-        unsafe { core::slice::from_raw_parts(self.as_ptr(), self.len()) }
-    }
-
-    fn as_slice_mut(&mut self) -> &mut [Nid] {
-        unsafe { core::slice::from_raw_parts_mut(self.as_mut_ptr(), self.len()) }
-    }
-
-    pub fn push(&mut self, value: Nid) {
-        if let Some(layout) = self.layout() {
-            if unsafe { self.alloced.len == self.alloced.cap } {
-                unsafe {
-                    self.alloced.cap *= 2;
-                    self.alloced.base = Unique::new_unchecked(
-                        alloc::realloc(
-                            self.alloced.base.as_ptr().cast(),
-                            layout,
-                            self.alloced.cap as usize * core::mem::size_of::<Nid>(),
-                        )
-                        .cast(),
-                    );
-                }
-            }
-        } else if self.len() == INLINE_ELEMS {
-            unsafe {
-                let mut allcd =
-                    Self::alloc((self.inline.cap + 1).next_power_of_two() as _, self.len());
-                core::ptr::copy_nonoverlapping(self.as_ptr(), allcd.as_mut_ptr(), self.len());
-                debug_assert!(!allcd.is_inline());
-                *self = allcd;
-            }
-        }
-
-        unsafe {
-            *self.len_mut() += 1;
-            self.as_mut_ptr().add(self.len() - 1).write(value);
-        }
-    }
-
-    unsafe fn alloc(cap: usize, len: usize) -> Self {
-        debug_assert!(cap > INLINE_ELEMS);
-        let layout = unsafe { core::alloc::Layout::array::<Nid>(cap).unwrap_unchecked() };
-        let alloc = unsafe { alloc::alloc(layout) };
-        unsafe {
-            Vc {
-                alloced: AllocedVc {
-                    base: Unique::new_unchecked(alloc.cast()),
-                    len: len as _,
-                    cap: cap as _,
-                },
-            }
-        }
-    }
-
-    pub fn swap_remove(&mut self, index: usize) {
-        let len = self.len() - 1;
-        self.as_slice_mut().swap(index, len);
-        *self.len_mut() -= 1;
-    }
-
-    pub fn remove(&mut self, index: usize) {
-        self.as_slice_mut().copy_within(index + 1.., index);
-        *self.len_mut() -= 1;
-    }
-}
-
-impl Drop for Vc {
-    fn drop(&mut self) {
-        if let Some(layout) = self.layout() {
-            unsafe {
-                alloc::dealloc(self.alloced.base.as_ptr().cast(), layout);
-            }
-        }
-    }
-}
-
-impl Clone for Vc {
-    fn clone(&self) -> Self {
-        self.as_slice().into()
-    }
-}
-
-impl IntoIterator for Vc {
-    type IntoIter = VcIntoIter;
-    type Item = Nid;
-
-    fn into_iter(self) -> Self::IntoIter {
-        VcIntoIter { start: 0, end: self.len(), vc: self }
-    }
-}
-
-pub struct VcIntoIter {
-    start: usize,
-    end: usize,
-    vc: Vc,
-}
-
-impl Iterator for VcIntoIter {
-    type Item = Nid;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.start == self.end {
-            return None;
-        }
-
-        let ret = unsafe { core::ptr::read(self.vc.as_slice().get_unchecked(self.start)) };
-        self.start += 1;
-        Some(ret)
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let len = self.end - self.start;
-        (len, Some(len))
-    }
-}
-
-impl DoubleEndedIterator for VcIntoIter {
-    fn next_back(&mut self) -> Option<Self::Item> {
-        if self.start == self.end {
-            return None;
-        }
-
-        self.end -= 1;
-        Some(unsafe { core::ptr::read(self.vc.as_slice().get_unchecked(self.end)) })
-    }
-}
-
-impl ExactSizeIterator for VcIntoIter {}
-
-impl<const SIZE: usize> From<[Nid; SIZE]> for Vc {
-    fn from(value: [Nid; SIZE]) -> Self {
-        value.as_slice().into()
-    }
-}
-
-impl<'a> From<&'a [Nid]> for Vc {
-    fn from(value: &'a [Nid]) -> Self {
-        if value.len() <= INLINE_ELEMS {
-            let mut dflt = Self::default();
-            unsafe {
-                core::ptr::copy_nonoverlapping(value.as_ptr(), dflt.as_mut_ptr(), value.len())
-            };
-            dflt.inline.cap = value.len() as _;
-            dflt
-        } else {
-            let mut allcd = unsafe { Self::alloc(value.len(), value.len()) };
-            unsafe {
-                core::ptr::copy_nonoverlapping(value.as_ptr(), allcd.as_mut_ptr(), value.len())
-            };
-            allcd
-        }
-    }
-}
-
-impl Deref for Vc {
-    type Target = [Nid];
-
-    fn deref(&self) -> &Self::Target {
-        self.as_slice()
-    }
-}
-
-impl DerefMut for Vc {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.as_slice_mut()
-    }
-}
-
-#[derive(Clone, Copy)]
-#[repr(C)]
-struct InlineVc {
-    cap: Nid,
-    elems: MaybeUninit<[Nid; INLINE_ELEMS]>,
-}
-
-#[derive(Clone, Copy)]
-#[repr(C)]
-struct AllocedVc {
-    cap: Nid,
-    len: Nid,
-    base: Unique<Nid>,
-}
-
-pub trait Ent: Copy {
-    fn new(index: usize) -> Self;
-    fn index(self) -> usize;
-}
-
-#[repr(transparent)]
-pub struct EntSlice<K: Ent, T> {
-    k: PhantomData<fn(K)>,
-    data: [T],
-}
-
-impl<'a, K: Ent, T> From<&'a [T]> for &'a EntSlice<K, T> {
-    fn from(value: &'a [T]) -> Self {
-        unsafe { core::mem::transmute(value) }
-    }
-}
-
-impl<K: Ent, T> core::ops::Index<K> for EntSlice<K, T> {
-    type Output = T;
-
-    fn index(&self, index: K) -> &Self::Output {
-        &self.data[index.index()]
-    }
-}
-
-pub struct EntVec<K: Ent, T> {
-    data: ::alloc::vec::Vec<T>,
-    k: PhantomData<fn(K)>,
-}
-
-impl<K: Ent, T> Default for EntVec<K, T> {
-    fn default() -> Self {
-        Self { data: Default::default(), k: PhantomData }
-    }
-}
-
-impl<K: Ent, T> EntVec<K, T> {
-    pub fn clear(&mut self) {
-        self.data.clear();
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.data.is_empty()
-    }
-
-    pub fn len(&self) -> usize {
-        self.data.len()
-    }
-
-    pub fn push(&mut self, value: T) -> K {
-        let k = K::new(self.data.len());
-        self.data.push(value);
-        k
-    }
-
-    pub fn next(&self, index: K) -> Option<&T> {
-        self.data.get(index.index() + 1)
-    }
-
-    pub fn shadow(&mut self, len: usize)
-    where
-        T: Default,
-    {
-        if self.data.len() < len {
-            self.data.resize_with(len, Default::default);
-        }
-    }
-
-    pub fn iter(&self) -> core::slice::Iter<T> {
-        self.data.iter()
-    }
-}
-
-impl<K: Ent, T> core::ops::Index<K> for EntVec<K, T> {
-    type Output = T;
-
-    fn index(&self, index: K) -> &Self::Output {
-        &self.data[index.index()]
-    }
-}
-
-impl<K: Ent, T> core::ops::IndexMut<K> for EntVec<K, T> {
-    fn index_mut(&mut self, index: K) -> &mut Self::Output {
-        &mut self.data[index.index()]
-    }
-}
-
-macro_rules! decl_ent {
-    ($(
-        $vis:vis struct $name:ident($index:ty);
-    )*) => {$(
-        #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
-        $vis struct $name($index);
-
-        impl crate::utils::Ent for $name {
-            fn new(index: usize) -> Self {
-                Self(index as $index)
-            }
-
-            fn index(self) -> usize {
-                self.0 as _
-            }
-        }
-
-
-        impl core::fmt::Display for $name {
-            fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-                write!(f, concat!(stringify!($name), "{}"), self.0)
-            }
-        }
-    )*};
-}
-pub(crate) use decl_ent;

lang/tests/son_tests_advanced_floating_point_arithmetic.txt

@@ -1,47 +0,0 @@
-main:
-    ADDI64 r254, r254, -24d
-    ST r31, r254, 0a, 24h
-    LI32 r32, 1148846080w
-    CP r2, r32
-    JAL r31, r0, :sin
-    CP r33, r1
-    FMUL32 r32, r33, r32
-    FTI32 r32, r32, 1b
-    CP r1, r32
-    LD r31, r254, 0a, 24h
-    ADDI64 r254, r254, 24d
-    JALA r0, r31, 0a
-sin:
-    CP r13, r2
-    LI32 r14, 1124073472w
-    LI32 r15, 1078530011w
-    FMUL32 r14, r13, r14
-    FDIV32 r14, r14, r15
-    FTI32 r14, r14, 1b
-    ANDI r15, r14, 255d
-    MULI64 r15, r15, 4d
-    LRA r16, r0, :sin_table
-    LI32 r17, 1086918619w
-    ITF32 r18, r14
-    ADDI64 r14, r14, 64d
-    ADD64 r15, r16, r15
-    LI32 r19, 1132462080w
-    FMUL32 r17, r18, r17
-    ANDI r14, r14, 255d
-    LI32 r18, 1056964608w
-    LD r15, r15, 0a, 4h
-    FDIV32 r17, r17, r19
-    MULI64 r14, r14, 4d
-    FMUL32 r18, r15, r18
-    FSUB32 r13, r13, r17
-    ADD64 r14, r16, r14
-    FMUL32 r16, r13, r18
-    LD r14, r14, 0a, 4h
-    FSUB32 r14, r14, r16
-    FMUL32 r13, r14, r13
-    FADD32 r13, r15, r13
-    CP r1, r13
-    JALA r0, r31, 0a
-code size: 1311
-ret: 826
-status: Ok(())

lang/tests/son_tests_aliasing_overoptimization.txt

@@ -1,6 +0,0 @@
-main:
-    CP r1, r0
-    JALA r0, r31, 0a
-code size: 22
-ret: 0
-status: Ok(())

lang/tests/son_tests_arithmetic.txt

@@ -1,6 +0,0 @@
-main:
-    CP r1, r0
-    JALA r0, r31, 0a
-code size: 22
-ret: 0
-status: Ok(())

lang/tests/son_tests_arrays.txt

@@ -1,32 +0,0 @@
-main:
-    ADDI64 r254, r254, -56d
-    ST r31, r254, 24a, 32h
-    LI64 r32, 1d
-    ADDI64 r33, r254, 0d
-    ST r32, r254, 0a, 8h
-    LI64 r34, 2d
-    ST r34, r254, 8a, 8h
-    LI64 r34, 4d
-    ST r34, r254, 16a, 8h
-    CP r2, r33
-    JAL r31, r0, :pass
-    CP r33, r1
-    ADD64 r32, r33, r32
-    CP r1, r32
-    LD r31, r254, 24a, 32h
-    ADDI64 r254, r254, 56d
-    JALA r0, r31, 0a
-pass:
-    CP r13, r2
-    LD r14, r13, 8a, 8h
-    MULI64 r15, r14, 8d
-    LD r16, r13, 0a, 8h
-    ADD64 r13, r15, r13
-    ADD64 r14, r14, r16
-    LD r13, r13, 0a, 8h
-    ADD64 r13, r13, r14
-    CP r1, r13
-    JALA r0, r31, 0a
-code size: 246
-ret: 8
-status: Ok(())

lang/tests/son_tests_big_array_crash.txt

@@ -1,8 +0,0 @@
-main:
-    LRA r13, r0, :sin_table
-    LD r13, r13, 80a, 8h
-    CP r1, r13
-    JALA r0, r31, 0a
-code size: 770
-ret: 1736
-status: Ok(())

lang/tests/son_tests_branch_assignments.txt

@@ -1,14 +0,0 @@
-main:
-    CP r14, r2
-    LI64 r13, 1d
-    JNE r14, r13, :0
-    JMP :1
- 0: JNE r14, r0, :2
-    LI64 r13, 2d
-    JMP :1
- 2: LI64 r13, 3d
- 1: CP r1, r13
-    JALA r0, r31, 0a
-code size: 75
-ret: 2
-status: Ok(())

lang/tests/son_tests_c_strings.txt

@@ -1,32 +0,0 @@
-main:
-    ADDI64 r254, r254, -24d
-    ST r31, r254, 0a, 24h
-    LRA r32, r0, :"abඞ\n\r\t56789\0"
-    CP r2, r32
-    JAL r31, r0, :str_len
-    CP r32, r1
-    LRA r33, r0, :"fff\0"
-    CP r2, r33
-    JAL r31, r0, :str_len
-    CP r33, r1
-    ADD64 r32, r33, r32
-    CP r1, r32
-    LD r31, r254, 0a, 24h
-    ADDI64 r254, r254, 24d
-    JALA r0, r31, 0a
-str_len:
-    CP r13, r2
-    CP r15, r0
-    CP r14, r15
- 2: LD r16, r13, 0a, 1h
-    ANDI r16, r16, 255d
-    JNE r16, r15, :0
-    CP r1, r14
-    JMP :1
- 0: ADDI64 r13, r13, 1d
-    ADDI64 r14, r14, 1d
-    JMP :2
- 1: JALA r0, r31, 0a
-code size: 216
-ret: 16
-status: Ok(())

lang/tests/son_tests_comments.txt

@@ -1,13 +0,0 @@
-foo:
-    JALA r0, r31, 0a
-main:
-    ADDI64 r254, r254, -8d
-    ST r31, r254, 0a, 8h
-    JAL r31, r0, :foo
-    CP r1, r0
-    LD r31, r254, 0a, 8h
-    ADDI64 r254, r254, 8d
-    JALA r0, r31, 0a
-code size: 88
-ret: 0
-status: Ok(())

lang/tests/son_tests_comparing_floating_points.txt

@@ -1,65 +0,0 @@
-box:
-    CP r13, r2
-    CP r1, r13
-    JALA r0, r31, 0a
-main:
-    ADDI64 r254, r254, -32d
-    ST r31, r254, 0a, 32h
-    LI32 r32, 1065353216w
-    CP r2, r32
-    JAL r31, r0, :box
-    CP r33, r1
-    CP r2, r0
-    JAL r31, r0, :box
-    CP r34, r1
-    FCMPLT32 r33, r33, r34
-    ANDI r33, r33, 255d
-    JNE r33, r0, :0
-    CP r2, r32
-    JAL r31, r0, :box
-    CP r33, r1
-    CP r2, r0
-    JAL r31, r0, :box
-    CP r34, r1
-    FCMPGT32 r33, r33, r34
-    NOT r33, r33
-    ANDI r33, r33, 255d
-    JNE r33, r0, :1
-    CP r2, r0
-    JAL r31, r0, :box
-    CP r33, r1
-    CP r2, r32
-    JAL r31, r0, :box
-    CP r34, r1
-    FCMPGT32 r33, r33, r34
-    ANDI r33, r33, 255d
-    JNE r33, r0, :2
-    CP r2, r0
-    JAL r31, r0, :box
-    CP r33, r1
-    CP r2, r32
-    JAL r31, r0, :box
-    CP r32, r1
-    FCMPLT32 r32, r33, r32
-    NOT r32, r32
-    ANDI r32, r32, 255d
-    JNE r32, r0, :3
-    CP r1, r0
-    JMP :4
- 3: LI64 r32, 4d
-    CP r1, r32
-    JMP :4
- 2: LI64 r32, 3d
-    CP r1, r32
-    JMP :4
- 1: LI64 r32, 2d
-    CP r1, r32
-    JMP :4
- 0: LI64 r32, 1d
-    CP r1, r32
- 4: LD r31, r254, 0a, 32h
-    ADDI64 r254, r254, 32d
-    JALA r0, r31, 0a
-code size: 355
-ret: 0
-status: Ok(())

lang/tests/son_tests_comptime_function_from_another_file.txt

@@ -1,8 +0,0 @@
-main:
-    LRA r13, r0, :a
-    LD r13, r13, 0a, 8h
-    CP r1, r13
-    JALA r0, r31, 0a
-code size: 50
-ret: 50
-status: Ok(())

lang/tests/son_tests_comptime_min_reg_leak.txt

@@ -1,8 +0,0 @@
-main:
-    LRA r13, r0, :a
-    LD r13, r13, 0a, 8h
-    CP r1, r13
-    JALA r0, r31, 0a
-code size: 50
-ret: 50
-status: Ok(())

lang/tests/son_tests_conditional_stores.txt

@@ -1,19 +0,0 @@
-cond:
-    CP r1, r0
-    JALA r0, r31, 0a
-main:
-    ADDI64 r254, r254, -24d
-    ST r31, r254, 0a, 24h
-    JAL r31, r0, :cond
-    CP r32, r0
-    CP r33, r1
-    JNE r33, r32, :0
-    JMP :1
- 0: LI64 r32, 2d
- 1: CP r1, r32
-    LD r31, r254, 0a, 24h
-    ADDI64 r254, r254, 24d
-    JALA r0, r31, 0a
-code size: 117
-ret: 0
-status: Ok(())

lang/tests/son_tests_const_folding_with_arg.txt

@@ -1,6 +0,0 @@
-main:
-    CP r1, r0
-    JALA r0, r31, 0a
-code size: 22
-ret: 0
-status: Ok(())

lang/tests/son_tests_constants.txt

@@ -1,7 +0,0 @@
-main:
-    LI32 r13, 69w
-    CP r1, r13
-    JALA r0, r31, 0a
-code size: 28
-ret: 69
-status: Ok(())

lang/tests/son_tests_dead_code_in_loop.txt

@@ -1,6 +0,0 @@
-main:
-    CP r1, r0
-    JALA r0, r31, 0a
-code size: 22
-ret: 0
-status: Ok(())

lang/tests/son_tests_defer.txt

@@ -1,19 +0,0 @@
-main:
-    LI64 r15, 3d
-    LI64 r16, 10d
-    CP r14, r0
-    CP r13, r14
- 3: JNE r13, r16, :0
-    LI64 r14, -10d
-    ADD64 r14, r13, r14
-    CP r1, r14
-    JMP :1
- 0: DIRU64 r0, r17, r13, r15
-    JNE r17, r14, :2
-    JMP :2
- 2: ADDI64 r13, r13, 1d
-    JMP :3
- 1: JALA r0, r31, 0a
-code size: 103
-ret: 0
-status: Ok(())

lang/tests/son_tests_die.txt

@@ -1,11 +0,0 @@
-fun:
-    UN 
-main:
-    ADDI64 r254, r254, -8d
-    ST r31, r254, 0a, 8h
-    JAL r31, r0, :fun
-    LD r31, r254, 0a, 8h
-    ADDI64 r254, r254, 8d
-code size: 64
-ret: 0
-status: Err(Unreachable)

lang/tests/son_tests_different_function_destinations.txt

@@ -1,72 +0,0 @@
-main:
-    ADDI64 r254, r254, -88d
-    ST r31, r254, 48a, 40h
-    LRA r32, r0, :glob_stru
-    JAL r31, r0, :new_stru
-    ST r1, r32, 0a, 16h
-    LD r33, r32, 0a, 8h
-    JEQ r33, r0, :0
-    LI64 r32, 300d
-    CP r1, r32
-    JMP :1
- 0: ST r0, r32, 0a, 8h
-    LD r33, r32, 0a, 8h
-    JEQ r33, r0, :2
-    ST r0, r32, 8a, 8h
-    LI64 r32, 200d
-    CP r1, r32
-    JMP :1
- 2: LI64 r34, 1d
-    ST r34, r32, 0a, 8h
-    ST r34, r32, 8a, 8h
-    ADDI64 r33, r254, 0d
-    ST r34, r254, 0a, 8h
-    ST r34, r254, 8a, 8h
-    ST r34, r254, 16a, 8h
-    ST r34, r254, 24a, 8h
-    ST r34, r254, 32a, 8h
-    ST r34, r254, 40a, 8h
-    ADDI64 r35, r33, 48d
-    CP r32, r33
- 8: JNE r35, r32, :3
-    LD r32, r254, 32a, 8h
-    JEQ r32, r0, :4
-    LI64 r32, 100d
-    CP r1, r32
-    JMP :1
- 4: ST r34, r254, 0a, 8h
-    ST r34, r254, 8a, 8h
-    ST r34, r254, 16a, 8h
-    ST r34, r254, 24a, 8h
-    ST r34, r254, 32a, 8h
-    ST r34, r254, 40a, 8h
-    CP r32, r33
- 7: LD r34, r254, 32a, 8h
-    JNE r35, r32, :5
-    JEQ r34, r0, :6
-    LI64 r32, 10d
-    CP r1, r32
-    JMP :1
- 6: CP r1, r0
-    JMP :1
- 5: ST r0, r32, 0a, 8h
-    ST r0, r32, 8a, 8h
-    ADDI64 r32, r32, 16d
-    JMP :7
- 3: JAL r31, r0, :new_stru
-    ST r1, r32, 0a, 16h
-    ADDI64 r32, r32, 16d
-    JMP :8
- 1: LD r31, r254, 48a, 40h
-    ADDI64 r254, r254, 88d
-    JALA r0, r31, 0a
-new_stru:
-    ADDI64 r254, r254, -16d
-    ST r0, r254, 0a, 8h
-    ST r0, r254, 8a, 8h
-    LD r1, r254, 0a, 16h
-    ADDI64 r254, r254, 16d
-    JALA r0, r31, 0a
-code size: 668
-ret: 0
-status: Ok(())

lang/tests/son_tests_different_types.txt

@@ -1,29 +0,0 @@
-main:
-    ADDI64 r254, r254, -12d
-    LI8 r13, 255b
-    ST r13, r254, 0a, 1h
-    ST r0, r254, 1a, 1h
-    ST r0, r254, 2a, 1h
-    ST r13, r254, 3a, 1h
-    ST r0, r254, 4a, 4h
-    LD r13, r254, 4a, 4h
-    LI32 r14, 2w
-    ST r14, r254, 8a, 4h
-    LD r14, r254, 8a, 4h
-    LI64 r15, 2d
-    ANDI r14, r14, 4294967295d
-    JEQ r14, r15, :0
-    CP r1, r0
-    JMP :1
- 0: ANDI r13, r13, 4294967295d
-    JEQ r13, r0, :2
-    LI64 r13, 64d
-    CP r1, r13
-    JMP :1
- 2: LI64 r13, 512d
-    CP r1, r13
- 1: ADDI64 r254, r254, 12d
-    JALA r0, r31, 0a
-code size: 235
-ret: 512
-status: Ok(())

lang/tests/son_tests_directives.txt

@@ -1,21 +0,0 @@
-main:
-    ADDI64 r254, r254, -16d
-    LI64 r13, 10d
-    ST r13, r254, 0a, 8h
-    LI64 r13, 20d
-    ST r13, r254, 8a, 8h
-    LI64 r13, 6d
-    LI64 r14, 5d
-    LI64 r15, 1d
-    CP r2, r15
-    LD r3, r254, 0a, 16h
-    CP r5, r14
-    CP r6, r13
-    ECA 
-    CP r1, r0
-    ADDI64 r254, r254, 16d
-    JALA r0, r31, 0a
-ev: Ecall
-code size: 143
-ret: 0
-status: Ok(())

lang/tests/son_tests_elide_stack_offsets_for_parameters_correctly.txt

@@ -1,28 +0,0 @@
-main:
-    ADDI64 r254, r254, -40d
-    ST r31, r254, 24a, 16h
-    LI64 r32, 1d
-    ST r32, r254, 0a, 8h
-    ST r0, r254, 8a, 8h
-    ST r0, r254, 16a, 8h
-    LD r2, r254, 8a, 16h
-    JAL r31, r0, :pass
-    CP r32, r1
-    CP r1, r32
-    LD r31, r254, 24a, 16h
-    ADDI64 r254, r254, 40d
-    JALA r0, r31, 0a
-pass:
-    ADDI64 r254, r254, -16d
-    ST r2, r254, 0a, 16h
-    ADDI64 r2, r254, 0d
-    CP r13, r2
-    LD r14, r13, 0a, 8h
-    LD r13, r13, 8a, 8h
-    ADD64 r13, r13, r14
-    CP r1, r13
-    ADDI64 r254, r254, 16d
-    JALA r0, r31, 0a
-code size: 235
-ret: 0
-status: Ok(())