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]
/
cpu
/
cz80
/
cz80.c
diff --git
a/cpu/cz80/cz80.c
b/cpu/cz80/cz80.c
index
d7bdba3
..
091e2a5
100644
(file)
--- a/
cpu/cz80/cz80.c
+++ b/
cpu/cz80/cz80.c
@@
-15,7
+15,7
@@
\r
#if PICODRIVE_HACKS
\r
#undef EMU_M68K
\r
\r
#if PICODRIVE_HACKS
\r
#undef EMU_M68K
\r
-#include <
Pico/PicoI
nt.h>
\r
+#include <
pico/pico_i
nt.h>
\r
#endif
\r
\r
#ifndef ALIGN_DATA
\r
#endif
\r
\r
#ifndef ALIGN_DATA
\r
@@
-219,7
+219,10
@@
void Cz80_Reset(cz80_struc *CPU)
#if PICODRIVE_HACKS
\r
static inline unsigned char picodrive_read(unsigned short a)
\r
{
\r
#if PICODRIVE_HACKS
\r
static inline unsigned char picodrive_read(unsigned short a)
\r
{
\r
- return (a < 0x4000) ? Pico.zram[a&0x1fff] : z80_read(a);
\r
+ unsigned long v = z80_read_map[a >> Z80_MEM_SHIFT];
\r
+ if (v & 0x80000000)
\r
+ return ((z80_read_f *)(v << 1))(a);
\r
+ return *(unsigned char *)((v << 1) + a);
\r
}
\r
#endif
\r
\r
}
\r
#endif
\r
\r
@@
-242,6
+245,7
@@
INT32 Cz80_Exec(cz80_struc *CPU, INT32 cycles)
UINT32 res;
\r
UINT32 val;
\r
int afterEI = 0;
\r
UINT32 res;
\r
UINT32 val;
\r
int afterEI = 0;
\r
+ union16 *data;
\r
\r
PC = CPU->PC;
\r
#if CZ80_ENCRYPTED_ROM
\r
\r
PC = CPU->PC;
\r
#if CZ80_ENCRYPTED_ROM
\r
@@
-255,7
+259,8
@@
INT32 Cz80_Exec(cz80_struc *CPU, INT32 cycles)
Cz80_Exec:
\r
if (CPU->ICount > 0)
\r
{
\r
Cz80_Exec:
\r
if (CPU->ICount > 0)
\r
{
\r
- union16 *data = pzHL;
\r
+Cz80_Exec_nocheck:
\r
+ data = pzHL;
\r
Opcode = READ_OP();
\r
#if CZ80_EMULATE_R_EXACTLY
\r
zR++;
\r
Opcode = READ_OP();
\r
#if CZ80_EMULATE_R_EXACTLY
\r
zR++;
\r
@@
-270,6
+275,8
@@
Cz80_Check_Interrupt:
if (CPU->IRQState != CLEAR_LINE)
\r
{
\r
CHECK_INT
\r
if (CPU->IRQState != CLEAR_LINE)
\r
{
\r
CHECK_INT
\r
+ CPU->ICount -= CPU->ExtraCycles;
\r
+ CPU->ExtraCycles = 0;
\r
}
\r
goto Cz80_Exec;
\r
}
\r
}
\r
goto Cz80_Exec;
\r
}
\r