notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frontend: merge updates from SDL project
[pcsx_rearmed.git]
/
libpcsxcore
/
psxcounters.c
diff --git
a/libpcsxcore/psxcounters.c
b/libpcsxcore/psxcounters.c
index
865b3d8
..
8b8fea8
100644
(file)
--- a/
libpcsxcore/psxcounters.c
+++ b/
libpcsxcore/psxcounters.c
@@
-22,17
+22,11
@@
*/
#include "psxcounters.h"
*/
#include "psxcounters.h"
+#include "gpu.h"
#include "debug.h"
/******************************************************************************/
#include "debug.h"
/******************************************************************************/
-typedef struct Rcnt
-{
- u16 mode, target;
- u32 rate, irq, counterState, irqState;
- u32 cycle, cycleStart;
-} Rcnt;
-
enum
{
Rc0Gate = 0x0001, // 0 not implemented
enum
{
Rc0Gate = 0x0001, // 0 not implemented
@@
-66,20
+60,22
@@
static const u32 CountToOverflow = 0;
static const u32 CountToTarget = 1;
static const u32 FrameRate[] = { 60, 50 };
static const u32 CountToTarget = 1;
static const u32 FrameRate[] = { 60, 50 };
-static const u32 VBlankStart[] = { 240, 256 };
static const u32 HSyncTotal[] = { 263, 313 };
static const u32 HSyncTotal[] = { 263, 313 };
-static const u32 SpuUpdInterval[] = { 23, 22 };
+static const u32 SpuUpdInterval[] = { 32, 32 };
+#define VBlankStart 240
-static const s32 VerboseLevel = 0;
+#define VERBOSE_LEVEL 0
+static const s32 VerboseLevel = VERBOSE_LEVEL;
/******************************************************************************/
/******************************************************************************/
-
static
Rcnt rcnts[ CounterQuantity ];
+Rcnt rcnts[ CounterQuantity ];
-static u32 hSyncCount = 0;
+u32 hSyncCount = 0;
+u32 frame_counter = 0;
static u32 spuSyncCount = 0;
static u32 hsync_steps = 0;
static u32 spuSyncCount = 0;
static u32 hsync_steps = 0;
-static u32
gpu_wants_hcnt
= 0;
+static u32
base_cycle
= 0;
u32 psxNextCounter = 0, psxNextsCounter = 0;
u32 psxNextCounter = 0, psxNextsCounter = 0;
@@
-92,8
+88,9
@@
void setIrq( u32 irq )
}
static
}
static
-void verboseLog(
s
32 level, const char *str, ... )
+void verboseLog(
u
32 level, const char *str, ... )
{
{
+#if VERBOSE_LEVEL > 0
if( level <= VerboseLevel )
{
va_list va;
if( level <= VerboseLevel )
{
va_list va;
@@
-106,6
+103,7
@@
void verboseLog( s32 level, const char *str, ... )
printf( "%s", buf );
fflush( stdout );
}
printf( "%s", buf );
fflush( stdout );
}
+#endif
}
/******************************************************************************/
}
/******************************************************************************/
@@
-180,6
+178,9
@@
void psxRcntSet()
psxNextCounter = countToUpdate;
}
}
psxNextCounter = countToUpdate;
}
}
+
+ psxRegs.interrupt |= (1 << PSXINT_RCNT);
+ new_dyna_set_event(PSXINT_RCNT, psxNextCounter);
}
/******************************************************************************/
}
/******************************************************************************/
@@
-189,20
+190,16
@@
void psxRcntReset( u32 index )
{
u32 count;
{
u32 count;
+ rcnts[index].mode |= RcUnknown10;
+
if( rcnts[index].counterState == CountToTarget )
{
if( rcnts[index].counterState == CountToTarget )
{
+ count = psxRegs.cycle;
+ count -= rcnts[index].cycleStart;
+ if( rcnts[index].rate > 1 )
+ count /= rcnts[index].rate;
if( rcnts[index].mode & RcCountToTarget )
if( rcnts[index].mode & RcCountToTarget )
- {
- count = psxRegs.cycle;
- count -= rcnts[index].cycleStart;
- if (rcnts[index].rate > 1)
- count /= rcnts[index].rate;
count -= rcnts[index].target;
count -= rcnts[index].target;
- }
- else
- {
- count = _psxRcntRcount( index );
- }
_psxRcntWcount( index, count );
_psxRcntWcount( index, count );
@@
-217,8
+214,12
@@
void psxRcntReset( u32 index )
}
rcnts[index].mode |= RcCountEqTarget;
}
rcnts[index].mode |= RcCountEqTarget;
+
+ if( count < 0xffff ) // special case, overflow too?
+ return;
}
}
- else if( rcnts[index].counterState == CountToOverflow )
+
+ if( rcnts[index].counterState == CountToOverflow )
{
count = psxRegs.cycle;
count -= rcnts[index].cycleStart;
{
count = psxRegs.cycle;
count -= rcnts[index].cycleStart;
@@
-240,10
+241,6
@@
void psxRcntReset( u32 index )
rcnts[index].mode |= RcOverflow;
}
rcnts[index].mode |= RcOverflow;
}
-
- rcnts[index].mode |= RcUnknown10;
-
- psxRcntSet();
}
void psxRcntUpdate()
}
void psxRcntUpdate()
@@
-291,42
+288,50
@@
void psxRcntUpdate()
}
// VSync irq.
}
// VSync irq.
- if( hSyncCount == VBlankStart
[Config.PsxType]
)
+ if( hSyncCount == VBlankStart )
{
{
- GPU_vBlank( 1, &hSyncCount, &gpu_wants_hcnt );
-
- // For the best times. :D
- //setIrq( 0x01 );
+ HW_GPU_STATUS &= ~PSXGPU_LCF;
+ GPU_vBlank( 1, 0 );
+ setIrq( 0x01 );
+
+ EmuUpdate();
+ GPU_updateLace();
}
// Update lace. (with InuYasha fix)
if( hSyncCount >= (Config.VSyncWA ? HSyncTotal[Config.PsxType] / BIAS : HSyncTotal[Config.PsxType]) )
{
hSyncCount = 0;
}
// Update lace. (with InuYasha fix)
if( hSyncCount >= (Config.VSyncWA ? HSyncTotal[Config.PsxType] / BIAS : HSyncTotal[Config.PsxType]) )
{
hSyncCount = 0;
+ frame_counter++;
- GPU_vBlank( 0, &hSyncCount, &gpu_wants_hcnt );
- setIrq( 0x01 );
-
- EmuUpdate();
- GPU_updateLace();
+ gpuSyncPluginSR();
+ if( (HW_GPU_STATUS & PSXGPU_ILACE_BITS) == PSXGPU_ILACE_BITS )
+ HW_GPU_STATUS |= frame_counter << 31;
+ GPU_vBlank( 0, HW_GPU_STATUS >> 31 );
}
// Schedule next call, in hsyncs
hsync_steps = SpuUpdInterval[Config.PsxType] - spuSyncCount;
}
// Schedule next call, in hsyncs
hsync_steps = SpuUpdInterval[Config.PsxType] - spuSyncCount;
- next_vsync = VBlankStart
[Config.PsxType]
- hSyncCount; // ok to overflow
+ next_vsync = VBlankStart - hSyncCount; // ok to overflow
next_lace = HSyncTotal[Config.PsxType] - hSyncCount;
if( next_vsync && next_vsync < hsync_steps )
hsync_steps = next_vsync;
if( next_lace && next_lace < hsync_steps )
hsync_steps = next_lace;
next_lace = HSyncTotal[Config.PsxType] - hSyncCount;
if( next_vsync && next_vsync < hsync_steps )
hsync_steps = next_vsync;
if( next_lace && next_lace < hsync_steps )
hsync_steps = next_lace;
- if( gpu_wants_hcnt )
- hsync_steps = 1;
rcnts[3].cycleStart = cycle - leftover_cycles;
rcnts[3].cycleStart = cycle - leftover_cycles;
- rcnts[3].cycle = hsync_steps * rcnts[3].target;
- psxRcntSet();
+ if (Config.PsxType)
+ // 20.12 precision, clk / 50 / 313 ~= 2164.14
+ base_cycle += hsync_steps * 8864320;
+ else
+ // clk / 60 / 263 ~= 2146.31
+ base_cycle += hsync_steps * 8791293;
+ rcnts[3].cycle = base_cycle >> 12;
+ base_cycle &= 0xfff;
}
}
+ psxRcntSet();
+
#ifndef NDEBUG
DebugVSync();
#endif
#ifndef NDEBUG
DebugVSync();
#endif
@@
-338,8
+343,6
@@
void psxRcntWcount( u32 index, u32 value )
{
verboseLog( 2, "[RCNT %i] wcount: %x\n", index, value );
{
verboseLog( 2, "[RCNT %i] wcount: %x\n", index, value );
- psxRcntUpdate();
-
_psxRcntWcount( index, value );
psxRcntSet();
}
_psxRcntWcount( index, value );
psxRcntSet();
}
@@
-348,8
+351,6
@@
void psxRcntWmode( u32 index, u32 value )
{
verboseLog( 1, "[RCNT %i] wmode: %x\n", index, value );
{
verboseLog( 1, "[RCNT %i] wmode: %x\n", index, value );
- psxRcntUpdate();
-
rcnts[index].mode = value;
rcnts[index].irqState = 0;
rcnts[index].mode = value;
rcnts[index].irqState = 0;
@@
-401,8
+402,6
@@
void psxRcntWtarget( u32 index, u32 value )
{
verboseLog( 1, "[RCNT %i] wtarget: %x\n", index, value );
{
verboseLog( 1, "[RCNT %i] wtarget: %x\n", index, value );
- psxRcntUpdate();
-
rcnts[index].target = value;
_psxRcntWcount( index, _psxRcntRcount( index ) );
rcnts[index].target = value;
_psxRcntWcount( index, _psxRcntRcount( index ) );
@@
-415,8
+414,6
@@
u32 psxRcntRcount( u32 index )
{
u32 count;
{
u32 count;
- psxRcntUpdate();
-
count = _psxRcntRcount( index );
// Parasite Eve 2 fix.
count = _psxRcntRcount( index );
// Parasite Eve 2 fix.
@@
-440,8
+437,6
@@
u32 psxRcntRmode( u32 index )
{
u16 mode;
{
u16 mode;
- psxRcntUpdate();
-
mode = rcnts[index].mode;
rcnts[index].mode &= 0xe7ff;
mode = rcnts[index].mode;
rcnts[index].mode &= 0xe7ff;
@@
-505,6
+500,8
@@
s32 psxRcntFreeze( gzFile f, s32 Mode )
if (Mode == 0)
hsync_steps = (psxRegs.cycle - rcnts[3].cycleStart) / rcnts[3].target;
if (Mode == 0)
hsync_steps = (psxRegs.cycle - rcnts[3].cycleStart) / rcnts[3].target;
+ base_cycle = 0;
+
return 0;
}
return 0;
}