From d2f29611d1379a249c8f3f955ed16a336f9290cd Mon Sep 17 00:00:00 2001 From: notaz Date: Wed, 16 Dec 2009 23:38:37 +0000 Subject: [PATCH] revive pandora and win32 builds, rm gp2x dep for linux, lots of refactoring git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@842 be3aeb3a-fb24-0410-a615-afba39da0efa --- common/common.mak | 55 ++++ common/common_arm.mak | 21 +- common/emu.c | 23 +- common/emu.h | 1 + common/main.c | 2 +- common/menu.c | 83 ++++-- common/menu.h | 4 +- common/plat.h | 2 +- gp2x/Makefile | 47 +--- gp2x/emu.c | 50 ++-- gp2x/in_gp2x.c | 3 + gp2x/plat.c | 40 +-- linux/Makefile | 50 +--- linux/emu.c | 319 +++++++++++++++++++++ linux/{gp2x.c => io.c} | 136 +-------- linux/plat.c | 16 ++ pandora/Makefile | 109 ++----- pandora/emu.c | 623 +++++++++-------------------------------- pandora/pandora.c | 20 +- pandora/version.h | 2 + psp/emu.c | 7 - win32/Makefile | 89 +----- win32/main.c | 2 +- win32/plat.c | 15 +- 24 files changed, 701 insertions(+), 1018 deletions(-) create mode 100644 linux/emu.c rename linux/{gp2x.c => io.c} (74%) create mode 100644 pandora/version.h diff --git a/common/common.mak b/common/common.mak index be33b5a..f9958f4 100644 --- a/common/common.mak +++ b/common/common.mak @@ -1,3 +1,35 @@ +ifneq ($(DEBUG),) +CFLAGS += -ggdb +endif +ifeq "$(profile)" "1" +CFLAGS += -fprofile-generate +endif +ifeq "$(profile)" "2" +CFLAGS += -fprofile-use +endif + +# === Pico core === +# Pico +OBJS += pico/area.o pico/cart.o pico/memory.o pico/pico.o pico/sek.o pico/z80if.o \ + pico/videoport.o pico/draw2.o pico/draw.o pico/mode4.o pico/sms.o \ + pico/misc.o pico/eeprom.o pico/patch.o pico/debug.o +# CD +OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \ + pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \ + pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o +# 32X +OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o pico/32x/pwm.o +# Pico +OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o +# carthw +OBJS += pico/carthw/carthw.o +# SVP +OBJS += pico/carthw/svp/svp.o pico/carthw/svp/memory.o \ + pico/carthw/svp/ssp16.o +# sound +OBJS += pico/sound/sound.o +OBJS += pico/sound/sn76496.o pico/sound/ym2612.o + # === CPU cores === # --- M68k --- ifeq "$(use_musashi)" "1" @@ -54,6 +86,29 @@ OBJS += cpu/sh2/mame/sh2pico.o endif +DIRS += platform platform/common pico pico/cd pico/pico pico/32x pico/sound pico/carthw/svp \ + cpu cpu/musashi cpu/cz80 cpu/fame cpu/sh2/mame cpu/drc + + +# common rules +.c.o: + @echo ">>>" $< + $(CC) $(CFLAGS) -c $< -o $@ +.s.o: + @echo ">>>" $< + $(CC) $(CFLAGS) -c $< -o $@ + +clean_prof: + find ../.. -name '*.gcno' -delete + find ../.. -name '*.gcda' -delete + +mkdirs: + mkdir -p $(DIRS) + +../../tools/textfilter: ../../tools/textfilter.c + make -C ../../tools/ textfilter + + # random deps pico/carthw/svp/compiler.o : ../../cpu/drc/emit_$(ARCH).c cpu/sh2/compiler.o : ../../cpu/drc/emit_$(ARCH).c diff --git a/common/common_arm.mak b/common/common_arm.mak index 11270a3..ce6d711 100644 --- a/common/common_arm.mak +++ b/common/common_arm.mak @@ -26,27 +26,10 @@ OBJS += pico/cd/memory_arm.o endif -.c.o: - @echo ">>>" $< - $(CC) $(CFLAGS) -c $< -o $@ +DIRS += cpu/Cyclone cpu/Cyclone/proj cpu/Cyclone/tools cpu/DrZ80 -.S.o: - @echo ">>>" $< - $(CC) $(CFLAGS) -c $< -o $@ - - -../../tools/textfilter: ../../tools/textfilter.c - make -C ../../tools/ textfilter - -clean_prof: - find ../.. -name '*.gcno' -delete - find ../.. -name '*.gcda' -delete - -mkdirs: - mkdir -p $(DIRS) # build helix libs ../common/helix/$(CROSS)helix-mp3.a: - make -C ../common/helix clean all - + make -C ../common/helix CROSS=$(CROSS) clean all diff --git a/common/emu.c b/common/emu.c index e916b3f..23e90eb 100644 --- a/common/emu.c +++ b/common/emu.c @@ -730,6 +730,27 @@ static void make_config_cfg(char *cfg_buff_512) cfg_buff_512[511] = 0; } +void emu_prep_defconfig(void) +{ + memset(&defaultConfig, 0, sizeof(defaultConfig)); + defaultConfig.EmuOpt = 0x9d | EOPT_RAM_TIMINGS|EOPT_CONFIRM_SAVE|EOPT_EN_CD_LEDS; + defaultConfig.s_PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 | + POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES | + POPT_EN_32X|POPT_EN_PWM; + defaultConfig.s_PsndRate = 44100; + defaultConfig.s_PicoRegion = 0; // auto + defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP + defaultConfig.s_PicoCDBuffers = 0; + defaultConfig.Frameskip = -1; // auto + defaultConfig.volume = 50; + defaultConfig.gamma = 100; + defaultConfig.scaling = 0; + defaultConfig.turbo_rate = 15; + + // platform specific overrides + pemu_prep_defconfig(); +} + void emu_set_defconfig(void) { memcpy(¤tConfig, &defaultConfig, sizeof(currentConfig)); @@ -786,7 +807,7 @@ int emu_read_config(int game, int no_defaults) } } - plat_validate_config(); + pemu_validate_config(); // some sanity checks #ifdef PSP diff --git a/common/emu.h b/common/emu.h index b498488..1f23742 100644 --- a/common/emu.h +++ b/common/emu.h @@ -117,6 +117,7 @@ int emu_swap_cd(const char *fname); int emu_save_load_game(int load, int sram); void emu_reset_game(void); +void emu_prep_defconfig(void); void emu_set_defconfig(void); int emu_read_config(int game, int no_defaults); int emu_write_config(int game); diff --git a/common/main.c b/common/main.c index 7a7c876..b0ad4ba 100644 --- a/common/main.c +++ b/common/main.c @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) /* in_init() must go before config, config accesses in_ fwk */ in_init(); - pemu_prep_defconfig(); + emu_prep_defconfig(); emu_read_config(0, 0); config_readlrom(PicoConfigFile); diff --git a/common/menu.c b/common/menu.c index b5e5e36..c9fc188 100644 --- a/common/menu.c +++ b/common/menu.c @@ -23,8 +23,9 @@ #include static char static_buff[64]; -char menu_error_msg[64] = { 0, }; static int menu_error_time = 0; +char menu_error_msg[64] = { 0, }; +void *g_menubg_ptr; #ifndef UIQ3 @@ -300,6 +301,49 @@ void menu_init(void) } +static void menu_darken_bg(void *dst, void *src, int pixels, int darker) +{ + unsigned int *dest = dst; + unsigned int *sorc = src; + pixels /= 2; + if (darker) + { + while (pixels--) + { + unsigned int p = *sorc++; + *dest++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3); + } + } + else + { + while (pixels--) + { + unsigned int p = *sorc++; + *dest++ = (p&0xf79ef79e)>>1; + } + } +} + +static void menu_enter(int is_rom_loaded) +{ + if (is_rom_loaded) + { + // darken the active framebuffer + menu_darken_bg(g_menubg_ptr, g_screen_ptr, g_screen_width * g_screen_height, 1); + } + else + { + char buff[256]; + + // should really only happen once, on startup.. + emu_make_path(buff, "skin/background.png", sizeof(buff)); + if (readpng(g_menubg_ptr, buff, READPNG_BG) < 0) + memset(g_menubg_ptr, 0, g_screen_width * g_screen_height * 2); + } + + plat_video_menu_enter(is_rom_loaded); +} + static int me_id2offset(const menu_entry *ent, menu_id id) { int i; @@ -664,7 +708,7 @@ static void do_delete(const char *fpath, const char *fname) plat_video_menu_begin(); if (!rom_loaded) - menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0); + menu_darken_bg(g_screen_ptr, g_screen_ptr, g_screen_width * g_screen_height, 0); len = strlen(fname); if (len > g_screen_width/6) @@ -712,6 +756,7 @@ static unsigned short file2color(const char *fname) static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel) { int max_cnt, start, i, x, pos; + void *darken_ptr; max_cnt = g_screen_height / me_sfont_h; start = max_cnt / 2 - sel; @@ -722,7 +767,8 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel) // if (!rom_loaded) // menu_darken_bg(gp2x_screen, 320*240, 0); - menu_darken_bg((short *)g_screen_ptr + g_screen_width * max_cnt/2 * 10, g_screen_width * 8, 0); + darken_ptr = (short *)g_screen_ptr + g_screen_width * max_cnt/2 * 10; + menu_darken_bg(darken_ptr, darken_ptr, g_screen_width * 8, 0); x = 5 + me_mfont_w + 1; if (start - 2 >= 0) @@ -1002,7 +1048,7 @@ static void draw_savestate_bg(int slot) /* do a frame and fetch menu bg */ pemu_forced_frame(POPT_EN_SOFTSCALE); - plat_video_menu_enter(1); + menu_enter(1); memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram)); memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram)); @@ -1809,7 +1855,7 @@ static void debug_menu_loop(void) case 1: draw_frame_debug(); break; case 2: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2); pemu_forced_frame(0); - menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0); + menu_darken_bg(g_screen_ptr, g_screen_ptr, g_screen_width * g_screen_height, 0); PDebugShowSpriteStats((unsigned short *)g_screen_ptr + (g_screen_height/2 - 240/2)*g_screen_width + g_screen_width/2 - 320/2, g_screen_width); break; case 3: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2); @@ -1969,7 +2015,7 @@ void menu_loop(void) me_enable(e_menu_main, MA_MAIN_RESET_GAME, rom_loaded); me_enable(e_menu_main, MA_MAIN_PATCHES, PicoPatches != NULL); - plat_video_menu_enter(rom_loaded); + menu_enter(rom_loaded); in_set_blocking(1); me_loop(e_menu_main, &sel, menu_main_plat_draw); @@ -2017,7 +2063,7 @@ int menu_loop_tray(void) { int ret = 1, sel = 0; - plat_video_menu_enter(rom_loaded); + menu_enter(rom_loaded); in_set_blocking(1); me_loop(e_menu_tray, &sel, NULL); @@ -2068,29 +2114,6 @@ void menu_plat_setup(int is_wiz) e_menu_gfx_options[i].need_to_save = 0; } -/* TODO: rename */ -void menu_darken_bg(void *dst, int pixels, int darker) -{ - unsigned int *screen = dst; - pixels /= 2; - if (darker) - { - while (pixels--) - { - unsigned int p = *screen; - *screen++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3); - } - } - else - { - while (pixels--) - { - unsigned int p = *screen; - *screen++ = (p&0xf79ef79e)>>1; - } - } -} - /* hidden options for config engine only */ static menu_entry e_menu_hidden[] = { diff --git a/common/menu.h b/common/menu.h index 5f7db7b..c9be9f2 100644 --- a/common/menu.h +++ b/common/menu.h @@ -154,6 +154,8 @@ typedef struct extern me_bind_action me_ctrl_actions[15]; extern me_bind_action emuctrl_actions[]; // platform code +extern void *g_menubg_ptr; + void menu_init(void); void menu_plat_setup(int is_wiz); void text_out16(int x, int y, const char *texto, ...); @@ -168,5 +170,3 @@ int menu_loop_tray(void); menu_entry *me_list_get_first(void); menu_entry *me_list_get_next(void); -void menu_darken_bg(void *dst, int pixels, int darker); - diff --git a/common/plat.h b/common/plat.h index 5580dd8..40478b6 100644 --- a/common/plat.h +++ b/common/plat.h @@ -6,6 +6,7 @@ extern "C" { extern char cpu_clk_name[]; void pemu_prep_defconfig(void); +void pemu_validate_config(void); void pemu_loop_prep(void); void pemu_loop_end(void); void pemu_forced_frame(int opts); @@ -34,7 +35,6 @@ void plat_video_menu_end(void); void plat_video_wait_vsync(void); void plat_video_toggle_renderer(int is_next, int force_16bpp, int is_menu); -void plat_validate_config(void); void plat_update_volume(int has_changed, int is_up); int plat_is_dir(const char *path); diff --git a/gp2x/Makefile b/gp2x/Makefile index cdfea37..9d8aa6a 100644 --- a/gp2x/Makefile +++ b/gp2x/Makefile @@ -13,7 +13,6 @@ asm_ym2612 = 1 asm_misc = 1 asm_cdpico = 1 asm_cdmemory = 1 -amalgamate = 0 #profile = 1 #drc_debug = 3 @@ -34,14 +33,6 @@ DEFINES += ARM __GP2X__ IN_GP2X IN_EVDEV # BENCHMARK CFLAGS += -Wall -Winline -I../.. -I. ifeq ($(DEBUG),) CFLAGS += -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math -else -CFLAGS += -ggdb -endif -ifeq "$(profile)" "1" -CFLAGS += -fprofile-generate -endif -ifeq "$(profile)" "2" -CFLAGS += -fprofile-use endif CFLAGS += -mcpu=arm920t -mtune=arm920t ASFLAGS = -mcpu=arm920t -mfloat-abi=soft @@ -58,53 +49,27 @@ OBJS += plat.o warm.o pollux_set.o soc.o soc_mmsp2.o soc_pollux.o soc_dummy.o em # 940 core control OBJS += 940ctl.o +# ARM stuff +OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o +OBJS += pico/sound/mix_arm.o + # common OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \ platform/common/arm_utils.o platform/common/arm_linux.o platform/common/readpng.o \ platform/common/mp3_helix.o platform/common/input.o platform/common/main.o \ platform/linux/sndout_oss.o platform/linux/plat.o platform/linux/in_evdev.o -# Pico -ifeq "$(amalgamate)" "1" -OBJS += ../../picoAll.o -else -OBJS += pico/area.o pico/cart.o pico/memory.o pico/pico.o pico/sek.o pico/z80if.o \ - pico/videoport.o pico/draw2.o pico/draw.o pico/mode4.o pico/sms.o \ - pico/misc.o pico/eeprom.o pico/patch.o pico/debug.o -# Pico - CD -OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \ - pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \ - pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o -endif -# Pico - 32X -OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o pico/32x/pwm.o -# Pico - Pico -OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o -# Pico - carthw -OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \ - pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o - -# Pico - sound -ifneq "$(amalgamate)" "1" -OBJS += pico/sound/sound.o -endif -OBJS += pico/sound/mix_arm.o -OBJS += pico/sound/sn76496.o pico/sound/ym2612.o # unzip OBJS += unzip/unzip.o unzip/unzip_stream.o # zlib OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \ zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o -CFLAGS += $(addprefix -D,$(DEFINES)) - vpath %.c = ../.. vpath %.s = ../.. vpath %.S = ../.. -DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/32x \ - pico/sound pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools \ - cpu/mz80 cpu/DrZ80 cpu/sh2/mame cpu/drc +DIRS += platform/gp2x platform/linux zlib unzip all: mkdirs PicoDrive @@ -113,6 +78,8 @@ include ../common/common.mak include ../common/common_arm.mak include ../common/revision.mak +CFLAGS += $(addprefix -D,$(DEFINES)) + # partial linking helps profiled builds due to section merging PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a $(LD) -r -o $@ $^ diff --git a/gp2x/emu.c b/gp2x/emu.c index 49f7149..b1b314e 100644 --- a/gp2x/emu.c +++ b/gp2x/emu.c @@ -40,21 +40,6 @@ static int osd_fps_x, osd_y; extern void *gp2x_screens[4]; -int plat_get_root_dir(char *dst, int len) -{ - extern char **g_argv; - int j; - - strncpy(dst, g_argv[0], len); - len -= 32; // reserve - if (len < 0) len = 0; - dst[len] = 0; - for (j = strlen(dst); j > 0; j--) - if (dst[j] == '/') { dst[j+1] = 0; break; } - - return j + 1; -} - static void scaling_update(void) { @@ -76,21 +61,7 @@ void pemu_prep_defconfig(void) { gp2x_soc_t soc; - memset(&defaultConfig, 0, sizeof(defaultConfig)); - defaultConfig.EmuOpt = 0x9d | EOPT_RAM_TIMINGS|EOPT_CONFIRM_SAVE|EOPT_EN_CD_LEDS; - defaultConfig.s_PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 | - POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES | - POPT_EN_32X|POPT_EN_PWM; - defaultConfig.s_PsndRate = 44100; - defaultConfig.s_PicoRegion = 0; // auto - defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP - defaultConfig.s_PicoCDBuffers = 0; - defaultConfig.Frameskip = -1; // auto defaultConfig.CPUclock = default_cpu_clock; - defaultConfig.volume = 50; - defaultConfig.gamma = 100; - defaultConfig.scaling = 0; - defaultConfig.turbo_rate = 15; soc = soc_detect(); if (soc == SOCID_MMSP2) @@ -99,6 +70,23 @@ void pemu_prep_defconfig(void) defaultConfig.EmuOpt |= EOPT_WIZ_TEAR_FIX|EOPT_SHOW_RTC; } +void pemu_validate_config(void) +{ + gp2x_soc_t soc; + + soc = soc_detect(); + if (soc != SOCID_MMSP2) + PicoOpt &= ~POPT_EXT_FM; + if (soc != SOCID_POLLUX) + currentConfig.EmuOpt &= ~EOPT_WIZ_TEAR_FIX; + + if (currentConfig.gamma < 10 || currentConfig.gamma > 300) + currentConfig.gamma = 100; + + if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 1024) + currentConfig.CPUclock = default_cpu_clock; +} + static void (*osd_text)(int x, int y, const char *text); static void osd_text8(int x, int y, const char *text) @@ -346,13 +334,13 @@ void pemu_update_display(const char *fps, const char *notice) } } - if (notice || (emu_opt & 2)) { + if (notice || (emu_opt & EOPT_SHOW_FPS)) { if (notice) osd_text(4, osd_y, notice); if (emu_opt & 2) osd_text(osd_fps_x, osd_y, fps); } - if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD)) + if ((PicoAHW & PAHW_MCD) && (emu_opt & EOPT_EN_CD_LEDS)) draw_cd_leds(); if (PicoAHW & PAHW_PICO) draw_pico_ptr(); diff --git a/gp2x/in_gp2x.c b/gp2x/in_gp2x.c index 37abeaf..eb97a7e 100644 --- a/gp2x/in_gp2x.c +++ b/gp2x/in_gp2x.c @@ -80,6 +80,9 @@ static int in_gp2x_get_wiz_bits(void) } #ifdef FAKE_IN_GP2X +volatile unsigned short *gp2x_memregs; +gp2x_soc_t soc_detect(void) { return -1; } + static int in_gp2x_get_fake_bits(void) { extern int current_keys; diff --git a/gp2x/plat.c b/gp2x/plat.c index 075937e..0e207bf 100644 --- a/gp2x/plat.c +++ b/gp2x/plat.c @@ -69,26 +69,6 @@ char cpu_clk_name[16] = "GP2X CPU clocks"; void plat_video_menu_enter(int is_rom_loaded) { - if (is_rom_loaded) - { - // darken the active framebuffer - memset(g_screen_ptr, 0, 320*8*2); - menu_darken_bg((char *)g_screen_ptr + 320*8*2, 320*224, 1); - memset((char *)g_screen_ptr + 320*232*2, 0, 320*8*2); - } - else - { - char buff[256]; - - // should really only happen once, on startup.. - emu_make_path(buff, "skin/background.png", sizeof(buff)); - if (readpng(g_screen_ptr, buff, READPNG_BG) < 0) - memset(g_screen_ptr, 0, 320*240*2); - } - - // copy to buffer2, switch to black - gp2x_memcpy_buffers((1<<2), g_screen_ptr, 0, 320*240*2); - /* try to switch nicely avoiding tearing on Wiz */ gp2x_video_wait_vsync(); memset(gp2x_screens[0], 0, 320*240*2); @@ -114,23 +94,6 @@ void plat_video_menu_end(void) gp2x_video_flip2(); } -void plat_validate_config(void) -{ - gp2x_soc_t soc; - - soc = soc_detect(); - if (soc != SOCID_MMSP2) - PicoOpt &= ~POPT_EXT_FM; - if (soc != SOCID_POLLUX) - currentConfig.EmuOpt &= ~EOPT_WIZ_TEAR_FIX; - - if (currentConfig.gamma < 10 || currentConfig.gamma > 300) - currentConfig.gamma = 100; - - if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 1024) - currentConfig.CPUclock = default_cpu_clock; -} - void plat_early_init(void) { gp2x_soc_t soc; @@ -175,6 +138,9 @@ void plat_init(void) gp2x_memset_all_buffers(0, 0, 320*240*2); + // use buffer2 for menubg (using only buffers 0, 1 in menu) + g_menubg_ptr = gp2x_screens[2]; + // snd sndout_oss_init(); } diff --git a/linux/Makefile b/linux/Makefile index 6c28e41..d09e211 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -16,14 +16,8 @@ ifndef ARCH ARCH = x86 endif -ifeq "$(profile)" "1" -CFLAGS += -O3 -Wall -CFLAGS += -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math -CFLAGS += -fprofile-generate -else -CFLAGS += -ggdb -Wall -falign-functions=2 -endif DEFINES = _UNZIP_SUPPORT IO_STATS IN_EVDEV +CFLAGS += -ggdb -Wall -falign-functions=2 CFLAGS += -I../.. -I. LDFLAGS += -lm -lpng ifeq "$(ARCH)" "arm" @@ -36,7 +30,7 @@ LDFLAGS += -lX11 CC = $(CROSS)gcc # frontend -OBJS += platform/gp2x/emu.o blit.o in_evdev.o plat.o sndout_oss.o gp2x.o log_io.o +OBJS += io.o emu.o blit.o in_evdev.o plat.o sndout_oss.o log_io.o # common OBJS += platform/common/main.o platform/common/emu.o platform/common/menu.o \ @@ -46,47 +40,34 @@ OBJS += platform/common/main.o platform/common/emu.o platform/common/menu.o \ ifeq "$(fake_in_gp2x)" "1" DEFINES += IN_GP2X FAKE_IN_GP2X OBJS += platform/gp2x/in_gp2x.o +DIRS += platform/gp2x endif -# Pico -OBJS += pico/area.o pico/cart.o pico/memory.o pico/pico.o pico/sek.o \ - pico/videoport.o pico/draw2.o pico/draw.o pico/z80if.o pico/patch.o \ - pico/mode4.o pico/sms.o pico/misc.o pico/eeprom.o pico/debug.o -# Pico - CD -OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \ - pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \ - pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o -# Pico - 32X -OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o pico/32x/pwm.o -# Pico - Pico -OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o -# Pico - sound -OBJS += pico/sound/sound.o pico/sound/sn76496.o pico/sound/ym2612.o pico/sound/mix.o -# Pico - carthw -OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \ - pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o ifeq "$(ARCH)" "arm" OBJS += pico/carthw/svp/stub_arm.o endif +OBJS += pico/sound/mix.o +OBJS += pico/carthw/svp/compiler.o + # zlib OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \ zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o zlib/uncompr.o # unzip OBJS += unzip/unzip.o unzip/unzip_stream.o -CFLAGS += $(addprefix -D,$(DEFINES)) - vpath %.c = ../.. vpath %.s = ../.. vpath %.S = ../.. vpath %.asm = ../.. -DIRS = platform/linux platform/gp2x platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \ - pico/32x zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80 cpu/sh2/mame cpu/drc +DIRS += platform/linux all: mkdirs PicoDrive include ../common/common.mak +include ../common/revision.mak + +CFLAGS += $(addprefix -D,$(DEFINES)) clean: tidy @$(RM) PicoDrive @@ -99,17 +80,6 @@ PicoDrive : $(OBJS) @echo ">>>" $@ $(CC) $(CFLAGS) $^ $(LDFLAGS) -Wl,-Map=PicoDrive.map -o $@ -mkdirs: - @mkdir -p $(DIRS) - -include ../common/revision.mak - -.c.o: - @echo ">>>" $< - $(CC) $(CFLAGS) -c $< -o $@ -.s.o: - @echo ">>>" $< - $(CC) $(CFLAGS) -c $< -o $@ %.o : %.asm @echo ">>>" $< nasm -f elf $< -o $@ diff --git a/linux/emu.c b/linux/emu.c new file mode 100644 index 0000000..aa5185f --- /dev/null +++ b/linux/emu.c @@ -0,0 +1,319 @@ +// (c) Copyright 2006-2009 notaz, All rights reserved. +// Free for non-commercial use. + +// For commercial use, separate licencing terms must be obtained. + +#include +#include + +#include "../common/emu.h" +#include "../common/menu.h" +#include "../common/plat.h" +#include "../common/arm_utils.h" +#include "../linux/sndout_oss.h" +#include "version.h" + +#include + + +static short __attribute__((aligned(4))) sndBuffer[2*44100/50]; +unsigned char temp_frame[320 * 240 * 2]; +unsigned char *PicoDraw2FB = temp_frame; +static int osd_fps_x; +char cpu_clk_name[] = "unused"; + +extern void update_screen(void); + + +void pemu_prep_defconfig(void) +{ + // XXX: move elsewhere + g_menubg_ptr = temp_frame; +} + +void pemu_validate_config(void) +{ + extern int PicoOpt; +// PicoOpt &= ~POPT_EXT_FM; + PicoOpt &= ~POPT_EN_SVP_DRC; +} + +// FIXME: dupes from GP2X, need cleanup +static void (*osd_text)(int x, int y, const char *text); + +static void osd_text8(int x, int y, const char *text) +{ + int len = strlen(text)*8; + int *p, i, h, offs; + + len = (len+3) >> 2; + for (h = 0; h < 8; h++) { + offs = (x + g_screen_width * (y+h)) & ~3; + p = (int *) ((char *)g_screen_ptr + offs); + for (i = len; i; i--, p++) + *p = 0xe0e0e0e0; + } + emu_text_out8(x, y, text); +} + +static void osd_text16(int x, int y, const char *text) +{ + int len = strlen(text)*8; + int *p, i, h, offs; + + len = (len+1) >> 1; + for (h = 0; h < 8; h++) { + offs = (x + g_screen_width * (y+h)) & ~1; + p = (int *) ((short *)g_screen_ptr + offs); + for (i = len; i; i--, p++) + *p = (*p >> 2) & 0x39e7; + } + emu_text_out16(x, y, text); +} + +static void draw_cd_leds(void) +{ + int led_reg, pitch, scr_offs, led_offs; + led_reg = Pico_mcd->s68k_regs[0]; + + pitch = 320; + led_offs = 4; + scr_offs = pitch * 2 + 4; + + if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP)) { + #define p(x) px[(x) >> 2] + // 8-bit modes + unsigned int *px = (unsigned int *)((char *)g_screen_ptr + scr_offs); + unsigned int col_g = (led_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0; + unsigned int col_r = (led_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0; + p(pitch*0) = p(pitch*1) = p(pitch*2) = col_g; + p(pitch*0 + led_offs) = p(pitch*1 + led_offs) = p(pitch*2 + led_offs) = col_r; + #undef p + } else { + #define p(x) px[(x)*2 >> 2] = px[((x)*2 >> 2) + 1] + // 16-bit modes + unsigned int *px = (unsigned int *)((short *)g_screen_ptr + scr_offs); + unsigned int col_g = (led_reg & 2) ? 0x06000600 : 0; + unsigned int col_r = (led_reg & 1) ? 0xc000c000 : 0; + p(pitch*0) = p(pitch*1) = p(pitch*2) = col_g; + p(pitch*0 + led_offs) = p(pitch*1 + led_offs) = p(pitch*2 + led_offs) = col_r; + #undef p + } +} + +static int EmuScanBegin16(unsigned int num) +{ + DrawLineDest = (unsigned short *)g_screen_ptr + num * g_screen_width; + + return 0; +} + +void pemu_update_display(const char *fps, const char *notice) +{ + if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) { + if (notice) + osd_text(4, g_screen_height - 8, notice); + if (currentConfig.EmuOpt & EOPT_SHOW_FPS) + osd_text(osd_fps_x, g_screen_height - 8, fps); + } + if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS)) + draw_cd_leds(); + + update_screen(); +} + +void plat_video_toggle_renderer(int is_next, int force_16bpp, int is_menu) +{ + // this will auto-select SMS/32X renderers + PicoDrawSetColorFormat(1); +} + +void plat_video_menu_enter(int is_rom_loaded) +{ +} + +void plat_video_menu_begin(void) +{ + memcpy32(g_screen_ptr, g_menubg_ptr, g_screen_width * g_screen_height * 2 / 4); +} + +void plat_video_menu_end(void) +{ + update_screen(); +} + +void plat_status_msg_clear(void) +{ + unsigned short *d = (unsigned short *)g_screen_ptr + g_screen_width * g_screen_height; + int l = g_screen_width * 8; + memset32((int *)(d - l), 0, l * 2 / 4); +} + +void plat_status_msg_busy_next(const char *msg) +{ + plat_status_msg_clear(); + pemu_update_display("", msg); + emu_status_msg(""); + reset_timing = 1; +} + +void plat_status_msg_busy_first(const char *msg) +{ +// memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4); + plat_status_msg_busy_next(msg); +} + +void plat_update_volume(int has_changed, int is_up) +{ +} + +void pemu_forced_frame(int opts) +{ + int po_old = PicoOpt; + int eo_old = currentConfig.EmuOpt; + + PicoOpt &= ~POPT_ALT_RENDERER; + PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites + currentConfig.EmuOpt |= EOPT_16BPP; + + PicoDrawSetColorFormat(1); + PicoScanBegin = EmuScanBegin16; + + Pico.m.dirtyPal = 1; + PicoFrameDrawOnly(); + + PicoOpt = po_old; + currentConfig.EmuOpt = eo_old; +} + +static void updateSound(int len) +{ + len <<= 1; + if (PicoOpt & POPT_EN_STEREO) + len <<= 1; + + if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len)) + return; + + /* avoid writing audio when lagging behind to prevent audio lag */ + if (PicoSkipFrame != 2) + sndout_oss_write(PsndOut, len); +} + +void pemu_sound_start(void) +{ + static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0; + int target_fps = Pico.m.pal ? 50 : 60; + + PsndOut = NULL; + + if (currentConfig.EmuOpt & EOPT_EN_SOUND) + { + int snd_excess_add; + if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old) + PsndRerate(Pico.m.frame_count ? 1 : 0); + + snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps; + printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n", + PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal); + sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3); + sndout_oss_setvol(currentConfig.volume, currentConfig.volume); + PicoWriteSound = updateSound; + plat_update_volume(0, 0); + memset(sndBuffer, 0, sizeof(sndBuffer)); + PsndOut = sndBuffer; + PsndRate_old = PsndRate; + PicoOpt_old = PicoOpt; + pal_old = Pico.m.pal; + } +} + +void pemu_sound_stop(void) +{ +} + +void pemu_sound_wait(void) +{ + // don't need to do anything, writes will block by themselves +} + +void plat_debug_cat(char *str) +{ +} + +void emu_video_mode_change(int start_line, int line_count, int is_32cols) +{ + osd_fps_x = 260; + + // clear whole screen in all buffers + memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4); +} + +void pemu_loop_prep(void) +{ + PicoDrawSetColorFormat(1); + PicoScanBegin = EmuScanBegin16; + osd_text = osd_text16; + + pemu_sound_start(); +} + +void pemu_loop_end(void) +{ + int po_old = PicoOpt; + int eo_old = currentConfig.EmuOpt; + + pemu_sound_stop(); + memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4); + + /* do one more frame for menu bg */ + PicoOpt &= ~POPT_ALT_RENDERER; + PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES; + currentConfig.EmuOpt |= EOPT_16BPP; + + PicoDrawSetColorFormat(1); + Pico.m.dirtyPal = 1; + PicoFrame(); + + PicoOpt = po_old; + currentConfig.EmuOpt = eo_old; +} + +void plat_wait_till_us(unsigned int us_to) +{ + unsigned int now; + + now = plat_get_ticks_us(); + + while ((signed int)(us_to - now) > 512) + { + usleep(1024); + now = plat_get_ticks_us(); + } +} + +void plat_video_wait_vsync(void) +{ +} + +const char *plat_get_credits(void) +{ + return "PicoDrive v" VERSION " (c) notaz, 2006-2009\n\n\n" + "Credits:\n" + "fDave: Cyclone 68000 core,\n" + " base code of PicoDrive\n" + "Reesy & FluBBa: DrZ80 core\n" + "MAME devs: YM2612 and SN76496 cores\n" + "rlyeh and others: minimal SDK\n" + "Squidge: mmuhack\n" + "Dzz: ARM940 sample\n" + "GnoStiC / Puck2099: USB joy code\n" + "craigix: GP2X hardware\n" + "ketchupgun: skin design\n" + "\n" + "special thanks (for docs, ideas):\n" + " Charles MacDonald, Haze,\n" + " Stephane Dallongeville,\n" + " Lordus, Exophase, Rokas,\n" + " Nemesis, Tasco Deluxe"; +} diff --git a/linux/gp2x.c b/linux/io.c similarity index 74% rename from linux/gp2x.c rename to linux/io.c index 6eb252b..b16cf08 100644 --- a/linux/gp2x.c +++ b/linux/io.c @@ -1,4 +1,3 @@ -/* faking/emulating gp2x by using xlib */ #include #include #include @@ -10,28 +9,19 @@ #include #include #include -#include -#include "../gp2x/version.h" #include "../common/emu.h" #include "../common/menu.h" -#include "../common/readpng.h" #include "sndout_oss.h" +#include "version.h" #include "log_io.h" unsigned long current_keys = 0; -static int current_bpp = 8; +static int current_bpp = 16; static int current_pal[256]; static const char *verstring = "PicoDrive " VERSION; static int scr_changed = 0, scr_w = SCREEN_WIDTH, scr_h = SCREEN_HEIGHT; -void *gp2x_screens[4]; - -// dummies -int mix_32_to_16l_level; -int crashed_940 = 0; -int default_cpu_clock = 123; -void *gp2x_memregs = NULL; /* ifndef is for qemu build without video out */ #ifndef ARM @@ -262,19 +252,14 @@ static void xlib_init(void) static void realloc_screen(void) { void *old = g_screen_ptr; - int i; g_screen_width = scr_w; g_screen_height = scr_h; g_screen_ptr = calloc(g_screen_width * g_screen_height * 2, 1); free(old); scr_changed = 0; - - for (i = 0; i < 4; i++) - gp2x_screens[i] = g_screen_ptr; } -/* gp2x/emu.c stuff, most to be rm'd */ -static void gp2x_video_flip_(void) +void update_screen(void) { #ifndef ARM unsigned int *image; @@ -319,86 +304,6 @@ static void gp2x_video_flip_(void) #endif } -static void gp2x_video_changemode_ll_(int bpp) -{ - current_bpp = bpp; -} - -static void gp2x_video_setpalette_(int *pal, int len) -{ - memcpy(current_pal, pal, len*4); -} - -void gp2x_memcpy_all_buffers(void *data, int offset, int len) -{ -} - -void gp2x_memset_all_buffers(int offset, int byte, int len) -{ - memset((char *)g_screen_ptr + offset, byte, len); -} - -void gp2x_video_changemode(int bpp) -{ - gp2x_video_changemode_ll_(bpp); -} - -void gp2x_make_fb_bufferable(int yes) -{ -} - -int soc_detect(void) -{ - return 0; -} - -/* plat */ -static char menu_bg_buffer[320*240*2]; -char cpu_clk_name[16] = "GP2X CPU clocks"; - -void plat_video_menu_enter(int is_rom_loaded) -{ - if (is_rom_loaded) - { - // darken the active framebuffer - memset(g_screen_ptr, 0, 320*8*2); - menu_darken_bg((char *)g_screen_ptr + 320*8*2, 320*224, 1); - memset((char *)g_screen_ptr + 320*232*2, 0, 320*8*2); - } - else - { - char buff[256]; - - // should really only happen once, on startup.. - emu_make_path(buff, "skin/background.png", sizeof(buff)); - if (readpng(g_screen_ptr, buff, READPNG_BG) < 0) - memset(g_screen_ptr, 0, 320*240*2); - } - - memcpy(menu_bg_buffer, g_screen_ptr, 320*240*2); - - // switch to 16bpp - gp2x_video_changemode_ll_(16); - gp2x_video_flip_(); -} - -void plat_video_menu_begin(void) -{ - memcpy(g_screen_ptr, menu_bg_buffer, 320*240*2); -} - -void plat_video_menu_end(void) -{ - gp2x_video_flip_(); -} - -void plat_validate_config(void) -{ - extern int PicoOpt; -// PicoOpt &= ~POPT_EXT_FM; - PicoOpt &= ~(1<<17); // POPT_EN_SVP_DRC -} - void plat_early_init(void) { } @@ -422,38 +327,7 @@ void plat_finish(void) sndout_oss_exit(); } -/* nasty */ -static void do_nothing() -{ -} - -void *gp2x_video_flip = gp2x_video_flip_; -void *gp2x_video_flip2 = gp2x_video_flip_; -void *gp2x_video_changemode_ll = gp2x_video_changemode_ll_; -void *gp2x_video_setpalette = gp2x_video_setpalette_; - -void *gp2x_video_RGB_setscaling = do_nothing; -void *gp2x_video_wait_vsync = do_nothing; -void *gp2x_set_cpuclk = do_nothing; -void *gp2x_read_battery = do_nothing; -void *set_lcd_custom_rate = do_nothing; -void *unset_lcd_custom_rate = do_nothing; -void *set_lcd_gamma = do_nothing; -void *set_ram_timings = do_nothing; -void *unset_ram_timings = do_nothing; - -/* joy */ -int gp2x_touchpad_read(int *x, int *y) -{ - return -1; -} - /* misc */ -void spend_cycles(int c) -{ - usleep(c/200); -} - int mp3_get_bitrate(FILE *f, int size) { return 128; @@ -467,10 +341,6 @@ void mp3_update(int *buffer, int length, int stereo) { } -void cache_flush_d_inval_i() -{ -} - /* lprintf */ void lprintf(const char *fmt, ...) { diff --git a/linux/plat.c b/linux/plat.c index 842cd5b..d777f23 100644 --- a/linux/plat.c +++ b/linux/plat.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -17,6 +18,21 @@ int plat_is_dir(const char *path) return 0; } +int plat_get_root_dir(char *dst, int len) +{ + extern char **g_argv; + int j; + + strncpy(dst, g_argv[0], len); + len -= 32; // reserve + if (len < 0) len = 0; + dst[len] = 0; + for (j = strlen(dst); j > 0; j--) + if (dst[j] == '/') { dst[j+1] = 0; break; } + + return j + 1; +} + #ifdef __GP2X__ /* Wiz has a borked gettimeofday().. */ #define plat_get_ticks_ms plat_get_ticks_ms_good diff --git a/pandora/Makefile b/pandora/Makefile index cde55c1..4f132df 100644 --- a/pandora/Makefile +++ b/pandora/Makefile @@ -1,49 +1,39 @@ #export CROSS = arm-none-linux-gnueabi- +CROSS ?= $(CROSS_COMPILE) LIBROOT = /home/notaz/dev/pnd/libroot # settings -#mz80 = 1 -#cz80 = 1 -#debug_cyclone = 1 +use_cyclone = 1 +#use_musashi = 1 +use_drz80 = 1 +use_sh2drc = 1 +#use_sh2mame = 1 + asm_memory = 1 asm_render = 1 asm_ym2612 = 1 asm_misc = 1 asm_cdpico = 1 asm_cdmemory = 1 -amalgamate = 0 #profile = 1 -#use_musashi = 1 -#use_famec = 1 +#drc_debug = 3 +-include Makefile.local -ifeq "$(debug_cyclone)" "1" -use_cyclone = 1 -use_musashi = 1 -endif ifeq "$(use_musashi)" "1" +# due to CPU stop flag acces asm_cdpico = 0 -asm_memory = 0 asm_cdmemory = 0 -else -use_cyclone = 1 endif -DEFINC = -I../.. -I. -DARM -DPANDORA -DIN_EVDEV -COPT_COMMON = -Wall -Winline -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a -I$(LIBROOT)/include +ARCH = arm +DEFINES += ARM PANDORA IN_EVDEV +CFLAGS += -I../.. -I. -I$(LIBROOT)/include +CFLAGS += -Wall -Winline -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a ifeq ($(DEBUG),) -COPT_COMMON += -O2 # -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math -else -COPT_COMMON += -ggdb -endif -ifeq "$(profile)" "1" -COPT_COMMON += -fprofile-generate -endif -ifeq "$(profile)" "2" -COPT_COMMON += -fprofile-use +CFLAGS += -O2 -fomit-frame-pointer -fstrict-aliasing -ffast-math endif -CFLAGS = $(COPT_COMMON) -SFLAGS = $(CFLAGS) +LDFLAGS += -lm -lpng -L$(LIBROOT)/lib -static ASFLAGS = -mcpu=cortex-a8 CC = $(CROSS)gcc STRIP = $(CROSS)strip @@ -52,7 +42,7 @@ LD = $(CROSS)ld OBJCOPY = $(CROSS)objcopy # frontend -OBJS += pandora.o emu.o asm_utils.o plat.o +OBJS += pandora.o emu.o asm_utils.o # common OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \ @@ -60,79 +50,32 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla platform/common/readpng.o platform/common/input.o platform/common/main.o \ platform/linux/in_evdev.o platform/linux/sndout_oss.o platform/linux/plat.o -# Pico -ifeq "$(amalgamate)" "1" -OBJS += ../../picoAll.o -else -OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o \ - pico/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.o -# Pico - CD -OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \ - pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \ - pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o -endif -# Pico - Pico -OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o -# Pico - carthw -OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \ - pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o - -# Pico - sound -ifneq "$(amalgamate)" "1" -OBJS += pico/sound/sound.o -endif +# ARM stuff +OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o OBJS += pico/sound/mix_arm.o -OBJS += pico/sound/sn76496.o pico/sound/ym2612.o + # zlib OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \ zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o # unzip OBJS += unzip/unzip.o unzip/unzip_stream.o -# debug -ifeq "$(debug_cyclone)" "1" -OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o -endif -# CPU cores -ifeq "$(use_musashi)" "1" -DEFINC += -DEMU_M68K -OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o -endif -ifeq "$(use_cyclone)" "1" -DEFINC += -DEMU_C68K -OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o -endif -ifeq "$(use_famec)" "1" -DEFINC += -DEMU_F68K -OBJS += cpu/fame/famec.o -endif -# drz80/mz80 -ifeq "$(mz80)" "1" -DEFINC += -D_USE_MZ80 -OBJS += cpu/mz80/mz80.o -else -ifeq "$(cz80)" "1" -DEFINC += -D_USE_CZ80 -OBJS += cpu/cz80/cz80.o -else -DEFINC += -D_USE_DRZ80 -OBJS += cpu/DrZ80/drz80.o -endif -endif vpath %.c = ../.. vpath %.s = ../.. vpath %.S = ../.. -DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \ - zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80 - +DIRS += platform/linux zlib unzip all: mkdirs PicoDrive +include ../common/common.mak include ../common/common_arm.mak +include ../common/revision.mak + +CFLAGS += $(addprefix -D,$(DEFINES)) PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a @echo ">>>" $@ - $(CC) -o $@ $(CFLAGS) $^ -lm -Wl,-Map=PicoDrive.map -lpng -L$(LIBROOT)/lib -static + $(CC) -o $@ $(CFLAGS) $^ $(LDFLAGS) -Wl,-Map=PicoDrive.map ifeq ($(DEBUG),) $(STRIP) $@ endif diff --git a/pandora/emu.c b/pandora/emu.c index af3474a..4a628c7 100644 --- a/pandora/emu.c +++ b/pandora/emu.c @@ -4,112 +4,38 @@ // For commercial use, separate licencing terms must be obtained. #include -#include -#include -#include -#include "../common/arm_utils.h" -#include "../common/fonts.h" #include "../common/emu.h" #include "../common/menu.h" -#include "../common/config.h" -#include "../common/input.h" +#include "../common/plat.h" +#include "../common/arm_utils.h" #include "../linux/sndout_oss.h" #include "asm_utils.h" +#include "version.h" #include -#include -#include -#include - -//#define PFRAMES -#define BENCHMARK -//#define USE_320_SCREEN 1 -#ifdef BENCHMARK -#define OSD_FPS_X (800-200) -#else -#define OSD_FPS_X (800-120) -#endif +#define USE_320_SCREEN 1 static short __attribute__((aligned(4))) sndBuffer[2*44100/50]; +static unsigned char temp_frame[g_screen_width * g_screen_height * 2]; +unsigned char *PicoDraw2FB = temp_frame; static int osd_fps_x; -unsigned char *PicoDraw2FB = NULL; // temporary buffer for alt renderer - -#define PICO_PEN_ADJUST_X 4 -#define PICO_PEN_ADJUST_Y 2 -static int pico_pen_x = 0, pico_pen_y = 240/2; - - -int plat_get_root_dir(char *dst, int len) -{ - extern char **g_argv; - int j; +char cpu_clk_name[] = "unused"; - strncpy(dst, g_argv[0], len); - len -= 32; // reserve - if (len < 0) len = 0; - dst[len] = 0; - for (j = strlen(dst); j > 0; j--) - if (dst[j] == '/') { dst[j+1] = 0; break; } - - return j + 1; -} void pemu_prep_defconfig(void) { - memset(&defaultConfig, 0, sizeof(defaultConfig)); - defaultConfig.EmuOpt = 0x8f | 0x00600; // | <- confirm_save, cd_leds - defaultConfig.s_PicoOpt = 0x0f | POPT_EXT_FM|POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC; - defaultConfig.s_PicoOpt |= POPT_ACC_SPRITES|POPT_EN_MCD_GFX; - defaultConfig.EmuOpt &= ~8; // no save gzip - defaultConfig.s_PsndRate = 44100; - defaultConfig.s_PicoRegion = 0; - defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP - defaultConfig.s_PicoCDBuffers = 0; - defaultConfig.Frameskip = 0; - defaultConfig.CPUclock = 200; - defaultConfig.volume = 50; - defaultConfig.scaling = 0; - defaultConfig.turbo_rate = 15; + // XXX: move elsewhere + g_menubg_ptr = temp_frame; } -static void textOut16(int x, int y, const char *text) +void pemu_validate_config(void) { - int i,l,len=strlen(text); - unsigned int *screen = (unsigned int *)((unsigned short *)g_screen_ptr + (x&~1) + y*g_screen_width); - - for (i = 0; i < len; i++) - { - for (l=0;l<16;) - { - unsigned char fd = fontdata8x8[((text[i])*8)+l/2]; - unsigned int *d = &screen[l*g_screen_width/2]; - if (fd&0x80) d[0]=0xffffffff; - if (fd&0x40) d[1]=0xffffffff; - if (fd&0x20) d[2]=0xffffffff; - if (fd&0x10) d[3]=0xffffffff; - if (fd&0x08) d[4]=0xffffffff; - if (fd&0x04) d[5]=0xffffffff; - if (fd&0x02) d[6]=0xffffffff; - if (fd&0x01) d[7]=0xffffffff; - l++; d = &screen[l*g_screen_width/2]; - if (fd&0x80) d[0]=0xffffffff; - if (fd&0x40) d[1]=0xffffffff; - if (fd&0x20) d[2]=0xffffffff; - if (fd&0x10) d[3]=0xffffffff; - if (fd&0x08) d[4]=0xffffffff; - if (fd&0x04) d[5]=0xffffffff; - if (fd&0x02) d[6]=0xffffffff; - if (fd&0x01) d[7]=0xffffffff; - l++; - } - screen += 8; - } } - +// FIXME: cleanup static void osd_text(int x, int y, const char *text) { int len = strlen(text)*8; @@ -163,25 +89,6 @@ static void draw_cd_leds(void) } } -static void draw_pico_ptr(void) -{ - unsigned short *p = (unsigned short *)g_screen_ptr; - - // only if pen enabled and for 16bit modes - if (pico_inp_mode == 0 || (PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) return; - - if (!(Pico.video.reg[12]&1) && !(PicoOpt&POPT_DIS_32C_BORDER)) - p += 32; - - p += g_screen_width * (pico_pen_y + PICO_PEN_ADJUST_Y); - p += pico_pen_x + PICO_PEN_ADJUST_X; - p[0] ^= 0xffff; - p[319] ^= 0xffff; - p[320] ^= 0xffff; - p[321] ^= 0xffff; - p[640] ^= 0xffff; -} - #ifdef USE_320_SCREEN static int EmuScanBegin16(unsigned int num) @@ -236,188 +143,78 @@ static int EmuScanEnd16(unsigned int num) #endif // USE_320_SCREEN -int localPal[0x100]; -static void (*vidCpyM2)(void *dest, void *src) = NULL; - -static void blit(const char *fps, const char *notice) +void pemu_update_display(const char *fps, const char *notice) { - int emu_opt = currentConfig.EmuOpt; - - if (PicoOpt&0x10) - { - // 8bit fast renderer - if (Pico.m.dirtyPal) { - Pico.m.dirtyPal = 0; - vidConvCpyRGB32(localPal, Pico.cram, 0x40); - // feed new palette to our device - // gp2x_video_setpalette(localPal, 0x40); - } - // a hack for VR - if (PicoAHW & PAHW_SVP) - memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328); - // do actual copy - vidCpyM2((unsigned char *)g_screen_ptr+g_screen_width*8, PicoDraw2FB+328*8); - } - else if (!(emu_opt&0x80)) - { - // 8bit accurate renderer - if (Pico.m.dirtyPal) - { - int pallen = 0xc0; - Pico.m.dirtyPal = 0; - if (Pico.video.reg[0xC]&8) // shadow/hilight mode - { - vidConvCpyRGB32(localPal, Pico.cram, 0x40); - vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40); - vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40); - memcpy32(localPal+0xc0, localPal+0x40, 0x40); - pallen = 0x100; - } - else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes - vidConvCpyRGB32(localPal, Pico.cram, 0x40); - vidConvCpyRGB32(localPal+0x40, HighPal, 0x40); - vidConvCpyRGB32(localPal+0x80, HighPal+0x40, 0x40); - pallen = 0xc0; - } - else { - vidConvCpyRGB32(localPal, Pico.cram, 0x40); - memcpy32(localPal+0x80, localPal, 0x40); - } - if (pallen > 0xc0) { - localPal[0xc0] = 0x0000c000; - localPal[0xd0] = 0x00c00000; - localPal[0xe0] = 0x00000000; // reserved pixels for OSD - localPal[0xf0] = 0x00ffffff; - } - // gp2x_video_setpalette(localPal, pallen); - } + if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) { + if (notice) + osd_text(4, 460, notice); + if (currentConfig.EmuOpt & EOPT_SHOW_FPS) + osd_text(osd_fps_x, 460, fps); } - - if (notice || (emu_opt & 2)) { - int h = g_screen_height-16; - if (currentConfig.scaling == 2 && !(Pico.video.reg[1]&8)) h -= 16; - if (notice) osd_text(4, h, notice); - if (emu_opt & 2) - osd_text(osd_fps_x, h, fps); - } - if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD)) + if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS)) draw_cd_leds(); - if (PicoAHW & PAHW_PICO) - draw_pico_ptr(); +} - //gp2x_video_wait_vsync(); - // gp2x_video_flip(); +void plat_video_toggle_renderer(int is_next, int force_16bpp, int is_menu) +{ + // this will auto-select SMS/32X renderers + PicoDrawSetColorFormat(1); } +void plat_video_menu_enter(int is_rom_loaded) +{ +} -// clears whole screen or just the notice area (in all buffers) -static void clearArea(int full) +void plat_video_menu_begin(void) { - if (full) memset(g_screen_ptr, 0, g_screen_width*g_screen_height*2); - else memset((short *)g_screen_ptr + g_screen_width * (g_screen_height - 16), 0, - g_screen_width * 16 * 2); + memcpy32(g_screen_ptr, g_menubg_ptr, g_screen_width * g_screen_height * 2 / 4); } +void plat_video_menu_end(void) +{ +} -static void vidResetMode(void) +void plat_status_msg_clear(void) { -#if 0 - if (PicoOpt&0x10) { - gp2x_video_changemode(8); - } else if (currentConfig.EmuOpt&0x80) { - gp2x_video_changemode(16); -#ifdef USE_320_SCREEN - PicoDrawSetColorFormat(1); - PicoScanBegin = EmuScanBegin16; -#else - PicoDrawSetColorFormat(-1); - PicoScanEnd = EmuScanEnd16; -#endif - } else { - gp2x_video_changemode(8); - PicoDrawSetColorFormat(2); - PicoScanBegin = EmuScanBegin8; - } - if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) { - // setup pal for 8-bit modes - localPal[0xc0] = 0x0000c000; // MCD LEDs - localPal[0xd0] = 0x00c00000; - localPal[0xe0] = 0x00000000; // reserved pixels for OSD - localPal[0xf0] = 0x00ffffff; - gp2x_video_setpalette(localPal, 0x100); - gp2x_memset_all_buffers(0, 0xe0, 320*240); - gp2x_video_flip(); - } - Pico.m.dirtyPal = 1; - // reset scaling - if (currentConfig.scaling == 2 && !(Pico.video.reg[1]&8)) - gp2x_video_RGB_setscaling(8, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 224); - else gp2x_video_RGB_setscaling(0, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 240); -#else -#ifdef USE_320_SCREEN - PicoDrawSetColorFormat(1); - PicoScanBegin = EmuScanBegin16; -#else - PicoDrawSetColorFormat(-1); - PicoScanEnd = EmuScanEnd16; -#endif -#endif + unsigned short *d = (unsigned short *)g_screen_ptr + g_screen_width * g_screen_height; + int l = g_screen_width * 8; + memset32((int *)(d - l), 0, l * 2 / 4); } +void plat_status_msg_busy_next(const char *msg) +{ + plat_status_msg_clear(); + pemu_update_display("", msg); + emu_status_msg(""); + reset_timing = 1; +} -static void update_volume(int has_changed, int is_up) +void plat_status_msg_busy_first(const char *msg) +{ +// memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4); + plat_status_msg_busy_next(msg); +} + +void plat_update_volume(int has_changed, int is_up) { static int prev_frame = 0, wait_frames = 0; int vol = currentConfig.volume; if (has_changed) { - if (vol < 5 && (PicoOpt&8) && prev_frame == Pico.m.frame_count - 1 && wait_frames < 12) - wait_frames++; - else { - if (is_up) { - if (vol < 99) vol++; - } else { - if (vol > 0) vol--; - } - wait_frames = 0; - sndout_oss_setvol(vol, vol); - currentConfig.volume = vol; + if (is_up) { + if (vol < 99) vol++; + } else { + if (vol > 0) vol--; } - sprintf(noticeMsg, "VOL: %02i", vol); - gettimeofday(¬iceMsgTime, 0); + wait_frames = 0; + sndout_oss_setvol(vol, vol); + currentConfig.volume = vol; + emu_status_msg("VOL: %02i", vol); prev_frame = Pico.m.frame_count; } - - // set the right mixer func - if (!(PicoOpt&8)) return; // just use defaults for mono - if (vol >= 5) - PsndMix_32_to_16l = mix_32_to_16l_stereo; - else { - mix_32_to_16l_level = 5 - vol; - PsndMix_32_to_16l = mix_32_to_16l_stereo_lvl; - } -} - - -static void updateSound(int len) -{ - if (PicoOpt&8) len<<=1; - - /* avoid writing audio when lagging behind to prevent audio lag */ - if (PicoSkipFrame != 2) - sndout_oss_write(PsndOut, len<<1); } - -static void SkipFrame(int do_audio) -{ - PicoSkipFrame=do_audio ? 1 : 2; - PicoFrame(); - PicoSkipFrame=0; -} - - void pemu_forced_frame(int opts) { int po_old = PicoOpt; @@ -427,7 +224,6 @@ void pemu_forced_frame(int opts) PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites currentConfig.EmuOpt |= 0x80; - //vidResetMode(); #ifdef USE_320_SCREEN PicoDrawSetColorFormat(1); PicoScanBegin = EmuScanBegin16; @@ -438,38 +234,22 @@ void pemu_forced_frame(int opts) Pico.m.dirtyPal = 1; PicoFrameDrawOnly(); -/* - if (!(Pico.video.reg[12]&1)) { - vidCpyM2 = vidCpyM2_32col; - clearArea(1); - } else vidCpyM2 = vidCpyM2_40col; - - vidCpyM2((unsigned char *)g_screen_ptr+g_screen_width*8, PicoDraw2FB+328*8); - vidConvCpyRGB32(localPal, Pico.cram, 0x40); - gp2x_video_setpalette(localPal, 0x40); -*/ PicoOpt = po_old; currentConfig.EmuOpt = eo_old; } -void plat_debug_cat(char *str) -{ -} - -static void simpleWait(int thissec, int lim_time) +static void updateSound(int len) { - struct timeval tval; + len <<= 1; + if (PicoOpt & POPT_EN_STEREO) + len <<= 1; - spend_cycles(1024); - gettimeofday(&tval, 0); - if (thissec != tval.tv_sec) tval.tv_usec+=1000000; + if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len)) + return; - while (tval.tv_usec < lim_time) - { - spend_cycles(1024); - gettimeofday(&tval, 0); - if (thissec != tval.tv_sec) tval.tv_usec+=1000000; - } + /* avoid writing audio when lagging behind to prevent audio lag */ + if (PicoSkipFrame != 2) + sndout_oss_write(PsndOut, len); } void pemu_sound_start(void) @@ -491,7 +271,7 @@ void pemu_sound_start(void) sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3); sndout_oss_setvol(currentConfig.volume, currentConfig.volume); PicoWriteSound = updateSound; - update_volume(0, 0); + plat_update_volume(0, 0); memset(sndBuffer, 0, sizeof(sndBuffer)); PsndOut = sndBuffer; PsndRate_old = PsndRate; @@ -509,224 +289,89 @@ void pemu_sound_wait(void) // don't need to do anything, writes will block by themselves } -void pemu_loop(void) +void plat_debug_cat(char *str) { - char fpsbuff[24]; // fps count c string - struct timeval tval; // timing - int pframes_done, pframes_shown, pthissec; // "period" frames, used for sync - int frames_done, frames_shown, thissec; // actual frames - int oldmodes = 0, target_fps, target_frametime, lim_time, vsync_offset, i; - char *notice = 0; - - printf("entered emu_Loop()\n"); - - fpsbuff[0] = 0; - - // make sure we are in correct mode - vidResetMode(); - Pico.m.dirtyPal = 1; - oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc; - - // pal/ntsc might have changed, reset related stuff - target_fps = Pico.m.pal ? 50 : 60; - target_frametime = 1000000/target_fps; - reset_timing = 1; - - pemu_sound_start(); - - // prepare CD buffer - if (PicoAHW & PAHW_MCD) PicoCDBufferInit(); - - // calc vsync offset to sync timing code with vsync - if (currentConfig.EmuOpt&0x2000) { - gettimeofday(&tval, 0); - //gp2x_video_wait_vsync(); - gettimeofday(&tval, 0); - vsync_offset = tval.tv_usec; - while (vsync_offset >= target_frametime) - vsync_offset -= target_frametime; - if (!vsync_offset) vsync_offset++; - printf("vsync_offset: %i\n", vsync_offset); - } else - vsync_offset = 0; - - frames_done = frames_shown = thissec = - pframes_done = pframes_shown = pthissec = 0; - - // loop - while (engineState == PGS_Running) - { - int modes; - - gettimeofday(&tval, 0); - if (reset_timing) { - reset_timing = 0; - pthissec = tval.tv_sec; - pframes_shown = pframes_done = tval.tv_usec/target_frametime; - } +} - // show notice message? - if (noticeMsgTime.tv_sec) - { - static int noticeMsgSum; - if((tval.tv_sec*1000000+tval.tv_usec) - (noticeMsgTime.tv_sec*1000000+noticeMsgTime.tv_usec) > 2000000) { // > 2.0 sec - noticeMsgTime.tv_sec = noticeMsgTime.tv_usec = 0; - clearArea(0); - notice = 0; - } else { - int sum = noticeMsg[0]+noticeMsg[1]+noticeMsg[2]; - if (sum != noticeMsgSum) { clearArea(0); noticeMsgSum = sum; } - notice = noticeMsg; - } - } +void emu_video_mode_change(int start_line, int line_count, int is_32cols) +{ + osd_fps_x = 260; - // check for mode changes - modes = ((Pico.video.reg[12]&1)<<2)|(Pico.video.reg[1]&8); - if (modes != oldmodes) - { - int scalex = g_screen_width; - osd_fps_x = OSD_FPS_X; - if (modes & 4) { - vidCpyM2 = vidCpyM2_40col; - } else { - if (PicoOpt & 0x100) { - vidCpyM2 = vidCpyM2_32col_nobord; - scalex = 256; - osd_fps_x = OSD_FPS_X - 64; - } else { - vidCpyM2 = vidCpyM2_32col; - } - } - //if (currentConfig.scaling == 2 && !(modes&8)) // want vertical scaling and game is not in 240 line mode - // gp2x_video_RGB_setscaling(8, scalex, 224); - // else gp2x_video_RGB_setscaling(0, scalex, 240); - oldmodes = modes; - clearArea(1); - } + // clear whole screen in all buffers + memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4); +} - // second changed? - if (thissec != tval.tv_sec) - { -#ifdef BENCHMARK - static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4]; - if (++bench == 4) { - bench = 0; - bench_fps_s = bench_fps / 4; - bf[bfp++ & 3] = bench_fps / 4; - bench_fps = 0; - } - bench_fps += frames_shown; - sprintf(fpsbuff, "%3i/%3i/%3i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2); - printf("%s\n", fpsbuff); +void pemu_loop_prep(void) +{ +#ifdef USE_320_SCREEN + PicoDrawSetColorFormat(1); + PicoScanBegin = EmuScanBegin16; #else - if (currentConfig.EmuOpt & 2) { - sprintf(fpsbuff, "%3i/%3i", frames_shown, frames_done); - if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; } - } -#endif - frames_shown = frames_done = 0; - thissec = tval.tv_sec; - } -#ifdef PFRAMES - sprintf(fpsbuff, "%i", Pico.m.frame_count); + PicoDrawSetColorFormat(-1); + PicoScanEnd = EmuScanEnd16; #endif - if (pthissec != tval.tv_sec) - { - if (PsndOut == 0 && currentConfig.Frameskip >= 0) { - pframes_done = pframes_shown = 0; - } else { - // it is quite common for this implementation to leave 1 fame unfinished - // when second changes, but we don't want buffer to starve. - if(PsndOut && pframes_done < target_fps && pframes_done > target_fps-5) { - emu_update_input(); - SkipFrame(1); pframes_done++; - } - - pframes_done -= target_fps; if (pframes_done < 0) pframes_done = 0; - pframes_shown -= target_fps; if (pframes_shown < 0) pframes_shown = 0; - if (pframes_shown > pframes_done) pframes_shown = pframes_done; - } - pthissec = tval.tv_sec; - } + pemu_sound_start(); +} - lim_time = (pframes_done+1) * target_frametime + vsync_offset; - if (currentConfig.Frameskip >= 0) // frameskip enabled - { - for(i = 0; i < currentConfig.Frameskip; i++) { - emu_update_input(); - SkipFrame(1); pframes_done++; frames_done++; - if (PsndOut && !reset_timing) { // do framelimitting if sound is enabled - gettimeofday(&tval, 0); - if (pthissec != tval.tv_sec) tval.tv_usec+=1000000; - if (tval.tv_usec < lim_time) { // we are too fast - simpleWait(pthissec, lim_time); - } - } - lim_time += target_frametime; - } - } - else if (tval.tv_usec > lim_time) // auto frameskip - { - // no time left for this frame - skip - if (tval.tv_usec - lim_time >= 300000) { - /* something caused a slowdown for us (disk access? cache flush?) - * try to recover by resetting timing... */ - reset_timing = 1; - continue; - } - emu_update_input(); - SkipFrame(tval.tv_usec < lim_time+target_frametime*2); pframes_done++; frames_done++; - continue; - } +void pemu_loop_end(void) +{ + int po_old = PicoOpt; + int eo_old = currentConfig.EmuOpt; - emu_update_input(); - PicoFrame(); + pemu_sound_stop(); + memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4); - // check time - gettimeofday(&tval, 0); - if (pthissec != tval.tv_sec) tval.tv_usec+=1000000; + /* do one more frame for menu bg */ + PicoOpt &= ~POPT_ALT_RENDERER; + PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES; + currentConfig.EmuOpt |= EOPT_16BPP; - if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 300000) // slowdown detection - reset_timing = 1; -#if 1 - else if (PsndOut != NULL || currentConfig.Frameskip < 0) - { - // sleep or vsync if we are still too fast - // usleep sleeps for ~20ms minimum, so it is not a solution here - if (!reset_timing && tval.tv_usec < lim_time) - { - // we are too fast - if (vsync_offset) { - if (lim_time - tval.tv_usec > target_frametime/2) - simpleWait(pthissec, lim_time - target_frametime/4); - // gp2x_video_wait_vsync(); - } else { - simpleWait(pthissec, lim_time); - } - } - } -#endif - blit(fpsbuff, notice); + PicoDrawSetColorFormat(1); + Pico.m.dirtyPal = 1; + PicoFrame(); - pframes_done++; pframes_shown++; - frames_done++; frames_shown++; - } + PicoOpt = po_old; + currentConfig.EmuOpt = eo_old; +} - emu_set_fastforward(0); +/* XXX: avoid busy wait somehow? */ +void plat_wait_till_us(unsigned int us_to) +{ + unsigned int now; - if (PicoAHW & PAHW_MCD) PicoCDBufferFree(); + spend_cycles(1024); + now = plat_get_ticks_us(); - // save SRAM - if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) { - /* FIXME: plat_status_msg_busy_first */ - emu_state_cb("Writing SRAM/BRAM.."); - emu_save_load_game(0, 1); - SRam.changed = 0; + while ((signed int)(us_to - now) > 512) + { + spend_cycles(1024); + now = plat_get_ticks_us(); } +} - // if in 8bit mode, generate 16bit image for menu background - if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) - pemu_forced_frame(POPT_EN_SOFTSCALE); +void plat_video_wait_vsync(void) +{ } +const char *plat_get_credits(void) +{ + return "PicoDrive v" VERSION " (c) notaz, 2006-2009\n\n\n" + "Credits:\n" + "fDave: Cyclone 68000 core,\n" + " base code of PicoDrive\n" + "Reesy & FluBBa: DrZ80 core\n" + "MAME devs: YM2612 and SN76496 cores\n" + "rlyeh and others: minimal SDK\n" + "Squidge: mmuhack\n" + "Dzz: ARM940 sample\n" + "GnoStiC / Puck2099: USB joy code\n" + "craigix: GP2X hardware\n" + "ketchupgun: skin design\n" + "\n" + "special thanks (for docs, ideas):\n" + " Charles MacDonald, Haze,\n" + " Stephane Dallongeville,\n" + " Lordus, Exophase, Rokas,\n" + " Nemesis, Tasco Deluxe"; +} diff --git a/pandora/pandora.c b/pandora/pandora.c index ce9fac6..92047c2 100644 --- a/pandora/pandora.c +++ b/pandora/pandora.c @@ -13,15 +13,17 @@ #include "../linux/sndout_oss.h" #include "../common/arm_linux.h" #include "../common/emu.h" -#include "pandora.h" static int fbdev = -1; #define SCREEN_MAP_SIZE (800*480*2) static void *screen = MAP_FAILED; -/* common */ -void pnd_init(void) +void plat_early_init(void) +{ +} + +void plat_init(void) { printf("entering init()\n"); fflush(stdout); @@ -47,7 +49,7 @@ void pnd_init(void) printf("exitting init()\n"); fflush(stdout); } -void pnd_exit(void) +void plat_finish(void) { if (screen != MAP_FAILED) munmap(screen, SCREEN_MAP_SIZE); @@ -69,13 +71,3 @@ void lprintf(const char *fmt, ...) va_end(vl); } - -/* fake GP2X */ -/* -void set_gamma(int g100, int A_SNs_curve) {} -void set_FCLK(unsigned MHZ) {} -void set_LCD_custom_rate(int rate) {} -void unset_LCD_custom_rate(void) {} -void Pause940(int yes) {} -void Reset940(int yes, int bank) {} -*/ diff --git a/pandora/version.h b/pandora/version.h new file mode 100644 index 0000000..69cf800 --- /dev/null +++ b/pandora/version.h @@ -0,0 +1,2 @@ +#define VERSION "1.70" + diff --git a/psp/emu.c b/psp/emu.c index 5eca789..9af4fe5 100644 --- a/psp/emu.c +++ b/psp/emu.c @@ -89,14 +89,8 @@ void emu_Deinit(void) void pemu_prep_defconfig(void) { - memset(&defaultConfig, 0, sizeof(defaultConfig)); - defaultConfig.EmuOpt = 0x1d | 0x680; // | <- confirm_save, cd_leds, acc rend - defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX|POPT_ACC_SPRITES; defaultConfig.s_PsndRate = 22050; - defaultConfig.s_PicoRegion = 0; // auto - defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP defaultConfig.s_PicoCDBuffers = 64; - defaultConfig.Frameskip = -1; // auto defaultConfig.CPUclock = 333; defaultConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU defaultConfig.KeyBinds[ 6] = 1<<1; @@ -117,7 +111,6 @@ void pemu_prep_defconfig(void) defaultConfig.scale = 1.20; // fullscreen defaultConfig.hscale40 = 1.25; defaultConfig.hscale32 = 1.56; - defaultConfig.turbo_rate = 15; } diff --git a/win32/Makefile b/win32/Makefile index c090e75..b2f02e2 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -3,10 +3,13 @@ CROSS=i586-mingw32msvc- #use_musashi = 1 use_fame = 1 -#use_mz80 = 1 +use_cz80 = 1 +use_sh2drc = 1 +#use_sh2mame = 1 -include Makefile.local +ARCH ?= x86 CC = $(CROSS)gcc CXX = $(CROSS)g++ LD = $(CROSS)ld @@ -25,66 +28,27 @@ OBJS += platform/common/emu.o platform/common/menu.o \ platform/common/config.o platform/common/fonts.o platform/common/readpng.o \ platform/common/input.o -# Pico -OBJS += pico/area.o pico/cart.o pico/memory.o pico/pico.o pico/sek.o \ - pico/videoport.o pico/draw2.o pico/draw.o pico/z80if.o pico/patch.o \ - pico/mode4.o pico/sms.o pico/misc.o pico/eeprom.o pico/debug.o -# Pico - CD -OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \ - pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \ - pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o -# Pico - 32X -OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o pico/32x/pwm.o -# Pico - Pico -OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o -# Pico - sound -OBJS += pico/sound/sound.o pico/sound/sn76496.o pico/sound/ym2612.o pico/sound/mix.o -# Pico - carthw -OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \ - pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o +OBJS += pico/carthw/svp/compiler.o +OBJS += pico/sound/mix.o # zlib OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \ zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o zlib/uncompr.o # unzip OBJS += unzip/unzip.o unzip/unzip_stream.o -# CPU cores -ifeq "$(use_musashi)" "1" -DEFINES += EMU_M68K -OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o -#OBJS += cpu/musashi/m68kdasm.o -endif -ifeq "$(use_fame)" "1" -DEFINES += EMU_F68K -OBJS += cpu/fame/famec.o -endif -# z80 -ifeq "$(use_mz80)" "1" -DEFINES += _USE_MZ80 -OBJS += cpu/mz80/mz80.o -else -DEFINES += _USE_CZ80 -OBJS += cpu/cz80/cz80.o -endif -# sh2 -OBJS += cpu/sh2mame/sh2pico.o -# misc -ifeq "$(use_fame)" "1" -ifeq "$(use_musashi)" "1" -OBJS += pico/debugCPU.o -endif -endif CFLAGS += $(addprefix -D,$(DEFINES)) CXXFLAGS = $(CFLAGS) vpath %.c = ../.. -DIRS = platform platform/gp2x platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \ - pico/32x zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80 cpu/sh2mame +DIRS += zlib unzip TARGET = PicoDrive.exe - all: mkdirs $(TARGET) + +include ../common/common.mak +include ../common/revision.mak + clean: tidy @$(RM) $(TARGET) tidy: @@ -96,37 +60,6 @@ $(TARGET) : $(OBJS) $(CC) $(CFLAGS) $^ $(LDFLAGS) -lm -lpng -Wl,-Map=$(TARGET).map -o $@ $(STRIP) $@ -mkdirs: - @mkdir -p $(DIRS) - -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/pico_int.h ../../pico/memory.h - -../../cpu/musashi/m68kops.c : - @make -C ../../cpu/musashi - -cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm - @echo $@ - @nasm -f elf $< -o $@ - -../../cpu/mz80/mz80.asm : - @make -C ../../cpu/mz80/ - -.c.o: - @echo ">>>" $< - $(CC) $(CFLAGS) -c $< -o $@ -.s.o: - @echo ">>>" $< - $(CC) $(CFLAGS) -c $< -o $@ - - -cpu/fame/famec.o : ../../cpu/fame/famec.c ../../cpu/fame/famec_opcodes.h - @echo ">>>" $< - $(CC) $(CFLAGS) -Wno-unused -c $< -o $@ - # ----------- release ----------- ifneq ($(findstring rel,$(MAKECMDGOALS)),) ifeq ($(VER),) diff --git a/win32/main.c b/win32/main.c index 17191e2..d43149c 100644 --- a/win32/main.c +++ b/win32/main.c @@ -565,7 +565,7 @@ void xxinit(void) { /* in_init() must go before config, config accesses in_ fwk */ in_init(); - pemu_prep_defconfig(); + emu_prep_defconfig(); emu_read_config(0, 0); config_readlrom(PicoConfigFile); diff --git a/win32/plat.c b/win32/plat.c index 79cf584..2770b94 100644 --- a/win32/plat.c +++ b/win32/plat.c @@ -59,18 +59,15 @@ int plat_wait_event(int *fds_hnds, int count, int timeout_ms) void pemu_prep_defconfig(void) { memset(&defaultConfig, 0, sizeof(defaultConfig)); - defaultConfig.EmuOpt = 0x9d | EOPT_RAM_TIMINGS|EOPT_CONFIRM_SAVE|EOPT_EN_CD_LEDS; - defaultConfig.s_PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 | - POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_ACC_SPRITES | - POPT_EN_32X|POPT_EN_PWM; defaultConfig.s_PicoOpt|= POPT_6BTN_PAD; // for xmen proto - defaultConfig.s_PsndRate = 44100; - defaultConfig.s_PicoRegion = 0; // auto - defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP defaultConfig.s_PicoCDBuffers = 0; defaultConfig.Frameskip = 0; } +void pemu_validate_config(void) +{ +} + static int EmuScanBegin16(unsigned int num) { DrawLineDest = (unsigned short *) g_screen_ptr + g_screen_width * num; @@ -200,10 +197,6 @@ void plat_video_menu_end(void) { } -void plat_validate_config(void) -{ -} - void plat_update_volume(int has_changed, int is_up) { } -- 2.39.5