notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cyclone: direct memhandler calls option + reset function
[picodrive.git]
/
pico
/
memory.c
diff --git
a/pico/memory.c
b/pico/memory.c
index
da73961
..
6bb79d5
100644
(file)
--- a/
pico/memory.c
+++ b/
pico/memory.c
@@
-501,6
+501,11
@@
u32 PicoRead8_io(u32 a)
goto end;
\r
}
\r
\r
goto end;
\r
}
\r
\r
+ if (!(PicoOpt & POPT_DIS_32X)) {
\r
+ d = PicoRead8_32x(a);
\r
+ goto end;
\r
+ }
\r
+
\r
d = m68k_unmapped_read8(a);
\r
end:
\r
return d;
\r
d = m68k_unmapped_read8(a);
\r
end:
\r
return d;
\r
@@
-512,6
+517,7
@@
u32 PicoRead16_io(u32 a)
\r
if ((a & 0xffe0) == 0x0000) { // I/O ports
\r
d = io_ports_read(a);
\r
\r
if ((a & 0xffe0) == 0x0000) { // I/O ports
\r
d = io_ports_read(a);
\r
+ d |= d << 8;
\r
goto end;
\r
}
\r
\r
goto end;
\r
}
\r
\r
@@
-529,6
+535,11
@@
u32 PicoRead16_io(u32 a)
goto end;
\r
}
\r
\r
goto end;
\r
}
\r
\r
+ if (!(PicoOpt & POPT_DIS_32X)) {
\r
+ d = PicoRead16_32x(a);
\r
+ goto end;
\r
+ }
\r
+
\r
d = m68k_unmapped_read16(a);
\r
end:
\r
return d;
\r
d = m68k_unmapped_read16(a);
\r
end:
\r
return d;
\r
@@
-554,6
+565,11
@@
void PicoWrite8_io(u32 a, u32 d)
Pico.m.sram_reg |= (u8)(d & 3);
\r
return;
\r
}
\r
Pico.m.sram_reg |= (u8)(d & 3);
\r
return;
\r
}
\r
+ if (!(PicoOpt & POPT_DIS_32X)) {
\r
+ PicoWrite8_32x(a, d);
\r
+ return;
\r
+ }
\r
+
\r
m68k_unmapped_write8(a, d);
\r
}
\r
\r
m68k_unmapped_write8(a, d);
\r
}
\r
\r
@@
-577,6
+593,10
@@
void PicoWrite16_io(u32 a, u32 d)
Pico.m.sram_reg |= (u8)(d & 3);
\r
return;
\r
}
\r
Pico.m.sram_reg |= (u8)(d & 3);
\r
return;
\r
}
\r
+ if (!(PicoOpt & POPT_DIS_32X)) {
\r
+ PicoWrite16_32x(a, d);
\r
+ return;
\r
+ }
\r
m68k_unmapped_write16(a, d);
\r
}
\r
\r
m68k_unmapped_write16(a, d);
\r
}
\r
\r
@@
-1063,7
+1083,6
@@
static unsigned char MEMH_FUNC z80_md_vdp_read(unsigned short a)
\r
static unsigned char MEMH_FUNC z80_md_bank_read(unsigned short a)
\r
{
\r
\r
static unsigned char MEMH_FUNC z80_md_bank_read(unsigned short a)
\r
{
\r
- extern unsigned int PicoReadM68k8(unsigned int a);
\r
unsigned int addr68k;
\r
unsigned char ret;
\r
\r
unsigned int addr68k;
\r
unsigned char ret;
\r
\r
@@
-1105,7
+1124,6
@@
static void MEMH_FUNC z80_md_vdp_br_write(unsigned int a, unsigned char data)
\r
static void MEMH_FUNC z80_md_bank_write(unsigned int a, unsigned char data)
\r
{
\r
\r
static void MEMH_FUNC z80_md_bank_write(unsigned int a, unsigned char data)
\r
{
\r
- extern void PicoWriteM68k8(unsigned int a, unsigned char d);
\r
unsigned int addr68k;
\r
\r
addr68k = Pico.m.z80_bank68k << 15;
\r
unsigned int addr68k;
\r
\r
addr68k = Pico.m.z80_bank68k << 15;
\r