notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix clang build
[picodrive.git]
/
pico
/
cd
/
memory.c
diff --git
a/pico/cd/memory.c
b/pico/cd/memory.c
index
94b81b7
..
6890b57
100644
(file)
--- a/
pico/cd/memory.c
+++ b/
pico/cd/memory.c
@@
-1165,7
+1165,12
@@
PICO_INTERNAL void PicoMemSetupCD(void)
\r
// setup FAME fetchmap
\r
{
\r
\r
// setup FAME fetchmap
\r
{
\r
+#ifdef __clang__
\r
+ volatile // prevent strange relocs from clang
\r
+#endif
\r
+ unsigned long ptr_ram = (unsigned long)PicoMem.ram;
\r
int i;
\r
int i;
\r
+
\r
// 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
@@
-1175,7
+1180,7
@@
PICO_INTERNAL void PicoMemSetupCD(void)
PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom;
\r
// .. and RAM
\r
for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)
\r
PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom;
\r
// .. and RAM
\r
for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)
\r
- PicoCpuFM68k.Fetch[i] =
(unsigned long)PicoMem.
ram - (i<<(24-FAMEC_FETCHBITS));
\r
+ PicoCpuFM68k.Fetch[i] =
ptr_
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