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
psx_gpu: more limit checking
[pcsx_rearmed.git]
/
libpcsxcore
/
psxcounters.c
diff --git
a/libpcsxcore/psxcounters.c
b/libpcsxcore/psxcounters.c
index
2ea7c63
..
8fc33b4
100644
(file)
--- a/
libpcsxcore/psxcounters.c
+++ b/
libpcsxcore/psxcounters.c
@@
-60,9
+60,9
@@
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 SpuUpdInterval[] = { 32, 32 };
static const u32 HSyncTotal[] = { 263, 313 };
static const u32 SpuUpdInterval[] = { 32, 32 };
+#define VBlankStart 240
#define VERBOSE_LEVEL 0
static const s32 VerboseLevel = VERBOSE_LEVEL;
#define VERBOSE_LEVEL 0
static const s32 VerboseLevel = VERBOSE_LEVEL;
@@
-128,7
+128,7
@@
void _psxRcntWcount( u32 index, u32 value )
}
else
{
}
else
{
- rcnts[index].cycle = 0x
ffff
* rcnts[index].rate;
+ rcnts[index].cycle = 0x
10000
* rcnts[index].rate;
rcnts[index].counterState = CountToOverflow;
}
}
rcnts[index].counterState = CountToOverflow;
}
}
@@
-143,11
+143,11
@@
u32 _psxRcntRcount( u32 index )
if (rcnts[index].rate > 1)
count /= rcnts[index].rate;
if (rcnts[index].rate > 1)
count /= rcnts[index].rate;
- if( count > 0x
ffff
)
+ if( count > 0x
10000
)
{
{
- verboseLog( 1, "[RCNT %i] rcount > 0xffff: %x\n", index, count );
- count &= 0xffff;
+ verboseLog( 1, "[RCNT %i] rcount > 0x10000: %x\n", index, count );
}
}
+ count &= 0xffff;
return count;
}
return count;
}
@@
-188,32
+188,29
@@
void psxRcntSet()
static
void psxRcntReset( u32 index )
{
static
void psxRcntReset( u32 index )
{
- u32
count
;
+ u32
rcycles
;
rcnts[index].mode |= RcUnknown10;
if( rcnts[index].counterState == CountToTarget )
{
rcnts[index].mode |= RcUnknown10;
if( rcnts[index].counterState == CountToTarget )
{
+ rcycles = psxRegs.cycle - rcnts[index].cycleStart;
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;
+ rcycles -= rcnts[index].target * rcnts[index].rate;
+ rcnts[index].cycleStart = psxRegs.cycle - rcycles;
}
else
{
}
else
{
- count = _psxRcntRcount( index );
+ rcnts[index].cycle = 0x10000 * rcnts[index].rate;
+ rcnts[index].counterState = CountToOverflow;
}
}
- _psxRcntWcount( index, count );
-
if( rcnts[index].mode & RcIrqOnTarget )
{
if( (rcnts[index].mode & RcIrqRegenerate) || (!rcnts[index].irqState) )
{
if( rcnts[index].mode & RcIrqOnTarget )
{
if( (rcnts[index].mode & RcIrqRegenerate) || (!rcnts[index].irqState) )
{
- verboseLog( 3, "[RCNT %i] irq
: %x\n", index, count
);
+ verboseLog( 3, "[RCNT %i] irq
\n", index
);
setIrq( rcnts[index].irq );
rcnts[index].irqState = 1;
}
setIrq( rcnts[index].irq );
rcnts[index].irqState = 1;
}
@@
-221,27
+218,28
@@
void psxRcntReset( u32 index )
rcnts[index].mode |= RcCountEqTarget;
rcnts[index].mode |= RcCountEqTarget;
- psxRcntSet();
-
- if( count < 0xffff ) // special case, overflow too?
+ if( rcycles < 0x10000 * rcnts[index].rate )
return;
}
if( rcnts[index].counterState == CountToOverflow )
{
return;
}
if( rcnts[index].counterState == CountToOverflow )
{
- count = psxRegs.cycle;
- count -= rcnts[index].cycleStart;
- if (rcnts[index].rate > 1)
- count /= rcnts[index].rate;
- count -= 0xffff;
+ rcycles = psxRegs.cycle - rcnts[index].cycleStart;
+ rcycles -= 0x10000 * rcnts[index].rate;
- _psxRcntWcount( index, count );
+ rcnts[index].cycleStart = psxRegs.cycle - rcycles;
+
+ if( rcycles < rcnts[index].target * rcnts[index].rate )
+ {
+ rcnts[index].cycle = rcnts[index].target * rcnts[index].rate;
+ rcnts[index].counterState = CountToTarget;
+ }
if( rcnts[index].mode & RcIrqOnOverflow )
{
if( (rcnts[index].mode & RcIrqRegenerate) || (!rcnts[index].irqState) )
{
if( rcnts[index].mode & RcIrqOnOverflow )
{
if( (rcnts[index].mode & RcIrqRegenerate) || (!rcnts[index].irqState) )
{
- verboseLog( 3, "[RCNT %i] irq
: %x\n", index, count
);
+ verboseLog( 3, "[RCNT %i] irq
\n", index
);
setIrq( rcnts[index].irq );
rcnts[index].irqState = 1;
}
setIrq( rcnts[index].irq );
rcnts[index].irqState = 1;
}
@@
-249,8
+247,6
@@
void psxRcntReset( u32 index )
rcnts[index].mode |= RcOverflow;
}
rcnts[index].mode |= RcOverflow;
}
-
- psxRcntSet();
}
void psxRcntUpdate()
}
void psxRcntUpdate()
@@
-298,11
+294,10
@@
void psxRcntUpdate()
}
// VSync irq.
}
// VSync irq.
- if( hSyncCount == VBlankStart
[Config.PsxType]
)
+ if( hSyncCount == VBlankStart )
{
{
- if( !(HW_GPU_STATUS & PSXGPU_ILACE) )
- HW_GPU_STATUS |= PSXGPU_LCF;
-
+ HW_GPU_STATUS &= ~PSXGPU_LCF;
+ GPU_vBlank( 1, 0 );
setIrq( 0x01 );
EmuUpdate();
setIrq( 0x01 );
EmuUpdate();
@@
-315,14
+310,15
@@
void psxRcntUpdate()
hSyncCount = 0;
frame_counter++;
hSyncCount = 0;
frame_counter++;
-
HW_GPU_STATUS &= ~PSXGPU_LCF
;
- if(
HW_GPU_STATUS & PSXGPU_ILACE
)
+
gpuSyncPluginSR()
;
+ if(
(HW_GPU_STATUS & PSXGPU_ILACE_BITS) == PSXGPU_ILACE_BITS
)
HW_GPU_STATUS |= frame_counter << 31;
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;
next_lace = HSyncTotal[Config.PsxType] - hSyncCount;
if( next_vsync && next_vsync < hsync_steps )
hsync_steps = next_vsync;
@@
-338,9
+334,10
@@
void psxRcntUpdate()
base_cycle += hsync_steps * 8791293;
rcnts[3].cycle = base_cycle >> 12;
base_cycle &= 0xfff;
base_cycle += hsync_steps * 8791293;
rcnts[3].cycle = base_cycle >> 12;
base_cycle &= 0xfff;
- psxRcntSet();
}
}
+ psxRcntSet();
+
#ifndef NDEBUG
DebugVSync();
#endif
#ifndef NDEBUG
DebugVSync();
#endif