From 4d926ffe0efdc02ceb43b8959857072ad7ef6f16 Mon Sep 17 00:00:00 2001 From: Marin Ivanov Date: Wed, 1 May 2024 01:21:41 +0300 Subject: fix: linking works --- src/linker.ld | 9 +++------ src/main.zig | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/linker.ld b/src/linker.ld index 429da33..768cf15 100644 --- a/src/linker.ld +++ b/src/linker.ld @@ -1,13 +1,10 @@ ENTRY(_start) SECTIONS { - . = 1M; - - .multiboot { - KEEP(*(.multiboot)) - } + . = 0x100000; .text : ALIGN(4K) { + KEEP(*(.multiboot)) *(.text) } @@ -20,7 +17,7 @@ SECTIONS { } .bss : ALIGN(4K) { - *(COMMON) *(.bss) + *(COMMON) } } diff --git a/src/main.zig b/src/main.zig index fdb2ea4..1f7facd 100644 --- a/src/main.zig +++ b/src/main.zig @@ -22,12 +22,12 @@ const stack_bytes_slice = stack_bytes[0..]; export fn _start() callconv(.Naked) noreturn { // @call(.{ .stack = stack_bytes_slice }, kmain, .{}); - asm volatile ("jmp kmain;"); + asm volatile ("jmp kmain"); while (true) {} } -fn kmain() void { +export fn kmain() void { console.initialize(); console.puts("Hello world!"); } -- cgit v1.2.3