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

IOS: Avoid ppcState global.

Browse Source
This commit is contained in:
Admiral H. Curtiss
2023-01-10 19:01:51 +01:00
parent 0a0b4d325f
commit ed633476e6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/IOS/IOS.cpp
View File

@ -200,7 +200,7 @@ static void ResetAndPausePPC()
auto& memory = system.GetMemory(); auto& memory = system.GetMemory();
memory.Write_U32(0x48000000, 0x00000000); // b 0x0 memory.Write_U32(0x48000000, 0x00000000); // b 0x0
PowerPC::Reset(); PowerPC::Reset();
PowerPC::ppcState.pc = 0; system.GetPPCState().pc = 0;
} }
static void ReleasePPC() static void ReleasePPC()
@ -212,7 +212,7 @@ static void ReleasePPC()
// NAND titles start with address translation off at 0x3400 (via the PPC bootstub) // NAND titles start with address translation off at 0x3400 (via the PPC bootstub)
// The state of other CPU registers (like the BAT registers) doesn't matter much // The state of other CPU registers (like the BAT registers) doesn't matter much
// because the realmode code at 0x3400 initializes everything itself anyway. // because the realmode code at 0x3400 initializes everything itself anyway.
PowerPC::ppcState.pc = 0x3400; system.GetPPCState().pc = 0x3400;
} }
static void ReleasePPCAncast() static void ReleasePPCAncast()
@ -223,7 +223,7 @@ static void ReleasePPCAncast()
// On a real console the Espresso verifies and decrypts the Ancast image, // On a real console the Espresso verifies and decrypts the Ancast image,
// then jumps to the decrypted ancast body. // then jumps to the decrypted ancast body.
// The Ancast loader already did this, so just jump to the decrypted body. // The Ancast loader already did this, so just jump to the decrypted body.
PowerPC::ppcState.pc = ESPRESSO_ANCAST_LOCATION_VIRT + sizeof(EspressoAncastHeader); system.GetPPCState().pc = ESPRESSO_ANCAST_LOCATION_VIRT + sizeof(EspressoAncastHeader);
} }
void RAMOverrideForIOSMemoryValues(MemorySetupType setup_type) void RAMOverrideForIOSMemoryValues(MemorySetupType setup_type)