mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-04-24 14:24:54 +00:00
Merge pull request #11290 from AdmiralCurtiss/phys-mem-region-init
Memmap: Fix initialization of PhysicalMemoryRegion.
This commit is contained in:
commit
c8705f014d
1 changed files with 8 additions and 7 deletions
|
@ -246,13 +246,14 @@ void Init()
|
||||||
s_exram_size = MathUtil::NextPowerOf2(GetExRamSizeReal());
|
s_exram_size = MathUtil::NextPowerOf2(GetExRamSizeReal());
|
||||||
s_exram_mask = GetExRamSize() - 1;
|
s_exram_mask = GetExRamSize() - 1;
|
||||||
|
|
||||||
s_physical_regions[0] = {&m_pRAM, 0x00000000, GetRamSize(), PhysicalMemoryRegion::ALWAYS, false};
|
s_physical_regions[0] = PhysicalMemoryRegion{
|
||||||
s_physical_regions[1] = {&m_pL1Cache, 0xE0000000, GetL1CacheSize(), PhysicalMemoryRegion::ALWAYS,
|
&m_pRAM, 0x00000000, GetRamSize(), PhysicalMemoryRegion::ALWAYS, 0, false};
|
||||||
false};
|
s_physical_regions[1] = PhysicalMemoryRegion{
|
||||||
s_physical_regions[2] = {&m_pFakeVMEM, 0x7E000000, GetFakeVMemSize(),
|
&m_pL1Cache, 0xE0000000, GetL1CacheSize(), PhysicalMemoryRegion::ALWAYS, 0, false};
|
||||||
PhysicalMemoryRegion::FAKE_VMEM, false};
|
s_physical_regions[2] = PhysicalMemoryRegion{
|
||||||
s_physical_regions[3] = {&m_pEXRAM, 0x10000000, GetExRamSize(), PhysicalMemoryRegion::WII_ONLY,
|
&m_pFakeVMEM, 0x7E000000, GetFakeVMemSize(), PhysicalMemoryRegion::FAKE_VMEM, 0, false};
|
||||||
false};
|
s_physical_regions[3] = PhysicalMemoryRegion{
|
||||||
|
&m_pEXRAM, 0x10000000, GetExRamSize(), PhysicalMemoryRegion::WII_ONLY, 0, false};
|
||||||
|
|
||||||
const bool wii = SConfig::GetInstance().bWii;
|
const bool wii = SConfig::GetInstance().bWii;
|
||||||
const bool mmu = Core::System::GetInstance().IsMMUMode();
|
const bool mmu = Core::System::GetInstance().IsMMUMode();
|
||||||
|
|
Loading…
Add table
Reference in a new issue