new memory handling, but asm and mappers need update.

Some cleanup and magic bit removal as a bonus.

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@768 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/common/common_arm.mak b/common/common_arm.mak
index 79b61fb..397e713 100644 (file)
--- a/common/common_arm.mak
+++ b/common/common_arm.mak
@@ -48,7 +48,7 @@ mkdirs:
 # deps
 pico/carthw/svp/compiler.o : ../../pico/carthw/svp/ssp16.o ../../pico/carthw/svp/gen_arm.c
 pico/pico.o pico/cd/pico.o : ../../pico/pico_cmn.c ../../pico/pico_int.h
-pico/memory.o pico/cd/memory.o : ../../pico/memory_cmn.c ../../pico/pico_int.h
+pico/memory.o pico/cd/memory.o : ../../pico/pico_int.h ../../pico/memory.h
 
 # build Cyclone
 ../../cpu/Cyclone/proj/Cyclone.s:

diff --git a/common/emu.c b/common/emu.c
index 4a95a3f..4fcb792 100644 (file)
--- a/common/emu.c
+++ b/common/emu.c
@@ -989,7 +989,8 @@ int emu_save_load_game(int load, int sram)
                        }\r
                } else {\r
                        sram_size = SRam.end-SRam.start+1;\r
-                       if(Pico.m.sram_reg & 4) sram_size=0x2000;\r
+                       if (Pico.m.sram_status & SRS_EEPROM)\r
+                               sram_size = 0x2000;\r
                        sram_data = SRam.data;\r
                }\r
                if (!sram_data) return 0; // SRam forcefully disabled for this game\r

diff --git a/common/revision.mak b/common/revision.mak
index 03093e3..2e92875 100644 (file)
--- a/common/revision.mak
+++ b/common/revision.mak
@@ -1,7 +1,11 @@
 platform/common/menu.o : revision.h
 
 revision.h: FORCE
+ifndef NOREVISION
        @echo "#define REVISION \"`svn info -r HEAD | grep Revision | cut -c 11-`\"" > /tmp/r.tmp
+else
+       @echo "#define REVISION \"0\"" > /tmp/r.tmp
+endif
        @diff -q $@ /tmp/r.tmp > /dev/null 2>&1 || mv -f /tmp/r.tmp $@
 
 FORCE:

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 92e5d97..ef63199 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -3,12 +3,12 @@ export CROSS = arm-linux-
 # settings\r
 #mz80 = 1\r
 #debug_cyclone = 1\r
-asm_memory = 1\r
+#asm_memory = 1 # TODO\r
 asm_render = 1\r
 asm_ym2612 = 1\r
 asm_misc = 1\r
 asm_cdpico = 1\r
-asm_cdmemory = 1\r
+#asm_cdmemory = 1 # TODO\r
 amalgamate = 0\r
 #profile = 1\r
 #use_musashi = 1\r

diff --git a/linux/Makefile b/linux/Makefile
index 033d3bd..2202db2 100644 (file)
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -103,7 +103,7 @@ include ../common/revision.mak
 
 pico/carthw/svp/compiler.o : ../../pico/carthw/svp/gen_arm.c
 pico/pico.o pico/cd/pico.o : ../../pico/pico_cmn.c ../../pico/pico_int.h
-pico/memory.o pico/cd/memory.o : ../../pico/memory_cmn.c ../../pico/pico_int.h
+pico/memory.o pico/cd/memory.o : ../../pico/pico_int.h ../../pico/memory.h
 
 ../../cpu/musashi/m68kops.c :
        @make -C ../../cpu/musashi