From 3790d261949b908fd29bf356959d17321d5e315a Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Sun, 23 May 2021 04:15:36 +0200
Subject: [PATCH] bootsect: Also handle if boot drive is above 0x8f and
 gracefully fail if that's the case

---
 stage1/hdd/bootsect.asm | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/stage1/hdd/bootsect.asm b/stage1/hdd/bootsect.asm
index 3f56af84..23e55436 100644
--- a/stage1/hdd/bootsect.asm
+++ b/stage1/hdd/bootsect.asm
@@ -27,13 +27,11 @@ start:
     ; So if the value the BIOS passed is <0x80, just assume it has passed
     ; an incorrect value.
     cmp dl, 0x80
-    jae .continue
-
-    ; Error out (BX zeroed out above)
-    push 0xb800
-    pop es
-    mov dword [es:bx], 'F ! '
-    jmp err
+    jb floppy_err
+    ; Values above 0x8f are dubious so we assume we weren't booted properly
+    ; for those either
+    cmp dl, 0x8f
+    ja hdd_err
 
   .continue:
     ; Make sure int 13h extensions are supported
@@ -75,10 +73,6 @@ start:
 
     jmp 0x08:vector
 
-err:
-    hlt
-    jmp err
-
 times 0xda-($-$$) db 0
 times 6 db 0
 
@@ -87,6 +81,21 @@ times 6 db 0
 %include 'disk.asm'
 %include '../gdt.asm'
 
+err:
+    push 0xb800
+    pop es
+    mov dword [es:0], eax
+    .h: hlt
+    jmp .h
+
+floppy_err:
+    mov eax, 'F ! '
+    jmp err
+
+hdd_err:
+    mov eax, 'H ! '
+    jmp err
+
 bits 32
 vector:
     mov eax, 0x10