Remove constants.zig

This commit is contained in:
Sam Tebbs 2021-02-22 14:22:54 +00:00
parent 9ca2541330
commit f62ba58f1a
4 changed files with 2 additions and 7 deletions

View file

@ -1,4 +1,3 @@
const constants = @import("constants");
const arch = @import("arch.zig");
/// The multiboot header
@ -13,7 +12,7 @@ const MEMINFO = 1 << 1;
const MAGIC = 0x1BADB002;
const FLAGS = ALIGN | MEMINFO;
const KERNEL_PAGE_NUMBER = constants.KERNEL_ADDR_OFFSET >> 22;
const KERNEL_PAGE_NUMBER = 0xC0000000 >> 22;
// The number of pages occupied by the kernel, will need to be increased as we add a heap etc.
const KERNEL_NUM_PAGES = 1;

View file

@ -1,2 +0,0 @@
/// The virtual address where the kernel will be loaded. This is at 3GB.
pub const KERNEL_ADDR_OFFSET = 0xC0000000;

View file

@ -1,5 +1,6 @@
ENTRY(_start)
/* Changes to KERNEL_ADDR_OFFSET must also be made to KERNEL_PAGE_NUMBER in boot.zig */
KERNEL_ADDR_OFFSET = 0xC0000000;
KERNEL_VADDR_START = 0xC0100000;