notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
famec: fix 64bit portability issues
[picodrive.git]
/
pico
/
cd
/
memory.c
diff --git
a/pico/cd/memory.c
b/pico/cd/memory.c
index
9482eb9
..
95c78f9
100644
(file)
--- a/
pico/cd/memory.c
+++ b/
pico/cd/memory.c
@@
-966,14
+966,14
@@
static void remap_word_ram(int r3)
if (!(r3 & 4))
\r
{
\r
for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x240000; i++)
\r
if (!(r3 & 4))
\r
{
\r
for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x240000; i++)
\r
- PicoCpuFM68k.Fetch[i] = (unsigned
int
)Pico_mcd->word_ram2M - 0x200000;
\r
+ PicoCpuFM68k.Fetch[i] = (unsigned
long
)Pico_mcd->word_ram2M - 0x200000;
\r
}
\r
else
\r
{
\r
for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x220000; i++)
\r
}
\r
else
\r
{
\r
for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x220000; i++)
\r
- PicoCpuFM68k.Fetch[i] = (unsigned
int
)Pico_mcd->word_ram1M[r3 & 1] - 0x200000;
\r
+ PicoCpuFM68k.Fetch[i] = (unsigned
long
)Pico_mcd->word_ram1M[r3 & 1] - 0x200000;
\r
for (i = M68K_FETCHBANK1*0x0c/0x100; (i<<(24-FAMEC_FETCHBITS)) < 0x0e0000; i++)
\r
for (i = M68K_FETCHBANK1*0x0c/0x100; (i<<(24-FAMEC_FETCHBITS)) < 0x0e0000; i++)
\r
- PicoCpuFS68k.Fetch[i] = (unsigned
int
)Pico_mcd->word_ram1M[(r3&1)^1] - 0x0c0000;
\r
+ PicoCpuFS68k.Fetch[i] = (unsigned
long
)Pico_mcd->word_ram1M[(r3&1)^1] - 0x0c0000;
\r
}
\r
#endif
\r
}
\r
}
\r
#endif
\r
}
\r
@@
-1073,23
+1073,23
@@
PICO_INTERNAL void PicoMemSetupCD(void)
// M68k
\r
// by default, point everything to fitst 64k of ROM (BIOS)
\r
for (i = 0; i < M68K_FETCHBANK1; i++)
\r
// M68k
\r
// by default, point everything to fitst 64k of ROM (BIOS)
\r
for (i = 0; i < M68K_FETCHBANK1; i++)
\r
- PicoCpuFM68k.Fetch[i] = (unsigned
int
)Pico.rom - (i<<(24-FAMEC_FETCHBITS));
\r
+ PicoCpuFM68k.Fetch[i] = (unsigned
long
)Pico.rom - (i<<(24-FAMEC_FETCHBITS));
\r
// now real ROM (BIOS)
\r
for (i = 0; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < Pico.romsize; i++)
\r
// now real ROM (BIOS)
\r
for (i = 0; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < Pico.romsize; i++)
\r
- PicoCpuFM68k.Fetch[i] = (unsigned
int
)Pico.rom;
\r
+ PicoCpuFM68k.Fetch[i] = (unsigned
long
)Pico.rom;
\r
// .. and RAM
\r
for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)
\r
// .. and RAM
\r
for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)
\r
- PicoCpuFM68k.Fetch[i] = (unsigned
int
)Pico.ram - (i<<(24-FAMEC_FETCHBITS));
\r
+ PicoCpuFM68k.Fetch[i] = (unsigned
long
)Pico.ram - (i<<(24-FAMEC_FETCHBITS));
\r
// S68k
\r
// PRG RAM is default
\r
for (i = 0; i < M68K_FETCHBANK1; i++)
\r
// S68k
\r
// PRG RAM is default
\r
for (i = 0; i < M68K_FETCHBANK1; i++)
\r
- PicoCpuFS68k.Fetch[i] = (unsigned
int
)Pico_mcd->prg_ram - (i<<(24-FAMEC_FETCHBITS));
\r
+ PicoCpuFS68k.Fetch[i] = (unsigned
long
)Pico_mcd->prg_ram - (i<<(24-FAMEC_FETCHBITS));
\r
// real PRG RAM
\r
for (i = 0; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < 0x80000; i++)
\r
// real PRG RAM
\r
for (i = 0; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < 0x80000; i++)
\r
- PicoCpuFS68k.Fetch[i] = (unsigned
int
)Pico_mcd->prg_ram;
\r
+ PicoCpuFS68k.Fetch[i] = (unsigned
long
)Pico_mcd->prg_ram;
\r
// WORD RAM 2M area
\r
for (i = M68K_FETCHBANK1*0x08/0x100; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < 0xc0000; i++)
\r
// WORD RAM 2M area
\r
for (i = M68K_FETCHBANK1*0x08/0x100; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < 0xc0000; i++)
\r
- PicoCpuFS68k.Fetch[i] = (unsigned
int
)Pico_mcd->word_ram2M - 0x80000;
\r
+ PicoCpuFS68k.Fetch[i] = (unsigned
long
)Pico_mcd->word_ram2M - 0x80000;
\r
// remap_word_ram() will setup word ram for both
\r
}
\r
#endif
\r
// remap_word_ram() will setup word ram for both
\r
}
\r
#endif
\r