SekRunPS Cyclone integration

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

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 67bbb34..d6ba1d5 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -12,12 +12,13 @@ asm_memory = 0      # TODO
 asm_render = 1\r
 asm_ym2612 = 1\r
 asm_misc = 1\r
+asm_cdpico = 1\r
 #profile = 1\r
 #use_musashi = 1\r
 #up = 1\r
 \r
 DEFINC = -I../.. -I. -DARM -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK\r
-COPT_COMMON = -static -s -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
+COPT_COMMON = -static -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math # -s\r
 ifeq "$(profile)" "1"\r
 COPT_COMMON += -fprofile-generate\r
 endif\r
@@ -61,6 +62,10 @@ ifeq "$(asm_misc)" "1"
 DEFINC += -D_ASM_MISC_C\r
 OBJS += ../../Pico/misc_asm.o\r
 endif\r
+ifeq "$(asm_cdpico)" "1"\r
+DEFINC += -D_ASM_CD_PICO_C\r
+OBJS += ../../Pico/cd/pico_asm.o\r
+endif\r
 # Pico - sound\r
 OBJS += ../../Pico/sound/mix_asm.o\r
 OBJS += ../../Pico/sound/sound.o ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o\r
@@ -93,8 +98,10 @@ all: PicoDrive.gpe
 \r
 PicoDrive.gpe : $(OBJS) helix/helix_mp3.a\r
        @echo $@\r
-       @$(GCC) -o $@ $(COPT) $^ -lm\r
+       @$(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map\r
+ifeq ($(DEBUG),)\r
        @$(STRIP) $@\r
+endif\r
 #      @$(GCC) $(COPT) $(OBJS) -lm -o PicoDrive_.gpe\r
 #      @gpecomp PicoDrive_.gpe $@\r
 ifeq "$(up)" "1"\r
@@ -137,6 +144,9 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 ../../Pico/misc_asm.o : ../../Pico/misc.s\r
        @echo $<\r
        @$(AS) $(ASOPT) $< -o $@\r
+../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s\r
+       @echo $<\r
+       @$(AS) $(ASOPT) $< -o $@\r
 \r
 # build Cyclone\r
 ../../cpu/Cyclone/proj/Cyclone.s :\r

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 99c80ba..a98a5be 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -547,7 +547,7 @@ int emu_WriteConfig(int game)
                strncpy(cfg, PicoConfigFile, 511);\r
                cfg[511] = 0;\r
        } else {\r
-               romfname_ext(cfg, "cfg", ".pbcfg");\r
+               romfname_ext(cfg, "cfg/", ".pbcfg");\r
        }\r
 \r
        printf("emu_WriteConfig: %s ", cfg);\r

diff --git a/gp2x/menu.c b/gp2x/menu.c
index aa3019f..5cab760 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -744,7 +744,7 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
        gp2x_text_out8(tl_x, (y+=10), "CD LEDs                    %s", (currentConfig.EmuOpt &0x0400)?"ON":"OFF"); // 3\r
        gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s)    %s", (currentConfig.PicoOpt&0x0800)?"ON":"OFF"); // 4\r
        gp2x_text_out8(tl_x, (y+=10), "PCM audio                  %s", (currentConfig.PicoOpt&0x0400)?"ON":"OFF"); // 5\r
-       gp2x_text_out8(tl_x, (y+=10), "Better sync (very slow)    %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 6\r
+       gp2x_text_out8(tl_x, (y+=10), "Better sync (slow)         %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 6\r
        gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer      %s", ra_buff); // 7\r
        gp2x_text_out8(tl_x, (y+=10), "Done");\r
 \r