piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

PowerPC: Namespace all header contents for PowerPC.h

Browse Source 
Puts everything under the same namespace. Previously the header was only
partially namespaced, which is inconsistent.
This commit is contained in:
Lioncash
2018-03-22 18:24:04 -04:00
parent 5e76f3a6d4
commit 4c97deb364
19 changed files with 187 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Debugger/CodeWindow.cpp
View File

@ -346,7 +346,7 @@ static bool WillInstructionReturn(UGeckoInstruction inst)
if (inst.hex == 0x4C000064u)
return true;
bool counter = (inst.BO_2 >> 2 & 1) != 0 || (CTR != 0) != ((inst.BO_2 >> 1 & 1) != 0);
bool condition = inst.BO_2 >> 4 != 0 || GetCRBit(inst.BI_2) == (inst.BO_2 >> 3 & 1);
bool condition = inst.BO_2 >> 4 != 0 || PowerPC::GetCRBit(inst.BI_2) == (inst.BO_2 >> 3 & 1);
bool isBclr = inst.OPCD_7 == 0b010011 && (inst.hex >> 1 & 0b10000) != 0;
return isBclr && counter && condition && !inst.LK_3;
}

8
Source/Core/DolphinWX/Debugger/RegisterView.cpp
View File

@ -76,9 +76,9 @@ u32 GetSpecialRegValue(int reg)
case 2:
return PowerPC::ppcState.spr[SPR_CTR];
case 3:
return GetCR();
return PowerPC::GetCR();
case 4:
return GetXER().Hex;
return PowerPC::GetXER().Hex;
case 5:
return PowerPC::ppcState.fpscr;
case 6:
@ -118,10 +118,10 @@ void SetSpecialRegValue(int reg, u32 value)
PowerPC::ppcState.spr[SPR_CTR] = value;
break;
case 3:
SetCR(value);
PowerPC::SetCR(value);
break;
case 4:
SetXER(UReg_XER(value));
PowerPC::SetXER(UReg_XER(value));
break;
case 5:
PowerPC::ppcState.fpscr = value;