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

vr4300: fix badvaddr register in TLB exceptions.

Browse source 
Currently, all load/store opcodes (with the exception of LWL/LWR) mask
the lowest bit of address that causes a TLB exception in the BADVADDR
COP0 register. This is wrong because the VR4300 reports the exact
faulting address in that register, the reason being that the exception
handler must require it.
This commit is contained in:
Giovanni Bajo 2021-05-04 00:18:03 +02:00 committed by Simon Eriksson
parent 1b31ca9b3c
commit 622dd402f0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vr4300/functions.c
View file

@ -1209,7 +1209,7 @@ cen64_hot int VR4300_LOAD_STORE(struct vr4300 *vr4300,
unsigned lshiftamt = (3 - request_size) << 3;
unsigned rshiftamt = (address & 0x3) << 3;
exdc_latch->request.vaddr = address & ~(sel_mask & 0x3);
exdc_latch->request.vaddr = address;
exdc_latch->request.data = dqm | (sel_mask & ((rt << lshiftamt) >> rshiftamt));
exdc_latch->request.wdqm = ((uint32_t) sel_mask << lshiftamt) >> rshiftamt;
exdc_latch->request.postshift = 0;
@ -1529,7 +1529,7 @@ int VR4300_SDL_SDR(struct vr4300 *vr4300,
dqm = mask >> shiftamt;
}
exdc_latch->request.vaddr = address & ~0x3ULL;
exdc_latch->request.vaddr = address;
exdc_latch->request.data = data;
exdc_latch->request.wdqm = dqm;
exdc_latch->request.access_type = VR4300_ACCESS_DWORD;
@ -1568,7 +1568,7 @@ int VR4300_SWL_SWR(struct vr4300 *vr4300,
dqm = mask >> shiftamt;
}
exdc_latch->request.vaddr = address & ~0x3ULL;
exdc_latch->request.vaddr = address;
exdc_latch->request.data = data;
exdc_latch->request.wdqm = dqm;
exdc_latch->request.access_type = VR4300_ACCESS_WORD;