diff options
Diffstat (limited to 'src/emu/cpu')
| -rw-r--r-- | src/emu/cpu/sh4/sh4.c | 18 | ||||
| -rw-r--r-- | src/emu/cpu/sh4/sh4comn.c | 4 | ||||
| -rw-r--r-- | src/emu/cpu/sh4/sh4comn.h | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c index 3830b5a8b52..4283acffc04 100644 --- a/src/emu/cpu/sh4/sh4.c +++ b/src/emu/cpu/sh4/sh4.c @@ -2086,16 +2086,16 @@ UINT32 sh4_getsqremap(SH4 *sh4, UINT32 address) { int i; UINT32 topaddr = address&0xfff00000; - + for (i=0;i<64;i++) { UINT32 topcmp = sh4->sh4_tlb_address[i]&0xfff00000; if (topcmp==topaddr) return (address&0x000fffff) | ((sh4->sh4_tlb_data[i])&0xfff00000); } - + } - + return address; } @@ -2112,10 +2112,10 @@ INLINE void PREFM(SH4 *sh4, UINT32 n) { addr = addr & 0xFFFFFFE0; dest = sh4_getsqremap(sh4, addr); // good enough for naomi-gd rom, probably not much else - + } else - { + { sq = (addr & 0x20) >> 5; dest = addr & 0x03FFFFE0; if (sq == 0) @@ -2124,7 +2124,7 @@ INLINE void PREFM(SH4 *sh4, UINT32 n) dest |= (sh4->m[QACR1] & 0x1C) << 24; addr = addr & 0xFFFFFFE0; } - + for (a = 0;a < 4;a++) { // shouldn't be causing a memory read, should store sq writes in registers. @@ -3358,7 +3358,7 @@ static CPU_RESET( sh4 ) sh4->internal_irq_level = -1; sh4->irln = 15; sh4->sleep_mode = 0; - + sh4->sh4_mmu_enabled = 0; } @@ -3680,7 +3680,7 @@ READ64_HANDLER( sh4_tlb_r ) else { UINT8 i = (offs>>8)&63; - return sh4->sh4_tlb_address[i]; + return sh4->sh4_tlb_address[i]; } } @@ -3698,7 +3698,7 @@ WRITE64_HANDLER( sh4_tlb_w ) else { UINT8 i = (offs>>8)&63; - sh4->sh4_tlb_address[i] = data&0xffffffff; + sh4->sh4_tlb_address[i] = data&0xffffffff; } } diff --git a/src/emu/cpu/sh4/sh4comn.c b/src/emu/cpu/sh4/sh4comn.c index c6509271c33..f10d5cd4f1e 100644 --- a/src/emu/cpu/sh4/sh4comn.c +++ b/src/emu/cpu/sh4/sh4comn.c @@ -650,7 +650,7 @@ WRITE32_HANDLER( sh4_internal_w ) printf("If you're seeing this, but running something other than a Naomi GD-ROM game then chances are it won't work\n"); printf("The MMU emulation is a hack specific to that system\n"); sh4->sh4_mmu_enabled = 1; - + // should be a different bit! { int i; @@ -659,7 +659,7 @@ WRITE32_HANDLER( sh4_internal_w ) sh4->sh4_tlb_address[i] = 0; sh4->sh4_tlb_data[i] = 0; } - + } } else diff --git a/src/emu/cpu/sh4/sh4comn.h b/src/emu/cpu/sh4/sh4comn.h index 1463c78ee84..e448f54cd5d 100644 --- a/src/emu/cpu/sh4/sh4comn.h +++ b/src/emu/cpu/sh4/sh4comn.h @@ -91,7 +91,7 @@ typedef struct int ioport4_pullup, ioport4_direction; void (*ftcsr_read_callback)(UINT32 data); - + /* This MMU simulation is good for the simple remap used on Naomi GD-ROM SQ access *ONLY* */ UINT32 sh4_tlb_address[64]; |
