notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.35a psp bugfix release
[picodrive.git]
/
Pico
/
Memory.c
diff --git
a/Pico/Memory.c
b/Pico/Memory.c
index
26be012
..
a3372d6
100644
(file)
--- a/
Pico/Memory.c
+++ b/
Pico/Memory.c
@@
-7,7
+7,7
@@
// For commercial use, separate licencing terms must be obtained.
\r
\r
\r
// For commercial use, separate licencing terms must be obtained.
\r
\r
\r
-#define __debug_io
\r
+
//
#define __debug_io
\r
\r
#include "PicoInt.h"
\r
\r
\r
#include "PicoInt.h"
\r
\r
@@
-323,7
+323,7
@@
PICO_INTERNAL_ASM u32 PicoRead8(u32 a)
\r
#ifndef EMU_CORE_DEBUG
\r
// sram
\r
\r
#ifndef EMU_CORE_DEBUG
\r
// sram
\r
- if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
\r
+ if
(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
\r
d = SRAMRead(a);
\r
elprintf(EL_SRAMIO, "sram r8 [%06x] %02x @ %06x", a, d, SekPc);
\r
goto end;
\r
d = SRAMRead(a);
\r
elprintf(EL_SRAMIO, "sram r8 [%06x] %02x @ %06x", a, d, SekPc);
\r
goto end;
\r
@@
-334,14
+334,17
@@
PICO_INTERNAL_ASM u32 PicoRead8(u32 a)
log_io(a, 8, 0);
\r
if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram
\r
\r
log_io(a, 8, 0);
\r
if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram
\r
\r
- d=OtherRead16(a&~1, 8); if ((a&1)==0) d>>=8;
\r
+ if ((a&0xe700e0)==0xc00000) // VDP
\r
+ d=PicoVideoRead(a);
\r
+ else d=OtherRead16(a&~1, 8);
\r
+ if ((a&1)==0) d>>=8;
\r
\r
end:
\r
#ifdef __debug_io
\r
dprintf("r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPc);
\r
#endif
\r
#ifdef EMU_CORE_DEBUG
\r
\r
end:
\r
#ifdef __debug_io
\r
dprintf("r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPc);
\r
#endif
\r
#ifdef EMU_CORE_DEBUG
\r
- if
(a>=Pico.romsize/*&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b*/
) {
\r
+ if
(a>=Pico.romsize
) {
\r
lastread_a = a;
\r
lastread_d[lrp_cyc++&15] = (u8)d;
\r
}
\r
lastread_a = a;
\r
lastread_d[lrp_cyc++&15] = (u8)d;
\r
}
\r
@@
-359,7
+362,7
@@
PICO_INTERNAL_ASM u32 PicoRead16(u32 a)
\r
#ifndef EMU_CORE_DEBUG
\r
// sram
\r
\r
#ifndef EMU_CORE_DEBUG
\r
// sram
\r
- if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
\r
+ if
(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
\r
d = SRAMRead(a);
\r
d |= d<<8;
\r
elprintf(EL_SRAMIO, "sram r16 [%06x] %04x @ %06x", a, d, SekPc);
\r
d = SRAMRead(a);
\r
d |= d<<8;
\r
elprintf(EL_SRAMIO, "sram r16 [%06x] %04x @ %06x", a, d, SekPc);
\r
@@
-370,14
+373,16
@@
PICO_INTERNAL_ASM u32 PicoRead16(u32 a)
if (a<Pico.romsize) { d = *(u16 *)(Pico.rom+a); goto end; } // Rom
\r
log_io(a, 16, 0);
\r
\r
if (a<Pico.romsize) { d = *(u16 *)(Pico.rom+a); goto end; } // Rom
\r
log_io(a, 16, 0);
\r
\r
- d = OtherRead16(a, 16);
\r
+ if ((a&0xe700e0)==0xc00000)
\r
+ d = PicoVideoRead(a);
\r
+ else d = OtherRead16(a, 16);
\r
\r
end:
\r
#ifdef __debug_io
\r
dprintf("r16: %06x, %04x @%06x", a&0xffffff, d, SekPc);
\r
#endif
\r
#ifdef EMU_CORE_DEBUG
\r
\r
end:
\r
#ifdef __debug_io
\r
dprintf("r16: %06x, %04x @%06x", a&0xffffff, d, SekPc);
\r
#endif
\r
#ifdef EMU_CORE_DEBUG
\r
- if
(a>=Pico.romsize/*&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b*/
) {
\r
+ if
(a>=Pico.romsize
) {
\r
lastread_a = a;
\r
lastread_d[lrp_cyc++&15] = d;
\r
}
\r
lastread_a = a;
\r
lastread_d[lrp_cyc++&15] = d;
\r
}
\r
@@
-404,14
+409,16
@@
PICO_INTERNAL_ASM u32 PicoRead32(u32 a)
if (a<Pico.romsize) { u16 *pm=(u16 *)(Pico.rom+a); d = (pm[0]<<16)|pm[1]; goto end; } // Rom
\r
log_io(a, 32, 0);
\r
\r
if (a<Pico.romsize) { u16 *pm=(u16 *)(Pico.rom+a); d = (pm[0]<<16)|pm[1]; goto end; } // Rom
\r
log_io(a, 32, 0);
\r
\r
- d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);
\r
+ if ((a&0xe700e0)==0xc00000)
\r
+ d = (PicoVideoRead(a)<<16)|PicoVideoRead(a+2);
\r
+ else d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);
\r
\r
end:
\r
#ifdef __debug_io
\r
dprintf("r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);
\r
#endif
\r
#ifdef EMU_CORE_DEBUG
\r
\r
end:
\r
#ifdef __debug_io
\r
dprintf("r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);
\r
#endif
\r
#ifdef EMU_CORE_DEBUG
\r
- if
(a>=Pico.romsize/*&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b*/
) {
\r
+ if
(a>=Pico.romsize
) {
\r
lastread_a = a;
\r
lastread_d[lrp_cyc++&15] = d;
\r
}
\r
lastread_a = a;
\r
lastread_d[lrp_cyc++&15] = d;
\r
}
\r
@@
-454,6
+461,7
@@
void PicoWrite16(u32 a,u16 d)
log_io(a, 16, 1);
\r
\r
a&=0xfffffe;
\r
log_io(a, 16, 1);
\r
\r
a&=0xfffffe;
\r
+ if ((a&0xe700e0)==0xc00000) { PicoVideoWrite(a,(u16)d); return; } // VDP
\r
OtherWrite16(a,d);
\r
}
\r
\r
OtherWrite16(a,d);
\r
}
\r
\r
@@
-476,6
+484,14
@@
static void PicoWrite32(u32 a,u32 d)
log_io(a, 32, 1);
\r
\r
a&=0xfffffe;
\r
log_io(a, 32, 1);
\r
\r
a&=0xfffffe;
\r
+ if ((a&0xe700e0)==0xc00000)
\r
+ {
\r
+ // VDP:
\r
+ PicoVideoWrite(a, (u16)(d>>16));
\r
+ PicoVideoWrite(a+2,(u16)d);
\r
+ return;
\r
+ }
\r
+
\r
OtherWrite16(a, (u16)(d>>16));
\r
OtherWrite16(a+2,(u16)d);
\r
}
\r
OtherWrite16(a, (u16)(d>>16));
\r
OtherWrite16(a+2,(u16)d);
\r
}
\r
@@
-525,33
+541,36
@@
unsigned int m68k_read_pcrelative_CD16(unsigned int a);
unsigned int m68k_read_pcrelative_CD32(unsigned int a);
\r
\r
// these are allowed to access RAM
\r
unsigned int m68k_read_pcrelative_CD32(unsigned int a);
\r
\r
// these are allowed to access RAM
\r
-static unsigned int m68k_read_8 (unsigned int a, int do_fake) {
\r
+static unsigned int m68k_read_8 (unsigned int a, int do_fake)
\r
+{
\r
a&=0xffffff;
\r
a&=0xffffff;
\r
- if(PicoMCD&1) return m68k_read_pcrelative_CD8(a);
\r
- if(a<Pico.romsize) return *(u8 *)(Pico.rom+(a^1)); // Rom
\r
+ if(a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k) return *(u8 *)(Pico.rom+(a^1)); // Rom
\r
#ifdef EMU_CORE_DEBUG
\r
if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
\r
#endif
\r
#ifdef EMU_CORE_DEBUG
\r
if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
\r
#endif
\r
+ if(PicoMCD&1) return m68k_read_pcrelative_CD8(a);
\r
if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram
\r
return 0;
\r
}
\r
if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram
\r
return 0;
\r
}
\r
-static unsigned int m68k_read_16(unsigned int a, int do_fake) {
\r
+static unsigned int m68k_read_16(unsigned int a, int do_fake)
\r
+{
\r
a&=0xffffff;
\r
a&=0xffffff;
\r
- if(PicoMCD&1) return m68k_read_pcrelative_CD16(a);
\r
- if(a<Pico.romsize) return *(u16 *)(Pico.rom+(a&~1)); // Rom
\r
+ if(a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k) return *(u16 *)(Pico.rom+(a&~1)); // Rom
\r
#ifdef EMU_CORE_DEBUG
\r
if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
\r
#endif
\r
#ifdef EMU_CORE_DEBUG
\r
if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
\r
#endif
\r
+ if(PicoMCD&1) return m68k_read_pcrelative_CD16(a);
\r
if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram
\r
return 0;
\r
}
\r
if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram
\r
return 0;
\r
}
\r
-static unsigned int m68k_read_32(unsigned int a, int do_fake) {
\r
+static unsigned int m68k_read_32(unsigned int a, int do_fake)
\r
+{
\r
a&=0xffffff;
\r
a&=0xffffff;
\r
- if(PicoMCD&1) return m68k_read_pcrelative_CD32(a);
\r
- if(a<Pico.romsize) { u16 *pm=(u16 *)(Pico.rom+(a&~1)); return (pm[0]<<16)|pm[1]; }
\r
+ if(a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k) { u16 *pm=(u16 *)(Pico.rom+(a&~1)); return (pm[0]<<16)|pm[1]; }
\r
#ifdef EMU_CORE_DEBUG
\r
if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
\r
#endif
\r
#ifdef EMU_CORE_DEBUG
\r
if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
\r
#endif
\r
+ if(PicoMCD&1) return m68k_read_pcrelative_CD32(a);
\r
if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram
\r
return 0;
\r
}
\r
if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram
\r
return 0;
\r
}
\r
@@
-570,7
+589,8
@@
unsigned int m68k_read_disassembler_32(unsigned int a) { return m68k_read_32(a,
unsigned int m68k_read_memory_8(unsigned int a)
\r
{
\r
u8 d;
\r
unsigned int m68k_read_memory_8(unsigned int a)
\r
{
\r
u8 d;
\r
- if(a<Pico.romsize) d = *(u8 *) (Pico.rom+(a^1));
\r
+ if (a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)
\r
+ d = *(u8 *) (Pico.rom+(a^1));
\r
else d = (u8) lastread_d[lrp_mus++&15];
\r
#ifdef __debug_io
\r
dprintf("r8_mu : %06x, %02x @%06x", a&0xffffff, d, SekPc);
\r
else d = (u8) lastread_d[lrp_mus++&15];
\r
#ifdef __debug_io
\r
dprintf("r8_mu : %06x, %02x @%06x", a&0xffffff, d, SekPc);
\r
@@
-580,7
+600,8
@@
unsigned int m68k_read_memory_8(unsigned int a)
unsigned int m68k_read_memory_16(unsigned int a)
\r
{
\r
u16 d;
\r
unsigned int m68k_read_memory_16(unsigned int a)
\r
{
\r
u16 d;
\r
- if(a<Pico.romsize) d = *(u16 *)(Pico.rom+(a&~1));
\r
+ if (a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)
\r
+ d = *(u16 *)(Pico.rom+(a&~1));
\r
else d = (u16) lastread_d[lrp_mus++&15];
\r
#ifdef __debug_io
\r
dprintf("r16_mu: %06x, %04x @%06x", a&0xffffff, d, SekPc);
\r
else d = (u16) lastread_d[lrp_mus++&15];
\r
#ifdef __debug_io
\r
dprintf("r16_mu: %06x, %04x @%06x", a&0xffffff, d, SekPc);
\r
@@
-590,7
+611,9
@@
unsigned int m68k_read_memory_16(unsigned int a)
unsigned int m68k_read_memory_32(unsigned int a)
\r
{
\r
u32 d;
\r
unsigned int m68k_read_memory_32(unsigned int a)
\r
{
\r
u32 d;
\r
- if(a<Pico.romsize) {u16 *pm=(u16 *)(Pico.rom+(a&~1));d=(pm[0]<<16)|pm[1];}
\r
+ if (a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)
\r
+ { u16 *pm=(u16 *)(Pico.rom+(a&~1));d=(pm[0]<<16)|pm[1]; }
\r
+ else if (a <= 0x78) d = m68k_read_32(a, 0);
\r
else d = lastread_d[lrp_mus++&15];
\r
#ifdef __debug_io
\r
dprintf("r32_mu: %06x, %08x @%06x", a&0xffffff, d, SekPc);
\r
else d = lastread_d[lrp_mus++&15];
\r
#ifdef __debug_io
\r
dprintf("r32_mu: %06x, %08x @%06x", a&0xffffff, d, SekPc);
\r
@@
-653,10
+676,6
@@
PICO_INTERNAL unsigned char z80_read(unsigned short a)
{
\r
u8 ret = 0;
\r
\r
{
\r
u8 ret = 0;
\r
\r
-#ifndef _USE_DRZ80
\r
- if (a<0x4000) return Pico.zram[a&0x1fff];
\r
-#endif
\r
-
\r
if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
\r
{
\r
if (PicoOpt&1) ret = (u8) YM2612Read();
\r
if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
\r
{
\r
if (PicoOpt&1) ret = (u8) YM2612Read();
\r
@@
-665,19
+684,20
@@
PICO_INTERNAL unsigned char z80_read(unsigned short a)
\r
if (a>=0x8000)
\r
{
\r
\r
if (a>=0x8000)
\r
{
\r
+ extern u32 PicoReadM68k8(u32 a);
\r
u32 addr68k;
\r
addr68k=Pico.m.z80_bank68k<<15;
\r
addr68k+=a&0x7fff;
\r
\r
u32 addr68k;
\r
addr68k=Pico.m.z80_bank68k<<15;
\r
addr68k+=a&0x7fff;
\r
\r
- ret = (u8) PicoRead8(addr68k);
\r
+ if (PicoMCD & 1)
\r
+ ret = PicoReadM68k8(addr68k);
\r
+ else ret = PicoRead8(addr68k);
\r
elprintf(EL_Z80BNK, "z80->68k r8 [%06x] %02x", addr68k, ret);
\r
return ret;
\r
}
\r
\r
elprintf(EL_Z80BNK, "z80->68k r8 [%06x] %02x", addr68k, ret);
\r
return ret;
\r
}
\r
\r
-#ifdef _USE_DRZ80
\r
- // should not be needed || dprintf("z80_read RAM");
\r
+ // should not be needed, cores should be able to access RAM themselves
\r
if (a<0x4000) return Pico.zram[a&0x1fff];
\r
if (a<0x4000) return Pico.zram[a&0x1fff];
\r
-#endif
\r
\r
elprintf(EL_ANOMALY, "z80 invalid r8 [%06x] %02x", a, ret);
\r
return ret;
\r
\r
elprintf(EL_ANOMALY, "z80 invalid r8 [%06x] %02x", a, ret);
\r
return ret;
\r
@@
-689,10
+709,6
@@
PICO_INTERNAL_ASM void z80_write(unsigned char data, unsigned short a)
PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
\r
#endif
\r
{
\r
PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
\r
#endif
\r
{
\r
-#ifndef _USE_DRZ80
\r
- if (a<0x4000) { Pico.zram[a&0x1fff]=data; return; }
\r
-#endif
\r
-
\r
if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
\r
{
\r
if(PicoOpt&1) emustatus|=YM2612Write(a, data) & 1;
\r
if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
\r
{
\r
if(PicoOpt&1) emustatus|=YM2612Write(a, data) & 1;
\r
@@
-715,18
+731,19
@@
PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
\r
if (a>=0x8000)
\r
{
\r
\r
if (a>=0x8000)
\r
{
\r
+ extern void PicoWriteM68k8(u32 a,u8 d);
\r
u32 addr68k;
\r
addr68k=Pico.m.z80_bank68k<<15;
\r
addr68k+=a&0x7fff;
\r
elprintf(EL_Z80BNK, "z80->68k w8 [%06x] %02x", addr68k, data);
\r
u32 addr68k;
\r
addr68k=Pico.m.z80_bank68k<<15;
\r
addr68k+=a&0x7fff;
\r
elprintf(EL_Z80BNK, "z80->68k w8 [%06x] %02x", addr68k, data);
\r
- PicoWrite8(addr68k, data);
\r
+ if (PicoMCD & 1)
\r
+ PicoWriteM68k8(addr68k, data);
\r
+ else PicoWrite8(addr68k, data);
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r
-#ifdef _USE_DRZ80
\r
- // should not be needed, drZ80 knows how to access RAM itself || dprintf("z80_write RAM @ %08x", lr);
\r
+ // should not be needed
\r
if (a<0x4000) { Pico.zram[a&0x1fff]=data; return; }
\r
if (a<0x4000) { Pico.zram[a&0x1fff]=data; return; }
\r
-#endif
\r
\r
elprintf(EL_ANOMALY, "z80 invalid w8 [%06x] %02x", a, data);
\r
}
\r
\r
elprintf(EL_ANOMALY, "z80 invalid w8 [%06x] %02x", a, data);
\r
}
\r