3 files changed, 26 insertions, 0 deletions

diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index ee9b69f81..68a29b154 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -246,6 +246,26 @@ void Write(const VAddr vaddr, const T data) {
     }
 }
 
+bool IsValidVirtualAddress(const VAddr vaddr) {
+    const u8* page_pointer = current_page_table->pointers[vaddr >> PAGE_BITS];
+    if (page_pointer)
+        return true;
+
+    if (current_page_table->attributes[vaddr >> PAGE_BITS] != PageType::Special)
+        return false;
+
+    MMIORegionPointer mmio_region = GetMMIOHandler(vaddr);
+    if (mmio_region) {
+        return mmio_region->IsValidAddress(vaddr);
+    }
+
+    return false;
+}
+
+bool IsValidPhysicalAddress(const PAddr paddr) {
+    return IsValidVirtualAddress(PhysicalToVirtualAddress(paddr));
+}
+
 u8* GetPointer(const VAddr vaddr) {
     u8* page_pointer = current_page_table->pointers[vaddr >> PAGE_BITS];
     if (page_pointer) {
@@ -261,6 +281,7 @@ u8* GetPointer(const VAddr vaddr) {
 }
 
 u8* GetPhysicalPointer(PAddr address) {
+    // TODO(Subv): This call should not go through the application's memory mapping.
     return GetPointer(PhysicalToVirtualAddress(address));
 }
 
diff --git a/src/core/memory.h b/src/core/memory.h
index 126d60471..9ada78fc8 100644
--- a/src/core/memory.h
+++ b/src/core/memory.h
@@ -110,6 +110,9 @@ enum : VAddr {
     NEW_LINEAR_HEAP_VADDR_END = NEW_LINEAR_HEAP_VADDR + NEW_LINEAR_HEAP_SIZE,
 };
 
+bool IsValidVirtualAddress(const VAddr addr);
+bool IsValidPhysicalAddress(const PAddr addr);
+
 u8 Read8(VAddr addr);
 u16 Read16(VAddr addr);
 u32 Read32(VAddr addr);
diff --git a/src/core/mmio.h b/src/core/mmio.h
index 06b555e98..cb644f51b 100644
--- a/src/core/mmio.h
+++ b/src/core/mmio.h
@@ -18,6 +18,8 @@ class MMIORegion {
 public:
     virtual ~MMIORegion() = default;
 
+    virtual bool IsValidAddress(VAddr addr) = 0;
+
     virtual u8 Read8(VAddr addr) = 0;
     virtual u16 Read16(VAddr addr) = 0;
     virtual u32 Read32(VAddr addr) = 0;