From 48388376206aaa7d887b41030019035a06203867 Mon Sep 17 00:00:00 2001
From: GPUCode <geoster3d@gmail.com>
Date: Fri, 17 Nov 2023 22:23:48 +0200
Subject: device_memory: Enable direct mapped addresses for nce

---
 src/core/device_memory.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/core/device_memory.cpp')

diff --git a/src/core/device_memory.cpp b/src/core/device_memory.cpp
index de3f8ef8f..0528a8e3b 100644
--- a/src/core/device_memory.cpp
+++ b/src/core/device_memory.cpp
@@ -6,15 +6,20 @@
 
 namespace Core {
 
-#ifdef ANDROID
+#ifdef ARCHITECTURE_arm64
 constexpr size_t VirtualReserveSize = 1ULL << 38;
 #else
 constexpr size_t VirtualReserveSize = 1ULL << 39;
 #endif
 
-DeviceMemory::DeviceMemory()
+DeviceMemory::DeviceMemory(bool direct_mapped_address)
     : buffer{Kernel::Board::Nintendo::Nx::KSystemControl::Init::GetIntendedMemorySize(),
-             VirtualReserveSize} {}
+             VirtualReserveSize} {
+    if (direct_mapped_address) {
+        buffer.EnableDirectMappedAddress();
+    }
+}
+
 DeviceMemory::~DeviceMemory() = default;
 
 } // namespace Core
-- 
cgit v1.2.3


From 9f91ba1f7357c61dd2c7c3b437ea203d467fd400 Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Fri, 17 Nov 2023 23:44:53 +0200
Subject: arm: Implement native code execution backend

---
 src/core/device_memory.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/core/device_memory.cpp')

diff --git a/src/core/device_memory.cpp b/src/core/device_memory.cpp
index 0528a8e3b..3a9151646 100644
--- a/src/core/device_memory.cpp
+++ b/src/core/device_memory.cpp
@@ -12,13 +12,9 @@ constexpr size_t VirtualReserveSize = 1ULL << 38;
 constexpr size_t VirtualReserveSize = 1ULL << 39;
 #endif
 
-DeviceMemory::DeviceMemory(bool direct_mapped_address)
+DeviceMemory::DeviceMemory()
     : buffer{Kernel::Board::Nintendo::Nx::KSystemControl::Init::GetIntendedMemorySize(),
-             VirtualReserveSize} {
-    if (direct_mapped_address) {
-        buffer.EnableDirectMappedAddress();
-    }
-}
+             VirtualReserveSize} {}
 
 DeviceMemory::~DeviceMemory() = default;
 
-- 
cgit v1.2.3


From 3ec3cca4d8d4e1733cbc337b0499ad3bdcdf52b0 Mon Sep 17 00:00:00 2001
From: GPUCode <geoster3d@gmail.com>
Date: Mon, 20 Nov 2023 15:52:18 +0200
Subject: core: Define HAS_NCE macro

---
 src/core/device_memory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core/device_memory.cpp')

diff --git a/src/core/device_memory.cpp b/src/core/device_memory.cpp
index 3a9151646..1aea56a99 100644
--- a/src/core/device_memory.cpp
+++ b/src/core/device_memory.cpp
@@ -6,7 +6,7 @@
 
 namespace Core {
 
-#ifdef ARCHITECTURE_arm64
+#ifdef HAS_NCE
 constexpr size_t VirtualReserveSize = 1ULL << 38;
 #else
 constexpr size_t VirtualReserveSize = 1ULL << 39;
-- 
cgit v1.2.3