dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-10-11 22:49:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14590 from jordan-woyak/mmu-256-mem2

Browse Source 
PowerPC/MMU: Change mask in DMA_LCToMemory and DMA_MemoryToLC functions to allow for a 256MiB MEM2.
This commit is contained in:
JMC47
2026-10-02 06:29:32 -04:00
committed by GitHub
parent 045c19b256 9599525ea1
commit 24c80c5a32
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
+1 -1
View File
@@ -1359,7 +1359,7 @@ class SettingsFragmentPresenter(
)
sl.add(
IntSliderSetting(
context, mem2Size, R.string.main_mem2_size, 0, 64, 128, "MB", 1
context, mem2Size, R.string.main_mem2_size, 0, 64, 256, "MB", 1
)
)
Source/Core/Core/PowerPC/MMU.cpp
+4 -4
View File
@@ -960,7 +960,7 @@ void MMU::DMA_LCToMemory(const u32 mem_address, const u32 cache_address, const u
// TODO: This is terribly slow.
// TODO: Refactor.
// Avatar: The Last Airbender (GC) uses this for videos.
if ((mem_address & 0x0F000000) == 0x08000000)
if ((mem_address & 0x1F000000) == 0x08000000)
{
for (u32 i = 0; i < 32 * num_blocks; i += 4)
{
@@ -972,7 +972,7 @@ void MMU::DMA_LCToMemory(const u32 mem_address, const u32 cache_address, const u
// No known game uses this; here for completeness.
// TODO: Refactor.
if ((mem_address & 0x0F000000) == 0x0C000000)
if ((mem_address & 0x1F000000) == 0x0C000000)
{
for (u32 i = 0; i < 32 * num_blocks; i += 4)
{
@@ -990,7 +990,7 @@ void MMU::DMA_MemoryToLC(const u32 cache_address, const u32 mem_address, const u
{
// No known game uses this; here for completeness.
// TODO: Refactor.
if ((mem_address & 0x0F000000) == 0x08000000)
if ((mem_address & 0x1F000000) == 0x08000000)
{
for (u32 i = 0; i < 32 * num_blocks; i += 4)
{
@@ -1002,7 +1002,7 @@ void MMU::DMA_MemoryToLC(const u32 cache_address, const u32 mem_address, const u
// No known game uses this.
// TODO: Refactor.
if ((mem_address & 0x0F000000) == 0x0C000000)
if ((mem_address & 0x1F000000) == 0x0C000000)
{
for (u32 i = 0; i < 32 * num_blocks; i += 4)
{
Source/Core/DolphinQt/Settings/AdvancedPane.cpp
+1 -1
View File
@@ -263,7 +263,7 @@ void AdvancedPane::CreateLayout()
mem2_override_slider_layout->setContentsMargins(0, 0, 0, 0);
ram_override_layout->addLayout(mem2_override_slider_layout);
m_mem2_override_slider = new ConfigSliderU32(64, 128, Config::MAIN_MEM2_SIZE, 0x100000);
m_mem2_override_slider = new ConfigSliderU32(64, 256, Config::MAIN_MEM2_SIZE, 0x100000);
mem2_override_slider_layout->addWidget(m_mem2_override_slider);
m_mem2_label =