aboutsummaryrefslogtreecommitdiff
path: root/src/main.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.zig')
-rw-r--r--src/main.zig27
1 files changed, 1 insertions, 26 deletions
diff --git a/src/main.zig b/src/main.zig
index 443e440..36dcd5e 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1,35 +1,10 @@
comptime {
- asm (@embedFile("boot64.s"));
- asm (@embedFile("boot32.s"));
+ _ = @import("bootstrap/boot.zig");
}
const debug = @import("debugcon.zig");
const console = @import("console.zig");
-const MAGIC = 0xE85250D6;
-const ARCHITECTURE = 0;
-
-const MultibootHeader = extern struct {
- magic: u32,
- architecture: u32,
- header_len: u32,
- checksum: u32,
-
- tag0: u16,
- tag1: u16,
- tag2: u32,
-};
-
-export const multiboot2 align(4) linksection(".multiboot") = MultibootHeader{
- .magic = MAGIC,
- .architecture = ARCHITECTURE,
- .header_len = 24,
- .checksum = 0x100000000 - (MAGIC + ARCHITECTURE + 24),
- .tag0 = 0,
- .tag1 = 0,
- .tag2 = 8,
-};
-
export fn kmain() noreturn {
console.initialize();
console.setColor(0x2F);