Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #503 from Sonicadvance1/PowerPC-downcount 
Move CoreTiming::downcount to PowerPC::ppcState.
  • Loading branch information
@Sonicadvance1
Sonicadvance1 committed Jun 26, 2014
2 parents 177658a + a40ae68 commit d0ad84f
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 53 deletions.
23 changes: 11 additions & 12 deletions Source/Core/Core/CoreTiming.cpp
View file
Expand Up @@ -46,7 +46,7 @@ Common::FifoQueue<BaseEvent, false> tsQueue;
// event pools
Event *eventPool = nullptr;

int downcount, slicelength;
int slicelength;
int maxSliceLength = MAX_SLICE_LENGTH;

s64 globalTimer;
Expand Down Expand Up @@ -113,7 +113,7 @@ void UnregisterAllEvents()

void Init()
{
downcount = maxSliceLength;
PowerPC::ppcState.downcount = maxSliceLength;
slicelength = maxSliceLength;
globalTimer = 0;
idledCycles = 0;
Expand Down Expand Up @@ -173,7 +173,6 @@ void EventDoState(PointerWrap &p, BaseEvent* ev)
void DoState(PointerWrap &p)
{
std::lock_guard<std::mutex> lk(tsWriteLock);
p.Do(downcount);
p.Do(slicelength);
p.Do(globalTimer);
p.Do(idledCycles);
Expand Down Expand Up @@ -336,10 +335,10 @@ void SetMaximumSlice(int maximumSliceLength)

void ForceExceptionCheck(int cycles)
{
if (downcount > cycles)
if (PowerPC::ppcState.downcount > cycles)
{
slicelength -= (downcount - cycles); // Account for cycles already executed by adjusting the slicelength
downcount = cycles;
slicelength -= (PowerPC::ppcState.downcount - cycles); // Account for cycles already executed by adjusting the slicelength
PowerPC::ppcState.downcount = cycles;
}
}

Expand Down Expand Up @@ -390,9 +389,9 @@ void Advance()
{
MoveEvents();

int cyclesExecuted = slicelength - downcount;
int cyclesExecuted = slicelength - PowerPC::ppcState.downcount;
globalTimer += cyclesExecuted;
downcount = slicelength;
PowerPC::ppcState.downcount = slicelength;

while (first)
{
Expand All @@ -414,14 +413,14 @@ void Advance()
if (!first)
{
WARN_LOG(POWERPC, "WARNING - no events in queue. Setting downcount to 10000");
downcount += 10000;
PowerPC::ppcState.downcount += 10000;
}
else
{
slicelength = (int)(first->time - globalTimer);
if (slicelength > maxSliceLength)
slicelength = maxSliceLength;
downcount = slicelength;
PowerPC::ppcState.downcount = slicelength;
}

if (advanceCallback)
Expand Down Expand Up @@ -451,8 +450,8 @@ void Idle()
Common::YieldCPU();
}

idledCycles += downcount;
downcount = 0;
idledCycles += PowerPC::ppcState.downcount;
PowerPC::ppcState.downcount = 0;

Advance();
}
Expand Down
1 change: 0 additions & 1 deletion Source/Core/Core/CoreTiming.h
View file
Expand Up @@ -78,7 +78,6 @@ void SetFakeTBStartTicks(u64 val);

void ForceExceptionCheck(int cycles);

extern int downcount;
extern int slicelength;

}; // end of namespace
4 changes: 2 additions & 2 deletions Source/Core/Core/FifoPlayer/FifoPlayer.cpp
View file
Expand Up @@ -74,7 +74,7 @@ bool FifoPlayer::Play()
{
m_CurrentFrame = m_FrameRangeStart;

CoreTiming::downcount = 0;
PowerPC::ppcState.downcount = 0;
CoreTiming::Advance();
}
else
Expand Down Expand Up @@ -301,7 +301,7 @@ void FifoPlayer::WriteFifo(u8 *data, u32 start, u32 end)
u32 cyclesUsed = elapsedCycles - m_ElapsedCycles;
m_ElapsedCycles = elapsedCycles;

CoreTiming::downcount -= cyclesUsed;
PowerPC::ppcState.downcount -= cyclesUsed;
CoreTiming::Advance();
}
}
Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
View file
Expand Up @@ -199,7 +199,7 @@ void Interpreter::SingleStep()
SingleStepInner();

CoreTiming::slicelength = 1;
CoreTiming::downcount = 0;
PowerPC::ppcState.downcount = 0;
CoreTiming::Advance();

if (PowerPC::ppcState.Exceptions)
Expand Down Expand Up @@ -233,7 +233,7 @@ void Interpreter::Run()

// Debugging friendly version of inner loop. Tries to do the timing as similarly to the
// JIT as possible. Does not take into account that some instructions take multiple cycles.
while (CoreTiming::downcount > 0)
while (PowerPC::ppcState.downcount > 0)
{
m_EndBlock = false;
int i;
Expand Down Expand Up @@ -276,13 +276,13 @@ void Interpreter::Run()
}
SingleStepInner();
}
CoreTiming::downcount -= i;
PowerPC::ppcState.downcount -= i;
}
}
else
{
// "fast" version of inner loop. well, it's not so fast.
while (CoreTiming::downcount > 0)
while (PowerPC::ppcState.downcount > 0)
{
m_EndBlock = false;

Expand All @@ -291,7 +291,7 @@ void Interpreter::Run()
{
cycles += SingleStepInner();
}
CoreTiming::downcount -= cycles;
PowerPC::ppcState.downcount -= cycles;
}
}

Expand Down
10 changes: 5 additions & 5 deletions Source/Core/Core/PowerPC/Jit64/Jit.cpp
View file
Expand Up @@ -287,7 +287,7 @@ void Jit64::WriteExit(u32 destination)
{
Cleanup();

SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
SUB(32, M(&PowerPC::ppcState.downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));

//If nobody has taken care of this yet (this can be removed when all branches are done)
JitBlock *b = js.curBlock;
Expand Down Expand Up @@ -317,7 +317,7 @@ void Jit64::WriteExitDestInEAX()
{
MOV(32, M(&PC), R(EAX));
Cleanup();
SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
SUB(32, M(&PowerPC::ppcState.downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
JMP(asm_routines.dispatcher, true);
}

Expand All @@ -327,7 +327,7 @@ void Jit64::WriteRfiExitDestInEAX()
MOV(32, M(&NPC), R(EAX));
Cleanup();
ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
SUB(32, M(&PowerPC::ppcState.downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
JMP(asm_routines.dispatcher, true);
}

Expand All @@ -337,7 +337,7 @@ void Jit64::WriteExceptionExit()
MOV(32, R(EAX), M(&PC));
MOV(32, M(&NPC), R(EAX));
ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
SUB(32, M(&PowerPC::ppcState.downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
JMP(asm_routines.dispatcher, true);
}

Expand All @@ -347,7 +347,7 @@ void Jit64::WriteExternalExceptionExit()
MOV(32, R(EAX), M(&PC));
MOV(32, M(&NPC), R(EAX));
ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExternalExceptions));
SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
SUB(32, M(&PowerPC::ppcState.downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
JMP(asm_routines.dispatcher, true);
}

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp
View file
Expand Up @@ -1726,7 +1726,7 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, u32 exitAddress) {
// If a FPU exception occurs, the exception handler will read
// from PC. Update PC with the latest value in case that happens.
Jit->MOV(32, M(&PC), Imm32(InstLoc));
Jit->SUB(32, M(&CoreTiming::downcount), Jit->js.downcountAmount > 127 ? Imm32(Jit->js.downcountAmount) : Imm8(Jit->js.downcountAmount));
Jit->SUB(32, M(&PowerPC::ppcState.downcount), Jit->js.downcountAmount > 127 ? Imm32(Jit->js.downcountAmount) : Imm8(Jit->js.downcountAmount));
Jit->OR(32, M((void *)&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_FPU_UNAVAILABLE));
Jit->WriteExceptionExit();
Jit->SetJumpTarget(b1);
Expand Down
8 changes: 4 additions & 4 deletions Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
View file
Expand Up @@ -388,7 +388,7 @@ void JitIL::WriteExit(u32 destination)
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling) {
ABI_CallFunction((void *)JitILProfiler::End);
}
SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
SUB(32, M(&PowerPC::ppcState.downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));

//If nobody has taken care of this yet (this can be removed when all branches are done)
JitBlock *b = js.curBlock;
Expand Down Expand Up @@ -420,7 +420,7 @@ void JitIL::WriteExitDestInOpArg(const Gen::OpArg& arg)
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bJITILTimeProfiling) {
ABI_CallFunction((void *)JitILProfiler::End);
}
SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
SUB(32, M(&PowerPC::ppcState.downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
JMP(asm_routines.dispatcher, true);
}

Expand All @@ -433,7 +433,7 @@ void JitIL::WriteRfiExitDestInOpArg(const Gen::OpArg& arg)
ABI_CallFunction((void *)JitILProfiler::End);
}
ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
SUB(32, M(&PowerPC::ppcState.downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
JMP(asm_routines.dispatcher, true);
}

Expand All @@ -446,7 +446,7 @@ void JitIL::WriteExceptionExit()
MOV(32, R(EAX), M(&PC));
MOV(32, M(&NPC), R(EAX));
ABI_CallFunction(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
SUB(32, M(&PowerPC::ppcState.downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount));
JMP(asm_routines.dispatcher, true);
}

Expand Down
17 changes: 7 additions & 10 deletions Source/Core/Core/PowerPC/JitArm32/Jit.cpp
View file
Expand Up @@ -134,22 +134,19 @@ void JitArm::Cleanup()
void JitArm::DoDownCount()
{
ARMReg rA = gpr.GetReg();
ARMReg rB = gpr.GetReg();
MOVI2R(rA, (u32)&CoreTiming::downcount);
LDR(rB, rA);
LDR(rA, R9, PPCSTATE_OFF(downcount));
if (js.downcountAmount < 255) // We can enlarge this if we used rotations
{
SUBS(rB, rB, js.downcountAmount);
STR(rB, rA);
SUBS(rA, rA, js.downcountAmount);
}
else
{
ARMReg rC = gpr.GetReg(false);
MOVI2R(rC, js.downcountAmount);
SUBS(rB, rB, rC);
STR(rB, rA);
ARMReg rB = gpr.GetReg(false);
MOVI2R(rB, js.downcountAmount);
SUBS(rA, rA, rB);
}
gpr.Unlock(rA, rB);
STR(rA, R9, PPCSTATE_OFF(downcount));
gpr.Unlock(rA);
}
void JitArm::WriteExitDestInR(ARMReg Reg)
{
Expand Down
1 change: 0 additions & 1 deletion Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp
View file
Expand Up @@ -95,7 +95,6 @@ void JitArmAsmRoutineManager::Generate()
// consumed by CALL.
SUB(_SP, _SP, 4);

MOVI2R(R0, (u32)&CoreTiming::downcount);
MOVI2R(R9, (u32)&PowerPC::ppcState.spr[0]);

FixupBranch skipToRealDispatcher = B();
Expand Down
17 changes: 7 additions & 10 deletions Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp
View file
Expand Up @@ -81,22 +81,19 @@ void JitArmIL::Break(UGeckoInstruction _inst)

void JitArmIL::DoDownCount()
{
ARMReg rA = R14;
ARMReg rB = R12;
MOVI2R(rA, (u32)&CoreTiming::downcount);
LDR(rB, rA);
ARMReg rA = R12;
LDR(rA, R9, PPCSTATE_OFF(downcount));
if (js.downcountAmount < 255) // We can enlarge this if we used rotations
{
SUBS(rB, rB, js.downcountAmount);
STR(rB, rA);
SUBS(rA, rA, js.downcountAmount);
}
else
{
ARMReg rC = R11;
MOVI2R(rC, js.downcountAmount);
SUBS(rB, rB, rC);
STR(rB, rA);
ARMReg rB = R11;
MOVI2R(rB, js.downcountAmount);
SUBS(rA, rA, rB);
}
STR(rA, R9, PPCSTATE_OFF(downcount));
}

void JitArmIL::WriteExitDestInReg(ARMReg Reg)
Expand Down
1 change: 0 additions & 1 deletion Source/Core/Core/PowerPC/JitArmIL/JitILAsm.cpp
View file
Expand Up @@ -27,7 +27,6 @@ void JitArmILAsmRoutineManager::Generate()
// consumed by CALL.
SUB(_SP, _SP, 4);

MOVI2R(R0, (u32)&CoreTiming::downcount);
MOVI2R(R9, (u32)&PowerPC::ppcState.spr[0]);

FixupBranch skipToRealDispatcher = B();
Expand Down
5 changes: 5 additions & 0 deletions Source/Core/Core/PowerPC/PowerPC.h
View file
Expand Up @@ -46,6 +46,11 @@ struct GC_ALIGNED64(PowerPCState)
// Exception management.
volatile u32 Exceptions;

// Downcount for determining when we need to do timing
// This isn't quite the right location for it, but it is here to accelerate the ARM JIT
// This variable should be inside of the CoreTiming namespace if we wanted to be correct.
int downcount;

u32 sr[16]; // Segment registers.

u32 DebugCount;
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/State.cpp
View file
Expand Up @@ -63,7 +63,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
static std::thread g_save_thread;

// Don't forget to increase this after doing changes on the savestate system
static const u32 STATE_VERSION = 26;
static const u32 STATE_VERSION = 27;

enum
{
Expand Down

0 comments on commit d0ad84f

Please sign in to comment.