mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-05 07:17:45 -04:00
giz port, restructuring
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@257 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz
parent
c9077ab4b9
commit
ea8c405fa7
30 changed files with 1706 additions and 970 deletions
|
|
@ -14,8 +14,13 @@ amalgamate = 0
|
|||
|
||||
|
||||
|
||||
DEFINC = -I../.. -I. -D__GIZ__ -D_UNZIP_SUPPORT
|
||||
COPT_COMMON = -static -Wall -O2 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
|
||||
DEFINC = -I../.. -I. -D__GIZ__ -D_UNZIP_SUPPORT -DNO_SYNC
|
||||
COPT_COMMON = -static -Wall -Winline
|
||||
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
|
||||
|
|
@ -30,10 +35,10 @@ AS = $(CROSS)as
|
|||
LD = $(CROSS)ld
|
||||
|
||||
# frontend
|
||||
OBJS += main.o menu.o giz.o emu.o
|
||||
OBJS += main.o emu.o menu.o giz.o asm_utils.o
|
||||
|
||||
# common
|
||||
OBJS += ../common/menu.o ../common/fonts.o ../common/arm_utils.o ../common/readpng.o
|
||||
OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o ../common/readpng.o
|
||||
|
||||
# Pico
|
||||
ifeq "$(amalgamate)" "1"
|
||||
|
|
@ -129,7 +134,7 @@ endif
|
|||
../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
|
||||
@echo $<
|
||||
@$(AS) $(ASFLAGS) $< -o $@
|
||||
../../Pico/misc_asm.o : ../../Pico/misc.s
|
||||
../../Pico/misc_asm.o : ../../Pico/Misc.s
|
||||
@echo $<
|
||||
@$(AS) $(ASFLAGS) $< -o $@
|
||||
../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
|
||||
|
|
@ -138,7 +143,7 @@ endif
|
|||
../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
|
||||
@echo $<
|
||||
@$(AS) $(ASFLAGS) $< -o $@
|
||||
../../Pico/cd/misc_asm.o : ../../Pico/cd/misc.s
|
||||
../../Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
|
||||
@echo $<
|
||||
@$(AS) $(ASFLAGS) $< -o $@
|
||||
|
||||
|
|
@ -160,6 +165,15 @@ clean_prof:
|
|||
find ../.. -name '*.gcno' -delete
|
||||
find ../.. -name '*.gcda' -delete
|
||||
|
||||
up: PicoDrive.exe
|
||||
synce-pcp -d 3 PicoDrive.exe ":/SD Card/emus/PicoDrive/PicoDrive.exe"
|
||||
|
||||
run: up
|
||||
synce-prun "/SD Card/emus/PicoDrive/PicoDrive.exe"
|
||||
|
||||
run_only:
|
||||
synce-prun "/SD Card/emus/PicoDrive/PicoDrive.exe"
|
||||
|
||||
# ----------- release -----------
|
||||
ifneq ($(findstring rel,$(MAKECMDGOALS)),)
|
||||
ifeq ($(VER),)
|
||||
|
|
|
|||
3
platform/gizmondo/asm_utils.h
Normal file
3
platform/gizmondo/asm_utils.h
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
void vidCpy8to16_40(void *dest, void *src, short *pal, int lines);
|
||||
|
||||
112
platform/gizmondo/asm_utils.s
Normal file
112
platform/gizmondo/asm_utils.s
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
@ vim:filetype=armasm
|
||||
|
||||
|
||||
.global vidCpy8to16_40 @ void *dest, void *src, short *pal, int lines
|
||||
|
||||
vidCpy8to16_40:
|
||||
stmfd sp!, {r4-r9,lr}
|
||||
|
||||
mov r3, r3, lsr #1
|
||||
orr r3, r3, r3, lsl #8
|
||||
add r1, r1, #8
|
||||
orr r3, r3, #(320/8-1)<<24
|
||||
|
||||
@ even lines
|
||||
vcloop_40_aligned:
|
||||
ldr r12, [r1], #4
|
||||
ldr r7, [r1], #4
|
||||
|
||||
and r4, lr, r12, lsl #1
|
||||
ldrh r4, [r2, r4]
|
||||
and r5, lr, r12, lsr #7
|
||||
ldrh r5, [r2, r5]
|
||||
and r6, lr, r12, lsr #15
|
||||
ldrh r6, [r2, r6]
|
||||
orr r4, r4, r5, lsl #16
|
||||
|
||||
and r5, lr, r12, lsr #23
|
||||
ldrh r5, [r2, r5]
|
||||
and r8, lr, r7, lsl #1
|
||||
ldrh r8, [r2, r8]
|
||||
orr r5, r6, r5, lsl #16
|
||||
|
||||
and r6, lr, r7, lsr #7
|
||||
ldrh r6, [r2, r6]
|
||||
and r12,lr, r7, lsr #15
|
||||
ldrh r12,[r2, r12]
|
||||
and r9, lr, r7, lsr #23
|
||||
ldrh r9, [r2, r9]
|
||||
orr r8, r8, r6, lsl #16
|
||||
|
||||
subs r3, r3, #1<<24
|
||||
orr r12,r12, r9, lsl #16
|
||||
|
||||
stmia r0!, {r4,r5,r8,r12}
|
||||
bpl vcloop_40_aligned
|
||||
|
||||
add r1, r1, #336 @ skip a line and 1 col
|
||||
add r0, r0, #320*2+2*2
|
||||
add r3, r3, #(320/8)<<24
|
||||
sub r3, r3, #1
|
||||
tst r3, #0xff
|
||||
bne vcloop_40_aligned
|
||||
|
||||
and r4, r3, #0xff00
|
||||
orr r3, r3, r4, lsr #8
|
||||
mov r4, r4, lsr #7
|
||||
sub r4, r4, #1
|
||||
mov r5, #320*2
|
||||
add r5, r5, #2
|
||||
mul r4, r5, r4
|
||||
sub r0, r0, r4
|
||||
mov r5, #328
|
||||
mul r4, r5, r4
|
||||
sub r1, r1, r4
|
||||
|
||||
vcloop_40_unaligned:
|
||||
ldr r12, [r1], #4
|
||||
ldr r7, [r1], #4
|
||||
|
||||
and r4, lr, r12, lsl #1
|
||||
ldrh r4, [r2, r4]
|
||||
and r5, lr, r12, lsr #7
|
||||
ldrh r5, [r2, r5]
|
||||
strh r4, [r0]!
|
||||
and r6, lr, r12, lsr #15
|
||||
ldrh r6, [r2, r6]
|
||||
|
||||
and r4, lr, r12, lsr #23
|
||||
ldrh r4, [r2, r4]
|
||||
orr r5, r5, r6, lsl #16
|
||||
|
||||
and r8, lr, r7, lsl #1
|
||||
ldrh r8, [r2, r8]
|
||||
|
||||
and r6, lr, r7, lsr #7
|
||||
ldrh r6, [r2, r6]
|
||||
orr r8, r4, r8, lsl #16
|
||||
|
||||
and r12,lr, r7, lsr #15
|
||||
ldrh r12,[r2, r12]
|
||||
|
||||
and r4, lr, r7, lsr #23
|
||||
ldrh r4, [r2, r6]
|
||||
orr r12,r6, r12,lsl #16
|
||||
subs r3, r3, #1
|
||||
|
||||
stmia r0!, {r5,r8,r12}
|
||||
strh r4, [r0]!
|
||||
bne vcloop_40_unaligned
|
||||
|
||||
add r1, r1, #336 @ skip a line and 1 col
|
||||
add r0, r0, #320*2+2*2
|
||||
add r3, r3, #(320/8)<<24
|
||||
sub r3, r3, #1
|
||||
tst r3, #0xff
|
||||
bne vcloop_40_unaligned
|
||||
|
||||
ldmfd sp!, {r4-r9,lr}
|
||||
bx lr
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,33 +1,503 @@
|
|||
#include <windows.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "kgsdk/Framework2D.h"
|
||||
#include "kgsdk/FrameworkAudio.h"
|
||||
#include "../common/emu.h"
|
||||
#include "../common/lprintf.h"
|
||||
#include "../common/arm_utils.h"
|
||||
#include "emu.h"
|
||||
#include "menu.h"
|
||||
#include "giz.h"
|
||||
#include "asm_utils.h"
|
||||
|
||||
#include <Pico/PicoInt.h>
|
||||
|
||||
#ifdef BENCHMARK
|
||||
#define OSD_FPS_X 220
|
||||
#else
|
||||
#define OSD_FPS_X 260
|
||||
#endif
|
||||
|
||||
// main 300K gfx-related buffer. Used by menu and renderers.
|
||||
unsigned char gfx_buffer[321*240*2*2];
|
||||
char romFileName[MAX_PATH];
|
||||
int engineState;
|
||||
currentConfig_t currentConfig;
|
||||
|
||||
unsigned char *rom_data = NULL;
|
||||
unsigned char *PicoDraw2FB = NULL; // temporary buffer for alt renderer
|
||||
int state_slot = 0;
|
||||
unsigned char *PicoDraw2FB = gfx_buffer; // temporary buffer for alt renderer ( (8+320)*(8+240+8) )
|
||||
int reset_timing = 0;
|
||||
int config_slot = 0, config_slot_current = 0;
|
||||
|
||||
static DWORD noticeMsgTime = 0;
|
||||
static int osd_fps_x;
|
||||
|
||||
|
||||
static void blit(const char *fps, const char *notice);
|
||||
static void clearArea(int full);
|
||||
|
||||
void emu_noticeMsgUpdated(void)
|
||||
{
|
||||
noticeMsgTime = GetTickCount();
|
||||
}
|
||||
|
||||
void emu_getMainDir(char *dst, int len)
|
||||
{
|
||||
if (len > 0) *dst = 0;
|
||||
}
|
||||
|
||||
static void emu_msg_cb(const char *msg)
|
||||
{
|
||||
if (giz_screen == NULL)
|
||||
giz_screen = Framework2D_LockBuffer();
|
||||
|
||||
memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4);
|
||||
emu_textOut16(4, 232, msg);
|
||||
noticeMsgTime = GetTickCount() - 2000;
|
||||
|
||||
/* assumption: emu_msg_cb gets called only when something slow is about to happen */
|
||||
reset_timing = 1;
|
||||
}
|
||||
|
||||
static void emu_state_cb(const char *str)
|
||||
{
|
||||
clearArea(0);
|
||||
blit("", str);
|
||||
}
|
||||
|
||||
static void emu_msg_tray_open(void)
|
||||
{
|
||||
strcpy(noticeMsg, "CD tray opened");
|
||||
noticeMsgTime = GetTickCount();
|
||||
}
|
||||
|
||||
|
||||
int emu_ReloadRom(void){}
|
||||
void emu_Init(void){}
|
||||
void emu_Deinit(void){}
|
||||
int emu_SaveLoadGame(int load, int sram){}
|
||||
void emu_Loop(void){}
|
||||
void emu_ResetGame(void){}
|
||||
int emu_ReadConfig(int game, int no_defaults){}
|
||||
int emu_WriteConfig(int game){}
|
||||
char *emu_GetSaveFName(int load, int is_sram, int slot){}
|
||||
int emu_check_save_file(int slot){}
|
||||
void emu_set_save_cbs(int gz){}
|
||||
void emu_forced_frame(void){}
|
||||
int emu_cd_check(int *pregion){}
|
||||
int find_bios(int region, char **bios_file){}
|
||||
void scaling_update(void){}
|
||||
void emu_Init(void)
|
||||
{
|
||||
// make dirs for saves, cfgs, etc.
|
||||
CreateDirectory(L"mds", NULL);
|
||||
CreateDirectory(L"srm", NULL);
|
||||
CreateDirectory(L"brm", NULL);
|
||||
CreateDirectory(L"cfg", NULL);
|
||||
|
||||
PicoInit();
|
||||
PicoMessage = emu_msg_cb;
|
||||
PicoMCDopenTray = emu_msg_tray_open;
|
||||
PicoMCDcloseTray = menu_loop_tray;
|
||||
}
|
||||
|
||||
void emu_Deinit(void)
|
||||
{
|
||||
// save SRAM
|
||||
if((currentConfig.EmuOpt & 1) && SRam.changed) {
|
||||
emu_SaveLoadGame(0, 1);
|
||||
SRam.changed = 0;
|
||||
}
|
||||
|
||||
if (!(currentConfig.EmuOpt & 0x20)) {
|
||||
FILE *f = fopen(PicoConfigFile, "r+b");
|
||||
if (!f) emu_WriteConfig(0);
|
||||
else {
|
||||
// if we already have config, reload it, except last ROM
|
||||
fseek(f, sizeof(currentConfig.lastRomFile), SEEK_SET);
|
||||
fread(¤tConfig.EmuOpt, 1, sizeof(currentConfig) - sizeof(currentConfig.lastRomFile), f);
|
||||
fseek(f, 0, SEEK_SET);
|
||||
fwrite(¤tConfig, 1, sizeof(currentConfig), f);
|
||||
fflush(f);
|
||||
fclose(f);
|
||||
}
|
||||
}
|
||||
|
||||
PicoExit();
|
||||
}
|
||||
|
||||
void emu_setDefaultConfig(void)
|
||||
{
|
||||
memset(¤tConfig, 0, sizeof(currentConfig));
|
||||
currentConfig.lastRomFile[0] = 0;
|
||||
currentConfig.EmuOpt = 0x1f | 0x600; // | confirm_save, cd_leds
|
||||
currentConfig.PicoOpt = 0x0f | 0xc00; // | cd_pcm, cd_cdda
|
||||
currentConfig.PsndRate = 22050;
|
||||
currentConfig.PicoRegion = 0; // auto
|
||||
currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP
|
||||
currentConfig.Frameskip = -1; // auto
|
||||
currentConfig.volume = 50;
|
||||
currentConfig.KeyBinds[ 2] = 1<<0; // SACB RLDU
|
||||
currentConfig.KeyBinds[ 3] = 1<<1;
|
||||
currentConfig.KeyBinds[ 0] = 1<<2;
|
||||
currentConfig.KeyBinds[ 1] = 1<<3;
|
||||
currentConfig.KeyBinds[ 5] = 1<<4;
|
||||
currentConfig.KeyBinds[ 6] = 1<<5;
|
||||
currentConfig.KeyBinds[ 7] = 1<<6;
|
||||
currentConfig.KeyBinds[ 8] = 1<<7;
|
||||
currentConfig.KeyBinds[ 4] = 1<<26; // switch rend
|
||||
currentConfig.KeyBinds[ 8] = 1<<27; // save state
|
||||
currentConfig.KeyBinds[ 9] = 1<<28; // load state
|
||||
currentConfig.KeyBinds[12] = 1<<29; // vol up
|
||||
currentConfig.KeyBinds[11] = 1<<30; // vol down
|
||||
currentConfig.PicoCDBuffers = 64;
|
||||
currentConfig.scaling = 0;
|
||||
}
|
||||
|
||||
|
||||
static int EmuScan16(unsigned int num, void *sdata)
|
||||
{
|
||||
if (!(Pico.video.reg[1]&8)) num += 8;
|
||||
DrawLineDest = (unsigned short *) giz_screen + 321*(num+1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int EmuScan8(unsigned int num, void *sdata)
|
||||
{
|
||||
// draw like the fast renderer
|
||||
if (!(Pico.video.reg[1]&8)) num += 8;
|
||||
HighCol = gfx_buffer + 328*8 + 328*(num+1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void osd_text(int x, int y, const char *text)
|
||||
{
|
||||
int len = strlen(text) * 8;
|
||||
int *p, i, h;
|
||||
len = (len+1) >> 1;
|
||||
for (h = 0; h < 8; h++) {
|
||||
p = (int *) ((unsigned short *) giz_screen+x+321*(y+h));
|
||||
p = (int *) ((int)p & ~3); // align
|
||||
for (i = len; i; i--, p++) *p = 0;
|
||||
}
|
||||
emu_textOut16(x, y, text);
|
||||
}
|
||||
|
||||
|
||||
short localPal[0x100];
|
||||
static void (*vidCpy8to16)(void *dest, void *src, short *pal, int lines) = NULL;
|
||||
|
||||
static void blit(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;
|
||||
vidConvCpyRGB565(localPal, Pico.cram, 0x40);
|
||||
}
|
||||
vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, 224);
|
||||
} else if (!(emu_opt&0x80)) {
|
||||
// 8bit accurate renderer
|
||||
if (Pico.m.dirtyPal) {
|
||||
Pico.m.dirtyPal = 0;
|
||||
vidConvCpyRGB565(localPal, Pico.cram, 0x40);
|
||||
if(Pico.video.reg[0xC]&8) { // shadow/hilight mode
|
||||
//vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);
|
||||
//vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40); // TODO
|
||||
blockcpy(localPal+0xc0, localPal+0x40, 0x40*4);
|
||||
localPal[0xc0] = 0x0600;
|
||||
localPal[0xd0] = 0xc000;
|
||||
localPal[0xe0] = 0x0000; // reserved pixels for OSD
|
||||
localPal[0xf0] = 0xffff;
|
||||
}
|
||||
/* no support
|
||||
else if (rendstatus & 0x20) { // mid-frame palette changes
|
||||
vidConvCpyRGB565(localPal+0x40, HighPal, 0x40);
|
||||
vidConvCpyRGB565(localPal+0x80, HighPal+0x40, 0x40);
|
||||
} */
|
||||
}
|
||||
// TODO...
|
||||
vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, 224);
|
||||
}
|
||||
|
||||
if (notice || (emu_opt & 2)) {
|
||||
int h = 232;
|
||||
if (notice) osd_text(4, h, notice);
|
||||
if (emu_opt & 2) osd_text(osd_fps_x, h, fps);
|
||||
}
|
||||
// if ((emu_opt & 0x400) && (PicoMCD & 1))
|
||||
// cd_leds();
|
||||
|
||||
//gp2x_video_wait_vsync();
|
||||
|
||||
if (!(PicoOpt&0x10)) {
|
||||
if (Pico.video.reg[1] & 8) {
|
||||
if (currentConfig.EmuOpt&0x80)
|
||||
DrawLineDest = (unsigned short *) giz_screen;
|
||||
else
|
||||
HighCol = gfx_buffer;
|
||||
} else {
|
||||
if (currentConfig.EmuOpt&0x80)
|
||||
DrawLineDest = (unsigned short *) giz_screen + 320*8;
|
||||
else
|
||||
HighCol = gfx_buffer + 328*8;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// clears whole screen or just the notice area (in all buffers)
|
||||
static void clearArea(int full)
|
||||
{
|
||||
if (giz_screen == NULL)
|
||||
giz_screen = Framework2D_LockBuffer();
|
||||
if (full) memset32(giz_screen, 0, 320*240*2/4);
|
||||
else memset32((int *)((char *)giz_screen + 320*232*2), 0, 320*8*2/4);
|
||||
}
|
||||
|
||||
static void vidResetMode(void)
|
||||
{
|
||||
void *screen;
|
||||
if (PicoOpt&0x10) {
|
||||
} else if (currentConfig.EmuOpt&0x80) {
|
||||
PicoDrawSetColorFormat(1);
|
||||
PicoScan = EmuScan16;
|
||||
} else {
|
||||
PicoDrawSetColorFormat(0);
|
||||
PicoScan = EmuScan8;
|
||||
}
|
||||
if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
|
||||
// setup pal for 8-bit modes
|
||||
localPal[0xc0] = 0x0600;
|
||||
localPal[0xd0] = 0xc000;
|
||||
localPal[0xe0] = 0x0000; // reserved pixels for OSD
|
||||
localPal[0xf0] = 0xffff;
|
||||
}
|
||||
Pico.m.dirtyPal = 1;
|
||||
screen = Framework2D_LockBuffer();
|
||||
memset32(screen, 0, 320*240*2/4);
|
||||
Framework2D_UnlockBuffer();
|
||||
giz_screen = NULL;
|
||||
}
|
||||
|
||||
|
||||
static void SkipFrame(int do_audio)
|
||||
{
|
||||
PicoSkipFrame=do_audio ? 1 : 2;
|
||||
PicoFrame();
|
||||
PicoSkipFrame=0;
|
||||
}
|
||||
|
||||
void emu_forcedFrame(void)
|
||||
{
|
||||
// TODO
|
||||
}
|
||||
|
||||
static void updateKeys(void)
|
||||
{
|
||||
}
|
||||
|
||||
static void simpleWait(DWORD until)
|
||||
{
|
||||
}
|
||||
|
||||
void emu_Loop(void)
|
||||
{
|
||||
//static int PsndRate_old = 0, PicoOpt_old = 0, PsndLen_real = 0, pal_old = 0;
|
||||
char fpsbuff[24]; // fps count c string
|
||||
DWORD tval, tval_prev = 0, tval_thissec = 0; // timing
|
||||
int frames_done = 0, frames_shown = 0, oldmodes = 0;
|
||||
int target_fps, target_frametime, lim_time, tval_diff, i;
|
||||
char *notice = NULL;
|
||||
|
||||
lprintf("entered emu_Loop()\n");
|
||||
|
||||
fpsbuff[0] = 0;
|
||||
|
||||
// make sure we are in correct mode
|
||||
vidResetMode();
|
||||
if (currentConfig.scaling) PicoOpt|=0x4000;
|
||||
else PicoOpt&=~0x4000;
|
||||
Pico.m.dirtyPal = 1;
|
||||
oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
|
||||
//find_combos(); // TODO
|
||||
|
||||
// pal/ntsc might have changed, reset related stuff
|
||||
target_fps = Pico.m.pal ? 50 : 60;
|
||||
target_frametime = (1000<<8)/target_fps;
|
||||
reset_timing = 1;
|
||||
|
||||
// prepare sound stuff
|
||||
/* if (currentConfig.EmuOpt & 4) {
|
||||
int snd_excess_add;
|
||||
if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
|
||||
sound_rerate(Pico.m.frame_count ? 1 : 0);
|
||||
}
|
||||
snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
|
||||
lprintf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
|
||||
PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);
|
||||
gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);
|
||||
gp2x_sound_volume(currentConfig.volume, currentConfig.volume);
|
||||
PicoWriteSound = updateSound;
|
||||
memset(sndBuffer, 0, sizeof(sndBuffer));
|
||||
PsndOut = sndBuffer;
|
||||
PsndRate_old = PsndRate;
|
||||
PsndLen_real = PsndLen;
|
||||
PicoOpt_old = PicoOpt;
|
||||
pal_old = Pico.m.pal;
|
||||
} else*/ {
|
||||
PsndOut = 0;
|
||||
}
|
||||
|
||||
// prepare CD buffer
|
||||
if (PicoMCD & 1) PicoCDBufferInit();
|
||||
|
||||
// loop?
|
||||
while (engineState == PGS_Running)
|
||||
{
|
||||
int modes;
|
||||
|
||||
tval = GetTickCount();
|
||||
if (reset_timing || tval < tval_prev) {
|
||||
reset_timing = 0;
|
||||
tval_thissec = tval;
|
||||
frames_shown = frames_done = 0;
|
||||
}
|
||||
|
||||
// show notice message?
|
||||
if (noticeMsgTime) {
|
||||
static int noticeMsgSum;
|
||||
if (tval - noticeMsgTime > 2000) { // > 2.0 sec
|
||||
noticeMsgTime = 0;
|
||||
clearArea(0);
|
||||
notice = 0;
|
||||
} else {
|
||||
int sum = noticeMsg[0]+noticeMsg[1]+noticeMsg[2];
|
||||
if (sum != noticeMsgSum) { clearArea(0); noticeMsgSum = sum; }
|
||||
notice = noticeMsg;
|
||||
}
|
||||
}
|
||||
|
||||
// check for mode changes
|
||||
modes = ((Pico.video.reg[12]&1)<<2)|(Pico.video.reg[1]&8);
|
||||
if (modes != oldmodes) {
|
||||
osd_fps_x = OSD_FPS_X;
|
||||
//if (modes & 4)
|
||||
vidCpy8to16 = vidCpy8to16_40;
|
||||
//else
|
||||
// vidCpy8to16 = vidCpy8to16_32col;
|
||||
oldmodes = modes;
|
||||
clearArea(1);
|
||||
}
|
||||
|
||||
// second passed?
|
||||
if (tval - tval_thissec >= 1000)
|
||||
{
|
||||
#ifdef BENCHMARK
|
||||
static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];
|
||||
if(++bench == 10) {
|
||||
bench = 0;
|
||||
bench_fps_s = bench_fps;
|
||||
bf[bfp++ & 3] = bench_fps;
|
||||
bench_fps = 0;
|
||||
}
|
||||
bench_fps += frames_shown;
|
||||
sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);
|
||||
#else
|
||||
if(currentConfig.EmuOpt & 2)
|
||||
sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);
|
||||
#endif
|
||||
tval_thissec = tval;
|
||||
|
||||
if (PsndOut == 0 && currentConfig.Frameskip >= 0) {
|
||||
frames_done = frames_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 && frames_done < target_fps && frames_done > target_fps-5) {
|
||||
updateKeys();
|
||||
SkipFrame(1); frames_done++;
|
||||
}
|
||||
|
||||
frames_done -= target_fps; if (frames_done < 0) frames_done = 0;
|
||||
frames_shown -= target_fps; if (frames_shown < 0) frames_shown = 0;
|
||||
if (frames_shown > frames_done) frames_shown = frames_done;
|
||||
}
|
||||
}
|
||||
#ifdef PFRAMES
|
||||
sprintf(fpsbuff, "%i", Pico.m.frame_count);
|
||||
#endif
|
||||
|
||||
tval_prev = tval;
|
||||
lim_time = (frames_done+1) * target_frametime;
|
||||
if (currentConfig.Frameskip >= 0) // frameskip enabled
|
||||
{
|
||||
for (i = 0; i < currentConfig.Frameskip; i++) {
|
||||
updateKeys();
|
||||
SkipFrame(1); frames_done++;
|
||||
if (PsndOut) { // do framelimitting if sound is enabled
|
||||
int tval_diff;
|
||||
tval = GetTickCount();
|
||||
tval_diff = (int)(tval - tval_thissec) << 8;
|
||||
if (tval_diff < lim_time) // we are too fast
|
||||
simpleWait(tval + ((lim_time - tval_diff)>>8));
|
||||
}
|
||||
lim_time += target_frametime;
|
||||
}
|
||||
}
|
||||
else // auto frameskip
|
||||
{
|
||||
int tval_diff;
|
||||
tval = GetTickCount();
|
||||
tval_diff = (int)(tval - tval_thissec) << 8;
|
||||
if (tval_diff > lim_time)
|
||||
{
|
||||
// no time left for this frame - skip
|
||||
if (tval_diff - lim_time >= (300<<8)) {
|
||||
/* something caused a slowdown for us (disk access? cache flush?)
|
||||
* try to recover by resetting timing... */
|
||||
reset_timing = 1;
|
||||
continue;
|
||||
}
|
||||
updateKeys();
|
||||
SkipFrame(tval_diff < lim_time+target_frametime*2); frames_done++;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
updateKeys();
|
||||
|
||||
if (giz_screen == NULL)
|
||||
giz_screen = Framework2D_LockBuffer();
|
||||
|
||||
PicoFrame();
|
||||
blit(fpsbuff, notice);
|
||||
|
||||
if (giz_screen != NULL) {
|
||||
Framework2D_UnlockBuffer();
|
||||
giz_screen = NULL;
|
||||
}
|
||||
|
||||
// check time
|
||||
tval = GetTickCount();
|
||||
tval_diff = (int)(tval - tval_thissec) << 8;
|
||||
|
||||
if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300<<8)) // slowdown detection
|
||||
reset_timing = 1;
|
||||
else if (PsndOut != NULL || currentConfig.Frameskip < 0)
|
||||
{
|
||||
// sleep if we are still too fast
|
||||
if (tval_diff < lim_time)
|
||||
{
|
||||
// we are too fast
|
||||
simpleWait(tval + ((lim_time - tval_diff) >> 8));
|
||||
}
|
||||
}
|
||||
|
||||
frames_done++; frames_shown++;
|
||||
}
|
||||
|
||||
|
||||
if (PicoMCD & 1) PicoCDBufferFree();
|
||||
|
||||
// save SRAM
|
||||
if ((currentConfig.EmuOpt & 1) && SRam.changed) {
|
||||
emu_state_cb("Writing SRAM/BRAM..");
|
||||
emu_SaveLoadGame(0, 1);
|
||||
SRam.changed = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void emu_ResetGame(void)
|
||||
{
|
||||
PicoReset(0);
|
||||
reset_timing = 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,44 +16,14 @@ enum TPicoGameState {
|
|||
PGS_RestartRun,
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
char lastRomFile[512];
|
||||
int EmuOpt; // LSb->MSb: use_sram, show_fps, enable_sound, gzip_saves,
|
||||
// <reserved>, no_save_cfg_on_exit, <unused>, 16_bit_mode
|
||||
// <reserved>, confirm_save, show_cd_leds, confirm_load
|
||||
// <reserved>, <reserved>
|
||||
int PicoOpt; // used for config saving only, see Pico.h
|
||||
int PsndRate; // ditto
|
||||
int PicoRegion; // ditto
|
||||
int Frameskip;
|
||||
int CPUclock; // unused, placeholder for config compatibility
|
||||
int KeyBinds[32];
|
||||
int volume;
|
||||
int gamma; // unused
|
||||
int JoyBinds[4][32]; // unused
|
||||
int PicoAutoRgnOrder;
|
||||
int PicoCDBuffers;
|
||||
int scaling; // unused
|
||||
} currentConfig_t;
|
||||
|
||||
extern unsigned char gfx_buffer[321*240*2*2];
|
||||
extern char romFileName[];
|
||||
extern int engineState;
|
||||
extern currentConfig_t currentConfig;
|
||||
|
||||
|
||||
int emu_ReloadRom(void);
|
||||
void emu_Init(void);
|
||||
void emu_Deinit(void);
|
||||
int emu_SaveLoadGame(int load, int sram);
|
||||
void emu_Loop(void);
|
||||
void emu_ResetGame(void);
|
||||
int emu_ReadConfig(int game, int no_defaults);
|
||||
int emu_WriteConfig(int game);
|
||||
char *emu_GetSaveFName(int load, int is_sram, int slot);
|
||||
int emu_check_save_file(int slot);
|
||||
void emu_set_save_cbs(int gz);
|
||||
void emu_forced_frame(void);
|
||||
int emu_cd_check(int *pregion);
|
||||
int find_bios(int region, char **bios_file);
|
||||
void scaling_update(void);
|
||||
void emu_forcedFrame(void);
|
||||
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@ void giz_init(HINSTANCE hInstance, HINSTANCE hPrevInstance)
|
|||
{
|
||||
int ret;
|
||||
|
||||
giz_screen = NULL;
|
||||
|
||||
lprintf("PicoDrive v" VERSION " (c) notaz, 2006,2007\n");
|
||||
lprintf("%s %s\n\n", __DATE__, __TIME__);
|
||||
|
||||
|
|
@ -60,6 +58,17 @@ void giz_init(HINSTANCE hInstance, HINSTANCE hPrevInstance)
|
|||
lprintf_al("Framework2D_Init() failed\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
// test screen
|
||||
giz_screen = Framework2D_LockBuffer();
|
||||
if (giz_screen == NULL)
|
||||
{
|
||||
lprintf_al("Framework2D_LockBuffer() failed\n");
|
||||
exit(1);
|
||||
}
|
||||
lprintf("Framework2D_LockBuffer returned %p\n", giz_screen);
|
||||
Framework2D_UnlockBuffer();
|
||||
giz_screen = NULL;
|
||||
}
|
||||
|
||||
void giz_deinit(void)
|
||||
|
|
|
|||
|
|
@ -7,8 +7,9 @@
|
|||
|
||||
#include "giz.h"
|
||||
#include "menu.h"
|
||||
#include "../common/menu.h"
|
||||
#include "emu.h"
|
||||
#include "../common/menu.h"
|
||||
#include "../common/emu.h"
|
||||
#include "version.h"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
#include "menu.h"
|
||||
#include "../common/arm_utils.h"
|
||||
#include "../common/menu.h"
|
||||
#include "../common/emu.h"
|
||||
#include "../common/readpng.h"
|
||||
#include "version.h"
|
||||
#include "kgsdk/Framework.h"
|
||||
|
|
@ -28,22 +29,17 @@
|
|||
#include <Pico/Patch.h>
|
||||
#include <zlib/zlib.h>
|
||||
|
||||
extern char romFileName[MAX_PATH];
|
||||
extern char *rom_data;
|
||||
extern int state_slot;
|
||||
extern int config_slot, config_slot_current;
|
||||
|
||||
#define gizKeyUnkn "???"
|
||||
static const char * const gizKeyNames[] = {
|
||||
"LEFT", "RIGHT", "UP", "DOWN", "STOP", "PLAY", "FORWARD", "REWIND",
|
||||
"LEFT_SHOULDER", "RIGHT_SHOULDER", "HOME", "VOLUME", "BRIGHTNESS", "ALARM", "POWER", gizKeyUnkn,
|
||||
gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn,
|
||||
gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn,
|
||||
gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn
|
||||
};
|
||||
|
||||
static unsigned char bg_buffer[321*240*2];
|
||||
unsigned char menu_screen[321*240*2]; /* draw here and blit later, to avoid flicker */
|
||||
char menuErrorMsg[40] = {0, };
|
||||
static unsigned char *bg_buffer = gfx_buffer + 321*240*2;
|
||||
unsigned char *menu_screen = gfx_buffer; /* draw here and blit later, to avoid flicker */
|
||||
|
||||
static void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
|
||||
static void menu_prepare_bg(int use_game_bg);
|
||||
|
|
@ -502,7 +498,7 @@ static void state_check_slots(void)
|
|||
|
||||
for (slot = 0; slot < 10; slot++)
|
||||
{
|
||||
if (emu_check_save_file(slot))
|
||||
if (emu_checkSaveFile(slot))
|
||||
{
|
||||
state_slot_flags |= 1 << slot;
|
||||
}
|
||||
|
|
@ -530,10 +526,10 @@ static void draw_savestate_bg(int slot)
|
|||
|
||||
if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) {
|
||||
file = gzopen(fname, "rb");
|
||||
emu_set_save_cbs(1);
|
||||
emu_setSaveStateCbs(1);
|
||||
} else {
|
||||
file = fopen(fname, "rb");
|
||||
emu_set_save_cbs(0);
|
||||
emu_setSaveStateCbs(0);
|
||||
}
|
||||
|
||||
if (file) {
|
||||
|
|
@ -551,7 +547,7 @@ static void draw_savestate_bg(int slot)
|
|||
areaClose(file);
|
||||
}
|
||||
|
||||
emu_forced_frame();
|
||||
emu_forcedFrame();
|
||||
menu_prepare_bg(1);
|
||||
|
||||
memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));
|
||||
|
|
@ -888,17 +884,17 @@ static void cd_menu_loop_options(void)
|
|||
menu_id selected_id;
|
||||
char *bios, *p;
|
||||
|
||||
if (find_bios(4, &bios)) { // US
|
||||
if (emu_findBios(4, &bios)) { // US
|
||||
for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;
|
||||
strncpy(bios_names.us, p, sizeof(bios_names.us)); bios_names.us[sizeof(bios_names.us)-1] = 0;
|
||||
} else strcpy(bios_names.us, "NOT FOUND");
|
||||
|
||||
if (find_bios(8, &bios)) { // EU
|
||||
if (emu_findBios(8, &bios)) { // EU
|
||||
for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;
|
||||
strncpy(bios_names.eu, p, sizeof(bios_names.eu)); bios_names.eu[sizeof(bios_names.eu)-1] = 0;
|
||||
} else strcpy(bios_names.eu, "NOT FOUND");
|
||||
|
||||
if (find_bios(1, &bios)) { // JP
|
||||
if (emu_findBios(1, &bios)) { // JP
|
||||
for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;
|
||||
strncpy(bios_names.jp, p, sizeof(bios_names.jp)); bios_names.jp[sizeof(bios_names.jp)-1] = 0;
|
||||
} else strcpy(bios_names.jp, "NOT FOUND");
|
||||
|
|
@ -930,21 +926,21 @@ static void cd_menu_loop_options(void)
|
|||
}
|
||||
switch (selected_id) { // BIOS testers
|
||||
case MA_CDOPT_TESTBIOS_USA:
|
||||
if (find_bios(4, &bios)) { // test US
|
||||
if (emu_findBios(4, &bios)) { // test US
|
||||
strcpy(romFileName, bios);
|
||||
engineState = PGS_ReloadRom;
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case MA_CDOPT_TESTBIOS_EUR:
|
||||
if (find_bios(8, &bios)) { // test EU
|
||||
if (emu_findBios(8, &bios)) { // test EU
|
||||
strcpy(romFileName, bios);
|
||||
engineState = PGS_ReloadRom;
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case MA_CDOPT_TESTBIOS_JAP:
|
||||
if (find_bios(1, &bios)) { // test JP
|
||||
if (emu_findBios(1, &bios)) { // test JP
|
||||
strcpy(romFileName, bios);
|
||||
engineState = PGS_ReloadRom;
|
||||
return;
|
||||
|
|
@ -1188,7 +1184,6 @@ static void menu_options_save(void)
|
|||
// unbind XYZ MODE, just in case
|
||||
unbind_action(0xf00);
|
||||
}
|
||||
scaling_update();
|
||||
}
|
||||
|
||||
static int menu_loop_options(void)
|
||||
|
|
@ -1617,7 +1612,7 @@ int menu_loop_tray(void)
|
|||
selfname = romsel_loop(curr_path);
|
||||
if (selfname) {
|
||||
int ret = -1, cd_type;
|
||||
cd_type = emu_cd_check(NULL);
|
||||
cd_type = emu_cdCheck(NULL);
|
||||
if (cd_type > 0)
|
||||
ret = Insert_CD(romFileName, cd_type == 2);
|
||||
if (ret != 0) {
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
|
||||
// For commercial use, separate licencing terms must be obtained.
|
||||
|
||||
extern char menuErrorMsg[40];
|
||||
|
||||
void menu_init(void);
|
||||
void text_out16(int x, int y, const char *texto, ...);
|
||||
void menu_loop(void);
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
|
||||
#define CPU_CALL
|
||||
|
||||
// draw.c
|
||||
#define OVERRIDE_HIGHCOL 1
|
||||
|
||||
// draw2.c
|
||||
#define START_ROW 0 // which row of tiles to start rendering at?
|
||||
#define END_ROW 28 // ..end
|
||||
|
|
|
|||
|
|
@ -1,10 +1,13 @@
|
|||
@ vim:filetype=armasm
|
||||
|
||||
@ .equiv START_ROW, 1
|
||||
@ .equiv END_ROW, 27
|
||||
@ .equiv START_ROW, 1
|
||||
@ .equiv END_ROW, 27
|
||||
@ one row means 8 pixels. If above example was used, (27-1)*8=208 lines would be rendered.
|
||||
.equiv START_ROW, 0
|
||||
.equiv END_ROW, 28
|
||||
.equiv START_ROW, 0
|
||||
.equiv END_ROW, 28
|
||||
|
||||
.equiv OVERRIDE_HIGHCOL, 1
|
||||
|
||||
@ this should be set to one only for GP2X port
|
||||
.equiv EXTERNAL_YM2612, 0
|
||||
.equiv EXTERNAL_YM2612, 0
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue