From: notaz <notasas@gmail.com>
Date: Wed, 2 Sep 2009 16:05:54 +0000 (+0000)
Subject: new memory handling, but asm and mappers need update.
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4182d35d5d7b51882e47c7865bdfdff8c0b2b8fc;p=libpicofe.git

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
--- 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
--- a/common/emu.c
+++ b/common/emu.c
@@ -989,7 +989,8 @@ int emu_save_load_game(int load, int sram)
 			}
 		} else {
 			sram_size = SRam.end-SRam.start+1;
-			if(Pico.m.sram_reg & 4) sram_size=0x2000;
+			if (Pico.m.sram_status & SRS_EEPROM)
+				sram_size = 0x2000;
 			sram_data = SRam.data;
 		}
 		if (!sram_data) return 0; // SRam forcefully disabled for this game
diff --git a/common/revision.mak b/common/revision.mak
index 03093e3..2e92875 100644
--- 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
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -3,12 +3,12 @@ export CROSS = arm-linux-
 # settings
 #mz80 = 1
 #debug_cyclone = 1
-asm_memory = 1
+#asm_memory = 1 # TODO
 asm_render = 1
 asm_ym2612 = 1
 asm_misc = 1
 asm_cdpico = 1
-asm_cdmemory = 1
+#asm_cdmemory = 1 # TODO
 amalgamate = 0
 #profile = 1
 #use_musashi = 1
diff --git a/linux/Makefile b/linux/Makefile
index 033d3bd..2202db2 100644
--- 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