a

Cargo.lock

@@ -13,22 +13,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "allocator-api2"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9"
-
-[[package]]
-name = "ariadne"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72fe02fc62033df9ba41cba57ee19acf5e742511a140c7dbc3a873e19a19a1bd"
-dependencies = [
- "unicode-width",
- "yansi",
-]
-
 [[package]]
 name = "beef"
 version = "0.5.2"
@@ -86,22 +70,10 @@ dependencies = [
  "ahash",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
-dependencies = [
- "ahash",
- "allocator-api2",
-]
-
 [[package]]
 name = "hbasm"
 version = "0.1.0"
 dependencies = [
- "ariadne",
- "hashbrown 0.14.0",
  "hbbytecode",
  "lasso",
  "logos",
@@ -118,7 +90,7 @@ version = "0.1.0"
 dependencies = [
  "delegate",
  "derive_more",
- "hashbrown 0.13.2",
+ "hashbrown",
  "hbbytecode",
  "log",
  "paste",
@@ -131,8 +103,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4644821e1c3d7a560fe13d842d13f587c07348a1a05d3a797152d41c90c56df2"
 dependencies = [
- "ahash",
- "hashbrown 0.13.2",
+ "hashbrown",
 ]
 
 [[package]]
@@ -261,20 +232,8 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
 
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "yansi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"

hbasm/Cargo.toml

@@ -5,14 +5,8 @@ edition = "2021"
 
 [dependencies]
 hbbytecode = { path = "../hbbytecode" }
+lasso      = "0.7"
 paste      = "1.0"
-hashbrown = "0.14.0"
-ariadne = "0.3.0"
-
-[dependencies.lasso]
-version = "0.7"
-default-features = false
-features = ["no-std"]
 
 [dependencies.logos]
 version = "0.13"

hbasm/assets/serial_driver.hbasm

@@ -5,14 +5,3 @@ start:
 -- 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

@@ -1,65 +1,269 @@
-#![no_std]
-#![feature(error_in_core)]
+use std::collections::HashMap;
+use {
+    lasso::{Rodeo, Spur},
+    logos::{Lexer, Logos, Span},
+    std::fmt::{Display, Formatter},
+};
 
-extern crate alloc;
+macro_rules! tokendef {
+    ($($opcode:literal),* $(,)?) => {
+        paste::paste! {
+            #[derive(Clone, Copy, Debug, PartialEq, Eq, Logos)]
+            #[logos(extras = Rodeo)]
+            #[logos(skip r"[ \t\f]+")]
+            #[logos(skip r"-- .*")]
+            pub enum Token {
+                $(#[token($opcode, |_| hbbytecode::opcode::[<$opcode:upper>])])*
+                OpCode(u8),
 
-pub mod text;
+                #[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),
 
-mod macros;
+                #[regex(
+                    "r[0-9]+",
+                    |lexer| match lexer.slice()[1..].parse() {
+                        Ok(n) => Some(n),
+                        _ => None
+                    },
+                )] Register(u8),
 
-use {alloc::vec::Vec, hashbrown::HashSet};
+                #[regex(
+                    r"\p{XID_Start}\p{XID_Continue}*:",
+                    |lexer| lexer.extras.get_or_intern(&lexer.slice()[..lexer.slice().len() - 1]),
+                )] Label(Spur),
 
-#[derive(Default)]
-pub struct Assembler {
-    pub buf: Vec<u8>,
-    sub:     HashSet<usize>,
-}
+                #[regex(
+                    r"\p{XID_Start}\p{XID_Continue}*",
+                    |lexer| lexer.extras.get_or_intern(lexer.slice()),
+                )] Symbol(Spur),
 
-impl Assembler {
-    macros::impl_asm!(
-        bbbb(p0: u8, p1: u8, p2: u8, p3: u8)
-            => [DIR, DIRF, FMAF],
-        bbb(p0: u8, p1: u8, p2: u8)
-            => [ADD, SUB, MUL, AND, OR, XOR, SL, SR, SRS, CMP, CMPU, BRC, ADDF, SUBF, MULF],
-        bbdh(p0: u8, p1: u8, p2: impl Imm, p3: u16)
-            => [LD, ST],
-        bbd(p0: u8, p1: u8, p2: impl Imm)
-            => [ADDI, MULI, ANDI, ORI, XORI, SLI, SRI, SRSI, CMPI, CMPUI,
-                BMC, JEQ, JNE, JLT, JGT, JLTU, JGTU, ADDFI, MULFI],
-        bb(p0: u8, p1: u8)
-            => [NEG, NOT, CP, SWA, NEGF, ITF, FTI],
-        bd(p0: u8, p1: impl Imm)
-            => [LI, JMP],
-        n()
-            => [NOP, ECALL],
-    );
-}
-
-pub trait Imm {
-    fn insert(&self, asm: &mut Assembler);
-}
-
-macro_rules! impl_imm_le_bytes {
-    ($($ty:ty),* $(,)?) => {
-        $(
-            impl Imm for $ty {
-                #[inline(always)]
-                fn insert(&self, asm: &mut Assembler) {
-                    asm.buf.extend(self.to_le_bytes());
+                #[token("\n")]
+                #[token(";")] ISep,
+                #[token(",")] PSep,
             }
         }
-        )*
     };
 }
 
-impl_imm_le_bytes!(u64, i64, f64);
+#[rustfmt::skip]
+tokendef![
+    "nop", "add", "sub", "mul", "and", "or", "xor", "sl", "sr", "srs", "cmp", "cmpu",
+    "dir", "neg", "not", "addi", "muli", "andi", "ori", "xori", "sli", "sri", "srsi",
+    "cmpi", "cmpui", "cp", "swa", "li", "ld", "st", "bmc", "brc", "jmp", "jeq", "jne",
+    "jlt", "jgt", "jltu", "jgtu", "ecall", "addf", "mulf", "dirf", "addfi", "mulfi",
+];
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct Symbol(pub u64);
-impl Imm for Symbol {
-    #[inline(always)]
-    fn insert(&self, asm: &mut Assembler) {
-        asm.sub.insert(asm.buf.len());
-        asm.buf.extend(self.0.to_le_bytes());
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub enum ErrorKind {
+    UnexpectedToken,
+    InvalidToken,
+    UnexpectedEnd,
+    InvalidSymbol,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Error {
+    pub kind: ErrorKind,
+    pub span: Span,
+}
+
+impl Display for Error {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Error {:?} at {:?}", self.kind, self.span)
     }
 }
+
+impl std::error::Error for Error {}
+
+macro_rules! expect_matches {
+    ($self:expr, $($pat:pat),* $(,)?) => {$(
+        let $pat = $self.next()?
+            else { return Err(ErrorKind::UnexpectedToken) };
+    )*}
+}
+
+pub fn assembly(code: &str, buf: &mut Vec<u8>) -> Result<(), Error> {
+    struct Assembler<'a> {
+        lexer: Lexer<'a, Token>,
+        buf: &'a mut Vec<u8>,
+        label_map: HashMap<Spur, u64>,
+        to_sub_label: HashMap<usize, Spur>,
+    }
+
+    impl<'a> Assembler<'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),
+            }
+        }
+
+        fn assemble(&mut self) -> Result<(), ErrorKind> {
+            use hbbytecode::opcode::*;
+            loop {
+                match self.lexer.next() {
+                    Some(Ok(Token::OpCode(op))) => {
+                        self.buf.push(op);
+                        match op {
+                            NOP | ECALL => Ok(()),
+                            DIR | DIRF => {
+                                expect_matches!(
+                                    self,
+                                    Token::Register(r0),
+                                    Token::PSep,
+                                    Token::Register(r1),
+                                    Token::PSep,
+                                    Token::Register(r2),
+                                    Token::PSep,
+                                    Token::Register(r3),
+                                );
+                                self.buf.extend([r0, r1, r2, r3]);
+                                Ok(())
+                            }
+                            ADD..=CMPU | ADDF..=MULF => {
+                                expect_matches!(
+                                    self,
+                                    Token::Register(r0),
+                                    Token::PSep,
+                                    Token::Register(r1),
+                                    Token::PSep,
+                                    Token::Register(r2),
+                                );
+                                self.buf.extend([r0, r1, r2]);
+                                Ok(())
+                            }
+                            BRC => {
+                                expect_matches!(
+                                    self,
+                                    Token::Register(r0),
+                                    Token::PSep,
+                                    Token::Register(r1),
+                                    Token::PSep,
+                                    Token::Integer(count),
+                                );
+                                self.buf.extend([
+                                    r0,
+                                    r1,
+                                    u8::try_from(count).map_err(|_| ErrorKind::UnexpectedToken)?,
+                                ]);
+                                Ok(())
+                            }
+                            NEG..=NOT | CP..=SWA => {
+                                expect_matches!(
+                                    self,
+                                    Token::Register(r0),
+                                    Token::PSep,
+                                    Token::Register(r1),
+                                );
+                                self.buf.extend([r0, r1]);
+                                Ok(())
+                            }
+                            LI | JMP => {
+                                expect_matches!(self, Token::Register(r0), Token::PSep);
+                                self.buf.push(r0);
+                                self.insert_imm()?;
+                                Ok(())
+                            }
+                            ADDI..=CMPUI | BMC | JEQ..=JGTU | ADDFI..=MULFI => {
+                                expect_matches!(
+                                    self,
+                                    Token::Register(r0),
+                                    Token::PSep,
+                                    Token::Register(r1),
+                                    Token::PSep,
+                                );
+                                self.buf.extend([r0, r1]);
+                                self.insert_imm()?;
+                                Ok(())
+                            }
+                            LD..=ST => {
+                                expect_matches!(
+                                    self,
+                                    Token::Register(r0),
+                                    Token::PSep,
+                                    Token::Register(r1),
+                                    Token::PSep,
+                                    Token::Integer(offset),
+                                    Token::PSep,
+                                    Token::Integer(len),
+                                );
+                                self.buf.extend([r0, r1]);
+                                self.buf.extend(offset.to_le_bytes());
+                                self.buf.extend(
+                                    u16::try_from(len)
+                                        .map_err(|_| ErrorKind::InvalidToken)?
+                                        .to_le_bytes(),
+                                );
+                                Ok(())
+                            }
+                            _ => unreachable!(),
+                        }?;
+                        match self.next() {
+                            Ok(Token::ISep) => (),
+                            Ok(_) => return Err(ErrorKind::UnexpectedToken),
+                            Err(ErrorKind::UnexpectedEnd) => return Ok(()),
+                            Err(e) => return Err(e),
+                        }
+                    }
+                    Some(Ok(Token::Label(lbl))) => {
+                        self.label_map.insert(lbl, self.buf.len() as u64);
+                    }
+                    Some(Ok(Token::ISep)) => (),
+                    Some(Ok(_)) => return Err(ErrorKind::UnexpectedToken),
+                    Some(Err(())) => return Err(ErrorKind::InvalidToken),
+                    None => return Ok(()),
+                }
+            }
+        }
+
+        fn link_local_syms(&mut self) -> Result<(), ErrorKind> {
+            for (ix, sym) in &self.to_sub_label {
+                self.label_map
+                    .get(sym)
+                    .ok_or(ErrorKind::InvalidSymbol)?
+                    .to_le_bytes()
+                    .iter()
+                    .enumerate()
+                    .for_each(|(i, b)| {
+                        self.buf[ix + i] = *b;
+                    });
+            }
+
+            Ok(())
+        }
+
+        fn insert_imm(&mut self) -> Result<(), ErrorKind> {
+            let imm = match self.next()? {
+                Token::Integer(i) => i.to_le_bytes(),
+                Token::Symbol(s) => {
+                    self.to_sub_label.insert(self.buf.len(), s);
+                    [0; 8]
+                }
+                _ => return Err(ErrorKind::UnexpectedToken),
+            };
+            self.buf.extend(imm);
+            Ok(())
+        }
+    }
+
+    let mut asm = Assembler {
+        lexer: Token::lexer(code),
+        label_map: Default::default(),
+        to_sub_label: Default::default(),
+        buf,
+    };
+
+    asm.assemble().map_err(|kind| Error {
+        kind,
+        span: asm.lexer.span(),
+    })?;
+
+    asm.link_local_syms()
+        .map_err(|kind| Error { kind, span: 0..0 })
+}

hbasm/src/macros.rs

@@ -1,72 +0,0 @@
-macro_rules! impl_asm_opcodes {
-    (
-        $generic:ident
-        ($($param_i:ident: $param_ty:ty),*)
-        => []
-    ) => {};
-
-    (
-        $generic:ident
-        ($($param_i:ident: $param_ty:ty),*)
-        => [$opcode:ident, $($rest:tt)*]
-    ) => {
-        paste::paste! {
-            #[allow(dead_code)]
-            #[inline(always)]
-            pub fn [<i_ $opcode:lower>](&mut self, $($param_i: $param_ty),*) {
-                self.$generic(hbbytecode::opcode::$opcode, $($param_i),*)
-            }
-        }
-
-        macros::impl_asm_opcodes!(
-            $generic($($param_i: $param_ty),*)
-            => [$($rest)*]
-        );
-    };
-}
-
-macro_rules! gen_impl_asm_insert {
-    ($($ty:ident),* $(,)?) => {
-        macro_rules! impl_asm_insert {
-            $(($self:expr, $id:ident, $ty) => {
-                $self.buf.extend($id.to_le_bytes())
-            };)*
-
-            ($self:expr, $id:ident, $_:ty) => {
-                Imm::insert(&$id, $self)
-            };
-        }
-    };
-}
-
-gen_impl_asm_insert!(u8, u16, u64);
-
-macro_rules! impl_asm {
-    (
-        $(
-            $ityn:ident
-            ($($param_i:ident: $param_ty:ty),* $(,)?)
-            => [$($opcode:ident),* $(,)?],
-        )*
-    ) => {
-        paste::paste! {
-            $(
-                #[allow(dead_code)]
-                fn [<i_param_ $ityn>](&mut self, opcode: u8, $($param_i: $param_ty),*) {
-                    self.buf.push(opcode);
-                    $(macros::impl_asm_insert!(self, $param_i, $param_ty);)*
-                }
-
-                macros::impl_asm_opcodes!(
-                    [<i_param_ $ityn>]($($param_i: $param_ty),*)
-                    => [$($opcode,)*]
-                );
-            )*
-        }
-    };
-}
-
-pub(super) use {impl_asm, impl_asm_opcodes};
-
-#[allow(clippy::single_component_path_imports)]
-pub(super) use impl_asm_insert;

hbasm/src/main.rs

@@ -1,9 +1,6 @@
-use {
-    ariadne::{ColorGenerator, Label, Report, ReportKind, Source},
-    std::{
+use std::{
     error::Error,
-        io::{stdin, Read},
-    },
+    io::{stdin, stdout, Read, Write},
 };
 
 fn main() -> Result<(), Box<dyn Error>> {
@@ -11,36 +8,14 @@ fn main() -> Result<(), Box<dyn Error>> {
     stdin().read_to_string(&mut code)?;
 
     let mut buf = vec![];
-
-    if let Err(e) = hbasm::text::assembly(&code, &mut buf) {
-        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.clone()))
-                .with_message(message)
-                .with_color(a),
-        )
-        .finish()
-        .eprint(("engine_internal", Source::from(&code)))
-        .unwrap();
+    if let Err(e) = hbasm::assembly(&code, &mut buf) {
+        eprintln!(
+            "Error {:?} at {:?} (`{}`)",
+            e.kind,
+            e.span.clone(),
+            &code[e.span],
+        );
     }
-
+    stdout().write_all(&buf)?;
     Ok(())
 }

hbasm/src/text.rs

@@ -1,273 +0,0 @@
-extern crate alloc;
-use alloc::vec::Vec;
-
-use {
-    core::fmt::{Display, Formatter},
-    hashbrown::HashMap,
-    lasso::{Rodeo, Spur},
-    logos::{Lexer, Logos, Span},
-};
-
-macro_rules! tokendef {
-    ($($opcode:literal),* $(,)?) => {
-        paste::paste! {
-            #[derive(Clone, Copy, Debug, PartialEq, Eq, Logos)]
-            #[logos(extras = Rodeo)]
-            #[logos(skip r"[ \t\f]+")]
-            #[logos(skip r"-- .*")]
-            pub enum Token {
-                $(#[token($opcode, |_| 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,
-            }
-        }
-    };
-}
-
-#[rustfmt::skip]
-tokendef![
-    "nop", "add", "sub", "mul", "and", "or", "xor", "sl", "sr", "srs", "cmp", "cmpu",
-    "dir", "neg", "not", "addi", "muli", "andi", "ori", "xori", "sli", "sri", "srsi",
-    "cmpi", "cmpui", "cp", "swa", "li", "ld", "st", "bmc", "brc", "jmp", "jeq", "jne",
-    "jlt", "jgt", "jltu", "jgtu", "ecall", "addf", "subf", "mulf", "dirf", "fmaf", "negf",
-    "itf", "fti", "addfi", "mulfi",
-];
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum ErrorKind {
-    UnexpectedToken,
-    InvalidToken,
-    UnexpectedEnd,
-    InvalidSymbol,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Error {
-    pub kind: ErrorKind,
-    pub span: Span,
-}
-
-impl Display for Error {
-    fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
-        write!(f, "Error {:?} at {:?}", self.kind, self.span)
-    }
-}
-
-impl core::error::Error for Error {}
-
-macro_rules! expect_matches {
-    ($self:expr, $($pat:pat),* $(,)?) => {$(
-        let $pat = $self.next()?
-            else { return Err(ErrorKind::UnexpectedToken) };
-    )*}
-}
-
-pub fn assembly(code: &str, buf: &mut Vec<u8>) -> Result<(), Error> {
-    struct Assembler<'a> {
-        lexer: Lexer<'a, Token>,
-        buf: &'a mut Vec<u8>,
-        label_map: HashMap<Spur, u64>,
-        to_sub_label: HashMap<usize, Spur>,
-    }
-
-    impl<'a> Assembler<'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),
-            }
-        }
-
-        fn assemble(&mut self) -> Result<(), ErrorKind> {
-            use hbbytecode::opcode::*;
-            loop {
-                match self.lexer.next() {
-                    Some(Ok(Token::OpCode(op))) => {
-                        self.buf.push(op);
-                        match op {
-                            NOP | ECALL => Ok(()),
-                            DIR | DIRF => {
-                                expect_matches!(
-                                    self,
-                                    Token::Register(r0),
-                                    Token::PSep,
-                                    Token::Register(r1),
-                                    Token::PSep,
-                                    Token::Register(r2),
-                                    Token::PSep,
-                                    Token::Register(r3),
-                                );
-                                self.buf.extend([r0, r1, r2, r3]);
-                                Ok(())
-                            }
-                            ADD..=CMPU | ADDF..=MULF => {
-                                expect_matches!(
-                                    self,
-                                    Token::Register(r0),
-                                    Token::PSep,
-                                    Token::Register(r1),
-                                    Token::PSep,
-                                    Token::Register(r2),
-                                );
-                                self.buf.extend([r0, r1, r2]);
-                                Ok(())
-                            }
-                            BRC => {
-                                expect_matches!(
-                                    self,
-                                    Token::Register(r0),
-                                    Token::PSep,
-                                    Token::Register(r1),
-                                    Token::PSep,
-                                    Token::Integer(count),
-                                );
-                                self.buf.extend([
-                                    r0,
-                                    r1,
-                                    u8::try_from(count).map_err(|_| ErrorKind::UnexpectedToken)?,
-                                ]);
-                                Ok(())
-                            }
-                            NEG..=NOT | CP..=SWA | NEGF..=FTI => {
-                                expect_matches!(
-                                    self,
-                                    Token::Register(r0),
-                                    Token::PSep,
-                                    Token::Register(r1),
-                                );
-                                self.buf.extend([r0, r1]);
-                                Ok(())
-                            }
-                            LI | JMP => {
-                                expect_matches!(self, Token::Register(r0), Token::PSep);
-                                self.buf.push(r0);
-                                self.insert_imm()?;
-                                Ok(())
-                            }
-                            ADDI..=CMPUI | BMC | JEQ..=JGTU | ADDFI..=MULFI => {
-                                expect_matches!(
-                                    self,
-                                    Token::Register(r0),
-                                    Token::PSep,
-                                    Token::Register(r1),
-                                    Token::PSep,
-                                );
-                                self.buf.extend([r0, r1]);
-                                self.insert_imm()?;
-                                Ok(())
-                            }
-                            LD..=ST => {
-                                expect_matches!(
-                                    self,
-                                    Token::Register(r0),
-                                    Token::PSep,
-                                    Token::Register(r1),
-                                    Token::PSep,
-                                    Token::Integer(offset),
-                                    Token::PSep,
-                                    Token::Integer(len),
-                                );
-                                self.buf.extend([r0, r1]);
-                                self.buf.extend(offset.to_le_bytes());
-                                self.buf.extend(
-                                    u16::try_from(len)
-                                        .map_err(|_| ErrorKind::InvalidToken)?
-                                        .to_le_bytes(),
-                                );
-                                Ok(())
-                            }
-                            _ => unreachable!(),
-                        }?;
-                        match self.next() {
-                            Ok(Token::ISep) => (),
-                            Ok(_) => return Err(ErrorKind::UnexpectedToken),
-                            Err(ErrorKind::UnexpectedEnd) => return Ok(()),
-                            Err(e) => return Err(e),
-                        }
-                    }
-                    Some(Ok(Token::Label(lbl))) => {
-                        self.label_map.insert(lbl, self.buf.len() as u64);
-                    }
-                    Some(Ok(Token::ISep)) => (),
-                    Some(Ok(_)) => return Err(ErrorKind::UnexpectedToken),
-                    Some(Err(())) => return Err(ErrorKind::InvalidToken),
-                    None => return Ok(()),
-                }
-            }
-        }
-
-        fn link_local_syms(&mut self) -> Result<(), ErrorKind> {
-            for (ix, sym) in &self.to_sub_label {
-                self.label_map
-                    .get(sym)
-                    .ok_or(ErrorKind::InvalidSymbol)?
-                    .to_le_bytes()
-                    .iter()
-                    .enumerate()
-                    .for_each(|(i, b)| {
-                        self.buf[ix + i] = *b;
-                    });
-            }
-
-            Ok(())
-        }
-
-        fn insert_imm(&mut self) -> Result<(), ErrorKind> {
-            let imm = match self.next()? {
-                Token::Integer(i) => i.to_le_bytes(),
-                Token::Symbol(s) => {
-                    self.to_sub_label.insert(self.buf.len(), s);
-                    [0; 8]
-                }
-                _ => return Err(ErrorKind::UnexpectedToken),
-            };
-            self.buf.extend(imm);
-            Ok(())
-        }
-    }
-
-    let mut asm = Assembler {
-        lexer: Token::lexer(code),
-        label_map: Default::default(),
-        to_sub_label: Default::default(),
-        buf,
-    };
-
-    asm.assemble().map_err(|kind| Error {
-        kind,
-        span: asm.lexer.span(),
-    })?;
-
-    asm.link_local_syms()
-        .map_err(|kind| Error { kind, span: 0..0 })
-}

hbbytecode/hbbytecode.h

@@ -4,57 +4,57 @@
 
 #pragma once
 #include <assert.h>
-#include <limits.h>
 #include <stdint.h>
 
-static_assert(CHAR_BIT == 8, "Cursed architectures are not supported");
-
-enum hbbc_Opcode: uint8_t {
-    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;
+typedef enum hbbc_Opcode: uint8_t {
+    hbbc_Op_NOP, hbbc_Op_ADD, 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_MULF,
+    hbbc_Op_DIRF, hbbc_Op_ADDFI, hbbc_Op_MULFI,
+} hbbc_Opcode;
 
 static_assert(sizeof(hbbc_Opcode) == 1);
 
 #pragma pack(push, 1)
-struct hbbc_ParamBBBB
+typedef struct hbbc_ParamBBBB
     { uint8_t _0; uint8_t _1; uint8_t _2; uint8_t _3; }
-    typedef hbbc_ParamBBBB;
-    static_assert(sizeof(hbbc_ParamBBBB) == 32 / 8);
+    hbbc_ParamBBBB;
+    static_assert(sizeof(hbbc_ParamBBBB) == 4);
 
-struct hbbc_ParamBBB
+typedef struct hbbc_ParamBBB
     { uint8_t _0; uint8_t _1; uint8_t _2; }
-    typedef hbbc_ParamBBB;
-    static_assert(sizeof(hbbc_ParamBBB) == 24 / 8);
+    hbbc_ParamBBB;
+    static_assert(sizeof(hbbc_ParamBBB) == 3);
 
-struct hbbc_ParamBBDH
+typedef struct hbbc_ParamBBDH
     { uint8_t _0; uint8_t _1; uint64_t _2; uint16_t _3; }
-    typedef hbbc_ParamBBDH;
-    static_assert(sizeof(hbbc_ParamBBDH) == 96 / 8);
+    hbbc_ParamBBDH;
+    static_assert(sizeof(hbbc_ParamBBDH) == 12);
 
-struct hbbc_ParamBBD
+typedef struct hbbc_ParamBBDB
+    { uint8_t _0; uint8_t _1; uint64_t _2; uint8_t _3; }
+    hbbc_ParamBBDB;
+    static_assert(sizeof(hbbc_ParamBBDB) == 11);
+
+typedef struct hbbc_ParamBBD
     { uint8_t _0; uint8_t _1; uint64_t _2; }
-    typedef hbbc_ParamBBD;
-    static_assert(sizeof(hbbc_ParamBBD) == 80 / 8);
+    hbbc_ParamBBD;
+    static_assert(sizeof(hbbc_ParamBBD) == 10);
 
-struct hbbc_ParamBB
+typedef struct hbbc_ParamBB
     { uint8_t _0; uint8_t _1; }
-    typedef hbbc_ParamBB;
-    static_assert(sizeof(hbbc_ParamBB) == 16 / 8);
+    hbbc_ParamBB;
+    static_assert(sizeof(hbbc_ParamBB) == 2);
 
-struct hbbc_ParamBD
+typedef struct hbbc_ParamBD
     { uint8_t _0; uint64_t _1; }
-    typedef hbbc_ParamBD;
-    static_assert(sizeof(hbbc_ParamBD) == 72 / 8);
+    hbbc_ParamBD;
+    static_assert(sizeof(hbbc_ParamBD) == 9);
 
 typedef uint64_t hbbc_ParamD;
-    static_assert(sizeof(hbbc_ParamD) == 64 / 8);
+    static_assert(sizeof(hbbc_ParamD) == 8);
 
 #pragma pack(pop)

hbbytecode/src/lib.rs

@@ -32,7 +32,7 @@ constmod!(pub opcode(u8) {
     CMP  = 10, "BBB; #0 ← #1 <=> #2";
     CMPU = 11, "BBB; #0 ← #1 <=> #2 (unsigned)";
     DIR  = 12, "BBBB; #0 ← #2 / #3, #1 ← #2 % #3";
-    NEG  = 13, "BB; #0 ← -#1";
+    NEG  = 13, "BB; #0 ← ~#1";
     NOT  = 14, "BB; #0 ← !#1";
 
     ADDI  = 15, "BBD; #0 ← #1 + imm #2";
@@ -64,16 +64,11 @@ constmod!(pub opcode(u8) {
     ECALL = 39, "N; Issue system call";
 
     ADDF  = 40, "BBB; #0 ← #1 +. #2";
-    SUBF = 41, "BBB; #0 ← #1 -. #2";
-    MULF = 42, "BBB; #0 ← #1 +. #2";
-    DIRF = 43, "BBBB; #0 ← #2 / #3, #1 ← #2 % #3";
-    FMAF = 44, "BBBB; #0 ← (#1 * #2) + #3";
-    NEGF = 45, "BB; #0 ← -#1";
-    ITF  = 46, "BB; #0 ← #1 as float";
-    FTI  = 47, "BB; #0 ← #1 as int";
+    MULF  = 41, "BBB; #0 ← #1 +. #2";
+    DIRF  = 42, "BBBB; #0 ← #2 / #3, #1 ← #2 % #3";
 
-    ADDFI = 48, "BBD; #0 ← #1 +. imm #2";
-    MULFI = 49, "BBD; #0 ← #1 *. imm #2";
+    ADDFI = 43, "BBD; #0 ← #1 +. imm #2";
+    MULFI = 44, "BBD; #0 ← #1 *. imm #2";
 });
 
 #[repr(packed)]
@@ -85,6 +80,9 @@ 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 ParamBBDB(pub u8, pub u8, pub u64, pub u8);
+
 #[repr(packed)]
 pub struct ParamBBD(pub u8, pub u8, pub u64);
 
@@ -99,6 +97,7 @@ pub struct ParamBD(pub u8, pub u64);
 pub unsafe trait OpParam {}
 unsafe impl OpParam for ParamBBBB {}
 unsafe impl OpParam for ParamBBB {}
+unsafe impl OpParam for ParamBBDB {}
 unsafe impl OpParam for ParamBBDH {}
 unsafe impl OpParam for ParamBBD {}
 unsafe impl OpParam for ParamBB {}

hbvm/src/lib.rs

@@ -1,6 +1,4 @@
-#![doc = include_str!("../README.md")]
 #![no_std]
-
 extern crate alloc;
 
 pub mod validate;

hbvm/src/main.rs

@@ -18,7 +18,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         return Ok(());
     } else {
         unsafe {
-            let mut vm = Vm::<_, 0>::new_unchecked(&prog, TestTrapHandler);
+            let mut vm = Vm::new_unchecked(&prog, TestTrapHandler);
             vm.memory.insert_test_page();
             println!("Program interrupt: {:?}", vm.run());
             println!("{:?}", vm.registers);

hbvm/src/validate.rs

@@ -1,5 +1,3 @@
-//! Validate if program is sound to execute
-
 /// Program validation error kind
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum ErrorKind {
@@ -49,7 +47,7 @@ pub fn validate(mut program: &[u8]) -> Result<(), Error> {
             [NOP | ECALL, rest @ ..]
             | [DIR | DIRF, _, _, _, _, rest @ ..]
             | [ADD..=CMPU | BRC | ADDF..=MULF, _, _, _, rest @ ..]
-            | [NEG..=NOT | CP..=SWA | NEGF..=FTI, _, _, rest @ ..]
+            | [NEG..=NOT | CP..=SWA, _, _, rest @ ..]
             | [LI | JMP, _, _, _, _, _, _, _, _, _, rest @ ..]
             | [ADDI..=CMPUI | BMC | JEQ..=JGTU | ADDFI..=MULFI, _, _, _, _, _, _, _, _, _, _, rest @ ..]
             | [LD..=ST, _, _, _, _, _, _, _, _, _, _, _, _, rest @ ..] => rest,

hbvm/src/vm/mem/mod.rs

@@ -1,14 +1,11 @@
-//! Program memory implementation
+mod paging;
 
-pub mod paging;
+use core::mem::MaybeUninit;
 
-use {
-    self::paging::{PageTable, Permission, PtEntry},
-    super::{trap::HandleTrap, VmRunError},
-    alloc::boxed::Box,
-    core::mem::MaybeUninit,
-    derive_more::Display,
-};
+use self::paging::{PageTable, Permission, PtEntry};
+use super::{trap::HandleTrap, VmRunError};
+use alloc::boxed::Box;
+use derive_more::Display;
 
 /// HoleyBytes virtual memory
 #[derive(Clone, Debug)]
@@ -85,7 +82,7 @@ impl Memory {
             |src, dst, count| core::ptr::copy_nonoverlapping(src, dst, count),
             traph,
         )
-        .map_err(LoadError)
+        .map_err(|_| LoadError)
     }
 
     /// Store value to an address
@@ -108,7 +105,7 @@ impl Memory {
             |dst, src, count| core::ptr::copy_nonoverlapping(src, dst, count),
             traph,
         )
-        .map_err(StoreError)
+        .map_err(|_| StoreError)
     }
 
     /// Copy a block of memory
@@ -123,7 +120,7 @@ impl Memory {
         dst: u64,
         count: usize,
         traph: &mut impl HandleTrap,
-    ) -> Result<(), BlkCopyError> {
+    ) -> Result<(), MemoryAccessReason> {
         // Yea, i know it is possible to do this more efficiently, but I am too lazy.
 
         const STACK_BUFFER_SIZE: usize = 512;
@@ -162,10 +159,7 @@ impl Memory {
                 |src, dst, count| core::ptr::copy(src, dst, count),
                 traph,
             )
-            .map_err(|addr| BlkCopyError {
-                access_reason: MemoryAccessReason::Load,
-                addr,
-            })?;
+            .map_err(|_| MemoryAccessReason::Load)?;
 
             // Store from buffer
             self.memory_access(
@@ -177,12 +171,9 @@ impl Memory {
                 |dst, src, count| core::ptr::copy(src, dst, count),
                 traph,
             )
-            .map_err(|addr| BlkCopyError {
-                access_reason: MemoryAccessReason::Store,
-                addr,
-            })?;
+            .map_err(|_| MemoryAccessReason::Store)?;
 
-            Ok::<_, BlkCopyError>(())
+            Ok::<_, MemoryAccessReason>(())
         })();
 
         // Deallocate if used heap-allocated array
@@ -210,19 +201,14 @@ impl Memory {
         permission_check: fn(Permission) -> bool,
         action: fn(*mut u8, *mut u8, usize),
         traph: &mut impl HandleTrap,
-    ) -> Result<(), u64> {
+    ) -> Result<(), ()> {
         let mut pspl = AddrSplitter::new(src, len, self.root_pt);
         loop {
             match pspl.next() {
                 // Page found
-                Some(Ok(AddrSplitOk {
-                    vaddr,
-                    ptr,
-                    size,
-                    perm,
-                })) => {
+                Some(Ok(AddrSplitOk { ptr, size, perm })) => {
                     if !permission_check(perm) {
-                        return Err(vaddr);
+                        return Err(());
                     }
 
                     // Perform memory action and bump dst pointer
@@ -238,7 +224,7 @@ impl Memory {
                         // Bump dst pointer
                         dst = unsafe { dst.add(size as _) };
                     } else {
-                        return Err(addr); // Unhandleable
+                        return Err(()); // Unhandleable
                     }
                 }
                 None => return Ok(()),
@@ -249,9 +235,6 @@ impl Memory {
 
 /// Result from address split
 struct AddrSplitOk {
-    /// Virtual address
-    vaddr: u64,
-
     /// Pointer to the start for perform operation
     ptr: *mut u8,
 
@@ -355,7 +338,6 @@ impl Iterator for AddrSplitter {
         self.bump(size);
 
         Some(Ok(AddrSplitOk {
-            vaddr: self.addr,
             ptr: unsafe { base.add(offset) }, // Return pointer to the start of region
             size: avail,
             perm,
@@ -390,11 +372,11 @@ impl PageSize {
 
 /// Unhandled load access trap
 #[derive(Clone, Copy, Display, Debug, PartialEq, Eq)]
-pub struct LoadError(u64);
+pub struct LoadError;
 
 /// Unhandled store access trap
 #[derive(Clone, Copy, Display, Debug, PartialEq, Eq)]
-pub struct StoreError(u64);
+pub struct StoreError;
 
 #[derive(Clone, Copy, Display, Debug, PartialEq, Eq)]
 pub enum MemoryAccessReason {
@@ -402,29 +384,23 @@ pub enum MemoryAccessReason {
     Store,
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct BlkCopyError {
-    access_reason: MemoryAccessReason,
-    addr: u64,
-}
-
-impl From<BlkCopyError> for VmRunError {
-    fn from(value: BlkCopyError) -> Self {
-        match value.access_reason {
-            MemoryAccessReason::Load => Self::LoadAccessEx(value.addr),
-            MemoryAccessReason::Store => Self::StoreAccessEx(value.addr),
+impl From<MemoryAccessReason> for VmRunError {
+    fn from(value: MemoryAccessReason) -> Self {
+        match value {
+            MemoryAccessReason::Load => Self::LoadAccessEx,
+            MemoryAccessReason::Store => Self::StoreAccessEx,
         }
     }
 }
 
 impl From<LoadError> for VmRunError {
-    fn from(value: LoadError) -> Self {
-        Self::LoadAccessEx(value.0)
+    fn from(_: LoadError) -> Self {
+        Self::LoadAccessEx
     }
 }
 
 impl From<StoreError> for VmRunError {
-    fn from(value: StoreError) -> Self {
-        Self::StoreAccessEx(value.0)
+    fn from(_: StoreError) -> Self {
+        Self::StoreAccessEx
     }
 }

hbvm/src/vm/mem/paging.rs

@@ -1,14 +1,10 @@
-//! Page table and associated structures implementation
-
-use {
-    core::{
+use core::{
     fmt::Debug,
     mem::MaybeUninit,
     ops::{Index, IndexMut},
     slice::SliceIndex,
-    },
-    delegate::delegate,
 };
+use delegate::delegate;
 
 /// Page entry permission
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
@@ -32,10 +28,6 @@ pub enum Permission {
 pub struct PtEntry(u64);
 impl PtEntry {
     /// Create new
-    ///
-    /// # Safety
-    /// - `ptr` has to point to valid data and shall not be deallocated
-    ///    troughout the entry lifetime
     #[inline]
     pub unsafe fn new(ptr: *mut PtPointedData, permission: Permission) -> Self {
         Self(ptr as u64 | permission as u64)
@@ -63,6 +55,7 @@ impl Debug for PtEntry {
     }
 }
 
+
 /// Page table
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 #[repr(align(4096))]
@@ -70,43 +63,15 @@ pub struct PageTable([PtEntry; 512]);
 
 impl PageTable {
     delegate!(to self.0 {
-        /// Returns a reference to an element or subslice depending on the type of
-        /// index.
-        ///
-        /// - If given a position, returns a reference to the element at that
-        ///   position or `None` if out of bounds.
-        /// - If given a range, returns the subslice corresponding to that range,
-        ///   or `None` if out of bounds.
-        ///
-        pub fn get<I>(&self, ix: I) -> Option<&I::Output>
+        pub unsafe fn get<I>(&self, ix: I) -> Option<&I::Output>
             where I: SliceIndex<[PtEntry]>;
 
-        /// Returns a mutable reference to an element or subslice depending on the
-        /// type of index (see [`get`]) or `None` if the index is out of bounds.
-        pub fn get_mut<I>(&mut self, ix: I) -> Option<&mut I::Output>
+        pub unsafe fn get_mut<I>(&mut self, ix: I) -> Option<&mut I::Output>
             where I: SliceIndex<[PtEntry]>;
 
-        /// Returns a reference to an element or subslice, without doing bounds
-        /// checking.
-        ///
-        /// For a safe alternative see [`get`].
-        ///
-        /// # Safety
-        ///
-        /// Calling this method with an out-of-bounds index is *[undefined behavior]*
-        /// even if the resulting reference is not used.
         pub unsafe fn get_unchecked<I>(&self, index: I) -> &I::Output
             where I: SliceIndex<[PtEntry]>;
 
-        /// Returns a mutable reference to an element or subslice, without doing
-        /// bounds checking.
-        ///
-        /// For a safe alternative see [`get_mut`].
-        ///
-        /// # Safety
-        ///
-        /// Calling this method with an out-of-bounds index is *[undefined behavior]*
-        /// even if the resulting reference is not used.
         pub unsafe fn get_unchecked_mut<I>(&mut self, index: I) -> &mut I::Output
             where I: SliceIndex<[PtEntry]>;
     });

hbvm/src/vm/mod.rs

@@ -50,7 +50,8 @@ macro_rules! binary_op {
             $handler(
                 Value::$ty(&$self.read_reg(a0)),
                 Value::$ty(&$self.read_reg(a1)),
-            ),
+            )
+            .into(),
         );
     }};
 }
@@ -61,7 +62,7 @@ macro_rules! binary_op_imm {
         let ParamBBD(tg, a0, imm) = param!($self, ParamBBD);
         $self.write_reg(
             tg,
-            $handler(Value::$ty(&$self.read_reg(a0)), Value::$ty(&imm.into())),
+            $handler(Value::$ty(&$self.read_reg(a0)), Value::$ty(&imm.into())).into(),
         );
     }};
 }
@@ -79,7 +80,7 @@ macro_rules! cond_jump {
 }
 
 /// HoleyBytes Virtual Machine
-pub struct Vm<'a, T, const TIMER_QUOTIENT: usize> {
+pub struct Vm<'a, T> {
     /// Holds 256 registers
     ///
     /// Writing to register 0 is considered undefined behaviour
@@ -97,12 +98,9 @@ pub struct Vm<'a, T, const TIMER_QUOTIENT: usize> {
 
     /// Program
     program: &'a [u8],
-
-    /// Program timer
-    timer: usize,
 }
 
-impl<'a, T: HandleTrap, const TIMER_QUOTIENT: usize> Vm<'a, T, TIMER_QUOTIENT> {
+impl<'a, T: HandleTrap> Vm<'a, T> {
     /// Create a new VM with program and trap handler
     ///
     /// # Safety
@@ -114,7 +112,6 @@ impl<'a, T: HandleTrap, const TIMER_QUOTIENT: usize> Vm<'a, T, TIMER_QUOTIENT> {
             traph,
             pc: 0,
             program,
-            timer: 0,
         }
     }
 
@@ -127,12 +124,12 @@ impl<'a, T: HandleTrap, const TIMER_QUOTIENT: usize> Vm<'a, T, TIMER_QUOTIENT> {
     /// Execute program
     ///
     /// Program can return [`VmRunError`] if a trap handling failed
-    pub fn run(&mut self) -> Result<VmRunOk, VmRunError> {
+    pub fn run(&mut self) -> Result<(), VmRunError> {
         use hbbytecode::opcode::*;
         loop {
             // Fetch instruction
             let Some(&opcode) = self.program.get(self.pc)
-                else { return Ok(VmRunOk::End) };
+                else { return Ok(()) };
 
             // Big match
             unsafe {
@@ -151,19 +148,21 @@ impl<'a, T: HandleTrap, const TIMER_QUOTIENT: usize> Vm<'a, T, TIMER_QUOTIENT> {
                         let ParamBBB(tg, a0, a1) = param!(self, ParamBBB);
                         self.write_reg(
                             tg,
-                            self.read_reg(a0).as_i64().cmp(&self.read_reg(a1).as_i64()) as i64,
+                            (self.read_reg(a0).as_i64().cmp(&self.read_reg(a1).as_i64()) as i64)
+                                .into(),
                         );
                     }
                     CMPU => {
                         let ParamBBB(tg, a0, a1) = param!(self, ParamBBB);
                         self.write_reg(
                             tg,
-                            self.read_reg(a0).as_u64().cmp(&self.read_reg(a1).as_u64()) as i64,
+                            (self.read_reg(a0).as_u64().cmp(&self.read_reg(a1).as_u64()) as i64)
+                                .into(),
                         );
                     }
                     NOT => {
                         let param = param!(self, ParamBB);
-                        self.write_reg(param.0, !self.read_reg(param.1).as_u64());
+                        self.write_reg(param.0, (!self.read_reg(param.1).as_u64()).into());
                     }
                     NEG => {
                         let param = param!(self, ParamBB);
@@ -172,15 +171,16 @@ impl<'a, T: HandleTrap, const TIMER_QUOTIENT: usize> Vm<'a, T, TIMER_QUOTIENT> {
                             match self.read_reg(param.1).as_u64() {
                                 0 => 1_u64,
                                 _ => 0,
-                            },
+                            }
+                            .into(),
                         );
                     }
                     DIR => {
                         let ParamBBBB(dt, rt, a0, a1) = param!(self, ParamBBBB);
                         let a0 = self.read_reg(a0).as_u64();
                         let a1 = self.read_reg(a1).as_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));
+                        self.write_reg(dt, (a0.checked_div(a1).unwrap_or(u64::MAX)).into());
+                        self.write_reg(rt, (a0.checked_rem(a1).unwrap_or(u64::MAX)).into());
                     }
                     ADDI => binary_op_imm!(self, as_u64, ops::Add::add),
                     MULI => binary_op_imm!(self, as_u64, ops::Mul::mul),
@@ -194,12 +194,13 @@ impl<'a, T: HandleTrap, const TIMER_QUOTIENT: usize> Vm<'a, T, TIMER_QUOTIENT> {
                         let ParamBBD(tg, a0, imm) = param!(self, ParamBBD);
                         self.write_reg(
                             tg,
-                            self.read_reg(a0).as_i64().cmp(&Value::from(imm).as_i64()) as i64,
+                            (self.read_reg(a0).as_i64().cmp(&Value::from(imm).as_i64()) as i64)
+                                .into(),
                         );
                     }
                     CMPUI => {
                         let ParamBBD(tg, a0, imm) = param!(self, ParamBBD);
-                        self.write_reg(tg, self.read_reg(a0).as_u64().cmp(&imm) as i64);
+                        self.write_reg(tg, (self.read_reg(a0).as_u64().cmp(&imm) as i64).into());
                     }
                     CP => {
                         let param = param!(self, ParamBB);
@@ -216,7 +217,7 @@ impl<'a, T: HandleTrap, const TIMER_QUOTIENT: usize> Vm<'a, T, TIMER_QUOTIENT> {
                     }
                     LI => {
                         let param = param!(self, ParamBD);
-                        self.write_reg(param.0, param.1);
+                        self.write_reg(param.0, param.1.into());
                     }
                     LD => {
                         let ParamBBDH(dst, base, off, count) = param!(self, ParamBBDH);
@@ -279,34 +280,13 @@ impl<'a, T: HandleTrap, const TIMER_QUOTIENT: usize> Vm<'a, T, TIMER_QUOTIENT> {
                             .ecall(&mut self.registers, &mut self.pc, &mut self.memory);
                     }
                     ADDF => binary_op!(self, as_f64, ops::Add::add),
-                    SUBF => binary_op!(self, as_f64, ops::Sub::sub),
                     MULF => binary_op!(self, as_f64, ops::Mul::mul),
                     DIRF => {
                         let ParamBBBB(dt, rt, a0, a1) = param!(self, ParamBBBB);
                         let a0 = self.read_reg(a0).as_f64();
                         let a1 = self.read_reg(a1).as_f64();
-                        self.write_reg(dt, a0 / a1);
-                        self.write_reg(rt, a0 % a1);
-                    }
-                    FMAF => {
-                        let ParamBBBB(dt, a0, a1, a2) = param!(self, ParamBBBB);
-                        self.write_reg(
-                            dt,
-                            self.read_reg(a0).as_f64() * self.read_reg(a1).as_f64()
-                                + self.read_reg(a2).as_f64(),
-                        );
-                    }
-                    NEGF => {
-                        let ParamBB(dt, a0) = param!(self, ParamBB);
-                        self.write_reg(dt, -self.read_reg(a0).as_f64());
-                    }
-                    ITF => {
-                        let ParamBB(dt, a0) = param!(self, ParamBB);
-                        self.write_reg(dt, self.read_reg(a0).as_i64() as f64);
-                    }
-                    FTI => {
-                        let ParamBB(dt, a0) = param!(self, ParamBB);
-                        self.write_reg(dt, self.read_reg(a0).as_f64() as i64);
+                        self.write_reg(dt, (a0 / a1).into());
+                        self.write_reg(rt, (a0 % a1).into());
                     }
                     ADDFI => binary_op_imm!(self, as_f64, ops::Add::add),
                     MULFI => binary_op_imm!(self, as_f64, ops::Mul::mul),
@@ -317,18 +297,11 @@ impl<'a, T: HandleTrap, const TIMER_QUOTIENT: usize> Vm<'a, T, TIMER_QUOTIENT> {
                             &mut self.memory,
                             op,
                         ) {
-                            return Err(VmRunError::InvalidOpcodeEx(op));
+                            return Err(VmRunError::InvalidOpcodeEx);
                         }
                     }
                 }
             }
-
-            if TIMER_QUOTIENT != 0 {
-                self.timer = self.timer.wrapping_add(1);
-                if self.timer % TIMER_QUOTIENT == 0 {
-                    return Ok(VmRunOk::Timer);
-                }
-            }
         }
     }
 
@@ -341,9 +314,9 @@ impl<'a, T: HandleTrap, const TIMER_QUOTIENT: usize> Vm<'a, T, TIMER_QUOTIENT> {
     /// Write a register.
     /// Writing to register 0 is no-op.
     #[inline]
-    unsafe fn write_reg(&mut self, n: u8, value: impl Into<Value>) {
+    unsafe fn write_reg(&mut self, n: u8, value: Value) {
         if n != 0 {
-            *self.registers.get_unchecked_mut(n as usize) = value.into();
+            *self.registers.get_unchecked_mut(n as usize) = value;
         }
     }
 }
@@ -353,21 +326,11 @@ impl<'a, T: HandleTrap, const TIMER_QUOTIENT: usize> Vm<'a, T, TIMER_QUOTIENT> {
 #[repr(u8)]
 pub enum VmRunError {
     /// Unhandled invalid opcode exceptions
-    InvalidOpcodeEx(u8),
+    InvalidOpcodeEx,
 
     /// Unhandled load access exception
-    LoadAccessEx(u64),
+    LoadAccessEx,
 
     /// Unhandled store access exception
-    StoreAccessEx(u64),
-}
-
-/// 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,
+    StoreAccessEx,
 }

hbvm/src/vm/trap.rs

@@ -1,5 +1,3 @@
-//! Program trap handling interfaces
-
 use super::{
     mem::{Memory, MemoryAccessReason, PageSize},
     value::Value,

hbvm/src/vm/value.rs

@@ -1,5 +1,3 @@
-//! HoleyBytes register value definition
-
 use core::fmt::Debug;
 
 /// Define [`Value`] union

rust-toolchain

@@ -1 +1 @@
-nightly
+stable

rustfmt.toml

@@ -1,4 +1,3 @@
 hex_literal_case = "Upper"
 imports_granularity = "One"
 struct_field_align_threshold = 5
-enum_discrim_align_threshold = 5

spec.md

@@ -19,6 +19,7 @@
 | BBBB | 32 bits |
 | BBB  | 24 bits |
 | BBDH | 96 bits |
+| BBDB | 88 bits |
 | BBD  | 80 bits |
 |  BB  | 16 bits |
 |  BD  | 72 bits |
@@ -199,38 +200,14 @@
 | Opcode | Name |     Action     |
 |:------:|:----:|:--------------:|
 |   40   | ADDF |    Addition    |
-|   41   | SUBF |  Subtraction   |
-|   42   | MULF | Multiplication |
+|   41   | MULF | Multiplication |
 
 ### Division-remainder
 - Type BBBB
 
 | Opcode | Name |                 Action                 |
-|:------:|:----:|:-------------------------:|
-|   43   | DIRF | Same as for integer `DIR` |
-
-### Fused Multiply-Add
-- Type BBBB
-
-| Opcode | Name |        Action         |
-|:------:|:----:|:---------------------:|
-|   44   | FMAF | `#0 ← (#1 * #2) + #3` |
-
-### Negation
-- Type BB
-| Opcode | Name |   Action   |
-|:------:|:----:|:----------:|
-|   45   | NEGF | `#0 ← -#1` |
-
-### Conversion
-- Type BB
-- Signed
-- `#0 ← #1 as _`
-
-| Opcode | Name |    Action    |
-|:------:|:----:|:------------:|
-|   46   | ITF  | Int to Float |
-|   47   | FTI  | Float to Int |
+|:------:|:----:|:--------------------------------------:|
+|   42   | DIRF | Same flow applies as for integer `DIR` |
 
 ## Floating point immediate operations
 - Type BBD
@@ -238,8 +215,8 @@
 
 | Opcode | Name  |     Action     |
 |:------:|:-----:|:--------------:|
-|   48   | ADDFI |    Addition    |
-|   49   | MULFI | Multiplication |
+|   43   | ADDFI |    Addition    |
+|   44   | MULFI | Multiplication |
 
 # Registers
 - There is 255 registers + one zero register (with index 0)