notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restore defaults function + some refactoring
[picodrive.git]
/
cpu
/
cz80
/
cz80macro.h
diff --git
a/cpu/cz80/cz80macro.h
b/cpu/cz80/cz80macro.h
index
91b49ef
..
7118dcc
100644
(file)
--- a/
cpu/cz80/cz80macro.h
+++ b/
cpu/cz80/cz80macro.h
@@
-57,7
+57,11
@@
//#ifndef BUILD_CPS1PSP
\r
//#define READ_MEM8(A) memory_region_cpu2[(A)]
\r
//#else
\r
//#ifndef BUILD_CPS1PSP
\r
//#define READ_MEM8(A) memory_region_cpu2[(A)]
\r
//#else
\r
+#if PICODRIVE_HACKS
\r
+#define READ_MEM8(A) picodrive_read(A)
\r
+#else
\r
#define READ_MEM8(A) CPU->Read_Byte(A)
\r
#define READ_MEM8(A) CPU->Read_Byte(A)
\r
+#endif
\r
//#endif
\r
#if CZ80_LITTLE_ENDIAN
\r
#define READ_MEM16(A) (READ_MEM8(A) | (READ_MEM8((A) + 1) << 8))
\r
//#endif
\r
#if CZ80_LITTLE_ENDIAN
\r
#define READ_MEM16(A) (READ_MEM8(A) | (READ_MEM8((A) + 1) << 8))
\r
@@
-65,7
+69,16
@@
#define READ_MEM16(A) ((READ_MEM8(A) << 8) | READ_MEM8((A) + 1))
\r
#endif
\r
\r
#define READ_MEM16(A) ((READ_MEM8(A) << 8) | READ_MEM8((A) + 1))
\r
#endif
\r
\r
+#if PICODRIVE_HACKS
\r
+#define WRITE_MEM8(A, D) { \
\r
+ unsigned short a = A; \
\r
+ unsigned char d = D; \
\r
+ if (a < 0x4000) Pico.zram[a&0x1fff] = d; \
\r
+ else z80_write(a, d); \
\r
+}
\r
+#else
\r
#define WRITE_MEM8(A, D) CPU->Write_Byte(A, D);
\r
#define WRITE_MEM8(A, D) CPU->Write_Byte(A, D);
\r
+#endif
\r
#if CZ80_LITTLE_ENDIAN
\r
#define WRITE_MEM16(A, D) { WRITE_MEM8(A, D); WRITE_MEM8((A) + 1, (D) >> 8); }
\r
#else
\r
#if CZ80_LITTLE_ENDIAN
\r
#define WRITE_MEM16(A, D) { WRITE_MEM8(A, D); WRITE_MEM8((A) + 1, (D) >> 8); }
\r
#else
\r