archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 09:48:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARMv7Context used through multiple inheritance

Browse source 
Forgive me...
This commit is contained in:
Nekotekina 2015-06-21 04:04:03 +03:00
parent 6c4148a949
commit a7f77c27f7
9 changed files with 64 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Memory/vm.cpp
View file

@ -659,7 +659,7 @@ namespace vm
case CPU_THREAD_ARMv7:
{
ARMv7Context& context = static_cast<ARMv7Thread&>(CPU).context;
ARMv7Context& context = static_cast<ARMv7Thread&>(CPU);
old_pos = context.SP;
context.SP -= align(size, 4); // room minimal possible size
@ -711,7 +711,7 @@ namespace vm
case CPU_THREAD_ARMv7:
{
ARMv7Context& context = static_cast<ARMv7Thread&>(CPU).context;
ARMv7Context& context = static_cast<ARMv7Thread&>(CPU);
if (context.SP != addr && !Emu.IsStopped())
{