From 857f2d6fe4a77a485d9ed46c0c80eecf61142607 Mon Sep 17 00:00:00 2001
From: kotorifan <kotorifan05@gmail.com>
Date: Mon, 2 Mar 2026 17:24:12 +0100
Subject: The bootloader now enters stage 2

---
 src/boot/boot.common.asm |  0
 src/boot/boot.stage1.asm | 29 +++++++++++++----------------
 src/boot/boot.stage2.asm |  2 +-
 3 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 src/boot/boot.common.asm

(limited to 'src/boot')

diff --git a/src/boot/boot.common.asm b/src/boot/boot.common.asm
deleted file mode 100644
index e69de29..0000000
diff --git a/src/boot/boot.stage1.asm b/src/boot/boot.stage1.asm
index bb55dee..a67e7fa 100644
--- a/src/boot/boot.stage1.asm
+++ b/src/boot/boot.stage1.asm
@@ -2,7 +2,9 @@
     [bits 16]
     [org 0x7c00]
     global _start
-
+    jmp _start
+    %include "boot.stage1.print.asm"
+    %include "common.asm"
 
 _start: 
     ;; Setup segment registers
@@ -21,11 +23,10 @@ _start:
     call _print_string
 
     ;; Load Stage 2
-    mov ah, 0x42                ; Extended read
-    mov dl, [drive]             ; Set drive number 
+    mov si, DAP                 ; DAP is at cs:si
     xor ax, ax
-    mov ds, ax
-    mov si, DAP
+    mov ah, 0x42                ; Extended read
+    mov dl, [drive]             ; Set drive number
     int 0x13                    ; Read disk 
     jc _disk_read_err
 
@@ -40,20 +41,16 @@ _disk_read_err:
     jmp .halt
 
     align 16
-DAP:    
-    db 0x10                             ; Size of packet
-    db 0                                ; Zero
-    dw READ_SECTORS_NUM                 ; Number of sectors to be read
-    dw STAGE2_ADDR                      ; Destination address
-    dw 0x0000                           ; Segment
-    dq 1                                ; Which sector to start at
-
+DAP:
+    db 0x10
+    db 0
+    dw READ_SECTORS_NUM
+    dw STAGE2_ADDR
+    dw 0x0000
+    dq 1
 drive:  db 0
 disk_read_err_msg: db "Disk error", 13, 10, 0
 boot_msg:  db "Booting", 13, 10, 0
 
-    %include "boot.stage1.print.asm"
-    %include "common.asm"
-
     times 510-($-$$) db 0
     dw 0xAA55
diff --git a/src/boot/boot.stage2.asm b/src/boot/boot.stage2.asm
index ac5d532..52c73e5 100644
--- a/src/boot/boot.stage2.asm
+++ b/src/boot/boot.stage2.asm
@@ -21,7 +21,7 @@ _s2_entry:
     or eax, 1
     mov cr0, eax
 
-    jmp far CODE_SEG32:_protected_mode
+    jmp CODE_SEG32:_protected_mode
 
     [bits 32]
 _protected_mode:    
-- 
cgit v1.3