From 67a7d8ee256437255a0ee68407347258df3749a5 Mon Sep 17 00:00:00 2001
From: Erin <erin@erindesu.cz>
Date: Tue, 8 Aug 2023 03:10:11 +0200
Subject: [PATCH] Added inner memory access

---
 hbvm/src/main.rs           |  4 +++-
 hbvm/src/softpaging/mod.rs | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/hbvm/src/main.rs b/hbvm/src/main.rs
index 05d23c7f..f5cc6136 100644
--- a/hbvm/src/main.rs
+++ b/hbvm/src/main.rs
@@ -1,3 +1,5 @@
+use hbvm::softpaging::paging::PageTable;
+
 use {
     hbbytecode::valider::validate,
     hbvm::{
@@ -61,7 +63,7 @@ impl HandlePageFault for TestTrapHandler {
     fn page_fault(
         &mut self,
         _: MemoryAccessReason,
-        //_: &mut Memory,
+        _: &mut PageTable,
         _: u64,
         _: PageSize,
         _: *mut u8,
diff --git a/hbvm/src/softpaging/mod.rs b/hbvm/src/softpaging/mod.rs
index 2ec72e57..96005a41 100644
--- a/hbvm/src/softpaging/mod.rs
+++ b/hbvm/src/softpaging/mod.rs
@@ -98,7 +98,13 @@ impl<PfHandler: HandlePageFault> SoftPagedMem<PfHandler> {
                 // No page found
                 Some(Err(AddrPageLookupError { addr, size })) => {
                     // Attempt to execute page fault handler
-                    if self.pf_handler.page_fault(reason, addr, size, dst) {
+                    if self.pf_handler.page_fault(
+                        reason,
+                        unsafe { &mut *self.root_pt },
+                        addr,
+                        size,
+                        dst,
+                    ) {
                         // Shift the splitter address
                         pspl.bump(size);
 
@@ -465,7 +471,7 @@ pub trait HandlePageFault {
     fn page_fault(
         &mut self,
         reason: MemoryAccessReason,
-        // memory: &mut SoftPagedMem<Self>, TODO: Make work
+        pagetable: &mut PageTable,
         vaddr: u64,
         size: PageSize,
         dataptr: *mut u8,