The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-19 02:36:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix -Wshadow warning.

Browse Source
This commit is contained in:
Rohit Nirmal 2014-12-05 20:25:00 -06:00
parent f7a16eca84
commit fa501e9d8d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/HW/MemmapFunctions.cpp
View File

@ -811,7 +811,7 @@ static u32 TranslatePageAddress(const u32 _Address, const XCheckTLBFlag _Flag)
// Direct access to the fastmem Arena // Direct access to the fastmem Arena
// FIXME: is this the best idea for clean code? // FIXME: is this the best idea for clean code?
u8* base = Memory::base; u8* base_mem = Memory::base;
// hash function no 1 "xor" .360 // hash function no 1 "xor" .360
u32 hash = (VSID ^ page_index); u32 hash = (VSID ^ page_index);
@ -827,11 +827,11 @@ static u32 TranslatePageAddress(const u32 _Address, const XCheckTLBFlag _Flag)
u32 pteg_addr = ((hash & PowerPC::ppcState.pagetable_hashmask) << 6) | PowerPC::ppcState.pagetable_base; u32 pteg_addr = ((hash & PowerPC::ppcState.pagetable_hashmask) << 6) | PowerPC::ppcState.pagetable_base;
if ((pteg_addr >> 28) == 1) if ((pteg_addr >> 28) == 1)
base = Memory::m_pEXRAM; base_mem = Memory::m_pEXRAM;
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
{ {
u32 pte = bswap(*(u32*)&base[pteg_addr]); u32 pte = bswap(*(u32*)&base_mem[pteg_addr]);
bool pteh = (pte & PTE1_H) == 0; bool pteh = (pte & PTE1_H) == 0;
if (hash_func == 1) if (hash_func == 1)
@ -842,7 +842,7 @@ static u32 TranslatePageAddress(const u32 _Address, const XCheckTLBFlag _Flag)
if (VSID == PTE1_VSID(pte) && (api == PTE1_API(pte))) if (VSID == PTE1_VSID(pte) && (api == PTE1_API(pte)))
{ {
UPTE2 PTE2; UPTE2 PTE2;
PTE2.Hex = bswap((*(u32*)&base[(pteg_addr + 4)])); PTE2.Hex = bswap((*(u32*)&base_mem[(pteg_addr + 4)]));
// set the access bits // set the access bits
switch (_Flag) switch (_Flag)
@ -854,7 +854,7 @@ static u32 TranslatePageAddress(const u32 _Address, const XCheckTLBFlag _Flag)
} }
if (_Flag != FLAG_NO_EXCEPTION) if (_Flag != FLAG_NO_EXCEPTION)
*(u32*)&base[(pteg_addr + 4)] = bswap(PTE2.Hex); *(u32*)&base_mem[(pteg_addr + 4)] = bswap(PTE2.Hex);
UpdateTLBEntry(_Flag, PTE2, _Address); UpdateTLBEntry(_Flag, PTE2, _Address);