redo application paging and system calls, rename mercury to hilbert

1 files changed, 11 insertions, 11 deletions

diff --git a/kernel/entry.cpp b/kernel/entry.cpp
index cce8066..8ba585f 100644
--- a/kernel/entry.cpp
+++ b/kernel/entry.cpp
@@ -1,13 +1,13 @@
-#include <mercury/kernel/storage/bd/memory.hpp>
-#include <mercury/kernel/storage/fs/tarfs.hpp>
-#include <mercury/kernel/application.hpp>
-#include <mercury/kernel/framebuffer.hpp>
-#include <mercury/kernel/terminal.hpp>
-#include <mercury/kernel/limine.hpp>
-#include <mercury/kernel/paging.hpp>
-#include <mercury/kernel/vfile.hpp>
+#include <hilbert/kernel/storage/bd/memory.hpp>
+#include <hilbert/kernel/storage/fs/tarfs.hpp>
+#include <hilbert/kernel/application.hpp>
+#include <hilbert/kernel/framebuffer.hpp>
+#include <hilbert/kernel/terminal.hpp>
+#include <hilbert/kernel/limine.hpp>
+#include <hilbert/kernel/paging.hpp>
+#include <hilbert/kernel/vfile.hpp>
 
-using namespace mercury::kernel;
+using namespace hilbert::kernel;
 
 LIMINE_BASE_REVISION(1)
 
@@ -173,8 +173,8 @@ extern "C" [[noreturn]] void entry() {
   //set up framebuffer and terminal:
   //TODO: assumes framebuffer is 32-bpp rgb
 
-  framebuffer::init_framebuffer(
-    fb_vaddr, framebuffer->width, framebuffer->height, framebuffer->pitch);
+  framebuffer::init_framebuffer(fb_start, fb_vaddr,
+    framebuffer->width, framebuffer->height, framebuffer->pitch);
 
   //switch to kernel p4