notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stupid sprite limit bug fixed
[picodrive.git]
/
Pico
/
Memory.c
diff --git
a/Pico/Memory.c
b/Pico/Memory.c
index
004d3af
..
bdcfaab
100644
(file)
--- a/
Pico/Memory.c
+++ b/
Pico/Memory.c
@@
-105,7
+105,7
@@
PICO_INTERNAL_ASM void PicoMemReset(void)
int PadRead(int i)
\r
{
\r
int pad,value,data_reg;
\r
int PadRead(int i)
\r
{
\r
int pad,value,data_reg;
\r
- pad=~PicoPad[i]; // Get inverse of pad MXYZ SACB RLDU
\r
+ pad=~PicoPad
Int
[i]; // Get inverse of pad MXYZ SACB RLDU
\r
data_reg=Pico.ioports[i+1];
\r
\r
// orr the bits, which are set as output
\r
data_reg=Pico.ioports[i+1];
\r
\r
// orr the bits, which are set as output
\r
@@
-345,7
+345,7
@@
PICO_INTERNAL_ASM u32 PicoRead8(u32 a)
if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram
\r
\r
if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead8(a); goto end; } // VDP
\r
if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram
\r
\r
if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead8(a); goto end; } // VDP
\r
-
\r
+
\r
d=OtherRead16(a&~1, 8);
\r
if ((a&1)==0) d>>=8;
\r
\r
d=OtherRead16(a&~1, 8);
\r
if ((a&1)==0) d>>=8;
\r
\r
@@
-465,7
+465,7
@@
void PicoWrite16(u32 a,u16 d)
\r
static void PicoWrite32(u32 a,u32 d)
\r
{
\r
\r
static void PicoWrite32(u32 a,u32 d)
\r
{
\r
- elprintf(EL_IO, "w32: %06x, %08x
", a&0xffffff, d
);
\r
+ elprintf(EL_IO, "w32: %06x, %08x
@%06x", a&0xffffff, d, SekPc
);
\r
#ifdef EMU_CORE_DEBUG
\r
lastwrite_cyc_d[lwp_cyc++&15] = d;
\r
#endif
\r
#ifdef EMU_CORE_DEBUG
\r
lastwrite_cyc_d[lwp_cyc++&15] = d;
\r
#endif
\r
@@
-983,8
+983,7
@@
PICO_INTERNAL unsigned char z80_read(unsigned short a)
\r
if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
\r
{
\r
\r
if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
\r
{
\r
- if (PicoOpt&POPT_EN_FM) ret = ym2612_read_local_z80();
\r
- return ret;
\r
+ return ym2612_read_local_z80();
\r
}
\r
\r
if (a>=0x8000)
\r
}
\r
\r
if (a>=0x8000)
\r