VERY experimental Nintendo Switch 2 emulator
C++
device_memory: Enable direct mapped addresses for nce
GPUCodedee500235583
diff --git a/src/common/settings.cpp b/src/common/settings.cppindex 19dfe08daa..167e984a6b 100644--- a/src/common/settings.cpp+++ b/src/common/settings.cpp@@ -156,8 +156,14 @@ bool IsFastmemEnabled() {return true;}-bool IsNceEnabled(bool is_64bit) {- return values.cpu_backend.GetValue() == CpuBackend::Nce && is_64bit;+static bool is_nce_enabled = false;++void SetNceEnabled(bool is_64bit) {+ is_nce_enabled = values.cpu_backend.GetValue() == CpuBackend::Nce && is_64bit;+}++bool IsNceEnabled() {+ return is_nce_enabled;}bool IsDockedMode() {diff --git a/src/common/settings.h b/src/common/settings.hindex 389c747cb0..fea639ee30 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -573,7 +573,8 @@ bool IsGPULevelExtreme();bool IsGPULevelHigh();bool IsFastmemEnabled();-bool IsNceEnabled(bool is_64bit = true);+void SetNceEnabled(bool is_64bit);+bool IsNceEnabled();bool IsDockedMode();diff --git a/src/core/core.cpp b/src/core/core.cppindex 14d6c8c270..1d557fb437 100644--- a/src/core/core.cpp+++ b/src/core/core.cpp@@ -136,7 +136,8 @@ struct System::Impl {}void Initialize(System& system) {- device_memory = std::make_unique<Core::DeviceMemory>();+ const bool direct_mapped_address = Settings::IsNceEnabled();+ device_memory = std::make_unique<Core::DeviceMemory>(direct_mapped_address);is_multicore = Settings::values.use_multi_core.GetValue();extended_memory_layout =diff --git a/src/core/device_memory.cpp b/src/core/device_memory.cppindex de3f8ef8f4..0528a8e3bb 100644--- a/src/core/device_memory.cpp+++ b/src/core/device_memory.cpp@@ -6,15 +6,20 @@namespace Core {-#ifdef ANDROID+#ifdef ARCHITECTURE_arm64constexpr size_t VirtualReserveSize = 1ULL << 38;#elseconstexpr 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 Corediff --git a/src/core/device_memory.h b/src/core/device_memory.hindex 13388b73e0..368f19e86b 100644--- a/src/core/device_memory.h+++ b/src/core/device_memory.h@@ -18,7 +18,7 @@ enum : u64 {class DeviceMemory {public:- explicit DeviceMemory();+ explicit DeviceMemory(bool direct_mapped_address);~DeviceMemory();DeviceMemory& operator=(const DeviceMemory&) = delete;