remove unused code

README.md

@@ -2,50 +2,18 @@ Call me Terry Davis because... actually please don't. I have visions: aspiration
 
 # bootle
 
-hobby kernel written in rust. It's just for playing around... for now :p
+hobby kernel
 
-run with `nix run git+https://git.mtgmonkey.net/andromeda/bootler#bootle`
+status: basically nothing, come back later
 
 # bootler
 
-hobby bootloader written in asm. It's just for playing around... for now :p
+hobby 1-stage legacy mode bootloader
 
-run with `nix run git+https://git.mtgmonkey.net/andromeda/bootler#bootler`
+status: gets to long mode, loads+jumps to kernel, starts idt and gdt... :)
 
-### memory map
+# twasm
 
-```
+hobby self-hosted assembler
-+------ 0x00100000 ------+
+
-| hardware, bios stuff   |
+status: basically nothing, come back later
-+------ 0x00080000 ------+
-|                        |
-|                        |
-+------ 0x00010200 ------+
-| x86_64 kernel          |
-+------ 0x00010000 ------+
-|                        |
-|                        |
-+------ 0x00009000 ------+
-| IDT                    |
-+------ 0x00008000 ------+
-|                        |
-|                        |
-+------ 0x00007E00 ------+
-| bootloader (boot.asm)  |
-+------ 0x00007C00 ------+
-| stack                  | TODO get real stack
-+------ 0x00005000 ------+
-| PT                     |
-+------ 0x00004000 ------+
-| PDT                    |
-+------ 0x00003000 ------+
-| PDPT                   |
-+------ 0x00002000 ------+
-| PML4T                  |
-+------ 0x00001000 ------+
-|                        |
-|                        |
-+------ 0x00000500 ------+
-| bios stuff             |
-+------ 0x00000000 ------+
-```

bootle/README.md

@@ -0,0 +1,28 @@
+# bootle
+
+hobby kernel written in rust. It's just for playing around... for now :p
+
+run with `nix run git+https://git.mtgmonkey.net/andromeda/bootler#bootle`
+
+### memory map
+
+```
++------ 0x00100000 ------+
+| hardware, bios stuff   |
++------ 0x00080000 ------+
+|                        |
+|                        |
++------ 0x00010200 ------+
+| kernel                 |
++------ 0x00010000 ------+
+| bootloader stuff       |
+| includes stack, gdt,   |
+| idt for the time being |
++------ 0x00000500 ------+
+| bios stuff             |
++------ 0x00000000 ------+
+```
+
+---
+
+this project follows [Common Changelog](https://common-changelog.org) guidelines

bootle/package.nix

@@ -6,27 +6,28 @@
   qemu,
   ...
 }: let
-  rust-toolchain = rust-bin.fromRustupToolchainFile ../../rust-toolchain.toml;
+  rust-toolchain = rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
   naersk' = callPackage naersk {
     cargo = rust-toolchain;
     rustc = rust-toolchain;
     clippy = rust-toolchain;
   };
 in (naersk'.buildPackage {
-  src = ../../.;
+  src = ./.;
 
   # deps for rust-src
   additionalCargoLock = "${rust-toolchain.availableComponents.rust-src}/lib/rustlib/src/rust/library/Cargo.lock";
 
   # just library build
   copyBins = false;
+  copyLibs = true;
   release = true;
 
   # build std
   cargoBuildOptions = x:
     x
     ++ [
-      "-Zbuild-std=core,compiler_builtins"
+      "-Zbuild-std"
     ];
 
   postInstall = ''
@@ -36,7 +37,7 @@ in (naersk'.buildPackage {
       -e _start \
       target/x86_64-unknown-none/release/libbootle.a
 
-    dd if=/dev/zero of=disk bs=512 count=2
+    dd if=/dev/zero of=disk bs=512 count=2880
     dd if=${bootler}/bin/boot.bin of=disk conv=notrunc
     dd if=kernel.bin of=disk bs=512 seek=1 conv=notrunc
 

bootle/src/lib.rs

@@ -12,11 +12,13 @@ pub extern "C" fn _start() -> ! {
 fn print_serial(s: &str) {
     let mut bytes = s.bytes();
     while let Some(b) = bytes.next() {
-        unsafe {core::arch::asm!(
+        unsafe {
-            "out dx, al"
+            core::arch::asm!(
-            , in("al") b
+                "out dx, al"
-        )};
+                , in("al") b
-    };
+            )
+        };
+    }
 }
 
 fn println_serial(s: &str) {
@@ -28,7 +30,11 @@ fn welcome_serial() {
     print_serial(ANSI_PINK);
     println_serial("\nWelcome to Bootle OS");
     println_serial("All code GPL licensed and freely available on git.mtgmonkey.net");
-    print_serial("Enjoy your time! Press "); print_serial(ANSI_RED); print_serial("ctrl+a x"); print_serial(ANSI_PINK); println_serial(" to escape Qemu");
+    print_serial("Enjoy your time! Press ");
+    print_serial(ANSI_RED);
+    print_serial("ctrl+a x");
+    print_serial(ANSI_PINK);
+    println_serial(" to escape Qemu");
     print_serial(ANSI_CLEAR);
 }
 
@@ -39,9 +45,7 @@ fn panic(_: &PanicInfo) -> ! {
 }
 
 fn halt() -> ! {
-    unsafe {core::arch::asm!(
+    unsafe { core::arch::asm!("hlt") };
-        "hlt"
-    )};
     halt()
 }
 

bootler/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## [0.1.0] - 2026-03-06
+
+### Added
+
+- initialised CHANGELOG.md

bootler/README.md

@@ -0,0 +1,43 @@
+# bootler
+
+hobby bootloader, 1-stage, legacy mode :p
+
+run with `nix run git+https://git.mtgmonkey.net/andromeda/bootler#bootler`
+
+### memory map
+
+```
+.                        .
+:                        :
+| longmode kernel        |
++------ 0x00010000 ------+
+|                        |
+|                        |
++------ 0x00009000 ------+
+| IDT                    |
++------ 0x00008000 ------+
+|                        |
+|                        |
++------ 0x00007E00 ------+
+| bootloader (boot.asm)  |
++------ 0x00007C00 ------+
+| stack                  |
++------ 0x00005000 ------+
+| PT                     |
++------ 0x00004000 ------+
+| PDT                    |
++------ 0x00003000 ------+
+| PDPT                   |
++------ 0x00002000 ------+
+| PML4T                  |
++------ 0x00001000 ------+
+|                        |
+|                        |
++------ 0x00000500 ------+
+| bios stuff             |
++------ 0x00000000 ------+
+```
+
+---
+
+this project follows [Common Changelog](https://common-changelog.org) guidelines

bootler/asm/boot.asm

@@ -6,7 +6,7 @@
 LOAD_ADDR equ 0x7C00
 
 KERNEL_START equ 2             ; first sector on disk to load kernel from; 1 indexed
-KERNEL_SIZE equ 1              ; length of kernel in sectors
+KERNEL_SIZE equ 16             ; length of kernel in sectors
 KERNEL_LOAD_ADDR_ES equ 0x1000 ; kernel to be loaded at es * 0x10 + 0x0000
 
 PAGE_TABLE_LOAD_ADDR equ 0x1000 ; start of page table; 4 * pt size 

bootler/package.nix

@@ -9,19 +9,18 @@ in
   stdenv.mkDerivation {
     pname = "bootler";
     version = "0.1.0";
-    src = ../../.;
+    src = ./.;
     buildPhase = ''
       ${nasm}/bin/nasm asm/boot.asm -o boot.bin
       ${nasm}/bin/nasm asm/kernel.asm -o dummy.bin
 
-      dd if=/dev/zero of=${bootImg} bs=512 count=2
+      dd if=/dev/zero of=${bootImg} bs=512 count=2880
       dd if=boot.bin of=${bootImg} conv=notrunc
       dd if=dummy.bin of=${bootImg} bs=512 seek=1 conv=notrunc
     '';
     installPhase = ''
       mkdir -p $out/bin
       cp boot.bin $out/bin
-      cp dummy.bin $out/bin
       cp ${bootImg} $out/bin
 
       # create emulation binary

flake.nix

@@ -18,20 +18,25 @@
     ...
   }: let
     system = "x86_64-linux";
-    pkgs = import nixpkgs {
+    pkgs = nixpkgs.legacyPackages.${system};
-      inherit system;
+    pkgsWithRustOverlay = pkgs.extend (import rust-overlay);
-      overlays = [(import rust-overlay)];
-    };
   in {
     packages.${system} = {
-      bootler = pkgs.callPackage ./nix/pkgs/bootler.nix {};
+      bootler = pkgs.callPackage ./bootler/package.nix {};
-      bootle = pkgs.callPackage ./nix/pkgs/bootle.nix {
+      bootle = pkgsWithRustOverlay.callPackage ./bootle/package.nix {
-        naersk = naersk;
+        inherit naersk;
+        bootler = self.packages.${system}.bootler;
+      };
+      twasm = pkgs.callPackage ./twasm/package.nix {
         bootler = self.packages.${system}.bootler;
       };
     };
     devShells.${system}.default = pkgs.mkShell {
-      inputsFrom = [self.packages.${system}.default];
+      inputsFrom = [
+        self.packages.${system}.bootle
+        self.packages.${system}.bootler
+        self.packages.${system}.twasm
+      ];
     };
   };
 }

nix/package.nix

@@ -1,47 +0,0 @@
-{
-  stdenv,
-  nasm,
-  qemu,
-  ...
-}: let
-  bootImg = "boot";
-in
-  stdenv.mkDerivation {
-    pname = "bootler";
-    version = "0.1.0";
-    src = ../.;
-    buildPhase = ''
-      ${nasm}/bin/nasm asm/boot.asm -o boot.bin
-      ${nasm}/bin/nasm asm/kernel.asm -o kernel.bin
-
-      dd if=/dev/zero of=${bootImg} bs=512 count=2
-      dd if=boot.bin of=${bootImg} conv=notrunc
-      dd if=kernel.bin of=${bootImg} bs=512 seek=1 conv=notrunc
-    '';
-    installPhase = ''
-      mkdir -p $out/bin
-      cp ${bootImg} $out/bin
-
-      # create emulation binary
-      cat<<EOF>$out/bin/bootler
-      #!/usr/bin/env bash
-
-      # create temp dir
-      mkdir -p ./.bootler
-      cp $(echo $out)/bin/${bootImg} ./.bootler/${bootImg}
-      chmod a+w ./.bootler/${bootImg}
-
-      # run image
-      ${qemu}/bin/qemu-system-x86_64 \
-        -nographic \
-        -drive file=./.bootler/${bootImg},format=raw,index=0,media=disk
-
-      # clean up
-      rm ./.bootler -r
-
-      EOF
-
-      chmod +x $out/bin/${bootImg}
-      chmod +x $out/bin/bootler
-    '';
-  }

twasm/README.md

@@ -0,0 +1,342 @@
+# twasm
+
+this will be a self hosted, very minimal subset of nasm-style 64 bit asm
+
+### goals
+
+I want to compile Bootler and Twasm with the Twasm assembler
+
+### reading
+
+- [instructions](https://www.felixcloutier.com/x86/)
+- [opcodes,ModR/M,SIB](http://ref.x86asm.net/coder64.html) (no secure site available)
+- [calling conventions](https://wiki.osdev.org/Calling_Conventions); I try to use System V
+
+### memory map
+
+```
++------ 0x00100000 ------+
+| hardware, bios stuff   |
++------ 0x00080000 ------+
+| output binary          |
++------ 0x00070000 ------+
+| token table            |
++------ 0x00060000 ------+
+| test arena             |
++------ 0x00050000 ------+
+| stack (rsp)            |
++------------------------+
+| input                  |
++------------------------+
+| assembler              |
++------ 0x00010000 ------+
+| bootloader, bios, etc. |
++------------------------+
+```
+
+each word represents a token on the token table.
+
+#### token table (TT)
+
+each token gets loaded into the token table with the following form:
+
+```
++----------+
+| 15     0 |
++----------+
+| token id |
++----------+
+```
+
+### internal data structures
+
+#### `tokens.by_nameX`
+
+contains all tokens of that length followed by their ID. For some non-empty `tokens.by_nameX`, it is true that `tokens.by_name<X+1> - tokens.by_nameX` is the size in bytes of `tokens.by_nameX`.
+
+each entry is in the following form:
+
+```
++----------+--------------------------------+
+|[2 bytes] | 8 * token_length - 1         0 |
++----------+--------------------------------+
+| token ID | string without null terminator |
++----------+--------------------------------+
+
+```
+
+example implementation:
+
+```nasm
+tokens:
+  .by_name1:
+    db "+"
+    dw 0x0062
+    db "-"
+    dw 0x0063
+  .by_name2:
+    db "r8"
+    dw 0x0008
+  .by_name3: ; this is required for futureproofness; the caller can use this to
+             ; find the size of tokens.by_name2
+```
+
+#### `tokens.by_id`
+
+contains some tokens with their metadata. Some tokens have embedded information (`0x10XX` for instance). Those will not have entries in this table, being handled instead inside the assemble function itself.
+
+metadata about some tokens in the following form:
+
+```
++----------------+----------+-------+----------+
+| 31          24 | 23    20 | 19 16 | 15     0 |
++----------------+----------+-------+----------+
+| typed metadata | reserved | type  | token ID |
++----------------+----------+-------+----------+
+```
+
+the `type` hex digit is defined as the following:
+
+| hex | meaning  | examples |
+|-----|----------|-|
+| 0x0 | ignored  | `; this entire comment is 1 token` |
+| 0x1 | operator | `mov`, `hlt` |
+| 0x2 | register | `rsp`, `al` |
+| 0xF | unknown  | any token ID not represented in the lookup table |
+
+type metadata for the different types is as follows:
+
+```
++----------+
+| type 0x0 |
++----------+
+| 31    24 |
++----------+
+| reserved |
++----------+
+```
+
+```
++-------------------------------+
+| type 0x1                      |
++----------+--------------------+
+| 31    26 | 25              24 |
++----------+--------------------+
+| reserved | number of operands |
++----------+--------------------+
+```
+
+```
++------------------------------+
+| type 0x2                     |
++----------+-----------+-------+
+| 31    29 | 28     26 | 25 24 |
++----------+-----------+-------+
+| reserved | reg value | width |
++----------+-----------+-------+
+
+; reg is the value that cooresponds to the register in the ModR/M byte
+
+; width:
+00b ; 8 bit
+01b ; 16 bit
+10b ; 32 bit
+11b ; 64 bit
+```
+
+#### `opcodes.by_id`
+
+entries are as follows:
+
+```
++----------+--------+----------+
+| 31    24 | 23  16 | 15     0 |
++----------+--------+----------+
+| reserved | opcode | token ID |
++----------+--------+----------+
+```
+
+note the lack of support for multiple-byte opcodes or multiple opcodes for one token ID; these features will likely be added at some point after the parser accumulates too much jank.
+
+### token IDs
+
+supported tokens are listed below
+
+| token | id     | notes |
+|-------|--------|-|
+| rax   | 0x0000 | |
+| rbx   | 0x0001 | |
+| rcx   | 0x0002 | |
+| rdx   | 0x0003 | |
+| rsi   | 0x0004 | |
+| rdi   | 0x0005 | |
+| rsp   | 0x0006 | |
+| rbp   | 0x0007 | |
+| r8    | 0x0008 | |
+| r9    | 0x0009 | |
+| r10   | 0x000A | |
+| r11   | 0x000B | |
+| r12   | 0x000C | |
+| r13   | 0x000D | |
+| r14   | 0x000E | |
+| r15   | 0x000F | |
+| eax   | 0x0010 | |
+| ebx   | 0x0011 | |
+| ecx   | 0x0012 | |
+| edx   | 0x0013 | |
+| esi   | 0x0014 | |
+| edi   | 0x0015 | |
+| esp   | 0x0016 | |
+| ebp   | 0x0017 | |
+| r8d   | 0x0018 | |
+| r9d   | 0x0019 | |
+| r10d  | 0x001A | |
+| r11d  | 0x001B | |
+| r12d  | 0x001C | |
+| r13d  | 0x001D | |
+| r14d  | 0x001E | |
+| r15d  | 0x001F | |
+| ax    | 0x0020 | |
+| bx    | 0x0021 | |
+| cx    | 0x0022 | |
+| dx    | 0x0023 | |
+| si    | 0x0024 | |
+| di    | 0x0025 | |
+| sp    | 0x0026 | |
+| bp    | 0x0027 | |
+| r8w   | 0x0028 | |
+| r9w   | 0x0029 | |
+| r10w  | 0x002A | |
+| r11w  | 0x002B | |
+| r12w  | 0x002C | |
+| r13w  | 0x002D | |
+| r14w  | 0x002E | |
+| r15w  | 0x002F | |
+| al    | 0x0030 | |
+| bl    | 0x0031 | |
+| cl    | 0x0032 | |
+| dl    | 0x0033 | |
+| sil   | 0x0034 | |
+| dil   | 0x0035 | |
+| spl   | 0x0036 | |
+| bpl   | 0x0037 | |
+| r8b   | 0x0038 | |
+| r9b   | 0x0039 | |
+| r10b  | 0x003A | |
+| r11b  | 0x003B | |
+| r12b  | 0x003C | |
+| r13b  | 0x003D | |
+| r14b  | 0x003E | |
+| r15b  | 0x003F | |
+| ah    | 0x0040 | |
+| bh    | 0x0041 | |
+| ch    | 0x0042 | |
+| dh    | 0x0043 | |
+| cs    | 0x0044 | |
+| ds    | 0x0045 | |
+| es    | 0x0046 | |
+| fs    | 0x0047 | |
+| gs    | 0x0048 | |
+| ss    | 0x0049 | |
+| cr0   | 0x004A | |
+| cr2   | 0x004B | |
+| cr3   | 0x004C | |
+| cr4   | 0x004D | |
+| cr8   | 0x004E | |
+| hlt   | 0x004F | |
+| int3  | 0x0050 | |
+| [     | 0x0051 | open bracket placeholder; 0x10XX should be used in contexts where the surrounding tokens can be known |
+| ]     | 0x0052 | |
+| xor   | 0x0053 | |
+| inc   | 0x0054 | |
+| dec   | 0x0055 | |
+| mov   | 0x0056 | |
+| add   | 0x0057 | |
+| sub   | 0x0058 | |
+| call  | 0x0059 | |
+| ret   | 0x005A | |
+| cmp   | 0x005B | |
+| je    | 0x005C | |
+| jne   | 0x005D | |
+| jge   | 0x005E | |
+| jg    | 0x005F | |
+| jle   | 0x0060 | |
+| jl    | 0x0061 | |
+| +     | 0x0062 | |
+| -     | 0x0063 | |
+| *     | 0x0064 | |
+| /     | 0x0065 | |
+| [     | 0x10XX | open bracket with `XX` bytes until the closing bracket |
+|       | 0xFEXX | token terminator byte as token, where `XX` is the byte |
+|       | 0xFFFF | unrecognised token |
+
+### example program
+
+#### program in assembly
+
+this program doesn't do anything useful, it's just a test
+
+```nasm
+xor eax, eax
+inc rax
+mov [ rax ], rdx
+hlt
+
+```
+
+#### tokenization
+
+```nasm
+0x0053 ; xor
+0xFE20 ; space
+0x0010 ; eax
+0xFE2C ; comma
+0xFE20 ; space
+0x0010 ; eax
+0xFE0A ; newline
+0x0054 ; inc
+0xFE20 ; space
+0x0000 ; rax
+0xFE0A ; newline
+0x0056 ; mov
+0xFE20 ; space
+0x1004 ; open bracket (4)
+0xFE20 ; space         |1
+0x0000 ; rax           |2
+0xFE20 ; space         |3
+0x0052 ; close bracket |4
+0xFE2C ; comma
+0xFE20 ; space
+0x0003 ; rdx
+0xFE0A ; newline
+0x004F ; hlt
+0xFE0A ; newline
+0xFE00 ; null terminator
+```
+
+#### nasm output with the above example program, bits 64
+
+```nasm
+0x31 ; XOR r/m16/32/64 r16/32/64
+0xC0 ; ModR/M byte
+     ; mod 11b  ; directly address the following:
+     ; reg 000b ; EAX
+     ; r/m 000b ; EAX
+
+0x48 ; 64 Bit Operand Size prefix
+0xFF ; with `reg` from ModR/M byte 000b:
+     ; INC r/m16/32/64
+0xC0 ; ModR/M byte
+     ; mod 11b  ; direct addressing
+     ; reg 000b ; RAX
+     ; r/m 000b ; RAX
+
+0x48 ; 64 Bit Operand Size prefix
+0x89 ; MOV r/m16/32/64 r16/32/64
+0x10 ; ModR/M byte
+     ; mod 00b  ; indirect addressing, no displacement
+     ; reg 010b ; RDX
+     ; r/m 000b ; [RAX]
+
+0xF4 ; HLT
+```

twasm/asm/tests.asm

@@ -0,0 +1,520 @@
+; ------------------------------------------------------------------------------
+; tests
+; ------------------------------------------------------------------------------
+
+; ------------------------------------------------------------------------------
+; run_tests
+;
+; description:
+; runs all tests
+; ------------------------------------------------------------------------------
+
+run_tests:
+  mov rsi, .msg
+  call print.test
+
+  call clear_test_arena
+  call test_elemb
+
+  call clear_test_arena
+  call test_identify_token
+
+  call clear_test_arena
+  call test_identify_next_token
+
+  call clear_test_arena
+  call test_get_tte_type
+
+  call clear_test_arena
+  call test_get_tte_typed_metadata
+
+  call clear_test_arena
+  call test_get_direct_addressing_ModRM
+
+  call clear_test_arena
+  call test_get_opcode
+
+  call clear_test_arena
+  call test_get_reg_bits
+
+  ret
+  .msg db "running test suite...", 0x0A, 0x00
+
+; ------------------------------------------------------------------------------
+; test_elemb
+;
+; description:
+; tests elemb described functionality
+; ------------------------------------------------------------------------------
+
+test_elemb:
+  mov rsi, .msg
+  call print.test
+
+  ; [0]
+  mov rdi, 5
+  mov rsi, test_elemb_5
+  mov dl, [test_elemb_5]
+  call elemb
+  cmp al, 1
+  jne .fail
+
+  ; [n - 1]
+  mov rdi, 5
+  mov rsi, test_elemb_5
+  mov dl, [test_elemb_5 + 4]
+  call elemb
+  cmp al, 1
+  jne .fail
+
+  ; [1]
+  mov rdi, 5
+  mov rsi, test_elemb_5
+  mov dl, [test_elemb_5 + 1]
+  call elemb
+  cmp al, 1
+  jne .fail
+
+  ; not present
+  mov rdi, 5
+  mov rsi, test_elemb_5
+  mov dl, 0xDA
+  call elemb
+  cmp al, 0
+  jne .fail
+
+  ; 0 length list
+  mov rdi, 0
+  mov rsi, test_elemb_0
+  mov dl, 0x34
+  call elemb
+  cmp al, 0
+  jne .fail
+
+  .pass:
+    mov rsi, msg_pass
+    call print
+    ret
+  .fail:
+    mov rsi, msg_fail
+    call print
+    ret
+  .msg db "test_elemb...", 0x00
+
+; ------------------------------------------------------------------------------
+; test_identify_token
+;
+; description:
+; tests identify_token described functionality
+; ------------------------------------------------------------------------------
+
+test_identify_token:
+  mov rsi, .msg
+  call print.test
+
+  ; length1 token that exists
+  mov byte [TEST_ARENA_ADDR], "*"
+  mov rdi, TEST_ARENA_ADDR
+  mov rsi, 1
+  call identify_token
+  cmp ax, 0x0064
+  jne .fail
+
+  ; length1 token that doesn't exist
+  mov byte [TEST_ARENA_ADDR], " "
+  mov rdi, TEST_ARENA_ADDR
+  mov rsi, 1
+  call identify_token
+  cmp ax, 0xFFFF
+  jne .fail
+
+  ; length2 token that exists
+  mov word [TEST_ARENA_ADDR], "sp"
+  mov rdi, TEST_ARENA_ADDR
+  mov rsi, 2
+  call identify_token
+  cmp ax, 0x0026
+  jne .fail
+
+  ; length2 token that doesn't exist
+  mov word [TEST_ARENA_ADDR], "QQ"
+  mov rdi, TEST_ARENA_ADDR
+  mov rsi, 2
+  call identify_token
+  cmp ax, 0xFFFF
+  jne .fail
+
+  ; length3 token that exists
+  mov dword [TEST_ARENA_ADDR], "rax"
+  mov rdi, TEST_ARENA_ADDR
+  mov rsi, 3
+  call identify_token
+  cmp ax, 0x0000
+  jne .fail
+
+  ; length3 token that exists
+  mov dword [TEST_ARENA_ADDR], "cr0"
+  mov rdi, TEST_ARENA_ADDR
+  mov rsi, 3
+  call identify_token
+  cmp ax, 0x004A
+  jne .fail
+
+  ; length3 token that doesn't exist
+  mov dword [TEST_ARENA_ADDR], "r16"
+  mov rdi, TEST_ARENA_ADDR
+  mov rsi, 3
+  call identify_token
+  cmp ax, 0xFFFF
+  jne .fail
+
+  ; length4 token that exists
+  mov dword [TEST_ARENA_ADDR], "r10d"
+  mov rdi, TEST_ARENA_ADDR
+  mov rsi, 4
+  call identify_token
+  cmp ax, 0x001A
+  jne .fail
+
+  ; length4 token that exists
+  mov dword [TEST_ARENA_ADDR], "r15b"
+  mov rdi, TEST_ARENA_ADDR
+  mov rsi, 4
+  call identify_token
+  cmp ax, 0x003F
+  jne .fail
+
+  ; length4 token that doesn't exist
+  mov dword [TEST_ARENA_ADDR], "r15q"
+  mov rdi, TEST_ARENA_ADDR
+  mov rsi, 4
+  call identify_token
+  cmp ax, 0xFFFF
+  jne .fail
+
+  .pass:
+    mov rsi, msg_pass
+    call print
+    ret
+  .fail:
+    mov rsi, msg_fail
+    call print
+    ret
+  .msg db "test_identify_token...", 0x00
+
+; ------------------------------------------------------------------------------
+; test_identify_next_token
+;
+; description:
+; tests identify_next_token described functionality
+; ------------------------------------------------------------------------------
+
+test_identify_next_token:
+  mov rsi, .msg
+  call print.test
+
+  ; length1 token that exists
+  mov word [TEST_ARENA_ADDR], "* "
+  mov rdi, TEST_ARENA_ADDR
+  call identify_next_token
+  cmp ax, 0x0064
+  jne .fail
+
+  ; length1 token that doesn't exist
+  mov word [TEST_ARENA_ADDR], "  "
+  mov rdi, TEST_ARENA_ADDR
+  call identify_next_token
+  cmp ax, 0xFFFF
+  jne .fail
+
+  ; length2 token that exists
+  mov dword [TEST_ARENA_ADDR], "sp  "
+  mov rdi, TEST_ARENA_ADDR
+  call identify_next_token
+  cmp ax, 0x0026
+  jne .fail
+
+  ; length2 token that doesn't exist
+  mov dword [TEST_ARENA_ADDR], "QQ  "
+  mov rdi, TEST_ARENA_ADDR
+  call identify_next_token
+  cmp ax, 0xFFFF
+  jne .fail
+
+  ; length3 token that exists
+  mov dword [TEST_ARENA_ADDR], "rax "
+  mov rdi, TEST_ARENA_ADDR
+  call identify_next_token
+  cmp ax, 0x0000
+  jne .fail
+
+  ; length3 token that exists
+  mov dword [TEST_ARENA_ADDR], "cr0 "
+  mov rdi, TEST_ARENA_ADDR
+  call identify_next_token
+  cmp ax, 0x004A
+  jne .fail
+
+  ; length3 token that doesn't exist
+  mov dword [TEST_ARENA_ADDR], "r16 "
+  mov rdi, TEST_ARENA_ADDR
+  call identify_next_token
+  cmp ax, 0xFFFF
+  jne .fail
+
+  ; length4 token that exists
+  mov dword [TEST_ARENA_ADDR], "r10d"
+  mov byte [TEST_ARENA_ADDR + 4], " "
+  mov rdi, TEST_ARENA_ADDR
+  call identify_next_token
+  cmp ax, 0x001A
+  jne .fail
+
+  ; length4 token that exists
+  mov dword [TEST_ARENA_ADDR], "r15b"
+  mov byte [TEST_ARENA_ADDR + 4], " "
+  mov rdi, TEST_ARENA_ADDR
+  call identify_next_token
+  cmp ax, 0x003F
+  jne .fail
+
+  ; length4 token that doesn't exist
+  mov dword [TEST_ARENA_ADDR], "r15q"
+  mov byte [TEST_ARENA_ADDR + 4], " "
+  mov rdi, TEST_ARENA_ADDR
+  call identify_next_token
+  cmp ax, 0xFFFF
+  jne .fail
+
+  .pass:
+    mov rsi, msg_pass
+    call print
+    ret
+  .fail:
+    mov rsi, msg_fail
+    call print
+    ret
+  .msg db "test_identify_next_token...", 0x00
+
+
+; ------------------------------------------------------------------------------
+; test_get_tte_type
+;
+; description:
+; tests get_tte_type described functionality
+; ------------------------------------------------------------------------------
+
+test_get_tte_type:
+  mov rsi, .msg
+  call print.test
+
+  mov di, 0x0053    ; xor
+  call get_tte_type
+  cmp al, 0x01      ; operator
+  jne .fail
+
+  mov di, 0x0003    ; rdx
+  call get_tte_type
+  cmp al, 0x02      ; register
+  jne .fail
+
+  mov di, 0x0056    ; mov
+  call get_tte_type
+  cmp al, 0x01      ; operator
+  jne .fail
+
+  mov di, 0xFFFF    ; unrecognised token
+  call get_tte_type
+  cmp al, UNRECOGNISED_ID_TYPE
+  jne .fail
+
+  .pass:
+    mov rsi, msg_pass
+    call print
+    ret
+  .fail:
+    mov rsi, msg_fail
+    call print
+    ret
+  .msg db "test_get_tte_type...", 0x00
+
+; ------------------------------------------------------------------------------
+; test_get_tte_typed_metadata
+;
+; description:
+; tests get_tte_typed_metadata described functionality
+; ------------------------------------------------------------------------------
+
+test_get_tte_typed_metadata:
+  mov rsi, .msg
+  call print.test
+
+  mov di, 0x0053              ; xor
+  call get_tte_typed_metadata
+  cmp al, 0x02                ; # operands
+  jne .fail
+
+  mov di, 0x0003              ; rdx
+  call get_tte_typed_metadata
+  cmp al, 00001011b           ; reg: 010b
+                              ; width: 11b (64 bits)
+  jne .fail
+
+  mov di, 0x0056              ; mov
+  call get_tte_typed_metadata
+  cmp al, 0x02                ; # operands
+  jne .fail
+
+  mov di, 0xFFFF              ; unrecognised token
+  call get_tte_typed_metadata
+  cmp al, UNRECOGNISED_ID_METADATA
+  jne .fail
+
+  .pass:
+    mov rsi, msg_pass
+    call print
+    ret
+  .fail:
+    mov rsi, msg_fail
+    call print
+    ret
+  .msg db "test_get_tte_typed_metadata...", 0x00
+
+; ------------------------------------------------------------------------------
+; test_get_direct_addressing_ModRM
+;
+; description:
+; tests get_direct_addressing_ModRM described functionality
+; ------------------------------------------------------------------------------
+
+test_get_direct_addressing_ModRM:
+  mov rsi, .msg
+  call print.test
+
+  mov di, 0x0000 ; rax
+  mov si, 0x0000 ; rax
+  call get_direct_addressing_ModRM
+  cmp al, 11000000b ; Mod Reg R/M: 11b 000b 000b
+  jne .fail
+
+  mov di, 0x0000 ; rax
+  mov si, 0x0003 ; rdx
+  call get_direct_addressing_ModRM
+  cmp al, 11000010b ; Mod Reg R/M: 11b 000b 010b
+  jne .fail
+
+  mov di, 0x0003 ; rdx
+  mov si, 0x0000 ; rax
+  call get_direct_addressing_ModRM
+  cmp al, 11010000b ; Mod Reg R/M: 11b 010b 000b
+  jne .fail
+
+  mov di, 0x0003 ; rdx
+  mov si, 0x0003 ; rdx
+  call get_direct_addressing_ModRM
+  cmp al, 11010010b ; Mod Reg R/M 11b 010b 010b
+  jne .fail
+
+  .pass:
+    mov rsi, msg_pass
+    call print
+    ret
+  .fail:
+    mov rsi, msg_fail
+    call print
+    ret
+  .msg db "test_get_direct_addressing_ModRM...", 0x00
+
+; ------------------------------------------------------------------------------
+; test_get_opcode
+;
+; description:
+; tests get_opcode described functionality
+; ------------------------------------------------------------------------------
+
+test_get_opcode:
+  mov rsi, .msg
+  call print.test
+
+  mov di, 0x0053 ; xor
+  call get_opcode
+  cmp al, 0x31
+  jne .fail
+
+  mov di, 0x0054  ; inc
+  call get_opcode
+  cmp al, 0xFF
+  jne .fail
+
+  mov di, 0x004F  ; hlt
+  call get_opcode
+  cmp al, 0xF4
+  jne .fail
+
+  mov di, 0x0003  ; rdx (not an operator)
+  call get_opcode
+  cmp al, UNRECOGNISED_ID_OPCODE
+  jne .fail
+
+  .pass:
+    mov rsi, msg_pass
+    call print
+    ret
+  .fail:
+    mov rsi, msg_fail
+    call print
+    ret
+  .msg db "test_get_opcode...", 0x00
+
+; ------------------------------------------------------------------------------
+; test_get_reg_bits
+;
+; description:
+; tests get_reg_bits described functionality
+; ------------------------------------------------------------------------------
+
+test_get_reg_bits:
+  mov rsi, .msg
+  call print.test
+
+  mov di, 0x0000    ; rax
+  call get_reg_bits
+  cmp al, 000b
+  jne .fail
+
+  mov di, 0x0010    ; eax
+  call get_reg_bits
+  cmp al, 000b
+  jne .fail
+
+  mov di, 0x0003    ; rdx
+  call get_reg_bits
+  cmp al, 010b
+  jne .fail
+
+  .pass:
+    mov rsi, msg_pass
+    call print
+    ret
+  .fail:
+    mov rsi, msg_fail
+    call print
+    ret
+  .msg db "test_get_reg_bits...", 0x00
+
+msg_pass:
+  db 0x0A
+  times (TEST_LINE_LENGTH + .start - .end) db " ", ; right align
+  .start db "passed."
+  .end db 0x0A, 0x00
+msg_fail:
+  db 0x0A
+  times (TEST_LINE_LENGTH + .start - .end) db " ",
+  .start db "failed."
+  .end db 0x0A, 0x00
+
+test_byte db "Q" ; unterminated, just a byte chillin
+test_token_null db "TestTokn", 0x00 ; followed by null terminator. Quad word
+test_token_space db "TestTokn " ; followed by space. Quad word
+test_elemb_0: ; [This Page Intentionally Left Blank]
+test_elemb_5 db 0x54, 0x00, 0x21, 0x20, 0x34

twasm/package.nix

@@ -0,0 +1,42 @@
+{
+  bootler,
+  stdenv,
+  nasm,
+  qemu,
+  ...
+}:
+stdenv.mkDerivation {
+  pname = "twasm";
+  version = "0.1.0";
+  src = ./.;
+  buildPhase = ''
+    ${nasm}/bin/nasm asm/main.asm -o out.bin
+  '';
+  installPhase = ''
+    dd if=/dev/zero of=disk bs=512 count=2880
+    dd if=${bootler}/bin/boot.bin of=disk conv=notrunc
+    dd if=out.bin of=disk bs=512 seek=1 conv=notrunc
+
+    mkdir -p $out/bin
+
+    cat<<EOF>$out/bin/twasm
+    #!/usr/bin/env bash
+
+    mkdir -p ./.bootle
+    cp $(echo $out)/bin/disk ./.bootle/disk
+    chmod a+w ./.bootle/disk
+
+    ${qemu}/bin/qemu-system-x86_64 \
+      -nographic \
+      -s \
+      -drive file=./.bootle/disk,format=raw,index=0,media=disk
+
+    rm ./.bootle -r
+    EOF
+
+    chmod +x $out/bin/twasm
+
+    cp out.bin $out/bin
+    cp disk $out/bin
+  '';
+}