artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #10035 from liamwhite/long-long

Browse source 
kernel: switch extended memory setting to 8GB arrangement
This commit is contained in:
Mai 2023-04-10 03:04:05 -04:00 committed by GitHub
parent add4f82c33 baf4d1c22e
commit 47b80da906
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp
View file

@ -35,11 +35,11 @@ namespace {
using namespace Common::Literals; using namespace Common::Literals;
u32 GetMemorySizeForInit() { u32 GetMemorySizeForInit() {
return Settings::values.use_extended_memory_layout ? Smc::MemorySize_6GB : Smc::MemorySize_4GB; return Settings::values.use_extended_memory_layout ? Smc::MemorySize_8GB : Smc::MemorySize_4GB;
} }
Smc::MemoryArrangement GetMemoryArrangeForInit() { Smc::MemoryArrangement GetMemoryArrangeForInit() {
return Settings::values.use_extended_memory_layout ? Smc::MemoryArrangement_6GB return Settings::values.use_extended_memory_layout ? Smc::MemoryArrangement_8GB
: Smc::MemoryArrangement_4GB; : Smc::MemoryArrangement_4GB;
} }
} // namespace } // namespace
@ -91,7 +91,8 @@ std::size_t KSystemControl::Init::GetApplicationPoolSize() {
case Smc::MemoryArrangement_6GBForAppletDev: case Smc::MemoryArrangement_6GBForAppletDev:
return 3285_MiB; return 3285_MiB;
case Smc::MemoryArrangement_8GB: case Smc::MemoryArrangement_8GB:
return 4916_MiB; // Real kernel sets this to 4916_MiB. We are not debugging applets.
return 6547_MiB;
} }
}(); }();
@ -115,7 +116,8 @@ size_t KSystemControl::Init::GetAppletPoolSize() {
case Smc::MemoryArrangement_6GBForAppletDev: case Smc::MemoryArrangement_6GBForAppletDev:
return 2193_MiB; return 2193_MiB;
case Smc::MemoryArrangement_8GB: case Smc::MemoryArrangement_8GB:
return 2193_MiB; //! Real kernel sets this to 2193_MiB. We are not debugging applets.
return 562_MiB;
} }
}(); }();

2
src/yuzu/configuration/configure_general.ui
View file

@ -64,7 +64,7 @@
<item> <item>
<widget class="QCheckBox" name="use_extended_memory_layout"> <widget class="QCheckBox" name="use_extended_memory_layout">
<property name="text"> <property name="text">
<string>Extended memory layout (6GB DRAM)</string> <string>Extended memory layout (8GB DRAM)</string>
</property> </property>
</widget> </widget>
</item> </item>

2
src/yuzu_cmd/default_ini.h
View file

@ -163,7 +163,7 @@ keyboard_enabled =
# 0: Disabled, 1 (default): Enabled # 0: Disabled, 1 (default): Enabled
use_multi_core = use_multi_core =
# Enable extended guest system memory layout (6GB DRAM) # Enable extended guest system memory layout (8GB DRAM)
# 0 (default): Disabled, 1: Enabled # 0 (default): Disabled, 1: Enabled
use_extended_memory_layout = use_extended_memory_layout =