mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-05 07:17:45 -04:00
FAMEC idle loops, PSP port sync, minor adjustments
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@525 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz
parent
b06778874d
commit
c060a9ab9c
23 changed files with 408 additions and 155 deletions
46
Pico/Draw.c
46
Pico/Draw.c
|
|
@ -1466,58 +1466,66 @@ void PicoDrawSetColorFormat(int which)
|
|||
}
|
||||
|
||||
/* debug and fun */
|
||||
#define GREEN1 0x0700
|
||||
#ifdef USE_BGR555
|
||||
#define YELLOW1 0x071c
|
||||
#define BLUE1 0xf000
|
||||
#define RED1 0x001e
|
||||
#else
|
||||
#define YELLOW1 0xe700
|
||||
#define BLUE1 0x001e
|
||||
#define RED1 0xf000
|
||||
#endif
|
||||
|
||||
static void set16(unsigned short *p, unsigned short d, int cnt)
|
||||
{
|
||||
while (cnt-- > 0)
|
||||
*p++ = d;
|
||||
}
|
||||
|
||||
void PicoDrawShowSpriteStats(unsigned short *screen)
|
||||
void PicoDrawShowSpriteStats(unsigned short *screen, int stride)
|
||||
{
|
||||
int lines, i, u, step;
|
||||
unsigned short *dest;
|
||||
unsigned char *p;
|
||||
|
||||
memset(screen, 0, 320*240*2);
|
||||
step = (320-4*4-1) / MAX_LINE_SPRITES;
|
||||
lines = 240;
|
||||
if (!Pico.m.pal || !(Pico.video.reg[1]&8))
|
||||
lines = 224, screen += 320*8;
|
||||
lines = 224, screen += stride*8;
|
||||
|
||||
for (i = 0; i < lines; i++)
|
||||
{
|
||||
dest = screen + 320*i;
|
||||
dest = screen + stride*i;
|
||||
p = &HighLnSpr[i][0];
|
||||
|
||||
// sprite graphs
|
||||
for (u = 0; u < (p[0] & 0x7f); u++) {
|
||||
set16(dest, (p[3+u] & 0x80) ? 0xe700 : 0x0700, step);
|
||||
set16(dest, (p[3+u] & 0x80) ? YELLOW1 : GREEN1, step);
|
||||
dest += step;
|
||||
}
|
||||
|
||||
// flags
|
||||
dest = screen + 320*i + 320-4*4;
|
||||
if (p[1] & SPRL_HAVE_LO) set16(dest+4*0, 0x0700, 4);
|
||||
if (p[1] & SPRL_HAVE_HI) set16(dest+4*1, 0xe700, 4);
|
||||
if (p[1] & SPRL_MAY_HAVE_OP) set16(dest+4*2, 0x001e, 4);
|
||||
if (p[1] & SPRL_LO_ABOVE_HI) set16(dest+4*3, 0xf000, 4);
|
||||
dest = screen + stride*i + 320-4*4;
|
||||
if (p[1] & SPRL_HAVE_LO) set16(dest+4*0, GREEN1, 4);
|
||||
if (p[1] & SPRL_HAVE_HI) set16(dest+4*1, YELLOW1, 4);
|
||||
if (p[1] & SPRL_MAY_HAVE_OP) set16(dest+4*2, BLUE1, 4);
|
||||
if (p[1] & SPRL_LO_ABOVE_HI) set16(dest+4*3, RED1, 4);
|
||||
}
|
||||
|
||||
// draw grid
|
||||
for (i = step*5; i <= 320-4*4-1; i += step*5) {
|
||||
for (u = 0; u < lines; u++)
|
||||
screen[i + u*320] = 0x182;
|
||||
screen[i + u*stride] = 0x182;
|
||||
}
|
||||
}
|
||||
|
||||
void PicoDrawShowPalette(unsigned short *screen)
|
||||
void PicoDrawShowPalette(unsigned short *screen, int stride)
|
||||
{
|
||||
unsigned int *spal=(void *)Pico.cram;
|
||||
unsigned int *dpal=(void *)HighPal;
|
||||
int x, y, i;
|
||||
|
||||
memset(screen, 0, 320*240*2);
|
||||
|
||||
for (i = 0x3f/2; i >= 0; i--)
|
||||
#ifdef USE_BGR555
|
||||
dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);
|
||||
|
|
@ -1531,20 +1539,20 @@ void PicoDrawShowPalette(unsigned short *screen)
|
|||
HighPal[0x80|i] = (unsigned short)t;
|
||||
}
|
||||
|
||||
screen += 16*320+8;
|
||||
screen += 16*stride+8;
|
||||
for (y = 0; y < 8*4; y++)
|
||||
for (x = 0; x < 8*16; x++)
|
||||
screen[x + y*320] = HighPal[x/8 + (y/8)*16];
|
||||
screen[x + y*stride] = HighPal[x/8 + (y/8)*16];
|
||||
|
||||
screen += 160;
|
||||
for (y = 0; y < 8*4; y++)
|
||||
for (x = 0; x < 8*16; x++)
|
||||
screen[x + y*320] = HighPal[(x/8 + (y/8)*16) | 0x40];
|
||||
screen[x + y*stride] = HighPal[(x/8 + (y/8)*16) | 0x40];
|
||||
|
||||
screen += 320*48;
|
||||
screen += stride*48;
|
||||
for (y = 0; y < 8*4; y++)
|
||||
for (x = 0; x < 8*16; x++)
|
||||
screen[x + y*320] = HighPal[(x/8 + (y/8)*16) | 0x80];
|
||||
screen[x + y*stride] = HighPal[(x/8 + (y/8)*16) | 0x80];
|
||||
|
||||
Pico.m.dirtyPal = 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -983,8 +983,7 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
|
|||
|
||||
if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
|
||||
{
|
||||
if (PicoOpt&POPT_EN_FM) ret = ym2612_read_local_z80();
|
||||
return ret;
|
||||
return ym2612_read_local_z80();
|
||||
}
|
||||
|
||||
if (a>=0x8000)
|
||||
|
|
|
|||
|
|
@ -386,10 +386,7 @@ m_read8_misc2:
|
|||
cmp r2, #0x4000
|
||||
mvnne r0, #0
|
||||
bxne lr @ invalid
|
||||
ldr r1, =PicoOpt
|
||||
ldr r1, [r1]
|
||||
tst r1, #1
|
||||
bne ym2612_read_local_68k
|
||||
b ym2612_read_local_68k
|
||||
|
||||
m_read8_fake_ym2612:
|
||||
ldr r3, =(Pico+0x22200)
|
||||
|
|
|
|||
|
|
@ -113,11 +113,8 @@ u32 OtherRead16(u32 a, int realsize)
|
|||
if (Pico.m.z80Run&1)
|
||||
elprintf(EL_ANOMALY, "68k z80 read with no bus! [%06x] @ %06x", a, SekPc);
|
||||
if ((a&0x4000)==0x0000) { d=z80Read8(a); d|=d<<8; goto end; } // Z80 ram (not byteswaped)
|
||||
if ((a&0x6000)==0x4000) { // 0x4000-0x5fff, Fudge if disabled
|
||||
if (PicoOpt&POPT_EN_FM) d=ym2612_read_local_68k();
|
||||
else d=Pico.m.rotate++&3;
|
||||
goto end;
|
||||
}
|
||||
if ((a&0x6000)==0x4000) { d=ym2612_read_local_68k(); goto end; } // 0x4000-0x5fff
|
||||
|
||||
elprintf(EL_ANOMALY, "68k bad read [%06x]", a);
|
||||
d=0xffff;
|
||||
goto end;
|
||||
|
|
|
|||
|
|
@ -417,11 +417,8 @@ m_read8_misc3:
|
|||
m_read8_z80_misc:
|
||||
addiu $t0, 0xc000 # expecting 0x4000 to get 0
|
||||
bnez $t0, m_read_neg1 # invalid
|
||||
|
||||
lui $t0, %hi(PicoOpt)
|
||||
lw $t0, %lo(PicoOpt)($t0)
|
||||
andi $t0, 1
|
||||
bnez $t0, ym2612_read_local_68k
|
||||
nop
|
||||
j ym2612_read_local_68k
|
||||
nop
|
||||
|
||||
m_read8_fake_ym2612:
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ static __inline void SekRunM68k(int cyc)
|
|||
#elif defined(EMU_M68K)
|
||||
SekCycleCnt+=m68k_execute(cyc_do);
|
||||
#elif defined(EMU_F68K)
|
||||
SekCycleCnt+=fm68k_emulate(cyc_do+1, 0);
|
||||
SekCycleCnt+=fm68k_emulate(cyc_do+1, 0, 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -313,7 +313,7 @@ int idle_hit_counter = 0;
|
|||
|
||||
void PicoFrame(void)
|
||||
{
|
||||
#if 0
|
||||
#if 1
|
||||
if ((Pico.m.frame_count&0x3f) == 0) {
|
||||
elprintf(EL_STATUS, "ihits: %i", idle_hit_counter);
|
||||
idle_hit_counter = 0;
|
||||
|
|
|
|||
15
Pico/Sek.c
15
Pico/Sek.c
|
|
@ -182,6 +182,7 @@ PICO_INTERNAL void SekSetRealTAS(int use_real)
|
|||
static int *idledet_addrs = NULL;
|
||||
static int idledet_count = 0, idledet_bads = 0;
|
||||
int idledet_start_frame = 0;
|
||||
int jumptab[0x10000];
|
||||
|
||||
static unsigned char *rom_verify = NULL;
|
||||
|
||||
|
|
@ -202,6 +203,10 @@ void SekInitIdleDet(void)
|
|||
#ifdef EMU_C68K
|
||||
CycloneInitIdle();
|
||||
#endif
|
||||
#ifdef EMU_F68K
|
||||
{ extern void *get_jumptab(void); memcpy(jumptab, get_jumptab(), sizeof(jumptab)); }
|
||||
fm68k_emulate(0, 0, 1);
|
||||
#endif
|
||||
}
|
||||
|
||||
int SekIsIdleCode(unsigned short *dst, int bytes)
|
||||
|
|
@ -275,6 +280,9 @@ void SekFinishIdleDet(void)
|
|||
int done_something = idledet_count > 0;
|
||||
#ifdef EMU_C68K
|
||||
CycloneFinishIdle();
|
||||
#endif
|
||||
#ifdef EMU_F68K
|
||||
fm68k_emulate(0, 0, 2);
|
||||
#endif
|
||||
while (idledet_count > 0)
|
||||
{
|
||||
|
|
@ -291,10 +299,15 @@ void SekFinishIdleDet(void)
|
|||
|
||||
if (done_something)
|
||||
{
|
||||
int i;
|
||||
int i, *jt;
|
||||
extern void *get_jumptab(void);
|
||||
for (i = 0; i < Pico.romsize; i++)
|
||||
if (rom_verify[i] != Pico.rom[i])
|
||||
printf("ROM corruption @ %06x!\n", i), exit(1);
|
||||
|
||||
jt = get_jumptab();
|
||||
for (i = 0; i < 0x10000; i++)
|
||||
if (jumptab[i] != jt[i]) { printf("jumptab broken @ %04x\n", i); exit(1); }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ static __inline void SekRunM68k(int cyc)
|
|||
SekCycleCnt+=m68k_execute(cyc_do);
|
||||
#elif defined(EMU_F68K)
|
||||
g_m68kcontext=&PicoCpuFM68k;
|
||||
SekCycleCnt+=fm68k_emulate(cyc_do, 0);
|
||||
SekCycleCnt+=fm68k_emulate(cyc_do, 0, 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -124,7 +124,7 @@ static __inline void SekRunS68k(int cyc)
|
|||
SekCycleCntS68k+=m68k_execute(cyc_do);
|
||||
#elif defined(EMU_F68K)
|
||||
g_m68kcontext=&PicoCpuFS68k;
|
||||
SekCycleCntS68k+=fm68k_emulate(cyc_do, 0);
|
||||
SekCycleCntS68k+=fm68k_emulate(cyc_do, 0, 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -138,7 +138,7 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
|
|||
{
|
||||
SekCycleAim+=cyc_m68k;
|
||||
SekCycleAimS68k+=cyc_s68k;
|
||||
fm68k_emulate(0, 1);
|
||||
fm68k_emulate(0, 1, 0);
|
||||
}
|
||||
#else
|
||||
static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
|
||||
|
|
@ -164,7 +164,7 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
|
|||
SekCycleCnt += m68k_execute(cyc_do);
|
||||
#elif defined(EMU_F68K)
|
||||
g_m68kcontext = &PicoCpuFM68k;
|
||||
SekCycleCnt += fm68k_emulate(cyc_do, 0);
|
||||
SekCycleCnt += fm68k_emulate(cyc_do, 0, 0);
|
||||
#endif
|
||||
}
|
||||
if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) {
|
||||
|
|
@ -177,7 +177,7 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
|
|||
SekCycleCntS68k += m68k_execute(cyc_do);
|
||||
#elif defined(EMU_F68K)
|
||||
g_m68kcontext = &PicoCpuFS68k;
|
||||
SekCycleCntS68k += fm68k_emulate(cyc_do, 0);
|
||||
SekCycleCntS68k += fm68k_emulate(cyc_do, 0, 0);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ patch_desc_table:
|
|||
.word (0x71f2<<16) | 0x66f2, idle_detector_bcc8, idle_bne, Op6601 @ bne.s
|
||||
.word (0x75fa<<16) | 0x67fa, idle_detector_bcc8, idle_beq, Op6701 @ beq.s
|
||||
.word (0x75f8<<16) | 0x67f8, idle_detector_bcc8, idle_beq, Op6701 @ beq.s
|
||||
.word (0x75f6<<16) | 0x67f6, idle_detector_bcc8, idle_beq, Op6701 @ bne.s
|
||||
.word (0x75f2<<16) | 0x67f2, idle_detector_bcc8, idle_beq, Op6701 @ bne.s
|
||||
.word (0x75f6<<16) | 0x67f6, idle_detector_bcc8, idle_beq, Op6701 @ beq.s
|
||||
.word (0x75f2<<16) | 0x67f2, idle_detector_bcc8, idle_beq, Op6701 @ beq.s
|
||||
.word (0x7dfe<<16) | 0x60fe, idle_detector_dead, idle_bra, Op6001 @ bra.s
|
||||
.word (0x7dfc<<16) | 0x60fc, idle_detector_dead, idle_bra, Op6001 @ bra.s
|
||||
|
||||
|
|
@ -132,6 +132,7 @@ idle_detector_bcc8:
|
|||
sub r1, r1, r8, lsl #24
|
||||
mov r1, r1, lsr #24
|
||||
sub r1, r1, #2
|
||||
bic r1, r1, #1
|
||||
|
||||
bl SekIsIdleCode
|
||||
tst r0, r0
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ extern M68K_CONTEXT *g_m68kcontext;
|
|||
/* General purpose functions */
|
||||
void fm68k_init(void);
|
||||
int fm68k_reset(void);
|
||||
int fm68k_emulate(int n, int dualcore);
|
||||
int fm68k_emulate(int n, int dualcore, int idle_mode);
|
||||
int fm68k_would_interrupt(void); // to be called from fm68k_emulate()
|
||||
|
||||
unsigned fm68k_get_pc(M68K_CONTEXT *context);
|
||||
|
|
|
|||
|
|
@ -503,8 +503,6 @@ typedef signed int s32;
|
|||
#endif
|
||||
|
||||
|
||||
static int init_jump_table(void);
|
||||
|
||||
// global variable
|
||||
///////////////////
|
||||
|
||||
|
|
@ -634,7 +632,7 @@ void fm68k_init(void)
|
|||
#endif
|
||||
|
||||
if (!initialised)
|
||||
fm68k_emulate(0, 0);
|
||||
fm68k_emulate(0, 0, 0);
|
||||
|
||||
#ifdef FAMEC_DEBUG
|
||||
puts("FAME initialized.");
|
||||
|
|
@ -653,7 +651,7 @@ void fm68k_init(void)
|
|||
int fm68k_reset(void)
|
||||
{
|
||||
if (!initialised)
|
||||
fm68k_emulate(0, 0);
|
||||
fm68k_emulate(0, 0, 0);
|
||||
|
||||
// Si la CPU esta en ejecucion, salir con M68K_RUNNING
|
||||
if (m68kcontext.execinfo & M68K_RUNNING)
|
||||
|
|
@ -783,7 +781,7 @@ static void setup_jumptable(void);
|
|||
// main exec function
|
||||
//////////////////////
|
||||
|
||||
int fm68k_emulate(s32 cycles, int dualcore)
|
||||
int fm68k_emulate(s32 cycles, int dualcore, int idle_mode)
|
||||
{
|
||||
#ifndef FAMEC_NO_GOTOS
|
||||
u32 Opcode;
|
||||
|
|
@ -799,16 +797,13 @@ int fm68k_emulate(s32 cycles, int dualcore)
|
|||
|
||||
if (!initialised)
|
||||
{
|
||||
#ifdef FAMEC_NO_GOTOS
|
||||
init_jump_table();
|
||||
return 0;
|
||||
#else
|
||||
goto init_jump_table;
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef PICODRIVE_HACK
|
||||
if (dualcore) goto dualcore_mode;
|
||||
if (idle_mode == 1) goto idle_install;
|
||||
else if (idle_mode == 2) goto idle_remove;
|
||||
famec_restart:
|
||||
#endif
|
||||
|
||||
|
|
@ -1006,17 +1001,8 @@ dualcore_mode:
|
|||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifdef FAMEC_NO_GOTOS
|
||||
}
|
||||
|
||||
static int init_jump_table(void)
|
||||
{{
|
||||
#else
|
||||
init_jump_table:
|
||||
{
|
||||
#endif
|
||||
u32 i, j;
|
||||
|
||||
for(i = 0x0000; i <= 0xFFFF; i += 0x0001)
|
||||
|
|
@ -5032,6 +5018,49 @@ init_jump_table:
|
|||
|
||||
initialised = 1;
|
||||
return 0;
|
||||
}}
|
||||
}
|
||||
|
||||
#ifdef PICODRIVE_HACK
|
||||
|
||||
#define INSTALL_IDLE(fake_op_base,real_op,detector,idle_handler,normal_handler) \
|
||||
JumpTable[fake_op_base] = CAST_OP(idle_handler); \
|
||||
JumpTable[fake_op_base|0x0200] = CAST_OP(normal_handler); \
|
||||
JumpTable[real_op] = CAST_OP(detector)
|
||||
|
||||
#define UNDO_IDLE(fake_op_base,real_op,normal_handler) \
|
||||
JumpTable[fake_op_base] = JumpTable[fake_op_base|0x0200] = CAST_OP(0x4AFC); \
|
||||
JumpTable[real_op] = CAST_OP(normal_handler)
|
||||
|
||||
idle_install:
|
||||
printf("install..\n");
|
||||
INSTALL_IDLE(0x71fa, 0x66fa, idle_detector_bcc8, 0x6601_idle, 0x6601);
|
||||
INSTALL_IDLE(0x71f8, 0x66f8, idle_detector_bcc8, 0x6601_idle, 0x6601);
|
||||
INSTALL_IDLE(0x71f6, 0x66f6, idle_detector_bcc8, 0x6601_idle, 0x6601);
|
||||
INSTALL_IDLE(0x71f2, 0x66f2, idle_detector_bcc8, 0x6601_idle, 0x6601);
|
||||
INSTALL_IDLE(0x75fa, 0x67fa, idle_detector_bcc8, 0x6701_idle, 0x6701);
|
||||
INSTALL_IDLE(0x75f8, 0x67f8, idle_detector_bcc8, 0x6701_idle, 0x6701);
|
||||
INSTALL_IDLE(0x75f6, 0x67f6, idle_detector_bcc8, 0x6701_idle, 0x6701);
|
||||
INSTALL_IDLE(0x75f2, 0x67f2, idle_detector_bcc8, 0x6701_idle, 0x6701);
|
||||
INSTALL_IDLE(0x7dfe, 0x60fe, idle_detector_dead, 0x6001_idle, 0x6001);
|
||||
INSTALL_IDLE(0x7dfc, 0x60fc, idle_detector_dead, 0x6001_idle, 0x6001);
|
||||
return 0;
|
||||
|
||||
idle_remove:
|
||||
printf("remove..\n");
|
||||
UNDO_IDLE(0x71fa, 0x66fa, 0x6601);
|
||||
UNDO_IDLE(0x71f8, 0x66f8, 0x6601);
|
||||
UNDO_IDLE(0x71f6, 0x66f6, 0x6601);
|
||||
UNDO_IDLE(0x71f2, 0x66f2, 0x6601);
|
||||
UNDO_IDLE(0x75fa, 0x67fa, 0x6701);
|
||||
UNDO_IDLE(0x75f8, 0x67f8, 0x6701);
|
||||
UNDO_IDLE(0x75f6, 0x67f6, 0x6701);
|
||||
UNDO_IDLE(0x75f2, 0x67f2, 0x6701);
|
||||
UNDO_IDLE(0x7dfe, 0x60fe, 0x6001);
|
||||
UNDO_IDLE(0x7dfc, 0x60fc, 0x6001);
|
||||
return 0;
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
void *get_jumptab(void) { return JumpTable; }
|
||||
|
||||
|
|
|
|||
|
|
@ -39961,3 +39961,101 @@ OPCODE(0xE7E7)
|
|||
RET(14)
|
||||
}
|
||||
|
||||
#ifdef PICODRIVE_HACK
|
||||
// BRA
|
||||
OPCODE(0x6001_idle)
|
||||
{
|
||||
#ifdef FAMEC_CHECK_BRANCHES
|
||||
u32 newPC = (u32)(PC) - BasePC;
|
||||
s8 offs=Opcode;
|
||||
newPC += offs;
|
||||
SET_PC(newPC);
|
||||
CHECK_BRANCH_EXCEPTION(offs)
|
||||
#else
|
||||
PC += ((s8)(Opcode & 0xFE)) >> 1;
|
||||
#endif
|
||||
{
|
||||
extern int idle_hit_counter;
|
||||
idle_hit_counter++;
|
||||
}
|
||||
m68kcontext.io_cycle_counter = 10;
|
||||
RET(10)
|
||||
}
|
||||
|
||||
// BCC
|
||||
OPCODE(0x6601_idle)
|
||||
{
|
||||
if (flag_NotZ)
|
||||
{
|
||||
extern int idle_hit_counter;
|
||||
idle_hit_counter++;
|
||||
PC += ((s8)(Opcode & 0xFE)) >> 1;
|
||||
m68kcontext.io_cycle_counter = 8;
|
||||
}
|
||||
RET(8)
|
||||
}
|
||||
|
||||
OPCODE(0x6701_idle)
|
||||
{
|
||||
if (!flag_NotZ)
|
||||
{
|
||||
extern int idle_hit_counter;
|
||||
idle_hit_counter++;
|
||||
PC += ((s8)(Opcode & 0xFE)) >> 1;
|
||||
m68kcontext.io_cycle_counter = 8;
|
||||
}
|
||||
RET(8)
|
||||
}
|
||||
|
||||
|
||||
extern int SekIsIdleCode(unsigned short *dst, int bytes);
|
||||
extern int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop);
|
||||
|
||||
OPCODE(idle_detector_bcc8)
|
||||
{
|
||||
extern int idledet_start_frame;
|
||||
extern char Pico[];
|
||||
int frame_count, cond_true, bytes, ret, newop;
|
||||
u16 *dest_pc;
|
||||
|
||||
dest_pc = PC + (((s8)(Opcode & 0xFE)) >> 1);
|
||||
|
||||
frame_count = *(int *)(Pico+0x22208+0x1c); // Pico.m.frame_count
|
||||
if (frame_count < idledet_start_frame)
|
||||
goto end;
|
||||
|
||||
bytes = 0 - (s8)(Opcode & 0xFE) - 2;
|
||||
ret = SekIsIdleCode(dest_pc, bytes);
|
||||
newop = (Opcode & 0xfe) | 0x7100;
|
||||
if (!ret) newop |= 0x200;
|
||||
if (Opcode & 0x0100) newop |= 0x400; // beq
|
||||
|
||||
ret = SekRegisterIdlePatch(GET_PC - 2, Opcode, newop);
|
||||
switch (ret)
|
||||
{
|
||||
case 0: PC[-1] = newop; break;
|
||||
case 1: break;
|
||||
case 2: JumpTable[Opcode] = (Opcode & 0x0100) ? CAST_OP(0x6701) : CAST_OP(0x6601); break;
|
||||
}
|
||||
|
||||
end:
|
||||
cond_true = (Opcode & 0x0100) ? !flag_NotZ : flag_NotZ; // beq?
|
||||
if (cond_true)
|
||||
{
|
||||
PC = dest_pc;
|
||||
m68kcontext.io_cycle_counter -= 2;
|
||||
}
|
||||
RET(8)
|
||||
}
|
||||
|
||||
OPCODE(idle_detector_dead)
|
||||
{
|
||||
// patch without further questions
|
||||
int newop = 0x7d00 | (Opcode & 0xff);
|
||||
PC[-1] = newop;
|
||||
SekRegisterIdlePatch(GET_PC - 2, Opcode, newop);
|
||||
|
||||
PC += ((s8)(Opcode & 0xFE)) >> 1;
|
||||
RET(10)
|
||||
}
|
||||
#endif // PICODRIVE_HACK
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ int state_slot = 0;
|
|||
int config_slot = 0, config_slot_current = 0;
|
||||
char lastRomFile[512];
|
||||
int kb_combo_keys = 0, kb_combo_acts = 0; // keys and actions which need button combos
|
||||
int pico_inp_mode = 0;
|
||||
|
||||
unsigned char *movie_data = NULL;
|
||||
static int movie_size = 0;
|
||||
|
|
@ -971,3 +972,60 @@ int emu_SaveLoadGame(int load, int sram)
|
|||
}
|
||||
}
|
||||
|
||||
void emu_changeFastForward(int set_on)
|
||||
{
|
||||
static void *set_PsndOut = NULL;
|
||||
static int set_Frameskip, set_EmuOpt, is_on = 0;
|
||||
|
||||
if (set_on && !is_on) {
|
||||
set_PsndOut = PsndOut;
|
||||
set_Frameskip = currentConfig.Frameskip;
|
||||
set_EmuOpt = currentConfig.EmuOpt;
|
||||
PsndOut = NULL;
|
||||
currentConfig.Frameskip = 8;
|
||||
currentConfig.EmuOpt &= ~4;
|
||||
currentConfig.EmuOpt |= 0x40000;
|
||||
is_on = 1;
|
||||
strcpy(noticeMsg, "FAST FORWARD ");
|
||||
emu_noticeMsgUpdated();
|
||||
}
|
||||
else if (!set_on && is_on) {
|
||||
PsndOut = set_PsndOut;
|
||||
currentConfig.Frameskip = set_Frameskip;
|
||||
currentConfig.EmuOpt = set_EmuOpt;
|
||||
PsndRerate(1);
|
||||
is_on = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void emu_RunEventsPico(unsigned int events)
|
||||
{
|
||||
if (events & (1 << 3)) {
|
||||
pico_inp_mode++;
|
||||
if (pico_inp_mode > 2) pico_inp_mode = 0;
|
||||
switch (pico_inp_mode) {
|
||||
case 2: strcpy(noticeMsg, "Input: Pen on Pad "); break;
|
||||
case 1: strcpy(noticeMsg, "Input: Pen on Storyware"); break;
|
||||
case 0: strcpy(noticeMsg, "Input: Joytick ");
|
||||
PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000;
|
||||
break;
|
||||
}
|
||||
emu_noticeMsgUpdated();
|
||||
}
|
||||
if (events & (1 << 4)) {
|
||||
PicoPicohw.page--;
|
||||
if (PicoPicohw.page < 0) PicoPicohw.page = 0;
|
||||
sprintf(noticeMsg, "Page %i ", PicoPicohw.page);
|
||||
emu_noticeMsgUpdated();
|
||||
}
|
||||
if (events & (1 << 5)) {
|
||||
PicoPicohw.page++;
|
||||
if (PicoPicohw.page > 6) PicoPicohw.page = 6;
|
||||
sprintf(noticeMsg, "Page %i ", PicoPicohw.page);
|
||||
emu_noticeMsgUpdated();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ extern int config_slot, config_slot_current;
|
|||
extern unsigned char *movie_data;
|
||||
extern char lastRomFile[512];
|
||||
extern int kb_combo_keys, kb_combo_acts; // keys and actions which need button combos
|
||||
extern int pico_inp_mode;
|
||||
|
||||
|
||||
int emu_ReloadRom(void);
|
||||
|
|
@ -53,6 +54,8 @@ void emu_textOut16(int x, int y, const char *text);
|
|||
char *emu_makeRomId(void);
|
||||
void emu_findKeyBindCombos(void);
|
||||
void emu_forcedFrame(int opts);
|
||||
void emu_changeFastForward(int set_on);
|
||||
void emu_RunEventsPico(unsigned int events);
|
||||
|
||||
extern const char * const keyNames[];
|
||||
void emu_prepareDefaultConfig(void);
|
||||
|
|
|
|||
|
|
@ -1045,7 +1045,7 @@ menu_entry opt_entries[] =
|
|||
{ NULL, MB_NONE, MA_OPT_RENDERER, NULL, 0, 0, 0, 1 },
|
||||
{ "Scanline mode (faster)", MB_ONOFF, MA_OPT_INTERLACED, ¤tConfig.EmuOpt, 0x4000, 0, 0, 1 },
|
||||
{ "Scale low res mode", MB_ONOFF, MA_OPT_SCALING, ¤tConfig.scaling, 0x0001, 0, 3, 1 },
|
||||
{ "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES, ¤tConfig.PicoOpt, 0x0080, 0, 0, 1 },
|
||||
{ "Accurate sprites", MB_ONOFF, MA_OPT_ACC_SPRITES, ¤tConfig.PicoOpt, 0x0080, 0, 0, 1 },
|
||||
{ "Show FPS", MB_ONOFF, MA_OPT_SHOW_FPS, ¤tConfig.EmuOpt, 0x0002, 0, 0, 1 },
|
||||
{ NULL, MB_RANGE, MA_OPT_FRAMESKIP, ¤tConfig.Frameskip, 0, -1, 16, 1 },
|
||||
{ "Enable sound", MB_ONOFF, MA_OPT_ENABLE_SOUND, ¤tConfig.EmuOpt, 0x0004, 0, 0, 1 },
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ int reset_timing = 0;
|
|||
|
||||
#define PICO_PEN_ADJUST_X 4
|
||||
#define PICO_PEN_ADJUST_Y 2
|
||||
static int pico_pen_x = 320/2, pico_pen_y = 240/2, pico_inp_mode = 0;
|
||||
static int pico_pen_x = 320/2, pico_pen_y = 240/2;
|
||||
|
||||
static void emu_msg_cb(const char *msg);
|
||||
static void emu_msg_tray_open(void);
|
||||
|
|
@ -436,31 +436,10 @@ static void emu_msg_tray_open(void)
|
|||
|
||||
static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)
|
||||
{
|
||||
if (events & (1 << 3)) {
|
||||
pico_inp_mode++;
|
||||
if (pico_inp_mode > 2) pico_inp_mode = 0;
|
||||
switch (pico_inp_mode) {
|
||||
case 2: strcpy(noticeMsg, "Input: Pen on Pad "); break;
|
||||
case 1: strcpy(noticeMsg, "Input: Pen on Storyware"); break;
|
||||
case 0: strcpy(noticeMsg, "Input: Joytick ");
|
||||
PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000;
|
||||
break;
|
||||
}
|
||||
gettimeofday(¬iceMsgTime, 0);
|
||||
}
|
||||
if (events & (1 << 4)) {
|
||||
PicoPicohw.page--;
|
||||
if (PicoPicohw.page < 0) PicoPicohw.page = 0;
|
||||
sprintf(noticeMsg, "Page %i ", PicoPicohw.page);
|
||||
gettimeofday(¬iceMsgTime, 0);
|
||||
}
|
||||
if (events & (1 << 5)) {
|
||||
PicoPicohw.page++;
|
||||
if (PicoPicohw.page > 6) PicoPicohw.page = 6;
|
||||
sprintf(noticeMsg, "Page %i ", PicoPicohw.page);
|
||||
gettimeofday(¬iceMsgTime, 0);
|
||||
}
|
||||
if (pico_inp_mode != 0) {
|
||||
emu_RunEventsPico(events);
|
||||
|
||||
if (pico_inp_mode != 0)
|
||||
{
|
||||
PicoPad[0] &= ~0x0f; // release UDLR
|
||||
if (gp2x_keys & GP2X_UP) { pico_pen_y--; if (pico_pen_y < 0) pico_pen_y = 0; }
|
||||
if (gp2x_keys & GP2X_DOWN) { pico_pen_y++; if (pico_pen_y > 239-PICO_PEN_ADJUST_Y) pico_pen_y = 239-PICO_PEN_ADJUST_Y; }
|
||||
|
|
@ -512,31 +491,6 @@ static void update_volume(int has_changed, int is_up)
|
|||
}
|
||||
}
|
||||
|
||||
static void change_fast_forward(int set_on)
|
||||
{
|
||||
static void *set_PsndOut = NULL;
|
||||
static int set_Frameskip, set_EmuOpt, is_on = 0;
|
||||
|
||||
if (set_on && !is_on) {
|
||||
set_PsndOut = PsndOut;
|
||||
set_Frameskip = currentConfig.Frameskip;
|
||||
set_EmuOpt = currentConfig.EmuOpt;
|
||||
PsndOut = NULL;
|
||||
currentConfig.Frameskip = 8;
|
||||
currentConfig.EmuOpt &= ~4;
|
||||
is_on = 1;
|
||||
}
|
||||
else if (!set_on && is_on) {
|
||||
PsndOut = set_PsndOut;
|
||||
currentConfig.Frameskip = set_Frameskip;
|
||||
currentConfig.EmuOpt = set_EmuOpt;
|
||||
PsndRerate(1);
|
||||
update_volume(0, 0);
|
||||
reset_timing = 1;
|
||||
is_on = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void RunEvents(unsigned int which)
|
||||
{
|
||||
if (which & 0x1800) // save or load (but not both)
|
||||
|
|
@ -668,14 +622,16 @@ static void updateKeys(void)
|
|||
if (events & 0x6000)
|
||||
update_volume(1, events & 0x2000);
|
||||
|
||||
if ((events ^ prevEvents) & 0x40)
|
||||
change_fast_forward(events & 0x40);
|
||||
if ((events ^ prevEvents) & 0x40) {
|
||||
emu_changeFastForward(events & 0x40);
|
||||
update_volume(0, 0);
|
||||
reset_timing = 1;
|
||||
}
|
||||
|
||||
events &= ~prevEvents;
|
||||
|
||||
if (PicoAHW == PAHW_PICO)
|
||||
RunEventsPico(events, keys);
|
||||
|
||||
if (events) RunEvents(events);
|
||||
if (movie_data) emu_updateMovie();
|
||||
|
||||
|
|
@ -1044,7 +1000,7 @@ void emu_Loop(void)
|
|||
frames_done++; frames_shown++;
|
||||
}
|
||||
|
||||
change_fast_forward(0);
|
||||
emu_changeFastForward(0);
|
||||
|
||||
if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
|
||||
|
||||
|
|
|
|||
|
|
@ -432,8 +432,8 @@ rescan:
|
|||
// ------------ debug menu ------------
|
||||
|
||||
char *debugString(void);
|
||||
void PicoDrawShowSpriteStats(unsigned short *screen);
|
||||
void PicoDrawShowPalette(unsigned short *screen);
|
||||
void PicoDrawShowSpriteStats(unsigned short *screen, int stride);
|
||||
void PicoDrawShowPalette(unsigned short *screen, int stride);
|
||||
|
||||
static void draw_main_debug(void)
|
||||
{
|
||||
|
|
@ -477,8 +477,10 @@ static void debug_menu_loop(void)
|
|||
{
|
||||
case 0: draw_main_debug(); break;
|
||||
case 1: draw_frame_debug(); break;
|
||||
case 2: PicoDrawShowSpriteStats(gp2x_screen); break;
|
||||
case 3: PicoDrawShowPalette(gp2x_screen); break;
|
||||
case 2: gp2x_pd_clone_buffer2();
|
||||
PicoDrawShowSpriteStats(gp2x_screen, 320); break;
|
||||
case 3: memset(gp2x_screen, 0, 320*240*2);
|
||||
PicoDrawShowPalette(gp2x_screen, 320); break;
|
||||
}
|
||||
menu_flip();
|
||||
|
||||
|
|
@ -1186,7 +1188,7 @@ menu_entry opt_entries[] =
|
|||
{
|
||||
{ NULL, MB_NONE, MA_OPT_RENDERER, NULL, 0, 0, 0, 1, 1 },
|
||||
{ NULL, MB_RANGE, MA_OPT_SCALING, ¤tConfig.scaling, 0, 0, 3, 1, 1 },
|
||||
{ "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x080, 0, 0, 0, 1 },
|
||||
{ "Accurate sprites", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x080, 0, 0, 0, 1 },
|
||||
{ "Show FPS", MB_ONOFF, MA_OPT_SHOW_FPS, ¤tConfig.EmuOpt, 0x002, 0, 0, 1, 1 },
|
||||
{ NULL, MB_RANGE, MA_OPT_FRAMESKIP, ¤tConfig.Frameskip, 0, -1, 16, 1, 1 },
|
||||
{ "Enable sound", MB_ONOFF, MA_OPT_ENABLE_SOUND, ¤tConfig.EmuOpt, 0x004, 0, 0, 1, 1 },
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#define SIMPLE_WRITE_SOUND 0
|
||||
#define mix_32_to_16l_stereo_lvl mix_32_to_16l_stereo
|
||||
|
||||
#define EL_LOGMASK (EL_ANOMALY|EL_STATUS|EL_SRAMIO|EL_EEPROM|EL_UIO)//|EL_VDPDMA|EL_HVCNT|EL_ASVDP)//|EL_SVP)
|
||||
#define EL_LOGMASK (EL_ANOMALY|EL_STATUS|EL_SRAMIO|EL_EEPROM|EL_UIO|EL_IDLE)//|EL_VDPDMA|EL_HVCNT|EL_ASVDP)//|EL_SVP)
|
||||
// EL_VDPDMA|EL_ASVDP|EL_SR) // |EL_BUSREQ|EL_Z80BNK)
|
||||
|
||||
//#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)
|
||||
|
|
|
|||
|
|
@ -43,6 +43,8 @@ OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pi
|
|||
# Pico - carthw
|
||||
OBJS += ../../Pico/carthw/carthw.o ../../Pico/carthw/svp/svp.o ../../Pico/carthw/svp/Memory.o \
|
||||
../../Pico/carthw/svp/ssp16.o
|
||||
# Pico - Pico
|
||||
OBJS += ../../Pico/Pico/Pico.o ../../Pico/Pico/Memory.o ../../Pico/Pico/xpcm.o
|
||||
endif
|
||||
|
||||
# Pico - sound
|
||||
|
|
|
|||
|
|
@ -39,6 +39,9 @@ int engineState = PGS_Menu;
|
|||
static unsigned int noticeMsgTime = 0;
|
||||
int reset_timing = 0; // do we need this?
|
||||
|
||||
#define PICO_PEN_ADJUST_X 4
|
||||
#define PICO_PEN_ADJUST_Y 2
|
||||
static int pico_pen_x = 320/2, pico_pen_y = 240/2;
|
||||
|
||||
static void sound_init(void);
|
||||
static void sound_deinit(void);
|
||||
|
|
@ -122,7 +125,7 @@ void emu_prepareDefaultConfig(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;
|
||||
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
|
||||
|
|
@ -164,7 +167,7 @@ void emu_setDefaultConfig(void)
|
|||
extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);
|
||||
extern void amips_clut_6bit(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);
|
||||
|
||||
extern void (*amips_clut_f)(unsigned short *dst, unsigned char *src, unsigned short *pal, int count) = NULL;
|
||||
static void (*amips_clut_f)(unsigned short *dst, unsigned char *src, unsigned short *pal, int count) = NULL;
|
||||
|
||||
struct Vertex
|
||||
{
|
||||
|
|
@ -265,12 +268,11 @@ static void do_pal_update(int allow_sh, int allow_as)
|
|||
localPal[0x80|i]=(unsigned short)t;
|
||||
}
|
||||
localPal[0xe0] = 0;
|
||||
localPal[0xf0] = 0x001f;
|
||||
}
|
||||
else if (allow_as && (rendstatus & PDRAW_ACC_SPRITES))
|
||||
{
|
||||
memcpy32(localPal+0x40, localPal, 0x40);
|
||||
memcpy32(localPal+0x80, localPal, 0x40);
|
||||
memcpy32(localPal+0xc0, localPal, 0x40);
|
||||
memcpy32((int *)(void *)(localPal+0x80), (void *)localPal, 0x40/2);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -340,7 +342,7 @@ static void blitscreen_clut(void)
|
|||
|
||||
if (dynamic_palette)
|
||||
{
|
||||
if (!blit_16bit_mode) {
|
||||
if (!blit_16bit_mode) { // the current mode is not 16bit
|
||||
sceGuTexMode(GU_PSM_5650, 0, 0, 0);
|
||||
sceGuTexImage(0,512,512,512,(char *)VRAM_STUFF + 512*240);
|
||||
|
||||
|
|
@ -407,6 +409,21 @@ static void cd_leds(void)
|
|||
*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;
|
||||
}
|
||||
|
||||
static void draw_pico_ptr(void)
|
||||
{
|
||||
unsigned char *p = (unsigned char *)VRAM_STUFF + 16;
|
||||
|
||||
// only if pen enabled and for 8bit mode
|
||||
if (pico_inp_mode == 0 || blit_16bit_mode) return;
|
||||
|
||||
p += 512 * (pico_pen_y + PICO_PEN_ADJUST_Y);
|
||||
p += pico_pen_x + PICO_PEN_ADJUST_X;
|
||||
p[ -1] = 0xe0; p[ 0] = 0xf0; p[ 1] = 0xe0;
|
||||
p[ 511] = 0xf0; p[ 512] = 0xf0; p[ 513] = 0xf0;
|
||||
p[1023] = 0xe0; p[1024] = 0xf0; p[1025] = 0xe0;
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
static void dbg_text(void)
|
||||
{
|
||||
|
|
@ -438,6 +455,9 @@ void blit1(void)
|
|||
memset32((int *)pd, 0xe0e0e0e0, 320/4);
|
||||
}
|
||||
|
||||
if (PicoAHW & PAHW_PICO)
|
||||
draw_pico_ptr();
|
||||
|
||||
blitscreen_clut();
|
||||
}
|
||||
|
||||
|
|
@ -502,6 +522,7 @@ static void vidResetMode(void)
|
|||
PicoScanEnd = EmuScanSlowEnd;
|
||||
|
||||
localPal[0xe0] = 0;
|
||||
localPal[0xf0] = 0x001f;
|
||||
Pico.m.dirtyPal = 1;
|
||||
blit_16bit_mode = dynamic_palette = 0;
|
||||
|
||||
|
|
@ -693,7 +714,7 @@ void emu_forcedFrame(int opts)
|
|||
int eo_old = currentConfig.EmuOpt;
|
||||
|
||||
PicoOpt &= ~0x10;
|
||||
PicoOpt |= opts|POPT_ACC_SPRITES
|
||||
PicoOpt |= opts|POPT_ACC_SPRITES;
|
||||
currentConfig.EmuOpt |= 0x80;
|
||||
|
||||
vidResetMode();
|
||||
|
|
@ -714,6 +735,29 @@ void emu_forcedFrame(int opts)
|
|||
}
|
||||
|
||||
|
||||
static void RunEventsPico(unsigned int events, unsigned int keys)
|
||||
{
|
||||
emu_RunEventsPico(events);
|
||||
|
||||
if (pico_inp_mode != 0)
|
||||
{
|
||||
PicoPad[0] &= ~0x0f; // release UDLR
|
||||
if (keys & BTN_UP) { pico_pen_y--; if (pico_pen_y < 8) pico_pen_y = 8; }
|
||||
if (keys & BTN_DOWN) { pico_pen_y++; if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-PICO_PEN_ADJUST_Y; }
|
||||
if (keys & BTN_LEFT) { pico_pen_x--; if (pico_pen_x < 0) pico_pen_x = 0; }
|
||||
if (keys & BTN_RIGHT) {
|
||||
int lim = (Pico.video.reg[12]&1) ? 319 : 255;
|
||||
pico_pen_x++;
|
||||
if (pico_pen_x > lim-PICO_PEN_ADJUST_X)
|
||||
pico_pen_x = lim-PICO_PEN_ADJUST_X;
|
||||
}
|
||||
PicoPicohw.pen_pos[0] = pico_pen_x;
|
||||
if (!(Pico.video.reg[12]&1)) PicoPicohw.pen_pos[0] += pico_pen_x/4;
|
||||
PicoPicohw.pen_pos[0] += 0x3c;
|
||||
PicoPicohw.pen_pos[1] = pico_inp_mode == 1 ? (0x2f8 + pico_pen_y) : (0x1fc + pico_pen_y);
|
||||
}
|
||||
}
|
||||
|
||||
static void RunEvents(unsigned int which)
|
||||
{
|
||||
if (which & 0x1800) // save or load (but not both)
|
||||
|
|
@ -822,7 +866,15 @@ static void updateKeys(void)
|
|||
|
||||
events = (allActions[0] | allActions[1]) >> 16;
|
||||
|
||||
if ((events ^ prevEvents) & 0x40) {
|
||||
emu_changeFastForward(events & 0x40);
|
||||
reset_timing = 1;
|
||||
}
|
||||
|
||||
events &= ~prevEvents;
|
||||
|
||||
if (PicoAHW == PAHW_PICO)
|
||||
RunEventsPico(events, keys);
|
||||
if (events) RunEvents(events);
|
||||
if (movie_data) emu_updateMovie();
|
||||
|
||||
|
|
@ -1030,6 +1082,8 @@ void emu_Loop(void)
|
|||
}
|
||||
|
||||
|
||||
emu_changeFastForward(0);
|
||||
|
||||
if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
|
||||
|
||||
if (PsndOut != NULL) {
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
#include "mp3.h"
|
||||
#include "../common/menu.h"
|
||||
#include "../common/emu.h"
|
||||
#include "../common/config.h"
|
||||
#include "../common/lprintf.h"
|
||||
#include "version.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -62,8 +62,6 @@ static unsigned long wait_for_input(unsigned int interesting, int is_key_config)
|
|||
else if (repeats == 4) wait = 2;
|
||||
else if (repeats == 6) wait = 1;
|
||||
|
||||
for (i = 0; i < wait && inp_prev == gp2x_joystick_read(1); i++) {
|
||||
|
||||
for (i = 0; i < wait && inp_prev == psp_pad_read(1); i++) {
|
||||
if (i == 0) repeats++;
|
||||
psp_msleep(30);
|
||||
|
|
@ -439,8 +437,10 @@ static char *romsel_loop(char *curr_path)
|
|||
// ------------ debug menu ------------
|
||||
|
||||
char *debugString(void);
|
||||
void PicoDrawShowSpriteStats(unsigned short *screen, int stride);
|
||||
void PicoDrawShowPalette(unsigned short *screen, int stride);
|
||||
|
||||
static void draw_debug(void)
|
||||
static void draw_main_debug(void)
|
||||
{
|
||||
char *p, *str = debugString();
|
||||
int len, line;
|
||||
|
|
@ -457,15 +457,49 @@ static void draw_debug(void)
|
|||
if (*p == 0) break;
|
||||
p++; str = p;
|
||||
}
|
||||
menu_draw_end();
|
||||
}
|
||||
|
||||
static void draw_frame_debug(void)
|
||||
{
|
||||
char layer_str[48] = "layers: ";
|
||||
if (PicoDrawMask & PDRAW_LAYERB_ON) memcpy(layer_str + 8, "B", 1);
|
||||
if (PicoDrawMask & PDRAW_LAYERA_ON) memcpy(layer_str + 10, "A", 1);
|
||||
if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);
|
||||
if (PicoDrawMask & PDRAW_SPRITES_HI_ON) memcpy(layer_str + 19, "spr_hi", 6);
|
||||
|
||||
memset(psp_screen, 0, 512*272*2);
|
||||
emu_forcedFrame(0);
|
||||
smalltext_out16(4, 264, layer_str, 0xffff);
|
||||
}
|
||||
|
||||
static void debug_menu_loop(void)
|
||||
{
|
||||
int ret = 0;
|
||||
draw_debug();
|
||||
while (!(ret & (BTN_X|BTN_CIRCLE)))
|
||||
ret = wait_for_input(BTN_X|BTN_CIRCLE, 0);
|
||||
int inp, mode = 0;
|
||||
|
||||
while (1)
|
||||
{
|
||||
switch (mode)
|
||||
{
|
||||
case 0: draw_main_debug(); break;
|
||||
case 1: draw_frame_debug(); break;
|
||||
case 2: menu_draw_begin();
|
||||
PicoDrawShowSpriteStats((unsigned short *)psp_screen+512*16+80, 512); break;
|
||||
case 3: memset(psp_screen, 0, 512*272*2);
|
||||
PicoDrawShowPalette(psp_screen, 512); break;
|
||||
}
|
||||
menu_draw_end();
|
||||
|
||||
inp = wait_for_input(BTN_X|BTN_CIRCLE|BTN_L|BTN_R|BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT, 0);
|
||||
if (inp & (BTN_X|BTN_CIRCLE)) return;
|
||||
if (inp & BTN_L) { mode--; if (mode < 0) mode = 3; }
|
||||
if (inp & BTN_R) { mode++; if (mode > 3) mode = 0; }
|
||||
if (mode == 1) {
|
||||
if (inp & BTN_LEFT) PicoDrawMask ^= PDRAW_LAYERB_ON;
|
||||
if (inp & BTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;
|
||||
if (inp & BTN_DOWN) PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;
|
||||
if (inp & BTN_UP) PicoDrawMask ^= PDRAW_SPRITES_HI_ON;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ------------ patch/gg menu ------------
|
||||
|
|
@ -592,7 +626,7 @@ static void draw_savestate_bg(int slot)
|
|||
areaClose(file);
|
||||
}
|
||||
|
||||
emu_forcedFrame();
|
||||
emu_forcedFrame(0);
|
||||
menu_prepare_bg(1, 0);
|
||||
|
||||
restore_oldstate(oldstate);
|
||||
|
|
@ -802,6 +836,10 @@ me_bind_action emuctrl_actions[] =
|
|||
{ "Prev Save Slot ", 1<<25 },
|
||||
{ "Next Save Slot ", 1<<24 },
|
||||
{ "Switch Renderer ", 1<<26 },
|
||||
{ "Fast forward ", 1<<22 },
|
||||
{ "Pico Next page ", 1<<21 },
|
||||
{ "Pico Prev page ", 1<<20 },
|
||||
{ "Pico Switch input", 1<<19 },
|
||||
{ NULL, 0 }
|
||||
};
|
||||
|
||||
|
|
@ -1065,7 +1103,7 @@ static void menu_opt3_preview(int is_32col)
|
|||
}
|
||||
|
||||
memset32_uncached(psp_screen, 0, 512*272*2/4);
|
||||
emu_forcedFrame();
|
||||
emu_forcedFrame(0);
|
||||
menu_prepare_bg(1, 0);
|
||||
|
||||
if (oldstate) restore_oldstate(oldstate);
|
||||
|
|
@ -1176,7 +1214,7 @@ menu_entry opt2_entries[] =
|
|||
{ "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x00008, 0, 0, 1, 1 },
|
||||
{ "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x00020, 0, 0, 1, 1 },
|
||||
{ "Status line in main menu", MB_ONOFF, MA_OPT2_STATUS_LINE, ¤tConfig.EmuOpt, 0x20000, 0, 0, 1, 1 },
|
||||
{ "Disable frame limitter", MB_ONOFF, MA_OPT2_NO_FRAME_LIMIT, ¤tConfig.EmuOpt, 0x40000, 0, 0, 1, 1 },
|
||||
{ "Disable frame limiter", MB_ONOFF, MA_OPT2_NO_FRAME_LIMIT, ¤tConfig.EmuOpt, 0x40000, 0, 0, 1, 1 },
|
||||
{ "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1, 0 },
|
||||
};
|
||||
|
||||
|
|
@ -1235,7 +1273,7 @@ static void amenu_loop_options(void)
|
|||
menu_entry opt_entries[] =
|
||||
{
|
||||
{ NULL, MB_NONE, MA_OPT_RENDERER, NULL, 0, 0, 0, 1, 1 },
|
||||
{ "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x0080, 0, 0, 1, 1 },
|
||||
{ "Accurate sprites", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x0080, 0, 0, 0, 1 },
|
||||
{ "Show FPS", MB_ONOFF, MA_OPT_SHOW_FPS, ¤tConfig.EmuOpt, 0x0002, 0, 0, 1, 1 },
|
||||
{ NULL, MB_RANGE, MA_OPT_FRAMESKIP, ¤tConfig.Frameskip, 0, -1, 16, 1, 1 },
|
||||
{ "Enable sound", MB_ONOFF, MA_OPT_ENABLE_SOUND, ¤tConfig.EmuOpt, 0x0004, 0, 0, 1, 1 },
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ extern void blit1(void);
|
|||
#define CAN_HANDLE_240_LINES 1
|
||||
|
||||
// logging emu events
|
||||
#define EL_LOGMASK EL_STATUS // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO) // xffff
|
||||
#define EL_LOGMASK (EL_STATUS|EL_IDLE) // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO) // xffff
|
||||
|
||||
//#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)
|
||||
#define dprintf(x...)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue