diff options
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/main.zig b/src/main.zig index 76bdadf..f3ea424 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,9 +1,12 @@ +comptime { + asm (@embedFile("boot.s")); +} + const debug = @import("debugcon.zig"); const ALIGN = 1 << 0; const MEMINFO = 1 << 1; const MAGIC = 0xE85250D6; -// const FLAGS = ALIGN | MEMINFO; const FLAGS = 0; const MultibootHeader = extern struct { @@ -27,14 +30,6 @@ export const multiboot2 align(4) linksection(".multiboot") = MultibootHeader{ .tag2 = 8, }; -export fn _start() callconv(.Naked) noreturn { - asm volatile ( - \\ mov _sstack, %rsp - \\ mov %rsp, %rbp - ); - asm volatile ("jmp kmain"); -} - var vga = @as([*]volatile u16, @ptrFromInt(0xB8000)); export fn kmain() noreturn { |
