ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #378 from delroth/interrupts-comments 

CheckExceptions: add TODO and remove a wrong comment
This commit is contained in:
Ryan Houdek 2014-05-17 18:04:34 -05:00
parent a2d73ed525 0f1b1dd3cf
commit db96f862d2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/PowerPC/PowerPC.cpp
View File

@ -320,6 +320,11 @@ void CheckExceptions()
// set to exception type entry point // set to exception type entry point
//NPC = 0x00000x00; //NPC = 0x00000x00;
// TODO(delroth): Exception priority is completely wrong here: depending on
// the instruction class, exceptions should be executed in a given order,
// which is very different from the one arbitrarily chosen here. See §6.1.5
// in 6xx_pem.pdf.
if (exceptions & EXCEPTION_ISI) if (exceptions & EXCEPTION_ISI)
{ {
SRR0 = NPC; SRR0 = NPC;
@ -396,7 +401,7 @@ void CheckExceptions()
} }
// EXTERNAL INTERRUPT // EXTERNAL INTERRUPT
else if (MSR & 0x0008000) //hacky...the exception shouldn't be generated if EE isn't set... else if (MSR & 0x0008000) // Handling is delayed until MSR.EE=1.
{ {
if (exceptions & EXCEPTION_EXTERNAL_INT) if (exceptions & EXCEPTION_EXTERNAL_INT)
{ {