nivirx/stevia
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

ensure 2 byte jmp rel8 thunk to init

Browse Source 
surpress reloc abs warnings
corrected include paths/filenames
This commit is contained in:
Elaina Claus
2024-10-08 08:55:17 -04:00
parent 09d33086a0
commit 6643e3c990
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mbr/mbr.nasm
View File

@@ -21,7 +21,9 @@
[BITS 16] [BITS 16]
[ORG 0x7A00] [ORG 0x7A00]
[CPU KATMAI] [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 %define __STEVIA_MBR
jmp short (init - $$) jmp short (init - $$)
@@ -71,8 +73,8 @@ init:
; ;
; ############### ; ###############
%include "kmem_func.inc" %include "util/kmem_func.nasm"
%include "util/error_func.inc" %include "util/error_func.nasm"
; ############### ; ###############
; End Section ; End Section
@@ -163,7 +165,7 @@ main:
; ;
; ############### ; ###############
%include 'BIOS/func/ext_read.inc' %include 'BIOS/func/ext_read.nasm'
; ############### ; ###############
; End Section ; End Section

14
src/stage2/stage2.nasm
View File

@@ -21,8 +21,10 @@
[BITS 16] [BITS 16]
[ORG 0X7E00] [ORG 0X7E00]
[CPU KATMAI] [CPU KATMAI]
[WARNING -reloc-abs-byte]
[WARNING -reloc-abs-word] [WARNING -reloc-abs-word]
[WARNING -reloc-abs-dword] [WARNING -reloc-abs-dword] ; Yes, we use absolute addresses. surpress these warnings.
%define __STEVIA_STAGE2 %define __STEVIA_STAGE2
__STAGE2_ENTRY: __STAGE2_ENTRY:
@@ -70,8 +72,8 @@ init:
; ;
; ############### ; ###############
%include "kmem_func.inc" %include "util/kmem_func.nasm"
%include "util/error_func.inc" %include "util/error_func.nasm"
; ############### ; ###############
; End Section ; End Section
@@ -154,7 +156,7 @@ main:
ERROR STEVIA_DEBUG_HALT ERROR STEVIA_DEBUG_HALT
hcf: hcf:
hlt 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'
; ############################## ; ##############################
; ;

11
src/vbr/vbr.nasm
View File

@@ -20,11 +20,12 @@
[BITS 16] [BITS 16]
[ORG 0x7C00] [ORG 0x7C00]
[CPU KATMAI] [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 %define __STEVIA_VBR
__ENTRY: __ENTRY:
jmp short (init_thunk - $$) jmp short (init - $$)
nop nop
phy_bpb_start: phy_bpb_start:
@@ -75,8 +76,8 @@ init:
; ;
; ############### ; ###############
%include "kmem_func.inc" %include "util/kmem_func.nasm"
%include "util/error_func.inc" %include "util/error_func.nasm"
; ############### ; ###############
; End Section ; End Section
@@ -143,7 +144,7 @@ main:
; Required BIOS function(s) ; Required BIOS function(s)
; ############### ; ###############
%include 'BIOS/func/ext_read.inc' %include 'BIOS/func/ext_read.nasm'
%assign bytes_remaining (420 - ($ - $$)) %assign bytes_remaining (420 - ($ - $$))
%warning VBR has bytes_remaining bytes remaining for code (MAX: 420 bytes) %warning VBR has bytes_remaining bytes remaining for code (MAX: 420 bytes)