update github workflow since github includes firefox & snaps in the default runner image, which causes the build to fail.

going to need a custom runner I guess...might as well only do actions on gitea.

.github/workflows/daily.yaml

@@ -3,7 +3,7 @@ on:
   push:
     branches: [ $default-branch ]
   schedule:
-    - cron: "0 7 * * *"   # daily 07:00
+    - cron: "0 7 * * 1"   # mondays at 07:00
   workflow_dispatch: {}
 
 jobs:

include/cdecl16.inc

@@ -96,28 +96,6 @@
 %endmacro
 %endif
 
-
-; __CDECL16_INVOKE func, arg1[, arg2 ...]
-;   pushes args right-to-left, calls, then add sp by (#args)*2
-;   !!! warning for word sized args only !!!
-%ifnmacro __CDECL16_INVOKE
-%macro __CDECL16_INVOKE 1-*
-    %push __CDECL16_INVOKE
-    %define %$fn %1
-    %assign %$argc %0-1
-    %rotate -1              ; drop function name; %1.. are args
-    %rep %$argc
-        %rotate -1
-        push %1
-    %endrep
-    call %$fn
-    %if %$argc
-        add  sp, %$argc*2
-    %endif
-    %pop
-%endmacro
-%endif
-
 %ifnmacro __CDECL16_CLOB
 ; Save registers in the order listed. Supports "flags" as a pseudo-reg.
 %macro __CDECL16_CLOB 1-*

include/fat32/FAT32_SYS.inc

@@ -25,14 +25,9 @@ ALIGN 4, db 0x90
 InitFATDriver:
     __CDECL16_PROC_ENTRY
 .func:
-    mov ax, FAT32_State_t_size
+
-    push ax                     ; length of fat32_state structure
+    __CDECL16_CALL_ARGS fat32_state, 0x0000, FAT32_State_t_size
-    xor ax, ax
+    __CDECL16_CALL kmemset, 3
-    push ax                     ; init fat32_state with zero
-    mov ax, fat32_state
-    push ax                     ; address of structure
-    call kmemset
-    add sp, 0x6
 
 .calc_active_part:
     mov ax, word [partition_offset]            
@@ -106,16 +101,17 @@ ALIGN 4, db 0x90
 SearchFATDIR:
     __CDECL16_PROC_ENTRY
 .file_lookup:
-    print_string SearchFATDIR_info
+    __CDECL16_CALL_ARGS SearchFATDIR_info
+    __CDECL16_CALL PrintString, 1
+
     mov bx, fat32_state
     .load_first_dir:
-        mov eax, dword [bx + FAT32_State_t.curr_dir_cluster_32]
+
-        push dword eax          ; cluster
+        ; uint8_t ReadFATCluster(uint16_t seg, uint16_t offset, uint32_t cluster)
-        mov ax, dir_buffer
+        push dword [bx + FAT32_State_t.curr_dir_cluster_32]          ; cluster
-        push ax                 ; offset
+        push dir_buffer                                              ; offset
-        xor ax, ax
+        push 0x0000                                                  ; segment
-        push ax                 ; segment
+        call ReadFATCluster
-        call ReadFATCluster     ; uint8_t ReadFATCluster(uint16_t seg, uint16_t offset, uint32_t cluster)
         add sp, 0x8
 
         mov si, dir_buffer
@@ -125,9 +121,9 @@ SearchFATDIR:
         ; if eax >= 0x0FFFFFF8 then there are no more clusters (end of chain)
         ; if eax == 0x0FFFFFF7 then this is a cluster that is marked as bad
 
-        mov eax, dword [bx + FAT32_State_t.curr_dir_cluster_32]
+        ; uint32_t NextCluster(uint32_t active_cluster);
-        push dword eax
+        push dword [bx + FAT32_State_t.curr_dir_cluster_32]
-        call NextCluster        ; uint32_t NextCluster(uint32_t active_cluster);
+        call NextCluster        
         add sp, 0x4
 
         cmp eax, 0x0fff_fff7
@@ -137,16 +133,14 @@ SearchFATDIR:
 
     .load_next_dir_next_OK:
         ; load 512 bytes of directory entries from data sector
-        mov eax, [bx + FAT32_State_t.curr_dir_cluster_32]
-        push dword eax          ; cluster
 
-        mov ax, dir_buffer    
+        ; uint8_t ReadFATCluster(uint16_t seg, uint16_t offset, uint32_t cluster)
-        push ax                 ; offset
+        push dword [bx + FAT32_State_t.curr_dir_cluster_32] ; cluster   
-
+        push dir_buffer                                     ; offset
-        xor ax, ax
+        push 0x0000                                         ; segment
-        push ax                 ; segment
+        call ReadFATCluster     
-        call ReadFATCluster     ; uint8_t ReadFATCluster(uint16_t seg, uint16_t offset, uint32_t cluster)
         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
@@ -176,7 +170,9 @@ SearchFATDIR:
 
     ; TODO: move this to a seperate string search function
     .parse_dir:
-        print_string MaybeFound_Boot_info
+        __CDECL16_CALL_ARGS MaybeFound_Boot_info
+        __CDECL16_CALL PrintString, 1
+        
         .lfn_check:
             ; check for ATTR_READ_ONLY | ATTR_HIDDEN | ATTR_SYSTEM | ATTR_VOLUME_ID  (0x0F) in offset 11
             ; TODO: going to skip LFN for now, since all valid volumes will have SFN's
@@ -212,18 +208,13 @@ ALIGN 4, db 0x90
 NextCluster:
     __CDECL16_PROC_ENTRY
 .func:
-    print_string NextFATCluster_info
+    __CDECL16_CALL_ARGS NextFATCluster_info
+    __CDECL16_CALL PrintString, 1
 
-    mov ax, FAT32_NextClusterData_t_size
+    __CDECL16_CALL_ARGS fat32_nc_data, 0x0000, FAT32_NextClusterData_t_size
-    push ax                     ; length
+    __CDECL16_CALL kmemset, 3
-    xor ax, ax
-    push ax                     ; init with zero
-    mov ax, fat32_nc_data
-    push ax                     ; address of structure
-    call kmemset
-    add sp, 0x6
 
-    mov edx, dword [bp + 4]
+    mov edx, dword [bp + 4]                      ; active_cluster
     mov si, fat32_nc_data                        ; instead of push/pop and moving the data back
     mov di, fat32_bpb                            ; load si & di then use xchg
     mov bx, fat32_state
@@ -270,10 +261,11 @@ NextCluster:
 ;                         uint32_t lba,
 ;                         uint16_t count, uint16_t drive_num)
 .read_cluster:
-; next_cluster = fat_buffer[entry_offset]
+    ; next_cluster = fat_buffer[entry_offset]
     mov ebx, dword [si + FAT32_NextClusterData_t.entry_offset]
     mov si, fat_buffer
     mov eax, dword [bx+si+0]
+    ; BUG: ???
 .endp:
     __CDECL16_PROC_EXIT
     ret
@@ -285,7 +277,8 @@ ALIGN 4, db 0x90
 ReadFATCluster:
     __CDECL16_PROC_ENTRY
 .func:
-    print_string ReadFATCluster_info
+    __CDECL16_CALL_ARGS ReadFATCluster_info
+    __CDECL16_CALL PrintString, 1
 
     mov bx, fat32_bpb
     mov si, fat32_ebpb

scripts/create-disk.sh

@@ -124,8 +124,11 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
         echo "[2/7] Write DOS partition table (single FAT32 LBA @ 2048)"
         "$SF" --no-reread "$disk_img" < /tmp/pt.sfdisk
 
-        echo "[3/7] Make FAT32 filesystem in partition image"
+        # BUG: the default disk img is 256MiB which mkfs.fat wants to create
-        "$MKFS" -v -F32 -s 1 -n 'STEVIAFS' "$part_img"
+        #      a FAT16 FS by default. it needs to be at least 2GiB to to 'lock out'
+        #      FAT16 as an option. Force FAT32 here, might(?) break some things.
+        echo "[3/7] Make FAT filesystem in partition image"
+        "$MKFS" -F32 -v -n 'STEVIAFS' "$part_img"
 
         echo "[4/7] Patch VBR inside partition image (preserve BPB)"
 

src/stage2/stage2.nasm

@@ -34,13 +34,6 @@
 %include "early_mem.inc"
 %include "error_codes.inc"
 
-%macro print_string 1
-    mov ax, %1
-    push ax
-    call PrintString
-    add sp, 0x2
-%endmacro
-
 section .text
 begin_text:
 ; dl = byte boot_drive
@@ -145,37 +138,43 @@ main:
 
     call SetTextMode
     call disable_cursor_bios
-    print_string HelloPrompt_info
+
+    __CDECL16_CALL_ARGS HelloPrompt_info
+    __CDECL16_CALL PrintString, 1
 
     ; setup the early heap
     __CDECL16_CALL_ARGS early_heap_state
-    __CDECL16_CALL arena_init, 1
     
     ; enable A20 gate
     call EnableA20
-    print_string A20_Enabled_OK_info
+    __CDECL16_CALL_ARGS A20_Enabled_OK_info
+    __CDECL16_CALL PrintString, 1
 
     ; get system memory map
     call GetMemoryMap
-    print_string MemoryMap_OK_info
+    __CDECL16_CALL_ARGS MemoryMap_OK_info
+    __CDECL16_CALL PrintString, 1
 
     ; enter unreal mode (enter PM w/ 16 bit code, 32 bit flat memory model & return to real)
     ; ds, es will be set to the 64KiB STAGE2_SEGMENT, fs/gs will be flat/huge memory (4GiB)
     ; use __REFLAT macros to re-flat ds/es for easy transfers to >1MiB
     ; NOTE: if you modify a segment register you will need to re-unreal it
     call EnterUnrealMode
-    print_string UnrealMode_OK_info
+    __CDECL16_CALL_ARGS UnrealMode_OK_info
+    __CDECL16_CALL PrintString, 1
 
     ; FAT Driver setup
     call InitFATDriver
-    print_string InitFATSYS_OK_info
+    __CDECL16_CALL_ARGS InitFATSYS_OK_info
+    __CDECL16_CALL PrintString, 1
 
     ;
     ; Find first cluster of bootable file
     call SearchFATDIR
     push dword eax      ; save first cluster of bootable file
 
-    print_string FileFound_OK_info
+    __CDECL16_CALL_ARGS FileFound_OK_info
+    __CDECL16_CALL PrintString, 1
 
     pop dword eax
     push dword eax      ; print Cluster of boot file