From 26bb071b4de706b67ea975d3fefd2245cccc8bd8 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Sun, 28 Jul 2024 23:14:24 -0400
Subject: [PATCH] Update base address to build with kernel code model

---
 Rsconscript          | 2 +-
 src/hulk/hulk.ld     | 2 +-
 src/hulk/hurl/hurl.d | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Rsconscript b/Rsconscript
index f1abba0..0ba3e79 100644
--- a/Rsconscript
+++ b/Rsconscript
@@ -132,7 +132,7 @@ hulk_env = env "hulk", use: %w[ldc2 x86_64-elf-gcc] do |env|
     -sse4a
     -ssse3
   ]
-  env["DFLAGS"] += %W[-g -mtriple=x86_64-unknown-elf -mattr=#{cpu_attrs.join(",")} --betterC -release -O3 --wi --enable-cross-module-inlining -code-model=large --disable-red-zone]
+  env["DFLAGS"] += %W[-g -mtriple=x86_64-unknown-elf -mattr=#{cpu_attrs.join(",")} --betterC -release -O3 --wi --enable-cross-module-inlining -code-model=kernel --disable-red-zone]
   env["D_IMPORT_PATH"] += %w[src]
   env["D_IMPORT_PATH"] << env.expand("^/src")
   env["LD"] = "x86_64-elf-gcc"
diff --git a/src/hulk/hulk.ld b/src/hulk/hulk.ld
index a1742c5..bfac42e 100644
--- a/src/hulk/hulk.ld
+++ b/src/hulk/hulk.ld
@@ -1,6 +1,6 @@
 SECTIONS
 {
-    . = 0xFFFF800000000000;
+    . = 0xFFFFFFFF80000000;
     _hulk_mem_start = .;
     _hulk_header_start = .;
 
diff --git a/src/hulk/hurl/hurl.d b/src/hulk/hurl/hurl.d
index 45f4c1c..bc100a1 100644
--- a/src/hulk/hurl/hurl.d
+++ b/src/hulk/hurl/hurl.d
@@ -18,16 +18,16 @@ import hulk.util;
 struct Hurl
 {
     /** HULK base address. */
-    enum ulong HULK_BASE = 0xFFFF_8000_0000_0000u;
+    enum ulong HULK_BASE = 0xFFFF_FFFF_8000_0000u;
 
     /** HULK stack top address. */
-    enum ulong HULK_STACK_TOP = 0xFFFF_8001_0000_0000u;
+    enum ulong HULK_STACK_TOP = 0xFFFF_FFFF_9000_0000u;
 
     /** HULK framebuffer address. */
-    enum ulong HULK_FRAMEBUFFER = 0xFFFF_8001_0000_0000u;
+    enum ulong HULK_FRAMEBUFFER = 0xFFFF_FFFF_9000_0000u;
 
     /** A1 allocator range base address. */
-    enum ulong A1_BASE = 0xFFFF_8002_0000_0000u;
+    enum ulong A1_BASE = 0xFFFF_FFFF_A000_0000u;
 
     /**
      * Pointer to the base page table.