github.com/captain-amygdala.pistorm
1
0
Fork 0
mirror of https://github.com/captain-amygdala/pistorm.git synced 2026-01-27 20:27:31 +00:00
Code Issues Projects Releases Wiki Activity

Fix up Musashi performance with prefetch enabled

Browse Source 
Mapped memory ranges should always be given preference, since they can't actually cause a bus error or affect any read/write operations over the 68k bus.
This commit is contained in:
beeanyew
2021-04-16 10:47:25 +02:00
parent bf2bbbb7a3
commit 83fa34909f
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
m68kcpu.h
View File

@@ -1154,6 +1154,14 @@ static inline uint32 m68ki_ic_readimm16(uint32 address)
*/
static inline uint m68ki_read_imm_16(void)
{
uint32_t address = ADDRESS_68K(REG_PC);
for (int i = 0; i < read_ranges; i++) {
if(address >= read_addr[i] && address < read_upper[i]) {
REG_PC += 2;
return be16toh(((unsigned short *)(read_data[i] + (address - read_addr[i])))[0]);
}
}
m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
m68ki_cpu.mmu_tmp_fc = FLAG_S | FUNCTION_CODE_USER_PROGRAM;
m68ki_cpu.mmu_tmp_rw = 1;
@@ -1208,6 +1216,13 @@ static inline uint m68ki_read_imm_32(void)
// address = pmmu_translate_addr(address,1);
#endif
#endif
uint32_t address = ADDRESS_68K(REG_PC);
for (int i = 0; i < read_ranges; i++) {
if(address >= read_addr[i] && address < read_upper[i]) {
REG_PC += 4;
return be32toh(((unsigned int *)(read_data[i] + (address - read_addr[i])))[0]);
}
}
#if M68K_EMULATE_PREFETCH
uint temp_val;