notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eliminate texrels (wip2)
[picodrive.git]
/
pico
/
memory.c
diff --git
a/pico/memory.c
b/pico/memory.c
index
24e5f21
..
e72628e
100644
(file)
--- a/
pico/memory.c
+++ b/
pico/memory.c
@@
-49,7
+49,7
@@
static void xmap_set(uptr *map, int shift, int start_addr, int end_addr,
for (i = start_addr >> shift; i <= end_addr >> shift; i++) {
\r
map[i] = addr >> 1;
\r
if (is_func)
\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++) {
\r
map[i] = addr >> 1;
\r
if (is_func)
\r
- map[i] |=
(uptr)1 << (sizeof(addr) * 8 - 1)
;
\r
+ map[i] |=
MAP_FLAG
;
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-126,19
+126,19
@@
void m68k_map_unmap(int start_addr, int end_addr)
\r
addr = (uptr)m68k_unmapped_read8;
\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++)
\r
\r
addr = (uptr)m68k_unmapped_read8;
\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++)
\r
- m68k_read8_map[i] = (addr >> 1) |
(1 << 31)
;
\r
+ m68k_read8_map[i] = (addr >> 1) |
MAP_FLAG
;
\r
\r
addr = (uptr)m68k_unmapped_read16;
\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++)
\r
\r
addr = (uptr)m68k_unmapped_read16;
\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++)
\r
- m68k_read16_map[i] = (addr >> 1) |
(1 << 31)
;
\r
+ m68k_read16_map[i] = (addr >> 1) |
MAP_FLAG
;
\r
\r
addr = (uptr)m68k_unmapped_write8;
\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++)
\r
\r
addr = (uptr)m68k_unmapped_write8;
\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++)
\r
- m68k_write8_map[i] = (addr >> 1) |
(1 << 31)
;
\r
+ m68k_write8_map[i] = (addr >> 1) |
MAP_FLAG
;
\r
\r
addr = (uptr)m68k_unmapped_write16;
\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++)
\r
\r
addr = (uptr)m68k_unmapped_write16;
\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++)
\r
- m68k_write16_map[i] = (addr >> 1) |
(1 << 31)
;
\r
+ m68k_write16_map[i] = (addr >> 1) |
MAP_FLAG
;
\r
}
\r
\r
MAKE_68K_READ8(m68k_read8, m68k_read8_map)
\r
}
\r
\r
MAKE_68K_READ8(m68k_read8, m68k_read8_map)
\r
@@
-459,7
+459,7
@@
static void PicoWrite16_sram(u32 a, u32 d)
\r
// z80 area (0xa00000 - 0xa0ffff)
\r
// TODO: verify mirrors VDP and bank reg (bank area mirroring verified)
\r
\r
// z80 area (0xa00000 - 0xa0ffff)
\r
// TODO: verify mirrors VDP and bank reg (bank area mirroring verified)
\r
-
static
u32 PicoRead8_z80(u32 a)
\r
+u32 PicoRead8_z80(u32 a)
\r
{
\r
u32 d = 0xff;
\r
if ((Pico.m.z80Run & 1) || Pico.m.z80_reset) {
\r
{
\r
u32 d = 0xff;
\r
if ((Pico.m.z80Run & 1) || Pico.m.z80_reset) {
\r
@@
-483,7
+483,7
@@
static u32 PicoRead16_z80(u32 a)
return d | (d << 8);
\r
}
\r
\r
return d | (d << 8);
\r
}
\r
\r
-
static
void PicoWrite8_z80(u32 a, u32 d)
\r
+void PicoWrite8_z80(u32 a, u32 d)
\r
{
\r
if ((Pico.m.z80Run & 1) || Pico.m.z80_reset) {
\r
// verified on real hw
\r
{
\r
if ((Pico.m.z80Run & 1) || Pico.m.z80_reset) {
\r
// verified on real hw
\r