Emulation/cen64
1
0
Fork 0
mirror of https://github.com/n64dev/cen64.git synced 2024-06-20 21:17:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix two bugs in COP0 count

Browse source 
First, since the internal register is kept in CPU cycles (not RCP cycles),
we need to double the value written via MTC0/DMTC0.

Second, writing a count equal to compare would cause an infinite loop
because the fault would be triggered while PC was on the instruction
doing MTC0 itself, which would be then re-executed at the end of the
exception. On real hardware, in general, when COUNT==COMPARE, the
interrupt happens a few cycles later, enough for PC to move to other
opcodes. Instead of trying to implement this, I've simply made sure
that the interrupt happened after the opcode was executed rather than
before. Also, since the internal counter is in CPU cycles, we make
sure to only raise the CAUSE bit once.
This commit is contained in:
Giovanni Bajo 2021-06-13 11:29:17 +02:00 committed by Simon Eriksson
parent 6abe0f7e55
commit a56fa4ba41
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vr4300/cp0.c
View file

@ -92,6 +92,9 @@ int VR4300_DMTC0(struct vr4300 *vr4300,
switch (dest + VR4300_REGISTER_CP0_0)
{
case VR4300_CP0_REGISTER_COUNT:
rt <<= 1;
break;
case VR4300_CP0_REGISTER_CAUSE:
vr4300->regs[VR4300_CP0_REGISTER_CAUSE] &= ~0x0300;
vr4300->regs[VR4300_CP0_REGISTER_CAUSE] |= rt & 0x0300;
@ -193,6 +196,9 @@ int VR4300_MTC0(struct vr4300 *vr4300,
switch (dest + VR4300_REGISTER_CP0_0)
{
case VR4300_CP0_REGISTER_COUNT:
rt <<= 1;
break;
case VR4300_CP0_REGISTER_CAUSE:
vr4300->regs[VR4300_CP0_REGISTER_CAUSE] &= ~0x0300;
vr4300->regs[VR4300_CP0_REGISTER_CAUSE] |= (int32_t)rt & 0x0300;

10
vr4300/cpu.c
View file

@ -30,16 +30,18 @@ void vr4300_cycle(struct vr4300 *vr4300) {
// Increment counters.
vr4300->regs[VR4300_CP0_REGISTER_COUNT]++;
if ((uint32_t) (vr4300->regs[VR4300_CP0_REGISTER_COUNT] >> 1) ==
(uint32_t) vr4300->regs[VR4300_CP0_REGISTER_COMPARE])
vr4300->regs[VR4300_CP0_REGISTER_CAUSE] |= 0x8000;
// We're stalling for something...
if (pipeline->cycles_to_stall > 0)
pipeline->cycles_to_stall--;
else
vr4300_cycle_(vr4300);
if ((vr4300->regs[VR4300_CP0_REGISTER_COUNT] & 1) == 1 &&
(uint32_t) (vr4300->regs[VR4300_CP0_REGISTER_COUNT] >> 1) ==
(uint32_t) vr4300->regs[VR4300_CP0_REGISTER_COMPARE]) {
vr4300->regs[VR4300_CP0_REGISTER_CAUSE] |= 0x8000;
}
}
// Sets the opaque pointer used for external accesses.