From 6ae68d1a19784752227c38753ac683f2026f30d2 Mon Sep 17 00:00:00 2001
From: Elaina Claus <elaina.claus@chtm.me>
Date: Tue, 8 Oct 2024 08:55:17 -0400
Subject: [PATCH] ensure 2 byte jmp rel8 thunk to init surpress reloc abs
 warnings corrected include paths/filenames

---
 src/mbr/mbr.nasm       | 10 ++++++----
 src/stage2/stage2.nasm | 14 ++++++++------
 src/vbr/vbr.nasm       | 13 +++++++------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/mbr/mbr.nasm b/src/mbr/mbr.nasm
index de84aae..d02d405 100755
--- a/src/mbr/mbr.nasm
+++ b/src/mbr/mbr.nasm
@@ -21,7 +21,9 @@
 [BITS 16]
 [ORG 0x7A00]
 [CPU KATMAI]
-[WARNING -reloc-abs-word]
+[WARNING -reloc-abs-byte]
+[WARNING -reloc-abs-word]                   ; Yes, we use absolute addresses. surpress these warnings.
+
 %define __STEVIA_MBR
 
 jmp short (init - $$)
@@ -71,8 +73,8 @@ init:
 ;
 ; ###############
 
-%include "kmem_func.inc"
-%include "util/error_func.inc"
+%include "util/kmem_func.nasm"
+%include "util/error_func.nasm"
 
 ; ###############
 ; End Section
@@ -163,7 +165,7 @@ main:
 ;
 ; ###############
 
-%include 'BIOS/func/ext_read.inc'
+%include 'BIOS/func/ext_read.nasm'
 
 ; ###############
 ; End Section
diff --git a/src/stage2/stage2.nasm b/src/stage2/stage2.nasm
index b4750d7..717279a 100755
--- a/src/stage2/stage2.nasm
+++ b/src/stage2/stage2.nasm
@@ -21,8 +21,10 @@
 [BITS 16]
 [ORG 0X7E00]
 [CPU KATMAI]
+[WARNING -reloc-abs-byte]
 [WARNING -reloc-abs-word]
-[WARNING -reloc-abs-dword]
+[WARNING -reloc-abs-dword]              ; Yes, we use absolute addresses. surpress these warnings.
+
 %define __STEVIA_STAGE2
 
 __STAGE2_ENTRY:
@@ -70,8 +72,8 @@ init:
 ;
 ; ###############
 
-%include "kmem_func.inc"
-%include "util/error_func.inc"
+%include "util/kmem_func.nasm"
+%include "util/error_func.nasm"
 
 ; ###############
 ; End Section
@@ -154,7 +156,7 @@ main:
     ERROR STEVIA_DEBUG_HALT
 hcf:
     hlt
-    jmp short hcf
+    jmp short (hcf - $$)
 
 ; ###############
 ;
@@ -162,7 +164,7 @@ hcf:
 ;
 ; ###############
 
-%include 'fat32/fat32_sys.inc'
+%include 'fat32/FAT32_SYS.inc'
 
 ; ###############
 ;
@@ -170,7 +172,7 @@ hcf:
 ;
 ; ###############
 
-%include 'BIOS/BIOS_sys.inc'
+%include 'BIOS/BIOS_SYS.inc'
 
 ; ##############################
 ;
diff --git a/src/vbr/vbr.nasm b/src/vbr/vbr.nasm
index 9018af1..c630f6f 100755
--- a/src/vbr/vbr.nasm
+++ b/src/vbr/vbr.nasm
@@ -20,13 +20,14 @@
 [BITS 16]
 [ORG 0x7C00]
 [CPU KATMAI]
-[WARNING -reloc-abs-word]
+[WARNING -reloc-abs-byte]
+[WARNING -reloc-abs-word]                   ; Yes, we use absolute addresses. surpress these warnings.
 %define __STEVIA_VBR
 
 __ENTRY:
-    jmp short (init_thunk - $$)
+    jmp short (init - $$)
     nop
-    
+
 phy_bpb_start:
 ; fill BPB area with 0x00 since we skip writing this part to disk
 ; but we need it for the 'jmp short entry; nop' above
@@ -75,8 +76,8 @@ init:
 ;
 ; ###############
 
-%include "kmem_func.inc"
-%include "util/error_func.inc"
+%include "util/kmem_func.nasm"
+%include "util/error_func.nasm"
 
 ; ###############
 ; End Section
@@ -143,7 +144,7 @@ main:
 ; Required BIOS function(s)
 ; ###############
 
-%include 'BIOS/func/ext_read.inc'
+%include 'BIOS/func/ext_read.nasm'
 
 %assign bytes_remaining (420 - ($ - $$))
 %warning VBR has bytes_remaining bytes remaining for code (MAX: 420 bytes)