revert this for now, i need to read more
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2739 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
parent
32b983ef83
commit
fc582ea560
|
|
@ -35,35 +35,35 @@
|
|||
namespace PowerPC
|
||||
{
|
||||
|
||||
// STATE_TO_SAVE
|
||||
PowerPCState GC_ALIGNED16(ppcState);
|
||||
volatile CPUState state = CPU_STEPPING;
|
||||
// STATE_TO_SAVE
|
||||
PowerPCState GC_ALIGNED16(ppcState);
|
||||
volatile CPUState state = CPU_STEPPING;
|
||||
|
||||
static CoreMode mode;
|
||||
static CoreMode mode;
|
||||
|
||||
void CompactCR()
|
||||
{
|
||||
void CompactCR()
|
||||
{
|
||||
ppcState.cr = 0;
|
||||
for (int i = 0; i < 8; i++) {
|
||||
ppcState.cr |= ppcState.cr_fast[i] << (28 - i * 4);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ExpandCR()
|
||||
{
|
||||
void ExpandCR()
|
||||
{
|
||||
for (int i = 0; i < 8; i++) {
|
||||
ppcState.cr_fast[i] = (ppcState.cr >> (28 - i * 4)) & 0xF;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void DoState(PointerWrap &p)
|
||||
{
|
||||
void DoState(PointerWrap &p)
|
||||
{
|
||||
p.Do(ppcState);
|
||||
}
|
||||
}
|
||||
|
||||
void ResetRegisters()
|
||||
{
|
||||
void ResetRegisters()
|
||||
{
|
||||
for (int i = 0; i < 32; i++)
|
||||
{
|
||||
ppcState.gpr[i] = 0;
|
||||
|
|
@ -84,17 +84,17 @@ void ResetRegisters()
|
|||
|
||||
ppcState.msr = 0;
|
||||
rDEC = 0xFFFFFFFF;
|
||||
}
|
||||
}
|
||||
|
||||
void Init()
|
||||
{
|
||||
void Init()
|
||||
{
|
||||
enum {
|
||||
FPU_PREC_24 = 0 << 8,
|
||||
FPU_PREC_53 = 2 << 8,
|
||||
FPU_PREC_64 = 3 << 8,
|
||||
FPU_PREC_MASK = 3 << 8,
|
||||
};
|
||||
#ifdef _M_IX86
|
||||
#ifdef _M_IX86
|
||||
// sets the floating-point lib to 53-bit
|
||||
// PowerPC has a 53bit floating pipeline only
|
||||
// eg: sscanf is very sensitive
|
||||
|
|
@ -120,17 +120,17 @@ void Init()
|
|||
// ... but start as interpreter by default.
|
||||
mode = MODE_INTERPRETER;
|
||||
state = CPU_STEPPING;
|
||||
}
|
||||
}
|
||||
|
||||
void Shutdown()
|
||||
{
|
||||
void Shutdown()
|
||||
{
|
||||
// Shutdown both execution engines. Doesn't matter which one is active.
|
||||
jit.Shutdown();
|
||||
Interpreter::Shutdown();
|
||||
}
|
||||
}
|
||||
|
||||
void SetMode(CoreMode new_mode)
|
||||
{
|
||||
void SetMode(CoreMode new_mode)
|
||||
{
|
||||
if (new_mode == mode)
|
||||
return; // We don't need to do anything.
|
||||
|
||||
|
|
@ -145,10 +145,10 @@ void SetMode(CoreMode new_mode)
|
|||
// Don't really need to do much. It'll work, the cache will refill itself.
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SingleStep()
|
||||
{
|
||||
void SingleStep()
|
||||
{
|
||||
switch (mode)
|
||||
{
|
||||
case MODE_INTERPRETER:
|
||||
|
|
@ -158,10 +158,10 @@ void SingleStep()
|
|||
jit.SingleStep();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void RunLoop()
|
||||
{
|
||||
void RunLoop()
|
||||
{
|
||||
state = CPU_RUNNING;
|
||||
switch (mode)
|
||||
{
|
||||
|
|
@ -173,38 +173,38 @@ void RunLoop()
|
|||
break;
|
||||
}
|
||||
Host_UpdateDisasmDialog();
|
||||
}
|
||||
}
|
||||
|
||||
CPUState GetState()
|
||||
{
|
||||
CPUState GetState()
|
||||
{
|
||||
return state;
|
||||
}
|
||||
}
|
||||
|
||||
volatile CPUState *GetStatePtr()
|
||||
{
|
||||
volatile CPUState *GetStatePtr()
|
||||
{
|
||||
return &state;
|
||||
}
|
||||
}
|
||||
|
||||
void Start()
|
||||
{
|
||||
void Start()
|
||||
{
|
||||
state = CPU_RUNNING;
|
||||
Host_UpdateDisasmDialog();
|
||||
}
|
||||
}
|
||||
|
||||
void Pause()
|
||||
{
|
||||
void Pause()
|
||||
{
|
||||
state = CPU_STEPPING;
|
||||
Host_UpdateDisasmDialog();
|
||||
}
|
||||
}
|
||||
|
||||
void Stop()
|
||||
{
|
||||
void Stop()
|
||||
{
|
||||
state = CPU_POWERDOWN;
|
||||
Host_UpdateDisasmDialog();
|
||||
}
|
||||
}
|
||||
|
||||
void CheckExceptions()
|
||||
{
|
||||
void CheckExceptions()
|
||||
{
|
||||
// This check is unnecessary in JIT mode. However, it probably doesn't really hurt.
|
||||
if (!ppcState.Exceptions)
|
||||
return;
|
||||
|
|
@ -213,12 +213,62 @@ void CheckExceptions()
|
|||
// gcemu uses the mask 0x87C0FFFF instead of 0x0780FF77
|
||||
// Investigate!
|
||||
|
||||
// EXTERNAL INTTERUPT
|
||||
if (MSR & 0x0008000)
|
||||
if (ppcState.Exceptions & EXCEPTION_FPU_UNAVAILABLE)
|
||||
{
|
||||
//This happens a lot - Gamecube OS uses deferred FPU context switching
|
||||
SRR0 = PC; // re-execute the instruction
|
||||
SRR1 = MSR & 0x0780FF77;
|
||||
NPC = 0x80000800;
|
||||
|
||||
INFO_LOG(GEKKO, "EXCEPTION_FPU_UNAVAILABLE");
|
||||
ppcState.Exceptions &= ~EXCEPTION_FPU_UNAVAILABLE;
|
||||
SRR1 |= 0x02; //recoverable
|
||||
}
|
||||
else if (ppcState.Exceptions & EXCEPTION_SYSCALL)
|
||||
{
|
||||
SRR0 = NPC; // execute next instruction when we come back from handler
|
||||
SRR1 = MSR & 0x0780FF77;
|
||||
NPC = 0x80000C00;
|
||||
|
||||
INFO_LOG(GEKKO, "EXCEPTION_SYSCALL (PC=%08x)", PC);
|
||||
ppcState.Exceptions &= ~EXCEPTION_SYSCALL;
|
||||
SRR1 |= 0x02; //recoverable
|
||||
}
|
||||
else if (ppcState.Exceptions & EXCEPTION_DSI)
|
||||
{
|
||||
SRR0 = PC; // re-execute the instruction
|
||||
SRR1 = MSR & 0x0780FF77;
|
||||
NPC = 0x80000300;
|
||||
|
||||
INFO_LOG(GEKKO, "EXCEPTION_DSI");
|
||||
ppcState.Exceptions &= ~EXCEPTION_DSI;
|
||||
//SRR1 |= 0x02; //make recoverable ?
|
||||
}
|
||||
else if (ppcState.Exceptions & EXCEPTION_ISI)
|
||||
{
|
||||
SRR0 = PC;
|
||||
SRR1 = (MSR & 0x0780FF77) | 0x40000000;
|
||||
NPC = 0x80000400;
|
||||
|
||||
INFO_LOG(GEKKO, "EXCEPTION_ISI");
|
||||
ppcState.Exceptions &= ~EXCEPTION_ISI;
|
||||
//SRR1 |= 0x02; //make recoverable ?
|
||||
}
|
||||
else if (ppcState.Exceptions & EXCEPTION_ALIGNMENT)
|
||||
{
|
||||
//This never happens ATM
|
||||
SRR0 = NPC;
|
||||
SRR1 = MSR & 0x0780FF77;
|
||||
NPC = 0x80000600;
|
||||
|
||||
INFO_LOG(GEKKO, "EXCEPTION_ALIGNMENT");
|
||||
ppcState.Exceptions &= ~EXCEPTION_ALIGNMENT;
|
||||
//SRR1 |= 0x02; //make recoverable ?
|
||||
}
|
||||
|
||||
// EXTERNAL INTTERUPT
|
||||
else if (MSR & 0x0008000)
|
||||
{
|
||||
// EXCEPTION_SYSRESET (hard)
|
||||
// EXCEPTION_MACHINE_CHECK
|
||||
// EXCEPTION_SYSRESET (soft)
|
||||
if (ppcState.Exceptions & EXCEPTION_EXTERNAL_INT)
|
||||
{
|
||||
// Pokemon gets this "too early", it hasn't a handler yet
|
||||
|
|
@ -233,7 +283,6 @@ void CheckExceptions()
|
|||
SRR1 |= 0x02; //set it to recoverable
|
||||
_dbg_assert_msg_(GEKKO, (SRR1 & 0x02) != 0, "GEKKO", "EXTERNAL_INT unrecoverable???"); // unrecoverable exception !?!
|
||||
}
|
||||
// EXCEPTION_PERF_MONITOR
|
||||
else if (ppcState.Exceptions & EXCEPTION_DECREMENTER)
|
||||
{
|
||||
SRR0 = NPC;
|
||||
|
|
@ -251,82 +300,15 @@ void CheckExceptions()
|
|||
ERROR_LOG(GEKKO, "Unknown EXTERNAL INTERRUPT exception: Exceptions == %08x", ppcState.Exceptions);
|
||||
}
|
||||
}
|
||||
else if (ppcState.Exceptions & EXCEPTION_ISI)
|
||||
{
|
||||
SRR0 = PC;
|
||||
SRR1 = (MSR & 0x0780FF77) | 0x40000000;
|
||||
NPC = 0x80000400;
|
||||
|
||||
INFO_LOG(GEKKO, "EXCEPTION_ISI");
|
||||
ppcState.Exceptions &= ~EXCEPTION_ISI;
|
||||
//SRR1 |= 0x02; //make recoverable ?
|
||||
}
|
||||
// EXCEPTION_ADDR_BREAKPOINT
|
||||
else if (ppcState.Exceptions & EXCEPTION_PROGRAM)
|
||||
{
|
||||
SRR0 = NPC; // execute next instruction when we come back from handler
|
||||
SRR1 = MSR & 0x0780FF77;
|
||||
NPC = 0x80000700;
|
||||
|
||||
INFO_LOG(GEKKO, "EXCEPTION_PROGRAM (PC=%08x)", PC);
|
||||
ppcState.Exceptions &= ~EXCEPTION_PROGRAM;
|
||||
SRR1 |= 0x02; //recoverable
|
||||
}
|
||||
else if (ppcState.Exceptions & EXCEPTION_SYSCALL)
|
||||
{
|
||||
SRR0 = NPC; // execute next instruction when we come back from handler
|
||||
SRR1 = MSR & 0x0780FF77;
|
||||
NPC = 0x80000C00;
|
||||
|
||||
INFO_LOG(GEKKO, "EXCEPTION_SYSCALL (PC=%08x)", PC);
|
||||
ppcState.Exceptions &= ~EXCEPTION_SYSCALL;
|
||||
SRR1 |= 0x02; //recoverable
|
||||
}
|
||||
else if (ppcState.Exceptions & EXCEPTION_FPU_UNAVAILABLE)
|
||||
{
|
||||
//This happens a lot - Gamecube OS uses deferred FPU context switching
|
||||
SRR0 = PC; // re-execute the instruction
|
||||
SRR1 = MSR & 0x0780FF77;
|
||||
NPC = 0x80000800;
|
||||
|
||||
INFO_LOG(GEKKO, "EXCEPTION_FPU_UNAVAILABLE");
|
||||
ppcState.Exceptions &= ~EXCEPTION_FPU_UNAVAILABLE;
|
||||
SRR1 |= 0x02; //recoverable
|
||||
}
|
||||
// EXCEPTION_PROGRAM (floating point)
|
||||
else if (ppcState.Exceptions & EXCEPTION_DSI)
|
||||
{
|
||||
SRR0 = PC; // re-execute the instruction
|
||||
SRR1 = MSR & 0x0780FF77;
|
||||
NPC = 0x80000300;
|
||||
|
||||
INFO_LOG(GEKKO, "EXCEPTION_DSI");
|
||||
ppcState.Exceptions &= ~EXCEPTION_DSI;
|
||||
//SRR1 |= 0x02; //make recoverable ?
|
||||
}
|
||||
else if (ppcState.Exceptions & EXCEPTION_ALIGNMENT)
|
||||
{
|
||||
// Alignment exceptions have priorities
|
||||
//This never happens ATM
|
||||
SRR0 = NPC;
|
||||
SRR1 = MSR & 0x0780FF77;
|
||||
NPC = 0x80000600;
|
||||
|
||||
INFO_LOG(GEKKO, "EXCEPTION_ALIGNMENT");
|
||||
ppcState.Exceptions &= ~EXCEPTION_ALIGNMENT;
|
||||
//SRR1 |= 0x02; //make recoverable ?
|
||||
}
|
||||
// Other DSI exceptions
|
||||
// EXCEPTION_TRACE
|
||||
MSR &= ~0x0008000; // clear EE-bit so interrupts aren't possible anymore
|
||||
}
|
||||
}
|
||||
|
||||
void OnIdle(u32 _uThreadAddr)
|
||||
{
|
||||
void OnIdle(u32 _uThreadAddr)
|
||||
{
|
||||
u32 nextThread = Memory::Read_U32(_uThreadAddr);
|
||||
//do idle skipping
|
||||
if (nextThread == 0)
|
||||
CoreTiming::Idle();
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace
|
||||
Loading…
Reference in New Issue