make unreal mode unreal again

caught a bug where SetTextMode was setting mono text not 16-color mode

.gitea/workflows/onpush.yaml

@@ -0,0 +1,40 @@
+name: Daily Build and trunk tester
+on:
+  push:
+    branches: [ $default-branch ]
+  pull_request:
+    branches: [ $default-branch ]
+  schedule:
+    - cron: "0 7 * * *"   # daily 07:00
+  workflow_dispatch: {}
+
+jobs:
+  debian_update:
+    runs-on: debian-trixie
+    steps:
+      - name: Checkout (if needed)
+        uses: actions/checkout@v4
+
+      - name: Install CHTM apt cache endpoint into container
+        run: |
+          echo 'Acquire::http::Proxy "http://chtm-aptcache-01.lan.chtm.me:3142";' | tee /etc/apt/apt.conf.d/01aptproxy
+      
+      - name: Ensure image is up to date and install build tools and deps
+        run: |
+          bash -c "apt update && apt upgrade -y"
+          apt install -y build-essential nasm mtools fdisk dosfstools 
+
+      - name: Build stevia
+        run: make
+
+      - name: Upload build artifacts
+        if: always()   # still keep logs/artifacts even if build fails
+        uses: actions/upload-artifact@v3
+        with:
+          name: stevia-${{ github.run_number }}
+          path: |
+            build/output/artifacts.tar.gz
+            build/output/disk.img.gz
+            build/output/part.img.gz
+          if-no-files-found: error
+          retention-days: 30   # override server default if you like

.github/workflows/daily.yaml

@@ -0,0 +1,35 @@
+name: Daily Build and trunk tester
+on:
+  push:
+    branches: [ $default-branch ]
+  schedule:
+    - cron: "0 7 * * *"   # daily 07:00
+  workflow_dispatch: {}
+
+jobs:
+  debian_update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout (if needed)
+        uses: actions/checkout@v4
+      
+      - name: Update and install build tools and deps
+        run: |
+          sudo bash -c "apt update && apt upgrade -y"
+          sudo apt install -y build-essential nasm mtools fdisk dosfstools 
+
+      - name: Build stevia
+        run: make
+
+      - name: Upload build artifacts
+        if: always()   # still keep logs/artifacts even if build fails
+        uses: actions/upload-artifact@v4
+        with:
+          name: stevia-${{ github.run_number }}
+          path: |
+            build/output/artifacts.tar.gz
+            build/output/disk.img.gz
+            build/output/part.img.gz
+          if-no-files-found: error
+          retention-days: 7   # override server default if you like
+          

.gitignore

@@ -1,7 +1,8 @@
-out/*
 build/*
+build/output/*
 *.img
 *.img.gz
+*.img.gz
 *.elf
 bx_enh_dbg.ini
 stevia-log

LICENSE.md

@@ -1,14 +0,0 @@
-Copyright (C) 2025 Elaina Claus
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.

Makefile

@@ -32,8 +32,8 @@ GIT_VERSION := $(shell git describe --tags)
 GIT_HASH := $(shell git rev-parse HEAD)
 GIT_NASM_DEFINES := -D __GIT_VER__='"$(GIT_VERSION)"' -D __GIT_HASH__='"$(GIT_HASH)"'
 
-iso := '/tmp/disk.img'
-isoz := 'disk.img.gz'
+iso := 'build/disk.img'
+isoz := 'build/output/disk.img.gz'
 
 qemu_args := -L ./bin/ -bios bios.bin -cpu pentium3 -m 128 -S -s -monitor stdio -nic none
 .PHONY: all mbr vbr stage2 boottest clean run run_bochs iso isoz
@@ -45,10 +45,11 @@ stage2: $(stage2_binary_files)
 boottest: $(boottest_binary_files)
 
 clean:
-	@rm -rvf *.map
-	@rm -rvf $(build_dir)/*
-	@rm -rvf $(iso)
-	@rm -rvf $(isoz)
+	@rm -v $(build_dir)/*.bin
+	@rm -v $(build_dir)/*.map
+	@rm -v $(build_dir)/*.img
+	@rm -v $(build_dir)/output/*.img.gz
+	@rm -v $(build_dir)/output/*.tar.gz
 
 run: $(iso)
 	@sudo qemu-system-i386 $(qemu_args) -hda $(iso)
@@ -79,8 +80,7 @@ build/%.bin: src/miniboot32/%.nasm
 	@nasm -i$(include) -Wall -f bin $(GIT_NASM_DEFINES) $< -o $@
 
 $(iso): $(mbr_binary_files) $(vbr_binary_files) $(stage2_binary_files) $(boottest_binary_files)
-	@echo root access needed to create disk image...
-	@sudo scripts/create-disk.sh
+	@scripts/create-disk.sh
 
 $(isoz): $(iso)
 	@gzip -9kc $(iso) > $(isoz)

README.md

@@ -67,4 +67,4 @@ We welcome contributions! Feel free to open issues for bugs or feature requests,
 
 ## License
 
-This project is licensed under the MIT License. See the [LICENSE](LICENSE) file for more details.
+This project is licensed under the GPLv3 License. See the [LICENSE](LICENSE.md) or [COPYING](COPYING) file for more details.

bochsrc.txt

@@ -1,7 +1,7 @@
 # configuration file generated by Bochs
 plugin_ctrl: voodoo=false, unmapped=true, biosdev=true, speaker=true, extfpuirq=true, parallel=true, serial=true, busmouse=false, e1000=false, es1370=false, gameport=true, ne2k=false, sb16=false, usb_uhci=false, usb_ohci=false, usb_ehci=false, usb_xhci=false
 config_interface: textconfig
-display_library: wx
+display_library: x, options=gui_debug
 memory: guest=64, host=64, block_size=128
 romimage: file="/usr/share/bochs/BIOS-bochs-legacy", address=0x00000000, options=none, flash_data=none
 vgaromimage: file="/usr/share/bochs/VGABIOS-lgpl-latest"
@@ -10,7 +10,7 @@ floppy_bootsig_check: disabled=0
 floppya: type=1_44
 # no floppyb
 ata0: enabled=true, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
-ata0-master: type=disk, path="./disk.img", mode=flat, cylinders=0, heads=0, spt=0, sect_size=512, model="Stevia Disk", biosdetect=auto, translation=lba
+ata0-master: type=disk, path="./build/disk.img", mode=flat, cylinders=0, heads=0, spt=0, sect_size=512, model="Stevia Disk", biosdetect=auto, translation=lba
 ata0-slave: type=none
 ata1: enabled=false
 ata1-master: type=none

include/BIOS/func/E820_memory_map.nasm

@@ -40,23 +40,28 @@ GetMemoryMap:
 .func:
     mov dword [SteviaInfo + SteviaInfoStruct_t.MemoryMapEntries], 0
 
-    mov eax, 0xE820                         ; select 0xE820 function
+    
     xor ebx, ebx                            ; Continuation value, 0 for the first call
 
-    lea dx, [BIOSMemoryMap]
+    mov dx, BIOSMemoryMap
     shr dx, 4
     mov es, dx
     xor di, di                              ; (BIOSMemoryMap >> 4):0 makes di an index into BIOSMemoryMap
 
-    mov ecx, AddressRangeDescStruct_t_size
-    mov edx, 0x534D4150                     ; 'SMAP' magic
+    mov ecx, AddressRangeDescStruct_t_size  ; hard request ACPI 3.0 table versions (24 bytes)
+    
 .loop_L1:
+    mov eax, 0x0000E820                     ; select 0xE820 function
+    mov edx, 0x534D4150                     ; 'SMAP' magic
+    clc                                     ; clear carry
     int 0x15
     jc GetMemoryMap.error
     cmp eax, 0x534D4150
     jne GetMemoryMap.no_smap_returned
 .no_error:
-    inc dword [SteviaInfo + SteviaInfoStruct_t.MemoryMapEntries]
+    mov eax, dword [SteviaInfo + SteviaInfoStruct_t.MemoryMapEntries]
+    add eax, 1
+    mov dword [SteviaInfo + SteviaInfoStruct_t.MemoryMapEntries], eax
 
     cmp ecx, 20                             ; TODO: maybe this could be handled better than just panicing
     jb GetMemoryMap.nonstandard_e820        ; non-standard entry found 
@@ -64,9 +69,11 @@ GetMemoryMap:
     cmp ebx, 0
     je GetMemoryMap.endp                    ; 0 in ebx means we have reached the end of memory ranges
 
-    add di, AddressRangeDescStruct_t_size   ; increment di to next descriptor
-    mov edx, eax                            ; 'SMAP' to edx
-    mov eax, 0xE820                         ; select E820 function
+    ; setup for next loop, ebx is our next index and has already been set.
+    xor ecx, ecx
+    mov ecx, AddressRangeDescStruct_t_size  ; set ecx (requested_size) to 24 bytes
+    add di, cx                              ; increment di to next descriptor so es:di points to the next free space
+
     jmp GetMemoryMap.loop_L1
 .error:
     ERROR STAGE2_MM_E820_MISC_ERR
@@ -79,5 +86,37 @@ GetMemoryMap:
     __CDECL16_EXIT
     ret
 
+PrintMemoryMap:
+    __CDECL16_ENTRY
+.func:
+    mov eax, dword [SteviaInfo + SteviaInfoStruct_t.MemoryMapEntries]
+    cmp eax, 0
+    je PrintMemoryMap.endp          ; if entries == 0, exit
+
+    mov ecx, eax                    ; store # of entries in counter
+    mov eax, BIOSMemoryMap          ; address to start of e820 mmap
+
+    push dword ecx
+    push dword eax
+    call FormatMemoryMapEntry
+    add sp, 0x8
+
+    ; ax contains segment offset to string after call
+    ; TODO: going to need an allocator for strings and stuff...
+    ; print_string strformat_buffer
+    
+.endp:
+    __CDECL16_EXIT
+    ret
+
+FormatMemoryMapEntry:
+    __CDECL16_ENTRY
+.func:
+    ; create a string buffer somewhere and return address to result string in ax
+.endp:
+    __CDECL16_EXIT
+    ret
+
+
 %endif
 %define __INC_E820MEMORY_MAP

include/BIOS/func/a20enable.nasm

@@ -105,6 +105,7 @@ EnableA20:
     je EnableA20.endp         ; A20 is already enabled
 
     mov ax, 0x2403
+    clc                             ; clear carry
     int 0x15
     jc EnableA20.do_fallback_a20    ; carry = error...not supported?
     cmp ah, 0
@@ -121,6 +122,7 @@ EnableA20:
     ERROR STAGE2_A20_FAILED
 .do_bios_a20:
     mov ax, 0x2401
+    clc                             ; clear carry
     int 0x15
     jmp EnableA20.a20_check
 .do_fast_a20:

include/BIOS/func/ext_read.nasm

@@ -111,6 +111,7 @@ read_disk_raw:
     mov ah, 0x42                ; call #
     mov dl, byte [bp + 14]      ; drive #             
 
+    clc                         ; clear carry
     int 0x13
     jnc .endf
 

include/BIOS/func/video.nasm

@@ -24,9 +24,10 @@ SetTextMode:
     pushf
 .func:
     xor ah, ah                  ; Set Video mode BIOS function
-    mov al, 0x02                ; 16 color 80x25 Text mode
+    mov al, 0x03                ; 16 color 80x25 Text mode
     int 0x10                    ; Call video interrupt
                                 
+
     mov ah, 0x05                ; Select active display page BIOS function
     xor al, al                  ; page 0
     int 0x10                    ; call video interrupt
@@ -35,9 +36,10 @@ SetTextMode:
     __CDECL16_EXIT
     ret
 
-; disables blinking text mode cursor
+; disables blinking text mode cursor via crtc pokes
+; 0x3D4/0x3D5 for color, mono at 0x3B4/0x3B5
 ALIGN 4, db 0x90
-disable_cursor:
+disable_cursor_crtc:
     __CDECL16_ENTRY
 .func:
     mov dx, 0x3D4
@@ -51,5 +53,120 @@ disable_cursor:
     __CDECL16_EXIT
     ret
 
+; disables blinking text mode cursor via BIOS int 10h, ah = 01
+ALIGN 4, db 0x90
+disable_cursor_bios:
+    __CDECL16_ENTRY
+.func:
+    push bx
+    mov  ah, 03h      ; read cursor pos & shape
+    xor  bh, bh
+    int  10h          ; CH=top scanline, CL=bottom
+
+    or   ch, 20h      ; set bit 5 = disable
+    mov  ah, 01h      ; set leaf 01h
+    int  10h
+    pop  bx
+.endp:
+    __CDECL16_EXIT
+    ret
+
+; Prints a C-Style string (null terminated) using BIOS vga teletype call
+; void PrintString(char* buf)
+ALIGN 4, db 0x90
+PrintString:
+    __CDECL16_ENTRY
+    mov di, [bp + 4]    ; first arg is char[] 
+.str_len:
+    xor cx, cx         ; ECX = 0
+    not cx             ; ECX = -1 == 0xFFFF
+    xor ax, ax         ; search for al = 0x0
+
+    cld
+    repne scasb        ; deincrement cx while searching for al
+
+    not cx             ; the inverse of a neg number = abs(x) - 1
+    dec cx             ; CX contains the length of the string - nul byte at end
+.print:
+    mov si, [bp + 4]            ; source string
+.print_L0:
+    movzx ax, byte [si]
+    push ax
+    call PrintCharacter
+    add sp, 0x2
+
+    inc si
+    dec cx
+
+    jcxz PrintString.endp
+    jmp PrintString.print_L0    ; Fetch next character from string
+.endp:
+    __CDECL16_EXIT
+    ret                         ; Return from procedure
+
+; Prints a single character
+; void PrintCharacter(char c);
+ALIGN 4, db 0x90
+PrintCharacter:
+    __CDECL16_ENTRY
+.func:
+    movzx ax, byte [bp + 4]     ; AL = character c
+    mov ah, 0x0E                ; INT 0x10, AH=0x0E call
+    mov bx, 0x0007              ; BH = page no. BL =Text attribute 0x07 is lightgrey font on black background
+    int 0x10                    ; call video interrupt
+                                ; TODO: check for carry and clear carry before call
+.endp:
+    __CDECL16_EXIT
+    ret
+
+; TODO: fix the prolog, epilog and stack usage to confirm with cdecl16
+; prints the hex representation of of val
+; void PrintDWORD(uint32_t val);
+ALIGN 4, db 0x90
+PrintDWORD:
+    __CDECL16_ENTRY
+.func: 
+    mov si, IntToHex_table
+    mov ebx, 16     ; base-16
+
+    mov eax, dword [bp + 4]     ;val
+
+    xor edx, edx
+    xor cx, cx
+.next_digit:
+    div ebx            ; dividend in edx:eax -> quotient in eax, remainder in edx
+    push dx            ; save remainder
+    inc cx
+
+    xor dx, dx
+    test eax, eax
+    jnz PrintDWORD.next_digit
+
+.zero_pad:
+    cmp cx, 0x0008
+    je PrintDWORD.print_stack
+    xor ax, ax
+    push ax
+    inc cx
+    jmp PrintDWORD.zero_pad
+
+.print_stack:
+    pop bx
+    dec cx
+    push cx
+
+    movzx ax, byte [bx+si+0]    ; bx = index into Hex lookup table
+    push ax
+    call PrintCharacter
+    add sp, 0x2
+
+    pop cx
+
+    jcxz PrintDWORD.endp
+    jmp PrintDWORD.print_stack
+
+.endp:
+    __CDECL16_EXIT
+    ret
 %endif
 %define __INC_VIDEO

include/cdecl16.inc

@@ -14,14 +14,17 @@
 ;     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 %ifnmacro __CDECL16_ENTRY
-%macro __CDECL16_ENTRY 0
+%macro __CDECL16_ENTRY 0-1
     push bp
     mov bp, sp
-    sub sp, 0x10
 
     push si
     push di
     push bx
+
+    %if %0 = 1
+    sub  sp, %1        ; reserve locals only when needed
+    %endif
 %endmacro
 %endif
 

include/fat32/FAT32_SYS.inc

@@ -32,7 +32,7 @@ InitFATDriver:
     mov ax, fat32_state
     push ax                     ; address of structure
     call kmemset
-    sub sp, 0x6
+    add sp, 0x6
 
 .calc_active_part:
     mov ax, word [partition_offset]            
@@ -146,7 +146,7 @@ SearchFATDIR:
         xor ax, ax
         push ax                 ; segment
         call ReadFATCluster     ; uint8_t ReadFATCluster(uint16_t seg, uint16_t offset, uint32_t cluster)
-        sub sp, 0x8
+        add sp, 0x8
     .empty_dir_entry:
         ; check for 0x0 in first byte, if true then there are no more files
         ; if true we did not find the file, we should error here
@@ -221,7 +221,7 @@ NextCluster:
     mov ax, fat32_nc_data
     push ax                     ; address of structure
     call kmemset
-    sub sp, 0x6
+    add sp, 0x6
 
     mov edx, dword [bp + 4]
     mov si, fat32_nc_data                        ; instead of push/pop and moving the data back

include/util/arena_alloc.nasm

@@ -0,0 +1,100 @@
+%ifndef __INC_ARENA_ALLOC_FUNC
+
+%define __ARENA_HEAP_START 0x8000
+%define __ARENA_HEAP_SIZE  0x6000   ; 0x8000 -> 0xE000 = 24KiB of Heap
+
+struc ArenaStateStruc_t
+    .start resw 1
+    .end resw 1
+    .mark resw 1
+endstruc
+
+; void arena_init(ArenaState *a)
+;
+arena_init:
+    __CDECL16_ENTRY
+.func:
+    movzx eax, word [bp + 4]     ; ptr to state structure
+    mov di, ax
+
+    xor eax, eax
+    mov word [di + ArenaStateStruc_t.mark], eax
+    mov word [di + ArenaStateStruc_t.end], word (__ARENA_HEAP_START + __ARENA_HEAP_SIZE)
+    mov word [di + ArenaStateStruc_t.start], __ARENA_HEAP_START
+
+    ; zero out heap area on init
+    ; void* kmemset_byte(void* dst, uint8_t val, uint16_t len);
+    mov ax, __ARENA_HEAP_SIZE
+    push ax                     ; len
+    xor ax, ax
+    push ax                     ; val = 0
+    mov ax, __ARENA_HEAP_START
+    push ax                     ; dst
+    call kmemset
+    add sp, 0x6
+
+.endp:
+    __CDECL16_EXIT
+    ret
+
+; size_t align_up(size_t x, size_t a)
+; ax, bx. cx are all clobbered
+; align x up to the nearest specified alignment (a), a should be a power of 2
+; (x + (a-1)) & ~(a-1)
+; return value in ax
+arena_align_up:
+    __CDECL16_ENTRY
+.func:
+    
+    mov ax, [bp + 4]      ; x
+
+    mov bx, [bp + 6]      
+    sub bx, 1             ; a - 1
+
+    mov cx, ax
+    add cx, bx            ; x + (a+1)
+    not bx                ; ~(a-1)
+
+    and cx, bx            ; and with the inverse
+
+    mov ax, cx            ; move to ax and return
+.endp:
+    __CDECL16_EXIT
+    ret
+
+; void* arena_alloc(void* a, size_t bytes, size_t align)
+arena_alloc:
+    __CDECL16_ENTRY
+.func:
+    ; remove bytes from pool and increment mark to the new cursor location
+    ; return a pointer to the begining of  allocated segment
+.endp:
+    __CDECL16_EXIT
+    ret
+
+arena_mark:
+    __CDECL16_ENTRY
+.func:
+    ; return the current location of the 'cursor' in the allocator
+.endp:
+    __CDECL16_EXIT
+    ret
+
+arena_reset_to:
+    __CDECL16_ENTRY
+.func:
+    ; rewind the arena to a previously marked point
+.endp:
+    __CDECL16_EXIT
+    ret
+
+arena_reset:
+    __CDECL16_ENTRY
+.func:
+    ; reset the entire heap to a fresh state
+.endp:
+    __CDECL16_EXIT
+    ret
+
+%endif
+%define __INC_ARENA_ALLOC_FUNC

scripts/create-disk.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -euo pipefail
 
 # Copyright (C) 2025 Elaina Claus
 # 
@@ -15,8 +16,8 @@
 #     You should have received a copy of the GNU General Public License
 #     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-if ! [ $(id -u) = 0 ]; then
-   echo "Script must be run as root!" >&2
+if [ $(id -u) = 0 ]; then
+   echo "Script should not be run as root, it could break something! Exiting!" >&2
    exit 1
 fi
 
@@ -26,235 +27,143 @@ vbr_file=build/vbr.bin
 stage2_file=build/stage2.bin
 boottest_file=build/BOOTi686.bin
 
-
 # Disk creation options
-mount_point=/tmp/stevia_disk
-disk_tmp_file=/tmp/disk.img
-disk_file_final=./disk.img.gz
+disk_img=build/disk.img
+disk_img_final=build/output/disk.img.gz
+
+part_img=build/part.img
+part_img_final=build/output/part.img.gz
+
+artifacts_archive=build/output/artifacts.tar.gz
 
 # $disk_sector_size * $disk_size = total bytes, default is 256MiB
-disk_size=(524288 * 2)
+disk_sectors=(524288 * 2)
 disk_sector_size=512
+part_start=2048
+part_sectors=$((disk_sectors - part_start))
 
-if ! [ -e $disk_tmp_file ]; then
+#
+# Build sanity section
+#
+
+echo "*** Performing pre-build sanity checks ***"
+
+# Tools needed:
+#   sfdisk dosfstools (mkfs.fat), mtools (mcopy,mmd), gzip, dd, truncate, awk
+for t in mcopy mmd gzip dd truncate awk; do
+  command -v "$t" >/dev/null || { echo "Missing tool: $t" >&2; exit 1; }
+done
+
+# these are normally in the sbin paths so I've had issues detecting them with command -v
+SF=$(command -v sfdisk || echo /usr/sbin/sfdisk)
+MKFS=$(command -v mkfs.fat || echo /usr/sbin/mkfs.fat)
+
+[[ -x "$SF" ]] || { echo "sfdisk not found"; exit 1; }
+[[ -x "$MKFS" ]] || { echo "mkfs.fat not found"; exit 1; }
+
+# check that required build files exist
+for f in "$mbr_file" "$vbr_file" "$stage2_file" "$boottest_file"; do
+  [[ -f "$f" ]] || { echo "missing $f" >&2; exit 1; }
+done
+
+cat > /tmp/pt.sfdisk <<EOF
+label: dos
+unit: sectors
+sector-size: $disk_sector_size
+label-id: 0xa0b0c0d0
+
+start=$part_start, size=$((disk_sectors - part_start)), type=c, bootable
+EOF
+
+mtool_src=/tmp/mtools.conf
+cat > $mtool_src <<EOF
+drive c: file="$part_img"
+EOF
+
+#
+# Create disk images
+#
+
+echo "[1/7] Create disk.img and part.img"
+
+if ! [ -e "$disk_img" ]; then
     # create raw disk image
-    if ! dd if=/dev/zero of=$disk_tmp_file bs=$disk_sector_size count=$disk_size; then
+    if ! truncate -s $((disk_sectors * disk_sector_size)) "$disk_img"; then
         echo "Failed creating blank disk image." >&2
         exit 1
     fi
     sync
 else
     echo "Removing old disk image..."
-    rm -rfv $disk_tmp_file
-    if ! dd if=/dev/zero of=$disk_tmp_file bs=$disk_sector_size count=$disk_size; then
+    rm -rfv "$disk_img"
+    if ! truncate -s $((disk_sectors * disk_sector_size)) "$disk_img"; then
         echo "Failed creating blank disk image." >&2
         exit 1
     fi
     sync
 fi
 
+if ! [ -e "$part_img" ]; then
+    # create raw partition disk image
+    if ! truncate -s $((part_sectors * disk_sector_size)) "$part_img"; then
+        echo "Failed creating blank partition image." >&2
+        exit 1
+    fi
+    sync
+else
+    echo "Removing old (partition) disk image..."
+    rm -rfv "$part_img"
+    if ! truncate -s $((part_sectors * disk_sector_size)) "$part_img"; then
+        echo "Failed creating blank partition image." >&2
+        exit 1
+    fi
+    sync
+fi
+
+
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-        if [ -e $mbr_file ] && [ -e $vbr_file ]; then
-        # get next loop device and mount it
-        ld=$(losetup -f)
-        losetup -P -b 512 $ld $disk_tmp_file
+        echo "[2/7] Write DOS partition table (single FAT32 LBA @ 2048)"
+        "$SF" --no-reread "$disk_img" < /tmp/pt.sfdisk
 
-        # create a DOS disk, with 1 FAT32 partition that is bootable, part1 starts at sector 2048
-        sfdisk $ld < scripts/loop_setup.sfdisk
+        echo "[3/7] Make FAT32 filesystem in partition image"
+        "$MKFS" -v -F32 -s 1 -n 'STEVIAFS' "$part_img"
 
-        # get first partition, this is sloppy might need to review this...
-        firstpart=$(lsblk -ilp -o NAME $ld | tr '\n' ' ' | awk '{print $3}')
-        mkfs.fat -v -F32 -s 1 -n 'STEVIAFS' $firstpart
+        echo "[4/7] Patch VBR inside partition image (preserve BPB)"
 
-        #
-        # MBR setup
-        #
-
-        # copy MBR while preserving partition table
-        if ! dd if=$mbr_file of=$ld bs=1 count=440; then
-            echo "Failed to write MBR to disk. (part 1)" >&2
-            exit 1
-        fi
-
-        # copy MBR 0xAA55
-        if ! dd if=$mbr_file of=$ld bs=1 seek=510 skip=510 count=2; then
-            echo "Failed to write MBR to disk. (part 2)" >&2
-            exit 1
-        fi
-
-        #
-        # VBR Setup & backup VBR
-        # 
-
-        # copy VBR to partition 1 while preserving partition information
         # copy jmp short entry; nop
-        if ! dd if=$vbr_file of=$firstpart bs=1 count=3; then
-            echo "Failed to write VBR to disk. (part 1)" >&2
-            exit 1
-        fi
+        dd if=$vbr_file of="$part_img" bs=1 count=3 conv=notrunc
         # copy bootcode
-        if ! dd if=$vbr_file of=$firstpart bs=1 seek=90 skip=90 count=420; then
-            echo "Failed to write VBR to disk. (part 2)" >&2
-            exit 1
-        fi
-        # copy 0xAA55
-        if ! dd if=$vbr_file of=$firstpart bs=1 seek=510 skip=510 count=2; then
-            echo "Failed to write VBR to disk. (part 3)" >&2
-            exit 1
-        fi
+        dd if=$vbr_file of="$part_img" bs=1 seek=90 skip=90 count=420 conv=notrunc
+        # copy signature (should be 0xAA55)
+        dd if=$vbr_file of="$part_img" bs=1 seek=510 skip=510 count=2 conv=notrunc
 
-        # write backup VBR
-        if ! dd if=$firstpart of=$firstpart bs=$disk_sector_size count=1 seek=6; then
-            echo "Failed to copy VBR (sector 1) to backup VBR." >&2
-            exit 1
-        fi
+        # copy backup VBR within the created partition image
+        # Linux dosfstools will complain (read: not work) unless this is done it seems
+        # HACK: sector 6 is the **default** location of the BPB_BkBootSec, it **can** be different.
+        dd if="$part_img" of="$part_img" bs=$disk_sector_size count=1 seek=6 conv=notrunc
 
+        echo "[5/7] Copy boot payload to FAT32 filesystem using mtools as BOOT.BIN"
+        MTOOLSRC="$mtool_src" mcopy "$boottest_file" C:BOOT.BIN
+        MTOOLSRC="$mtool_src" mdir C:
 
-        #
-        # Stage2 Setup
-        #
+        echo "[6/7] Patch MBR and install stage2 loader to disk image"
+        # patch MBR+signature while preserving partition table
+        dd if="$mbr_file" of="$disk_img" bs=1 count=440 conv=notrunc
+        dd if="$mbr_file" of="$disk_img" bs=1 seek=510 skip=510 count=2 conv=notrunc
 
-        #stage2 to sectors 1-64
-        if ! dd if=$stage2_file of=$ld bs=$disk_sector_size seek=1; then
-            echo "Failed to write Stage2 to disk." >&2
-            exit 1
-        fi
+        # copy stage2 to absolute LBA 1
+        dd if="$stage2_file" of="$disk_img" bs=$disk_sector_size seek=1 conv=notrunc
 
-        # copy boot32 boot test file to disk image
-        if ! [ -e $mount_point ]; then
-            mkdir $mount_point
-        fi
-        mount $firstpart $mount_point
+        echo "[7/7] Assembling final disk image"
+        # place partition at it's place in the disk image
+        dd if="$part_img" of="$disk_img" bs=$disk_sector_size seek=$part_start conv=notrunc
 
-        # ensure mountpoint is actually a mountpoint
-        if ! mountpoint -q $mount_point; then
-            echo "Failed to mount partition at $mount_point." >&2
-            exit 1
-        fi
-
-        # copy kernel to filesystem 
-        if [ -e $boottest_file ]; then
-            cp -v $boottest_file $mount_point/BOOT.BIN
-        else
-            echo "Failed to write $boottest_file to disk image" >&2
-            exit 1
-        fi
-
-        #
-        # Final Cleanup
-        #
-
-        # detach loop device
-        umount $mount_point
-        sync
-        sleep 1
-        losetup -d $ld
-
-        # chown to the real user to prevent issues with reading/writing the file later
-        # BUG: ${logname}:$(id $(logname -g)) doesn't work right on WSL because of runlevel hacks in WSL
-        # BUG: https://github.com/microsoft/WSL/issues/1761
-        # as a work around I'll just reference LICENSE.md...WHICH SHOULD ALWAYS BE THERE 👀
-        chown --from=root:root --reference=LICENSE.md $disk_tmp_file
-
-    else
-        echo "unable to find MBR/VBR binaries!" >&2
-        exit 1
-    fi
-# requires util-linux from homebrew
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-        sfdisk_path="/usr/local/opt/util-linux/sbin/sfdisk"
-        if [ -e $mbr_file ] && [ -e $vbr_file ]; then
-        # use hdiutil to attach our empty disk image
-        ld_path_raw=$(hdiutil attach -readwrite -imagekey diskimage-class=CRawDiskImage -nomount -blocksize 512 -noverify /tmp/disk.img)
-        ld=$(echo $ld_path_raw | sed s:/dev/::)
-        ld_path="/dev/$ld"
-
-        # create a DOS disk, with 1 FAT32 partition
-        if ! [ -e $sfdisk_path ]; then
-            echo "sfdisk utility was not found...We cannot use diskutil to make disks due to the fact that it only makes Hybrid MBR's & GPT disks...blame Apple"
-            exit 4
-        else
-            $sfdisk_path $ld_path < scripts/loop_setup.sfdisk
-        fi
-
-        # give stuff a chance to settle, macOS has problems here
-        sync
-        sleep .5
-
-        # reattch the raw image file since macOS doesn't have a partprobe...
-        # this is the only way I know to get macOS to reprobe the disk
-        hdiutil eject $ld
-        unset ld_path
-        unset ld
-        unset ld_path_raw
-
-        ld_path_raw=$(hdiutil attach -readwrite -imagekey diskimage-class=CRawDiskImage -nomount -blocksize 512 -noverify /tmp/disk.img)
-        ld=$(echo $ld_path_raw | grep "FDisk_partition_scheme" | awk '{print $1}' | sed s:/dev/::)
-        ld_path="/dev/$ld"
-
-        if ! [ -b /dev/$ld ]; then
-            echo "Unable to remount disk! exitting before I do some damage!"
-            exit 5
-        fi
-
-        # get first partition and format as FAT32
-        firstpart=$(diskutil list $ld | grep 1: | awk '{print $6}')
-        firstpart_direct="r$firstpart"
-
-        newfs_msdos -F 32 /dev/$firstpart_direct
-        sync
-        
-        # copy MBR while preserving partition table
-        dd if=$mbr_file of=$ld_path bs=1 count=440 conv=sync
-        # copy MBR 0xAA55
-        dd if=$mbr_file of=$ld_path bs=1 seek=510 skip=510 count=2 conv=sync
-
-        # copy VBR to partition 1 while preserving partition information
-        # copy jmp short entry; nop
-        dd if=$vbr_file of=/dev/$firstpart bs=1 count=3 conv=sync
-        # copy bootcode
-        dd if=$vbr_file of=/dev/$firstpart bs=1 seek=90 skip=90 count=420 conv=sync
-        # copy 0xAA55
-        dd if=$vbr_file of=/dev/$firstpart bs=1 seek=510 skip=510 count=2 conv=sync
-
-        #stage2 to sectors 1-64
-        dd if=$stage2_file of=$ld_path bs=$disk_sector_size seek=1 conv=sync
-
-        #sync pending dd stuff
-        sync
-
-        # copy boot32 boot test file to disk image
-        if ! [ -e $mount_point ]; then
-            mkdir $mount_point
-        else
-            echo "$mount_point exists! clearing contents..."
-            rm -rfv $mount_point
-            mkdir $mount_point
-        fi
-        mount -t msdos /dev/$firstpart $mount_point
-
-        if [ -e $boottest_file ]; then
-            cp -v $boottest_file $mount_point
-        else
-            echo "unable to find boot32.bin!"
-            exit 3
-        fi
-
-        # detach loop device
-        sync
-        umount /dev/$firstpart
-        hdiutil eject $ld
-
-        # chown to the real user to prevent issues with reading/writing the file later
-        SUDOUSER=$(logname)
-        chown ${SUDOUSER}:staff disk.img
-        gzip -9kc $disk_tmp_file > $disk_file_final
-    else
-        echo "unable to find MBR/VBR binaries!"
-        exit 2
-    fi
+        echo " *** Outputing disk images will be in ./build/output/* *** "
+        gzip -9c "$disk_img" > "$disk_img_final"
+        gzip -9c "$part_img" > "$part_img_final"
+        tar caf "$artifacts_archive" build/*.bin build/*.map
 else
         # Unknown.
-        echo "Unknown OS type! Supported build hosts systems are GNU/Linux (WSL) and macOS."
+        echo "Unknown OS type! Supported build hosts systems are GNU/Linux (& WSL)"
         exit 1
 fi

scripts/loop_setup.sfdisk

@@ -1,5 +0,0 @@
-label: dos
-unit: sectors
-sector-size: 512
-
-start=        2048, type=c, bootable

src/mbr/mbr.nasm

@@ -18,7 +18,7 @@
 [CPU KATMAI]
 [WARNING -reloc-abs-byte]
 [WARNING -reloc-abs-word]                   ; Yes, we use absolute addresses. surpress these warnings.
-[map all mbr.map]
+[map all build/mbr.map]
 %define __STEVIA_MBR
 jmp short (init - $$)
 nop
@@ -58,7 +58,7 @@ init:
     cld
     rep stosb                         ; zero bss section
 
-    sub sp, 0x20                    ; local varible space
+    sub sp, 0x20                    ; local varible space (32 bytes)
     push bp                         ; setup top of stack frame
 
     xor cx, cx
@@ -96,6 +96,8 @@ main:
         mov ah, 0x41
         mov bx, 0x55AA
         mov dl, 0x80
+
+        clc
         int 0x13
         jnc main.find_active
         ERROR MBR_ERROR_NO_INT32E                         ; no extended function support

src/stage2/stage2.nasm

@@ -16,7 +16,7 @@
 [BITS 16]
 [ORG 0x0500]                            ; IF YOU CHANGE ORG CHANGE THE SIGN OFFSET AT THE END
 [CPU KATMAI]
-[map all stage2.map]
+[map all build/stage2.map]
 [WARNING -reloc-abs-byte]
 [WARNING -reloc-abs-word]
 [WARNING -reloc-abs-dword]              ; Yes, we use absolute addresses. surpress these warnings.
@@ -149,7 +149,7 @@ main:
     add sp, 0x6
 
     call SetTextMode
-    call disable_cursor
+    call disable_cursor_bios
     print_string HelloPrompt_info
     
     ; enable A20 gate
@@ -160,7 +160,7 @@ main:
     call GetMemoryMap
     print_string MemoryMap_OK_info
 
-    ; enter unreal mode
+    ; enter unreal mode (16 bit code, 32 bit flat memory model)
     call EnterUnrealMode
     print_string UnrealMode_OK_info
 
@@ -185,109 +185,6 @@ main:
 hcf:
     ERROR STEVIA_DEBUG_OK
 
-; ##############################
-;
-; SYSTEM CONFIGURATION FUNCTIONS
-;
-; ##############################
-
-; Prints a C-Style string (null terminated) using BIOS vga teletype call
-; void PrintString(char* buf)
-ALIGN 4, db 0x90
-PrintString:
-    __CDECL16_ENTRY
-    mov di, [bp + 4]    ; first arg is char[] 
-.str_len:
-    xor cx, cx         ; ECX = 0
-    not cx             ; ECX = -1 == 0xFFFF
-    xor ax, ax         ; search for al = 0x0
-
-    cld
-    repne scasb        ; deincrement cx while searching for al
-
-    not cx             ; the inverse of a neg number = abs(x) - 1
-    dec cx             ; CX contains the length of the string - nul byte at end
-.print:
-    mov si, [bp + 4]            ; source string
-.print_L0:
-    movzx ax, byte [si]
-    push ax
-    call PrintCharacter
-    add sp, 0x2
-
-    inc si
-    dec cx
-
-    jcxz PrintString.endp
-    jmp PrintString.print_L0    ; Fetch next character from string
-.endp:
-    __CDECL16_EXIT
-    ret                         ; Return from procedure
-
-; Prints a single character
-; void PrintCharacter(char c);
-ALIGN 4, db 0x90
-PrintCharacter:
-    __CDECL16_ENTRY
-.func:
-    movzx ax, byte [bp + 4]     ; AL = character c
-    mov ah, 0x0E                ; INT 0x10, AH=0x0E call
-    mov bx, 0x0007              ; BH = page no. BL =Text attribute 0x07 is lightgrey font on black background
-    int 0x10                    ; call video interrupt
-.endp:
-    __CDECL16_EXIT
-    ret
-
-; TODO: fix the prolog, epilog and stack usage to confirm with cdecl16
-; prints the hex representation of of val
-; void PrintDWORD(uint32_t val);
-ALIGN 4, db 0x90
-PrintDWORD:
-    __CDECL16_ENTRY
-.func: 
-    mov si, IntToHex_table
-    mov ebx, 16     ; base-16
-
-    mov eax, dword [bp + 4]     ;val
-
-    xor edx, edx
-    xor cx, cx
-.next_digit:
-    div ebx            ; dividend in edx:eax -> quotient in eax, remainder in edx
-    push dx            ; save remainder
-    inc cx
-
-    xor dx, dx
-    test eax, eax
-    jnz PrintDWORD.next_digit
-
-.zero_pad:
-    cmp cx, 0x0008
-    je PrintDWORD.print_stack
-    xor ax, ax
-    push ax
-    inc cx
-    jmp PrintDWORD.zero_pad
-
-.print_stack:
-    pop bx
-    dec cx
-    push cx
-
-    movzx ax, byte [bx+si+0]    ; bx = index into Hex lookup table
-    push ax
-    call PrintCharacter
-    add sp, 0x2
-
-    pop cx
-
-    jcxz PrintDWORD.endp
-    jmp PrintDWORD.print_stack
-
-.endp:
-    __CDECL16_EXIT
-    ret
-
 ; ##############################
 ;
 ; SYSTEM CONFIGURATION FUNCTIONS
@@ -296,56 +193,38 @@ PrintDWORD:
 ALIGN 4, db 0x90
 EnterUnrealMode:
     __CDECL16_ENTRY
-.func:
     cli                                   ; no interrupts
-    push ds                     ; save real mode data/stack selectors
-    push es
-    push fs
-    push gs
-    push ss
-
-    push cs                               ; save real mode code selector
-    xor ax, ax                            ;
-    pop ax                                ; save cs to ax to setup far jump
-    mov word [__UNREAL_SEGMENT], ax    
-
+.func:    
     lgdt [((__STAGE2_SEGMENT << 4) + unreal_gdt_info)]                 ; load unreal gdt
 
     mov eax, cr0                          
     or al,1                               ; set pmode bit
     mov cr0, eax                          ; switch to pmode
-    jmp short $+2
+    jmp short $+2                         ; i-cache flush
 
-    ;jmp far 0x0008:EnterUnrealMode.load_cs
+    ; set cs to a pm code segment (0x8) w/ the following
+    ;jmp far 0x0008:EnterUnrealMode.set_segs
     db 0xEA                               ; jmp far imm16:imm16
-    dw EnterUnrealMode.load_cs            ; error_far_ptr
+    dw EnterUnrealMode.set_segs            ; error_far_ptr
     dw 0x0008                             ; error_far_seg
-.load_cs:
-    mov bx, 0x10                          ; select descriptor 2
-    mov ds, bx                            ; 10h = 0001_0000b
-                  
-    mov ss, bx
-    mov es, bx
-    mov fs, bx
-    mov gs, bx                            ; other data/stack to index 2 (off 0x10)
+.set_segs:
+    mov ax, 0x10                          ; select descriptor 2
+    mov ds, ax                            ; 10h = 0001_0000b
+    mov es, ax                            ; es to big data
 
+    mov ss, ax                            ; big stack
+    mov fs, ax
+    mov gs, ax                            ; extra segments to big data as well
+.pm_start:
+    ; code here is running in protected mode
+.pm_end:
+    mov eax, cr0
     and al,0xFE                           ; toggle bit 1 of cr0
     mov cr0, eax                          ; back to realmode
-    jmp short $+2
+    jmp short $+2                         ; i-cache flush
   
-    ;jmp far 0x0008:EnterUnrealMode.unload_cs
-    db 0xEA                               ; jmp far imm16:imm16
-    dw EnterUnrealMode.unload_cs          ; error_far_ptr
-__UNREAL_SEGMENT:
-    dw 0x0000                             ; error_far_seg
-EnterUnrealMode.unload_cs:
-    pop ss
-    pop gs
-    pop fs
-    pop es
-    pop ds                                ; get back old segments
-    sti
 .endp:
+    sti                                   ; re-enable interupts
     __CDECL16_EXIT
     ret
 end_text:
@@ -361,13 +240,13 @@ begin_data:
 %define CRLF 0Dh, 0Ah
 
 %macro define_cstr 2
-    ALIGN 16
+    align 16
     %1_cstr:
         db %2, 00h
 %endmacro
 
 %macro define_info 2
-    ALIGN 16
+    align 16
     %1_info:
         db %2, CRLF, 00h
 %endmacro
@@ -386,7 +265,7 @@ define_info MaybeFound_Boot, "Maybe found a file...checking..."
 
 define_cstr BootTarget, "BOOT    BIN"
 
-ALIGN 16, db 0
+align 16, db 0
 BootTarget:
     db 'BOOT    BIN'
 
@@ -394,28 +273,28 @@ BootTarget:
 ; pre-bss init globals (generally const...but there are exceptions)
 ;
 
-align 8, db 0x00
+align 8, db 0
 boot_drive:
     db 0x00
 
-align 8, db 0x00
+align 8, db 0
 partition_offset:
     dw 0x0000
 
-align 8, db 0x00
+align 8, db 0
 vbr_fat32_bpb_ptr:
     dw 0x0000
 
-align 8, db 0x00
+align 8, db 0
 vbr_part_table_ptr:
     dw 0x0000
 
-ALIGN 16
+align 16, db 0
 IntToHex_table:
     db '0123456789ABCDEF'
 
 ; see docs/gdt.txt for a quick refresher on GDT 
-ALIGN 16, db 0
+align 16, db 0
 unreal_gdt_info:
     unreal_gdt_size: dw (unreal_gdt_end - unreal_gdt_start) - 1
     unreal_gdt_ptr:  dd ((__STAGE2_SEGMENT << 4) + unreal_gdt_start)
@@ -438,7 +317,7 @@ unreal_gdt_start:
     db 0x00              ; Base Address(31:24)
 unreal_gdt_end:
 
-ALIGN 16, db 0
+align 16, db 0
 gdt32_info:
     gdt32_size: dw (gdt32_end - gdt32_start) - 1
     gdt32_ptr:  dd ((__STAGE2_SEGMENT << 4) + gdt32_start)
@@ -474,19 +353,19 @@ gdt32_start:
         db 0x00
 gdt32_end:
 
-ALIGN 8,db 0x00
+align 16,db 0
 BUILD_NASM_VER:
     db "Stevia Stage2 built with NASM - ", __NASM_VER__, 00h
 
-ALIGN 8,db 0x00
+align 16,db 0
 BUILD_DATETIME:
     db 'Assembled - ', __DATE__, ' ', __TIME__, 00h
 
-ALIGN 8,db 0x00
+align 16,db 0
 BUILD_GIT_VER:
     db __GIT_VER__, 00h
 
-ALIGN 8,db 0x00
+align 16,db 0
 BUILD_GIT_HASH:
     db __GIT_HASH__, 00h
 end_data:
@@ -504,24 +383,29 @@ section .bss follows=.sign
 begin_bss:
 ; structures
 
-align 8, resb 1
-partition_table resb PartTable_t_size
+align 16, resb 1
+partition_table: 
+    resb PartTable_t_size
 
-align 8, resb 1
-fat32_bpb resb FAT32_bpb_t_size
-fat32_ebpb resb FAT32_ebpb_t_size
+align 16, resb 1
+fat32_bpb: 
+    resb FAT32_bpb_t_size
+fat32_ebpb: 
+    resb FAT32_ebpb_t_size
 
-align 8, resb 1
-fat32_nc_data resb 16
+align 16, resb 1
+fat32_nc_data: 
+    resb 16
 
-align 8, resb 1
-lba_packet resb LBAPkt_t_size
+align 16, resb 1
+lba_packet: 
+    resb LBAPkt_t_size
 
-align 8, resb 1
+align 16, resb 1
 fat32_state:
     resb FAT32_State_t_size
 
-align 8, resb 1
+align 16, resb 1
 SteviaInfo:
     resd 4
 ;
@@ -541,12 +425,15 @@ dir_buffer:
 fat_fsinfo:
     resb 512
 
+; TODO: this will hold 42 entries from the map function
+; the e820 function needs to check that it doesn't overflow
+; but realisticly 42 entries is enough for dev work
 align 16, resb 1
-%define BIOSMemoryMap_SIZE 2048
+%define BIOSMemoryMap_SIZE 1024
 BIOSMemoryMap:
-    resb 2048
+    resb BIOSMemoryMap_SIZE
 
-align 512, resb 1
+align 16, resb 1
 stack_bottom:
     resb 1024
 stack_top:

src/vbr/vbr.nasm

@@ -17,7 +17,7 @@
 [CPU KATMAI]
 [WARNING -reloc-abs-byte]
 [WARNING -reloc-abs-word]
-[map all vbr.map]                   ; Yes, we use absolute addresses. surpress these warnings.
+[map all build/vbr.map]                   ; Yes, we use absolute addresses. surpress these warnings.
 %define __STEVIA_VBR
 section .text
 __ENTRY:
@@ -72,7 +72,7 @@ init:
     cld
     rep stosb                          
     
-    sub sp, 0x20                    ; local varible space
+    sub sp, 0x20                    ; local varible space (32 bytes)
     push bp
 
     sti                             ; all done with inital setup and relocation, reenable interupts