From a52e1f622222d0d70cda3ee9fddd87bcd32f1629 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 27 Oct 2007 20:04:36 +0000 Subject: [PATCH] various bugfixes git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@282 be3aeb3a-fb24-0410-a615-afba39da0efa --- linux/Makefile | 20 +++++++++++++------- psp/emu.c | 34 ++++++++++++++++------------------ psp/menu.c | 16 ++++++++-------- 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index 6aed56e..90a149c 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -1,6 +1,7 @@ # settings -use_fame = 1 +#use_musashi = 1 +#use_mz80 = 1 # profile = 1 @@ -47,16 +48,21 @@ OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/i # unzip OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o # CPU cores -ifeq "$(use_fame)" "1" -DEFINC += -DEMU_F68K -OBJS += ../../cpu/fame/famec.o -else +ifeq "$(use_musashi)" "1" DEFINC += -DEMU_M68K OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o +else +DEFINC += -DEMU_F68K +OBJS += ../../cpu/fame/famec.o endif -# mz80 -DEFINC += -D_USE_MZ80 +# z80 +ifeq "$(use_mz80)" "1" +CFLAGS += -D_USE_MZ80 OBJS += ../../cpu/mz80/mz80.o +else +CFLAGS += -D_USE_CZ80 +OBJS += ../../cpu/cz80/cz80.o +endif # faked asm #DEFINC += -D_ASM_DRAW_C diff --git a/psp/emu.c b/psp/emu.c index d2eaca7..0ecbcc6 100644 --- a/psp/emu.c +++ b/psp/emu.c @@ -206,13 +206,15 @@ static void set_scaling_params(void) if (fbimg_yoffs < 0) fbimg_yoffs = 0; fbimg_offs = (fbimg_yoffs*512 + fbimg_xoffs) * 2; // dst is always 16bit + /* lprintf("set_scaling_params:\n"); lprintf("offs: %i, %i\n", fbimg_xoffs, fbimg_yoffs); lprintf("xy0, xy1: %i, %i; %i, %i\n", g_vertices[0].x, g_vertices[0].y, g_vertices[1].x, g_vertices[1].y); lprintf("uv0, uv1: %i, %i; %i, %i\n", g_vertices[0].u, g_vertices[0].v, g_vertices[1].u, g_vertices[1].v); + */ } -static void do_slowmode_pal(void) +static void do_pal_update(int allow_sh) { unsigned int *spal=(void *)Pico.cram; unsigned int *dpal=(void *)localPal; @@ -221,11 +223,11 @@ static void do_slowmode_pal(void) for (i = 0x3f/2; i >= 0; i--) dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4); - if (Pico.video.reg[0xC]&8) // shadow/hilight? + if (allow_sh && (Pico.video.reg[0xC]&8)) // shadow/hilight? { // shadowed pixels for (i = 0x3f/2; i >= 0; i--) - dpal[0x20|i] = dpal[0x60|i] = (spal[i]>>1)&0x738e738e; + dpal[0x20|i] = dpal[0x60|i] = (dpal[i]>>1)&0x738e738e; // hilighted pixels for (i = 0x3f; i >= 0; i--) { int t=localPal[i]&0xe71c;t+=0x4208; @@ -259,7 +261,7 @@ static void EmuScanPrepare(void) dynamic_palette = 0; if (Pico.m.dirtyPal) - do_slowmode_pal(); + do_pal_update(1); } static int EmuScanSlow(unsigned int num, void *sdata) @@ -271,7 +273,7 @@ static int EmuScanSlow(unsigned int num, void *sdata) do_slowmode_lines(num); dynamic_palette = 1; } - do_slowmode_pal(); + do_pal_update(1); } if (dynamic_palette) { @@ -289,8 +291,6 @@ static void blitscreen_clut(void) int offs = fbimg_offs; offs += (psp_screen == VRAM_FB0) ? VRAMOFFS_FB0 : VRAMOFFS_FB1; - sceKernelDcacheWritebackAll(); - sceGuSync(0,0); // sync with prev sceGuStart(GU_DIRECT, guCmdList); sceGuDrawBuffer(GU_PSM_5650, (void *)offs, 512); // point to back buffer @@ -314,14 +314,9 @@ static void blitscreen_clut(void) } if ((PicoOpt&0x10) && Pico.m.dirtyPal) - { - int i, *dpal = (void *)localPal, *spal = (int *)Pico.cram; - for (i = 0x3f/2; i >= 0; i--) - dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4); - localPal[0xe0] = 0; - Pico.m.dirtyPal = 0; - need_pal_upload = 1; - } + do_pal_update(0); + + sceKernelDcacheWritebackAll(); if (need_pal_upload) { need_pal_upload = 0; @@ -577,7 +572,8 @@ static void sound_prepare(void) static void sound_end(void) { - while (samples_made - samples_done >= samples_block || sceAudioOutput2GetRestSample() > 0) + samples_made = samples_done = 0; + while (sceAudioOutput2GetRestSample() > 0) psp_msleep(100); sceAudio_5C37C0AE(); } @@ -586,6 +582,8 @@ static void sound_deinit(void) { sound_thread_exit = 1; sceKernelSignalSema(sound_sem, 1); + sceKernelDeleteSema(sound_sem); + sound_sem = -1; } static void writeSound(int len) @@ -998,8 +996,8 @@ void emu_Loop(void) SRam.changed = 0; } - // draw a frame for bg.. - emu_forcedFrame(); + // clear fps counters and stuff + memset32((int *)psp_video_get_active_fb() + 512*264*2/4, 0, 512*8*2/4); } diff --git a/psp/menu.c b/psp/menu.c index 573e5f3..32c4115 100644 --- a/psp/menu.c +++ b/psp/menu.c @@ -43,7 +43,7 @@ static unsigned short bg_buffer[480*272] __attribute__((aligned(16))); #define menu_screen psp_screen static void menu_darken_bg(void *dst, const void *src, int pixels, int darker); -static void menu_prepare_bg(int use_game_bg); +static void menu_prepare_bg(int use_game_bg, int use_fg); static unsigned int inp_prev = 0; @@ -190,10 +190,10 @@ static void draw_dirlist(char *curdir, struct my_dirent **namelist, int n, int s if (pos > 26) break; if (namelist[i+1]->d_type & DT_DIR) { smalltext_out16_lim(14, pos*10, "/", 0xd7ff, 1); - smalltext_out16_lim(14+6, pos*10, namelist[i+1]->d_name, 0xd7ff, 53-3); + smalltext_out16_lim(14+6, pos*10, namelist[i+1]->d_name, 0xd7ff, 80-3); } else { unsigned short color = file2color(namelist[i+1]->d_name); - smalltext_out16_lim(14, pos*10, namelist[i+1]->d_name, color, 53-2); + smalltext_out16_lim(14, pos*10, namelist[i+1]->d_name, color, 80-2); } } text_out16(5, 130, ">"); @@ -552,7 +552,7 @@ static void draw_savestate_bg(int slot) } emu_forcedFrame(); - menu_prepare_bg(1); + menu_prepare_bg(1, 0); restore_oldstate(oldstate); } @@ -1016,7 +1016,7 @@ static void menu_opt3_preview(int is_32col) memset32(psp_screen, 0, 512*272*2/4); emu_forcedFrame(); - menu_prepare_bg(1); + menu_prepare_bg(1, 0); if (oldstate) restore_oldstate(oldstate); } @@ -1655,13 +1655,13 @@ static void menu_darken_bg(void *dst, const void *src, int pixels, int darker) } } -static void menu_prepare_bg(int use_game_bg) +static void menu_prepare_bg(int use_game_bg, int use_fg) { if (use_game_bg) { // darken the active framebuffer unsigned short *dst = bg_buffer; - unsigned short *src = psp_screen; + unsigned short *src = use_fg ? psp_video_get_active_fb() : psp_screen; int i; for (i = 272; i > 0; i--, dst += 480, src += 512) menu_darken_bg(dst, src, 480, 1); @@ -1678,7 +1678,7 @@ static void menu_prepare_bg(int use_game_bg) static void menu_gfx_prepare(void) { - menu_prepare_bg(rom_data != NULL); + menu_prepare_bg(rom_data != NULL, 1); menu_draw_begin(); menu_draw_end(); -- 2.39.2