ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11134 from Pokechu22/memmap-remove-io-size 

Memmap: Remove unused IO size field
This commit is contained in:
Admiral H. Curtiss 2022-10-08 13:59:44 +02:00 committed by GitHub
parent 934349a225 be65e96991
commit 1c2182d069
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HW/Memmap.cpp
View File

@ -75,7 +75,6 @@ static u32 s_fakevmem_size;
static u32 s_fakevmem_mask; static u32 s_fakevmem_mask;
static u32 s_L1_cache_size; static u32 s_L1_cache_size;
static u32 s_L1_cache_mask; static u32 s_L1_cache_mask;
static u32 s_io_size;
// s_exram_size is the amount allocated by the emulator, whereas s_exram_size_real // s_exram_size is the amount allocated by the emulator, whereas s_exram_size_real
// is what gets used by emulated software. If using retail IOS, it will // is what gets used by emulated software. If using retail IOS, it will
// always be set to 64MB. // always be set to 64MB.
@ -111,10 +110,6 @@ u32 GetL1CacheMask()
{ {
return s_L1_cache_mask; return s_L1_cache_mask;
} }
u32 GetIOSize()
{
return s_io_size;
}
u32 GetExRamSizeReal() u32 GetExRamSizeReal()
{ {
return s_exram_size_real; return s_exram_size_real;
@ -247,7 +242,6 @@ void Init()
s_fakevmem_mask = GetFakeVMemSize() - 1; s_fakevmem_mask = GetFakeVMemSize() - 1;
s_L1_cache_size = 0x00040000; s_L1_cache_size = 0x00040000;
s_L1_cache_mask = GetL1CacheSize() - 1; s_L1_cache_mask = GetL1CacheSize() - 1;
s_io_size = 0x00010000;
s_exram_size_real = get_mem2_size(); s_exram_size_real = get_mem2_size();
s_exram_size = MathUtil::NextPowerOf2(GetExRamSizeReal()); s_exram_size = MathUtil::NextPowerOf2(GetExRamSizeReal());
s_exram_mask = GetExRamSize() - 1; s_exram_mask = GetExRamSize() - 1;

1
Source/Core/Core/HW/Memmap.h
View File

@ -45,7 +45,6 @@ u32 GetFakeVMemSize();
u32 GetFakeVMemMask(); u32 GetFakeVMemMask();
u32 GetL1CacheSize(); u32 GetL1CacheSize();
u32 GetL1CacheMask(); u32 GetL1CacheMask();
u32 GetIOSize();
u32 GetExRamSizeReal(); u32 GetExRamSizeReal();
u32 GetExRamSize(); u32 GetExRamSize();
u32 GetExRamMask(); u32 GetExRamMask();