Skip to content

Commit 665c13e

Browse files
committed
no update
1 parent d637057 commit 665c13e

28 files changed

Lines changed: 251 additions & 37 deletions

GegOS.iso

12.5 MB
Binary file not shown.

GegOS64.iso

0 Bytes
Binary file not shown.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ $(BUILD_DIR)/$(KERNEL_BIN): $(OBJECTS) linker.ld
8181
$(BUILD64_DIR)/$(KERNEL64_BIN): $(OBJECTS64) linker64.ld
8282
@echo "LD64 $(KERNEL64_BIN)"
8383
@$(LD64) $(LDFLAGS64) $(OBJECTS64) -o $@
84-
@grub-file --is-x86-multiboot $@ && echo "Multiboot64: VALID" || (echo "ERROR: Multiboot64 invalid!"; exit 1)
84+
@grub-file --is-x86-multiboot2 $@ && echo "Multiboot2: VALID" || (echo "ERROR: Multiboot2 invalid!"; exit 1)
8585

8686
$(ISO_NAME): $(BUILD_DIR)/$(KERNEL_BIN) grub.cfg | dirs
8787
@echo "Creating 32-bit ISO..."

boot64.s

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,37 @@
1-
; boot64.s - 64-bit Multiboot bootloader for GegOS
1+
; boot64.s - 64-bit Multiboot2 bootloader for GegOS
22
; Assembler: NASM
33
; Target: x86-64 (64-bit)
44
; Enters long mode and boots 64-bit kernel
55

6-
; Multiboot 1 constants
7-
MBALIGN equ 1 << 0
8-
MEMINFO equ 1 << 1
9-
FLAGS equ MBALIGN | MEMINFO
10-
MAGIC equ 0x1BADB002
11-
CHECKSUM equ -(MAGIC + FLAGS)
6+
; Multiboot 2 constants
7+
MB2_MAGIC equ 0xe85250d6
8+
MB2_ARCH equ 0 ; i386 protected mode
9+
MB2_HEADER_LEN equ header_end - header_start
10+
MB2_CHECKSUM equ 0x100000000 - (MB2_MAGIC + MB2_ARCH + MB2_HEADER_LEN)
1211

13-
; Multiboot header section
12+
; Multiboot2 header section
1413
section .multiboot
15-
align 4
16-
dd MAGIC
17-
dd FLAGS
18-
dd CHECKSUM
14+
header_start:
15+
dd MB2_MAGIC
16+
dd MB2_ARCH
17+
dd MB2_HEADER_LEN
18+
dd MB2_CHECKSUM
19+
20+
; Framebuffer tag
21+
align 8
22+
dw 5 ; Type: framebuffer
23+
dw 0 ; Flags
24+
dd 20 ; Size
25+
dd 1024 ; Width
26+
dd 768 ; Height
27+
dd 32 ; Depth
28+
29+
; End tag
30+
align 8
31+
dw 0 ; Type: end
32+
dw 0 ; Flags
33+
dd 8 ; Size
34+
header_end:
1935

2036
; Stack section - 16KB stack
2137
section .bss

build/apps.o

17.7 KB
Binary file not shown.

build/boot.o

864 Bytes
Binary file not shown.

build/game_2048.o

4.48 KB
Binary file not shown.

build/gegos.bin

60.5 KB
Binary file not shown.

build/gui.o

9.15 KB
Binary file not shown.

build/isodir/boot/gegos.bin

60.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)