Merge upstream changes from branch 'trunk' into fat32_sys_rewrite

2024-12-19 20:09:48 -05:00
parent d98786072c 56b86fe12e
commit 9918f2367e
4 changed files with 102 additions and 81 deletions
--- a/src/vbr/vbr.nasm
+++ b/src/vbr/vbr.nasm
@@ -152,10 +152,10 @@ main:
    call read_disk_raw
    add sp, 0xC
 .enter_stage2:
-    mov dl, byte [bp - 2]               ; boot_drive
-    mov si, word [bp - 4]               ; part_offset
-    mov bx, partition_table
-    mov dx, fat32_bpb
+    mov dl, byte [bp - 2]               ; byte boot_drive
+    mov ax, word [bp - 4]               ; word part_offset
+    mov si, partition_table             ; ptr partition_table
+    mov di, fat32_bpb                   ; ptr fat32_bpb
    jmp word 0x0000:STAGE2_ENTRY

 ; ###############