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

align to 16 byte bounds and add git info to build

Browse Source
This commit is contained in:
Elaina Claus
2024-10-15 18:28:06 -04:00
parent e65220fece
commit 915ac4c8ae
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@@ -1,6 +1,3 @@
iso := '/tmp/disk.img'
isoz := 'disk.img.gz'
include := './include'
mbr_source_files := $(wildcard src/mbr/*.nasm)
@@ -15,6 +12,14 @@ boottest_binary_files := $(patsubst src/miniboot32/%.nasm, build/%.bin, $(bootte
build_dir := 'build'
# Get current Git version (tag) and hash
GIT_VERSION := $(shell git describe --tags)
GIT_HASH := $(shell git rev-parse HEAD)
GIT_NASM_DEFINES := -D __GIT_VER__='"$(GIT_VERSION)"' -D __GIT_HASH__='"$(GIT_HASH)"'
iso := '/tmp/disk.img'
isoz := 'disk.img.gz'
qemu_args := -L ./bin/ -bios bios.bin -cpu pentium3 -m 128 -S -s -monitor stdio -nic none
.PHONY: all mbr vbr stage2 boottest clean run run_bochs iso isoz
@@ -44,19 +49,19 @@ isoz: $(isoz)
build/%.bin: src/mbr/%.nasm
@mkdir -p $(shell dirname $@)
@nasm -i$(include) -Wall -f bin $< -o $@
@nasm -i$(include) -Wall -f bin $(GIT_NASM_DEFINES) $< -o $@
build/%.bin: src/vbr/%.nasm
@mkdir -p $(shell dirname $@)
@nasm -i$(include) -Wall -f bin $< -o $@
@nasm -i$(include) -Wall -f bin $(GIT_NASM_DEFINES) $< -o $@
build/%.bin: src/stage2/%.nasm
@mkdir -p $(shell dirname $@)
@nasm -i$(include) -Wall -f bin $< -o $@
@nasm -i$(include) -Wall -f bin $(GIT_NASM_DEFINES) $< -o $@
build/%.bin: src/miniboot32/%.nasm
@mkdir -p $(shell dirname $@)
@nasm -i$(include) -Wall -f bin $< -o $@
@nasm -i$(include) -Wall -f bin $(GIT_NASM_DEFINES) $< -o $@
$(iso): $(mbr_binary_files) $(vbr_binary_files) $(stage2_binary_files) $(boottest_binary_files)
@echo root access needed to create disk image...

24
src/stage2/stage2.nasm
View File

@@ -180,14 +180,12 @@ main:
call GetMemoryMap
print_string MemoryMap_OK_cstr
__BOCHS_MAGIC_DEBUG
; FAT Driver setup
call InitFATDriver
print_string InitFATSYS_OK_cstr
;
; Find first cluster of bootable file
__BOCHS_MAGIC_DEBUG
call SearchFATDIR
push dword eax ; save first cluster of bootable file
@@ -381,7 +379,7 @@ begin_data:
; #############
%macro define_str 2
ALIGN 4
ALIGN 16
%1_str:
db %2
%define str_len %strlen(%2) ; string
@@ -394,7 +392,7 @@ begin_data:
; TODO: place that newline and return
%macro define_cstr 2
%define CRLF_NUL 0Dh, 0Ah, 00h
ALIGN 4
ALIGN 16
%1_cstr:
db %2, CRLF_NUL
%endmacro
@@ -410,7 +408,7 @@ define_cstr NewLine, ""
define_str BootTarget, "BOOT BIN"
ALIGN 4
ALIGN 16
IntToHex_table:
db '0123456789ABCDEF'
@@ -474,13 +472,21 @@ gdt32_start:
db 0x00
gdt32_end:
ALIGN 8
version_magic:
ALIGN 8,db 0x00
BUILD_NASM_VER:
db "Stevia Stage2 built with NASM - ", __NASM_VER__, 00h
ALIGN 8
datetime_magic:
ALIGN 8,db 0x00
BUILD_DATETIME:
db 'Assembled - ', __DATE__, ' ', __TIME__, 00h
ALIGN 8,db 0x00
BUILD_GIT_VER:
db __GIT_VER__, 00h
ALIGN 8,db 0x00
BUILD_GIT_HASH:
db __GIT_HASH__, 00h
end_data:
%assign bytes_remaining ((MAX_STAGE2_BYTES - 4) - ($ - $$))