mirror of https://github.com/PCSX2/pcsx2.git
Fixed a logic flaw in r657 that caused a bottleneck in the MTGS ringbuffer stream. It was killing MTGS performance on games like FFXII, BoF5, and other GPU-intensive titles.
Moved GIf/GifDma code into its own file: Gif.cpp. GS.cpp is a lot more manageable now :D git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@658 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
Jake.Stine
Gregory Hainaut
parent
240defef4e
commit
24ef7776fd
531
pcsx2/GS.cpp
531
pcsx2/GS.cpp
|
|
@ -21,12 +21,11 @@
|
||||||
#include <list>
|
#include <list>
|
||||||
|
|
||||||
#include "Common.h"
|
#include "Common.h"
|
||||||
#include "VU.h"
|
|
||||||
#include "GS.h"
|
#include "GS.h"
|
||||||
#include "iR5900.h"
|
#include "iR5900.h"
|
||||||
#include "Counters.h"
|
#include "Counters.h"
|
||||||
|
|
||||||
#include "VifDma.h"
|
#include "Vifdma.h"
|
||||||
|
|
||||||
using namespace Threading;
|
using namespace Threading;
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
@ -109,12 +108,6 @@ __forceinline void GSVSYNC(void) {
|
||||||
|
|
||||||
u32 CSRw;
|
u32 CSRw;
|
||||||
|
|
||||||
#ifdef PCSX2_VIRTUAL_MEM
|
|
||||||
#define gif ((DMACh*)&PS2MEM_HW[0xA000])
|
|
||||||
#else
|
|
||||||
#define gif ((DMACh*)&psH[0xA000])
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef PCSX2_VIRTUAL_MEM
|
#ifdef PCSX2_VIRTUAL_MEM
|
||||||
#define PS2GS_BASE(mem) ((PS2MEM_BASE+0x12000000)+(mem&0x13ff))
|
#define PS2GS_BASE(mem) ((PS2MEM_BASE+0x12000000)+(mem&0x13ff))
|
||||||
#else
|
#else
|
||||||
|
|
@ -282,7 +275,7 @@ void gsReset()
|
||||||
psHu32(GIF_MODE) = 0;
|
psHu32(GIF_MODE) = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool _gsGIFSoftReset( int mask )
|
bool gsGIFSoftReset( int mask )
|
||||||
{
|
{
|
||||||
if( GSgifSoftReset == NULL )
|
if( GSgifSoftReset == NULL )
|
||||||
{
|
{
|
||||||
|
|
@ -311,7 +304,7 @@ void gsGIFReset()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// perform a soft reset (but do not do a full reset if the soft reset API is unavailable)
|
// perform a soft reset (but do not do a full reset if the soft reset API is unavailable)
|
||||||
_gsGIFSoftReset( 7 );
|
gsGIFSoftReset( 7 );
|
||||||
|
|
||||||
GSCSRr = 0x551B400F; // Set the FINISH bit to 1 for now
|
GSCSRr = 0x551B400F; // Set the FINISH bit to 1 for now
|
||||||
GSIMR = 0x7f00;
|
GSIMR = 0x7f00;
|
||||||
|
|
@ -341,7 +334,7 @@ void gsCSRwrite(u32 value)
|
||||||
// perform a soft reset -- and fall back to doing a full reset if the plugin doesn't
|
// perform a soft reset -- and fall back to doing a full reset if the plugin doesn't
|
||||||
// support soft resets.
|
// support soft resets.
|
||||||
|
|
||||||
if( !_gsGIFSoftReset( 7 ) )
|
if( !gsGIFSoftReset( 7 ) )
|
||||||
{
|
{
|
||||||
if( mtgsThread != NULL )
|
if( mtgsThread != NULL )
|
||||||
mtgsThread->SendSimplePacket( GS_RINGTYPE_RESET, 0, 0, 0 );
|
mtgsThread->SendSimplePacket( GS_RINGTYPE_RESET, 0, 0, 0 );
|
||||||
|
|
@ -498,522 +491,6 @@ void gsIrq() {
|
||||||
hwIntcIrq(0);
|
hwIntcIrq(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int gspath3done=0;
|
|
||||||
int gscycles = 0;
|
|
||||||
|
|
||||||
__forceinline void gsInterrupt() {
|
|
||||||
GIF_LOG("gsInterrupt: %8.8x\n", cpuRegs.cycle);
|
|
||||||
|
|
||||||
if((gif->chcr & 0x100) == 0){
|
|
||||||
//SysPrintf("Eh? why are you still interrupting! chcr %x, qwc %x, done = %x\n", gif->chcr, gif->qwc, done);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if(gif->qwc > 0 || gspath3done == 0) {
|
|
||||||
if( !(psHu32(DMAC_CTRL) & 0x1) ) {
|
|
||||||
Console::Notice("gs dma masked, re-scheduling...");
|
|
||||||
// re-raise the int shortly in the future
|
|
||||||
CPU_INT( 2, 64 );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
GIFdma();
|
|
||||||
#ifdef GSPATH3FIX
|
|
||||||
// re-reaise the IRQ as part of the mysterious Path3fix.
|
|
||||||
// fixme - this hack *should* have the gs_irq raised from the VIF, I think. It would be
|
|
||||||
// more efficient and more correct. (air)
|
|
||||||
if (!(vif1Regs->mskpath3 && (vif1ch->chcr & 0x100)) || (psHu32(GIF_MODE) & 0x1))
|
|
||||||
CPU_INT( 2, 64 );
|
|
||||||
#endif
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
gspath3done = 0;
|
|
||||||
gscycles = 0;
|
|
||||||
Path3transfer = 0;
|
|
||||||
gif->chcr &= ~0x100;
|
|
||||||
GSCSRr &= ~0xC000; //Clear FIFO stuff
|
|
||||||
GSCSRr |= 0x4000; //FIFO empty
|
|
||||||
//psHu32(GIF_MODE)&= ~0x4;
|
|
||||||
psHu32(GIF_STAT)&= ~0xE00; // OPH=0 | APATH=0
|
|
||||||
psHu32(GIF_STAT)&= ~0x1F000000; // QFC=0
|
|
||||||
hwDmacIrq(DMAC_GIF);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
static u64 s_gstag=0; // used for querying the last tag
|
|
||||||
|
|
||||||
static void WRITERING_DMA(u32 *pMem, u32 qwc)
|
|
||||||
{
|
|
||||||
psHu32(GIF_STAT) |= 0xE00;
|
|
||||||
|
|
||||||
// Path3 transfer will be set to zero by the GIFtag handler.
|
|
||||||
Path3transfer = 1;
|
|
||||||
|
|
||||||
if( mtgsThread != NULL )
|
|
||||||
{
|
|
||||||
int sizetoread = (qwc)<<4;
|
|
||||||
sizetoread = mtgsThread->PrepDataPacket( GIF_PATH_3, pMem, qwc );
|
|
||||||
u8* pgsmem = mtgsThread->GetDataPacketPtr();
|
|
||||||
|
|
||||||
/* check if page of endmem is valid (dark cloud2) */
|
|
||||||
// fixme: this hack makes no sense, because the giftagDummy will
|
|
||||||
// process the full length of bytes regardess of how much we copy.
|
|
||||||
// So you'd think if we're truncating the copy to prevent DEPs, we
|
|
||||||
// should truncate the gif packet size too.. (air)
|
|
||||||
|
|
||||||
// fixed? PrepDataPacket now returns the actual size of the packet.
|
|
||||||
// VIF handles scratchpad wrapping also, so this code shouldn't be needed anymore.
|
|
||||||
|
|
||||||
//vm build still needs this, fixes Fatal Frame init(rama)
|
|
||||||
|
|
||||||
#ifdef PCSX2_VIRTUAL_MEM //only do this for vm build, vtlb is fine
|
|
||||||
u32 pendmem = (u32)gif->madr + sizetoread;
|
|
||||||
if( dmaGetAddr(pendmem-16) == NULL )
|
|
||||||
{
|
|
||||||
pendmem = ((pendmem-16)&~0xfff)-16;
|
|
||||||
while(dmaGetAddr(pendmem) == NULL)
|
|
||||||
{
|
|
||||||
pendmem = (pendmem&~0xfff)-16;
|
|
||||||
}
|
|
||||||
memcpy_aligned(pgsmem, pMem, pendmem-(u32)gif->madr+16);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
memcpy_aligned(pgsmem, pMem, sizetoread<<4);
|
|
||||||
|
|
||||||
mtgsThread->SendDataPacket();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
GSGIFTRANSFER3(pMem, qwc);
|
|
||||||
if( GSgetLastTag != NULL )
|
|
||||||
{
|
|
||||||
GSgetLastTag(&s_gstag);
|
|
||||||
if( s_gstag == 1 )
|
|
||||||
Path3transfer = 0; /* fixes SRS and others */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int _GIFchain() {
|
|
||||||
#ifdef GSPATH3FIX
|
|
||||||
u32 qwc = (psHu32(GIF_MODE) & 0x4 && vif1Regs->mskpath3) ? min(8, (int)gif->qwc) : gif->qwc;
|
|
||||||
#else
|
|
||||||
u32 qwc = gif->qwc;
|
|
||||||
#endif
|
|
||||||
u32 *pMem;
|
|
||||||
|
|
||||||
//if (gif->qwc == 0) return 0;
|
|
||||||
|
|
||||||
pMem = (u32*)dmaGetAddr(gif->madr);
|
|
||||||
if (pMem == NULL) {
|
|
||||||
// reset path3, fixes dark cloud 2
|
|
||||||
|
|
||||||
_gsGIFSoftReset(4);
|
|
||||||
|
|
||||||
//must increment madr and clear qwc, else it loops
|
|
||||||
gif->madr+= gif->qwc*16;
|
|
||||||
gif->qwc = 0;
|
|
||||||
Console::Notice( "Hackfix - NULL GIFchain" );
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
WRITERING_DMA(pMem, qwc);
|
|
||||||
|
|
||||||
//if((psHu32(GIF_MODE) & 0x4)) amount -= qwc;
|
|
||||||
gif->madr+= qwc*16;
|
|
||||||
gif->qwc -= qwc;
|
|
||||||
return (qwc)*2;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define GIFchain() \
|
|
||||||
if (gif->qwc) { \
|
|
||||||
gscycles+= _GIFchain(); /* guessing */ \
|
|
||||||
}
|
|
||||||
|
|
||||||
int gscount = 0;
|
|
||||||
static int prevcycles = 0;
|
|
||||||
static u32* prevtag = NULL;
|
|
||||||
|
|
||||||
void GIFdma()
|
|
||||||
{
|
|
||||||
u32 *ptag;
|
|
||||||
u32 id;
|
|
||||||
|
|
||||||
gscycles= prevcycles ? prevcycles: gscycles;
|
|
||||||
|
|
||||||
if( (psHu32(GIF_CTRL) & 8) ) { // temporarily stop
|
|
||||||
SysPrintf("Gif dma temp paused?\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
GIF_LOG("dmaGIFstart chcr = %lx, madr = %lx, qwc = %lx\n tadr = %lx, asr0 = %lx, asr1 = %lx\n", gif->chcr, gif->madr, gif->qwc, gif->tadr, gif->asr0, gif->asr1);
|
|
||||||
|
|
||||||
#ifndef GSPATH3FIX
|
|
||||||
if ( !(psHu32(GIF_MODE) & 0x4) ) {
|
|
||||||
if (vif1Regs->mskpath3 || psHu32(GIF_MODE) & 0x1) {
|
|
||||||
gif->chcr &= ~0x100;
|
|
||||||
psHu32(GIF_STAT)&= ~0xE00; // OPH=0 | APATH=0
|
|
||||||
hwDmacIrq(2);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if ((psHu32(DMAC_CTRL) & 0xC0) == 0x80 && prevcycles != 0) { // STD == GIF
|
|
||||||
SysPrintf("GS Stall Control Source = %x, Drain = %x\n MADR = %x, STADR = %x", (psHu32(0xe000) >> 4) & 0x3, (psHu32(0xe000) >> 6) & 0x3, gif->madr, psHu32(DMAC_STADR));
|
|
||||||
|
|
||||||
if( gif->madr + (gif->qwc * 16) > psHu32(DMAC_STADR) ) {
|
|
||||||
CPU_INT(2, gscycles);
|
|
||||||
gscycles = 0;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
prevcycles = 0;
|
|
||||||
gif->qwc = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
GSCSRr &= ~0xC000; //Clear FIFO stuff
|
|
||||||
GSCSRr |= 0x8000; //FIFO full
|
|
||||||
//psHu32(GIF_STAT)|= 0xE00; // OPH=1 | APATH=3
|
|
||||||
psHu32(GIF_STAT)|= 0x10000000; // FQC=31, hack ;)
|
|
||||||
|
|
||||||
#ifdef GSPATH3FIX
|
|
||||||
if (vif1Regs->mskpath3 || psHu32(GIF_MODE) & 0x1) {
|
|
||||||
if(gif->qwc == 0) {
|
|
||||||
if((gif->chcr & 0x10e) == 0x104) {
|
|
||||||
ptag = (u32*)dmaGetAddr(gif->tadr); //Set memory pointer to TADR
|
|
||||||
|
|
||||||
if (ptag == NULL) { //Is ptag empty?
|
|
||||||
psHu32(DMAC_STAT)|= 1<<15; //If yes, set BEIS (BUSERR) in DMAC_STAT register
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
gscycles += 2;
|
|
||||||
gif->chcr = ( gif->chcr & 0xFFFF ) | ( (*ptag) & 0xFFFF0000 ); //Transfer upper part of tag to CHCR bits 31-15
|
|
||||||
id = (ptag[0] >> 28) & 0x7; //ID for DmaChain copied from bit 28 of the tag
|
|
||||||
gif->qwc = (u16)ptag[0]; //QWC set to lower 16bits of the tag
|
|
||||||
gif->madr = ptag[1]; //MADR = ADDR field
|
|
||||||
gspath3done = hwDmacSrcChainWithStack(gif, id);
|
|
||||||
GIF_LOG("PTH3 MASK gifdmaChain %8.8x_%8.8x size=%d, id=%d, addr=%lx\n", ptag[1], ptag[0], gif->qwc, id, gif->madr);
|
|
||||||
|
|
||||||
if ((gif->chcr & 0x80) && ptag[0] >> 31) { //Check TIE bit of CHCR and IRQ bit of tag
|
|
||||||
GIF_LOG("PATH3 MSK dmaIrq Set\n");
|
|
||||||
SysPrintf("GIF TIE\n");
|
|
||||||
gspath3done |= 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// When MTGS is enabled, Gifchain calls WRITERING_DMA, which calls GSRINGBUF_DONECOPY, which freezes
|
|
||||||
// the registers inside of the FreezeXMMRegs calls here and in the other two below..
|
|
||||||
// I'm not really sure that is intentional. --arcum42
|
|
||||||
FreezeXMMRegs(1);
|
|
||||||
FreezeMMXRegs(1);
|
|
||||||
GIFchain();
|
|
||||||
FreezeXMMRegs(0); // Theres a comment below that says not to unfreeze the xmm regs, so not sure about this.
|
|
||||||
FreezeMMXRegs(0);
|
|
||||||
|
|
||||||
if((gspath3done == 1 || (gif->chcr & 0xc) == 0) && gif->qwc == 0){
|
|
||||||
if(gif->qwc > 0) SysPrintf("Horray\n");
|
|
||||||
gspath3done = 0;
|
|
||||||
gif->chcr &= ~0x100;
|
|
||||||
//psHu32(GIF_MODE)&= ~0x4;
|
|
||||||
GSCSRr &= ~0xC000;
|
|
||||||
GSCSRr |= 0x4000;
|
|
||||||
Path3transfer = 0;
|
|
||||||
psHu32(GIF_STAT)&= ~0x1F000E00; // OPH=0 | APATH=0 | QFC=0
|
|
||||||
hwDmacIrq(DMAC_GIF);
|
|
||||||
}
|
|
||||||
//Dont unfreeze xmm regs here, Masked PATH3 can only be called by VIF, which is already handling it.
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
//gscycles = 0;
|
|
||||||
// Transfer Dn_QWC from Dn_MADR to GIF
|
|
||||||
if ((gif->chcr & 0xc) == 0 || gif->qwc > 0) { // Normal Mode
|
|
||||||
//gscount++;
|
|
||||||
if ((psHu32(DMAC_CTRL) & 0xC0) == 0x80 && (gif->chcr & 0xc) == 0) {
|
|
||||||
SysPrintf("DMA Stall Control on GIF normal\n");
|
|
||||||
}
|
|
||||||
FreezeXMMRegs(1);
|
|
||||||
FreezeMMXRegs(1);
|
|
||||||
GIFchain(); //Transfers the data set by the switch
|
|
||||||
FreezeXMMRegs(0);
|
|
||||||
FreezeMMXRegs(0);
|
|
||||||
if(gif->qwc == 0 && (gif->chcr & 0xc) == 0) gspath3done = 1;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// Chain Mode
|
|
||||||
while (gspath3done == 0 && gif->qwc == 0) { //Loop if the transfers aren't intermittent
|
|
||||||
ptag = (u32*)dmaGetAddr(gif->tadr); //Set memory pointer to TADR
|
|
||||||
if (ptag == NULL) { //Is ptag empty?
|
|
||||||
psHu32(DMAC_STAT)|= 1<<15; //If yes, set BEIS (BUSERR) in DMAC_STAT register
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
gscycles+=2; // Add 1 cycles from the QW read for the tag
|
|
||||||
|
|
||||||
// Transfer dma tag if tte is set
|
|
||||||
if (gif->chcr & 0x40) {
|
|
||||||
//u32 temptag[4] = {0};
|
|
||||||
//SysPrintf("GIF TTE: %x_%x\n", ptag[3], ptag[2]);
|
|
||||||
|
|
||||||
//temptag[0] = ptag[2];
|
|
||||||
//temptag[1] = ptag[3];
|
|
||||||
//GSGIFTRANSFER3(ptag, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
gif->chcr = ( gif->chcr & 0xFFFF ) | ( (*ptag) & 0xFFFF0000 ); //Transfer upper part of tag to CHCR bits 31-15
|
|
||||||
|
|
||||||
id = (ptag[0] >> 28) & 0x7; //ID for DmaChain copied from bit 28 of the tag
|
|
||||||
gif->qwc = (u16)ptag[0]; //QWC set to lower 16bits of the tag
|
|
||||||
gif->madr = ptag[1]; //MADR = ADDR field
|
|
||||||
|
|
||||||
gspath3done = hwDmacSrcChainWithStack(gif, id);
|
|
||||||
GIF_LOG("gifdmaChain %8.8x_%8.8x size=%d, id=%d, addr=%lx\n", ptag[1], ptag[0], gif->qwc, id, gif->madr);
|
|
||||||
|
|
||||||
if ((psHu32(DMAC_CTRL) & 0xC0) == 0x80) { // STD == GIF
|
|
||||||
// there are still bugs, need to also check if gif->madr +16*qwc >= stadr, if not, stall
|
|
||||||
if(!gspath3done && gif->madr + (gif->qwc * 16) > psHu32(DMAC_STADR) && id == 4) {
|
|
||||||
// stalled
|
|
||||||
SysPrintf("GS Stall Control Source = %x, Drain = %x\n MADR = %x, STADR = %x", (psHu32(0xe000) >> 4) & 0x3, (psHu32(0xe000) >> 6) & 0x3,gif->madr, psHu32(DMAC_STADR));
|
|
||||||
prevcycles = gscycles;
|
|
||||||
gif->tadr -= 16;
|
|
||||||
hwDmacIrq(13);
|
|
||||||
CPU_INT(2, gscycles);
|
|
||||||
gscycles = 0;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
FreezeXMMRegs(1);
|
|
||||||
FreezeMMXRegs(1);
|
|
||||||
GIFchain(); //Transfers the data set by the switch
|
|
||||||
FreezeXMMRegs(0);
|
|
||||||
FreezeMMXRegs(0);
|
|
||||||
|
|
||||||
if ((gif->chcr & 0x80) && ptag[0] >> 31) { //Check TIE bit of CHCR and IRQ bit of tag
|
|
||||||
GIF_LOG("dmaIrq Set\n");
|
|
||||||
gspath3done = 1;
|
|
||||||
//gif->qwc = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
prevtag = NULL;
|
|
||||||
prevcycles = 0;
|
|
||||||
if (!(vif1Regs->mskpath3 || (psHu32(GIF_MODE) & 0x1))) {
|
|
||||||
CPU_INT(2, gscycles);
|
|
||||||
gscycles = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void dmaGIF() {
|
|
||||||
//if(vif1Regs->mskpath3 || (psHu32(GIF_MODE) & 0x1)){
|
|
||||||
// CPU_INT(2, 48); //Wait time for the buffer to fill, fixes some timing problems in path 3 masking
|
|
||||||
//} //It takes the time of 24 QW for the BUS to become ready - The Punisher, And1 Streetball
|
|
||||||
//else
|
|
||||||
gspath3done = 0; // For some reason this doesnt clear? So when the system starts the thread, we will clear it :)
|
|
||||||
|
|
||||||
if(gif->qwc > 0 && (gif->chcr & 0x4) == 0x4)
|
|
||||||
gspath3done = 1; //Halflife sets a QWC amount in chain mode, no tadr set.
|
|
||||||
|
|
||||||
if ((psHu32(DMAC_CTRL) & 0xC) == 0xC ) { // GIF MFIFO
|
|
||||||
//SysPrintf("GIF MFIFO\n");
|
|
||||||
gifMFIFOInterrupt();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
GIFdma();
|
|
||||||
}
|
|
||||||
|
|
||||||
#define spr0 ((DMACh*)&PS2MEM_HW[0xD000])
|
|
||||||
|
|
||||||
static unsigned int mfifocycles;
|
|
||||||
static unsigned int gifqwc = 0;
|
|
||||||
static unsigned int gifdone = 0;
|
|
||||||
|
|
||||||
// called from only one location, so forceinline it:
|
|
||||||
static __forceinline int mfifoGIFrbTransfer() {
|
|
||||||
u32 qwc = (psHu32(GIF_MODE) & 0x4 && vif1Regs->mskpath3) ? min(8, (int)gif->qwc) : gif->qwc;
|
|
||||||
int mfifoqwc = min(gifqwc, qwc);
|
|
||||||
u32 *src;
|
|
||||||
|
|
||||||
|
|
||||||
/* Check if the transfer should wrap around the ring buffer */
|
|
||||||
if ((gif->madr+mfifoqwc*16) > (psHu32(DMAC_RBOR) + psHu32(DMAC_RBSR)+16)) {
|
|
||||||
int s1 = ((psHu32(DMAC_RBOR) + psHu32(DMAC_RBSR)+16) - gif->madr) >> 4;
|
|
||||||
|
|
||||||
// fixme - I don't think these should use WRITERING_DMA, since our source
|
|
||||||
// isn't the DmaGetAddr(gif->madr) address that WRITERING_DMA expects.
|
|
||||||
|
|
||||||
/* it does, so first copy 's1' bytes from 'addr' to 'data' */
|
|
||||||
src = (u32*)PSM(gif->madr);
|
|
||||||
if (src == NULL) return -1;
|
|
||||||
WRITERING_DMA(src, s1);
|
|
||||||
|
|
||||||
/* and second copy 's2' bytes from 'maddr' to '&data[s1]' */
|
|
||||||
src = (u32*)PSM(psHu32(DMAC_RBOR));
|
|
||||||
if (src == NULL) return -1;
|
|
||||||
WRITERING_DMA(src, (mfifoqwc - s1));
|
|
||||||
|
|
||||||
} else {
|
|
||||||
/* it doesn't, so just transfer 'qwc*16' words
|
|
||||||
from 'gif->madr' to GS */
|
|
||||||
src = (u32*)PSM(gif->madr);
|
|
||||||
if (src == NULL) return -1;
|
|
||||||
|
|
||||||
WRITERING_DMA(src, mfifoqwc);
|
|
||||||
gif->madr = psHu32(DMAC_RBOR) + (gif->madr & psHu32(DMAC_RBSR));
|
|
||||||
}
|
|
||||||
|
|
||||||
gifqwc -= mfifoqwc;
|
|
||||||
gif->qwc -= mfifoqwc;
|
|
||||||
gif->madr+= mfifoqwc*16;
|
|
||||||
mfifocycles+= (mfifoqwc) * 2; /* guessing */
|
|
||||||
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// called from only one location, so forceinline it:
|
|
||||||
static __forceinline int mfifoGIFchain() {
|
|
||||||
/* Is QWC = 0? if so there is nothing to transfer */
|
|
||||||
|
|
||||||
if (gif->qwc == 0) return 0;
|
|
||||||
|
|
||||||
if (gif->madr >= psHu32(DMAC_RBOR) &&
|
|
||||||
gif->madr <= (psHu32(DMAC_RBOR)+psHu32(DMAC_RBSR))) {
|
|
||||||
if (mfifoGIFrbTransfer() == -1) return -1;
|
|
||||||
} else {
|
|
||||||
int mfifoqwc = (psHu32(GIF_MODE) & 0x4 && vif1Regs->mskpath3) ? min(8, (int)gif->qwc) : gif->qwc;
|
|
||||||
u32 *pMem = (u32*)dmaGetAddr(gif->madr);
|
|
||||||
if (pMem == NULL) return -1;
|
|
||||||
|
|
||||||
WRITERING_DMA(pMem, mfifoqwc);
|
|
||||||
gif->madr+= mfifoqwc*16;
|
|
||||||
gif->qwc -= mfifoqwc;
|
|
||||||
mfifocycles+= (mfifoqwc) * 2; /* guessing */
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void mfifoGIFtransfer(int qwc) {
|
|
||||||
u32 *ptag;
|
|
||||||
int id;
|
|
||||||
u32 temp = 0;
|
|
||||||
mfifocycles = 0;
|
|
||||||
|
|
||||||
if(qwc > 0 ) {
|
|
||||||
gifqwc += qwc;
|
|
||||||
if(!(gif->chcr & 0x100))return;
|
|
||||||
}
|
|
||||||
SPR_LOG("mfifoGIFtransfer %x madr %x, tadr %x\n", gif->chcr, gif->madr, gif->tadr);
|
|
||||||
|
|
||||||
if(gif->qwc == 0){
|
|
||||||
if(gif->tadr == spr0->madr) {
|
|
||||||
#ifdef PCSX2_DEVBUILD
|
|
||||||
/*if( gifqwc > 1 )
|
|
||||||
SysPrintf("gif mfifo tadr==madr but qwc = %d\n", gifqwc);*/
|
|
||||||
#endif
|
|
||||||
//hwDmacIrq(14);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
gif->tadr = psHu32(DMAC_RBOR) + (gif->tadr & psHu32(DMAC_RBSR));
|
|
||||||
ptag = (u32*)dmaGetAddr(gif->tadr);
|
|
||||||
|
|
||||||
id = (ptag[0] >> 28) & 0x7;
|
|
||||||
gif->qwc = (ptag[0] & 0xffff);
|
|
||||||
gif->madr = ptag[1];
|
|
||||||
mfifocycles += 2;
|
|
||||||
|
|
||||||
gif->chcr = ( gif->chcr & 0xFFFF ) | ( (*ptag) & 0xFFFF0000 );
|
|
||||||
SPR_LOG("dmaChain %8.8x_%8.8x size=%d, id=%d, madr=%lx, tadr=%lx mfifo qwc = %x spr0 madr = %x\n",
|
|
||||||
ptag[1], ptag[0], gif->qwc, id, gif->madr, gif->tadr, gifqwc, spr0->madr);
|
|
||||||
|
|
||||||
gifqwc--;
|
|
||||||
switch (id) {
|
|
||||||
case 0: // Refe - Transfer Packet According to ADDR field
|
|
||||||
gif->tadr = psHu32(DMAC_RBOR) + ((gif->tadr + 16) & psHu32(DMAC_RBSR));
|
|
||||||
gifdone = 2; //End Transfer
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 1: // CNT - Transfer QWC following the tag.
|
|
||||||
gif->madr = psHu32(DMAC_RBOR) + ((gif->tadr + 16) & psHu32(DMAC_RBSR)); //Set MADR to QW after Tag
|
|
||||||
gif->tadr = psHu32(DMAC_RBOR) + ((gif->madr + (gif->qwc << 4)) & psHu32(DMAC_RBSR)); //Set TADR to QW following the data
|
|
||||||
gifdone = 0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 2: // Next - Transfer QWC following tag. TADR = ADDR
|
|
||||||
temp = gif->madr; //Temporarily Store ADDR
|
|
||||||
gif->madr = psHu32(DMAC_RBOR) + ((gif->tadr + 16) & psHu32(DMAC_RBSR)); //Set MADR to QW following the tag
|
|
||||||
gif->tadr = temp; //Copy temporarily stored ADDR to Tag
|
|
||||||
gifdone = 0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 3: // Ref - Transfer QWC from ADDR field
|
|
||||||
case 4: // Refs - Transfer QWC from ADDR field (Stall Control)
|
|
||||||
gif->tadr = psHu32(DMAC_RBOR) + ((gif->tadr + 16) & psHu32(DMAC_RBSR)); //Set TADR to next tag
|
|
||||||
gifdone = 0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 7: // End - Transfer QWC following the tag
|
|
||||||
gif->madr = psHu32(DMAC_RBOR) + ((gif->tadr + 16) & psHu32(DMAC_RBSR)); //Set MADR to data following the tag
|
|
||||||
gif->tadr = psHu32(DMAC_RBOR) + ((gif->madr + (gif->qwc << 4)) & psHu32(DMAC_RBSR)); //Set TADR to QW following the data
|
|
||||||
gifdone = 2; //End Transfer
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if ((gif->chcr & 0x80) && (ptag[0] >> 31)) {
|
|
||||||
SPR_LOG("dmaIrq Set\n");
|
|
||||||
gifdone = 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
FreezeXMMRegs(1);
|
|
||||||
FreezeMMXRegs(1);
|
|
||||||
if (mfifoGIFchain() == -1) {
|
|
||||||
SysPrintf("GIF dmaChain error size=%d, madr=%lx, tadr=%lx\n",
|
|
||||||
gif->qwc, gif->madr, gif->tadr);
|
|
||||||
gifdone = 1;
|
|
||||||
}
|
|
||||||
FreezeXMMRegs(0);
|
|
||||||
FreezeMMXRegs(0);
|
|
||||||
|
|
||||||
if(gif->qwc == 0 && gifdone == 2) gifdone = 1;
|
|
||||||
CPU_INT(11,mfifocycles);
|
|
||||||
|
|
||||||
SPR_LOG("mfifoGIFtransfer end %x madr %x, tadr %x\n", gif->chcr, gif->madr, gif->tadr);
|
|
||||||
}
|
|
||||||
|
|
||||||
void gifMFIFOInterrupt()
|
|
||||||
{
|
|
||||||
if(!(gif->chcr & 0x100)) { SysPrintf("WTF GIFMFIFO\n");cpuRegs.interrupt &= ~(1 << 11); return ; }
|
|
||||||
|
|
||||||
if(gifdone != 1) {
|
|
||||||
if(gifqwc <= 0) {
|
|
||||||
//SysPrintf("Empty\n");
|
|
||||||
psHu32(GIF_STAT)&= ~0xE00; // OPH=0 | APATH=0
|
|
||||||
hwDmacIrq(14);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
mfifoGIFtransfer(0);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#ifdef PCSX2_DEVBUILD
|
|
||||||
if(gifdone == 0 || gif->qwc > 0) {
|
|
||||||
Console::Error("gifMFIFO Panic > Shouldnt go here!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
//if(gifqwc > 0)SysPrintf("GIF MFIFO ending with stuff in it %x\n", gifqwc);
|
|
||||||
gifqwc = 0;
|
|
||||||
gifdone = 0;
|
|
||||||
gif->chcr &= ~0x100;
|
|
||||||
hwDmacIrq(DMAC_GIF);
|
|
||||||
GSCSRr &= ~0xC000; //Clear FIFO stuff
|
|
||||||
GSCSRr |= 0x4000; //FIFO empty
|
|
||||||
//psHu32(GIF_MODE)&= ~0x4;
|
|
||||||
psHu32(GIF_STAT)&= ~0xE00; // OPH=0 | APATH=0
|
|
||||||
psHu32(GIF_STAT)&= ~0x1F000000; // QFC=0
|
|
||||||
}
|
|
||||||
|
|
||||||
void gsSyncLimiterLostTime( s32 deltaTime )
|
void gsSyncLimiterLostTime( s32 deltaTime )
|
||||||
{
|
{
|
||||||
// This sync issue applies only to configs that are trying to maintain
|
// This sync issue applies only to configs that are trying to maintain
|
||||||
|
|
|
||||||
|
|
@ -277,6 +277,7 @@ extern void _gs_ChangeTimings( u32 framerate, u32 iTicks );
|
||||||
|
|
||||||
|
|
||||||
// used for resetting GIF fifo
|
// used for resetting GIF fifo
|
||||||
|
bool gsGIFSoftReset( int mask );
|
||||||
void gsGIFReset();
|
void gsGIFReset();
|
||||||
void gsCSRwrite(u32 value);
|
void gsCSRwrite(u32 value);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,552 @@
|
||||||
|
/* Pcsx2 - Pc Ps2 Emulator
|
||||||
|
* Copyright (C) 2002-2008 Pcsx2 Team
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "PrecompiledHeader.h"
|
||||||
|
|
||||||
|
#include "Common.h"
|
||||||
|
#include "VU.h"
|
||||||
|
#include "GS.h"
|
||||||
|
#include "iR5900.h"
|
||||||
|
#include "Counters.h"
|
||||||
|
|
||||||
|
#include "VifDma.h"
|
||||||
|
|
||||||
|
using std::min;
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef PCSX2_VIRTUAL_MEM
|
||||||
|
#define gif ((DMACh*)&PS2MEM_HW[0xA000])
|
||||||
|
#else
|
||||||
|
#define gif ((DMACh*)&psH[0xA000])
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static u64 s_gstag=0; // used for querying the last tag
|
||||||
|
static int gspath3done=0;
|
||||||
|
static int gscycles = 0;
|
||||||
|
|
||||||
|
__forceinline void gsInterrupt() {
|
||||||
|
GIF_LOG("gsInterrupt: %8.8x\n", cpuRegs.cycle);
|
||||||
|
|
||||||
|
if((gif->chcr & 0x100) == 0){
|
||||||
|
//SysPrintf("Eh? why are you still interrupting! chcr %x, qwc %x, done = %x\n", gif->chcr, gif->qwc, done);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(gif->qwc > 0 || gspath3done == 0) {
|
||||||
|
if( !(psHu32(DMAC_CTRL) & 0x1) ) {
|
||||||
|
Console::Notice("gs dma masked, re-scheduling...");
|
||||||
|
// re-raise the int shortly in the future
|
||||||
|
CPU_INT( 2, 64 );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GIFdma();
|
||||||
|
#ifdef GSPATH3FIX
|
||||||
|
// re-reaise the IRQ as part of the mysterious Path3fix.
|
||||||
|
// fixme - this hack *should* have the gs_irq raised from the VIF, I think. It would be
|
||||||
|
// more efficient and more correct. (air)
|
||||||
|
if (!(vif1Regs->mskpath3 && (vif1ch->chcr & 0x100)) || (psHu32(GIF_MODE) & 0x1))
|
||||||
|
CPU_INT( 2, 64 );
|
||||||
|
#endif
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
gspath3done = 0;
|
||||||
|
gscycles = 0;
|
||||||
|
Path3transfer = 0;
|
||||||
|
gif->chcr &= ~0x100;
|
||||||
|
GSCSRr &= ~0xC000; //Clear FIFO stuff
|
||||||
|
GSCSRr |= 0x4000; //FIFO empty
|
||||||
|
//psHu32(GIF_MODE)&= ~0x4;
|
||||||
|
psHu32(GIF_STAT)&= ~0xE00; // OPH=0 | APATH=0
|
||||||
|
psHu32(GIF_STAT)&= ~0x1F000000; // QFC=0
|
||||||
|
hwDmacIrq(DMAC_GIF);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
static void WRITERING_DMA(u32 *pMem, u32 qwc)
|
||||||
|
{
|
||||||
|
psHu32(GIF_STAT) |= 0xE00;
|
||||||
|
|
||||||
|
// Path3 transfer will be set to zero by the GIFtag handler.
|
||||||
|
Path3transfer = 1;
|
||||||
|
|
||||||
|
if( mtgsThread != NULL )
|
||||||
|
{
|
||||||
|
int sizetoread = (qwc)<<4;
|
||||||
|
sizetoread = mtgsThread->PrepDataPacket( GIF_PATH_3, pMem, qwc );
|
||||||
|
u8* pgsmem = mtgsThread->GetDataPacketPtr();
|
||||||
|
|
||||||
|
/* check if page of endmem is valid (dark cloud2) */
|
||||||
|
// fixme: this hack makes no sense, because the giftagDummy will
|
||||||
|
// process the full length of bytes regardess of how much we copy.
|
||||||
|
// So you'd think if we're truncating the copy to prevent DEPs, we
|
||||||
|
// should truncate the gif packet size too.. (air)
|
||||||
|
|
||||||
|
// fixed? PrepDataPacket now returns the actual size of the packet.
|
||||||
|
// VIF handles scratchpad wrapping also, so this code shouldn't be needed anymore.
|
||||||
|
|
||||||
|
//vm build still needs this, fixes Fatal Frame init(rama)
|
||||||
|
|
||||||
|
#ifdef PCSX2_VIRTUAL_MEM //only do this for vm build, vtlb is fine
|
||||||
|
u32 pendmem = (u32)gif->madr + sizetoread;
|
||||||
|
if( dmaGetAddr(pendmem-16) == NULL )
|
||||||
|
{
|
||||||
|
pendmem = ((pendmem-16)&~0xfff)-16;
|
||||||
|
while(dmaGetAddr(pendmem) == NULL)
|
||||||
|
{
|
||||||
|
pendmem = (pendmem&~0xfff)-16;
|
||||||
|
}
|
||||||
|
memcpy_aligned(pgsmem, pMem, pendmem-(u32)gif->madr+16);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
memcpy_aligned(pgsmem, pMem, sizetoread<<4);
|
||||||
|
|
||||||
|
mtgsThread->SendDataPacket();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
GSGIFTRANSFER3(pMem, qwc);
|
||||||
|
if( GSgetLastTag != NULL )
|
||||||
|
{
|
||||||
|
GSgetLastTag(&s_gstag);
|
||||||
|
if( s_gstag == 1 )
|
||||||
|
Path3transfer = 0; /* fixes SRS and others */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int _GIFchain() {
|
||||||
|
#ifdef GSPATH3FIX
|
||||||
|
u32 qwc = (psHu32(GIF_MODE) & 0x4 && vif1Regs->mskpath3) ? min(8, (int)gif->qwc) : gif->qwc;
|
||||||
|
#else
|
||||||
|
u32 qwc = gif->qwc;
|
||||||
|
#endif
|
||||||
|
u32 *pMem;
|
||||||
|
|
||||||
|
//if (gif->qwc == 0) return 0;
|
||||||
|
|
||||||
|
pMem = (u32*)dmaGetAddr(gif->madr);
|
||||||
|
if (pMem == NULL) {
|
||||||
|
// reset path3, fixes dark cloud 2
|
||||||
|
|
||||||
|
gsGIFSoftReset(4);
|
||||||
|
|
||||||
|
//must increment madr and clear qwc, else it loops
|
||||||
|
gif->madr+= gif->qwc*16;
|
||||||
|
gif->qwc = 0;
|
||||||
|
Console::Notice( "Hackfix - NULL GIFchain" );
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
WRITERING_DMA(pMem, qwc);
|
||||||
|
|
||||||
|
//if((psHu32(GIF_MODE) & 0x4)) amount -= qwc;
|
||||||
|
gif->madr+= qwc*16;
|
||||||
|
gif->qwc -= qwc;
|
||||||
|
return (qwc)*2;
|
||||||
|
}
|
||||||
|
|
||||||
|
#define GIFchain() \
|
||||||
|
if (gif->qwc) { \
|
||||||
|
gscycles+= _GIFchain(); /* guessing */ \
|
||||||
|
}
|
||||||
|
|
||||||
|
int gscount = 0;
|
||||||
|
static int prevcycles = 0;
|
||||||
|
static u32* prevtag = NULL;
|
||||||
|
|
||||||
|
void GIFdma()
|
||||||
|
{
|
||||||
|
u32 *ptag;
|
||||||
|
u32 id;
|
||||||
|
|
||||||
|
gscycles= prevcycles ? prevcycles: gscycles;
|
||||||
|
|
||||||
|
if( (psHu32(GIF_CTRL) & 8) ) { // temporarily stop
|
||||||
|
SysPrintf("Gif dma temp paused?\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GIF_LOG("dmaGIFstart chcr = %lx, madr = %lx, qwc = %lx\n tadr = %lx, asr0 = %lx, asr1 = %lx\n", gif->chcr, gif->madr, gif->qwc, gif->tadr, gif->asr0, gif->asr1);
|
||||||
|
|
||||||
|
#ifndef GSPATH3FIX
|
||||||
|
if ( !(psHu32(GIF_MODE) & 0x4) ) {
|
||||||
|
if (vif1Regs->mskpath3 || psHu32(GIF_MODE) & 0x1) {
|
||||||
|
gif->chcr &= ~0x100;
|
||||||
|
psHu32(GIF_STAT)&= ~0xE00; // OPH=0 | APATH=0
|
||||||
|
hwDmacIrq(2);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if ((psHu32(DMAC_CTRL) & 0xC0) == 0x80 && prevcycles != 0) { // STD == GIF
|
||||||
|
SysPrintf("GS Stall Control Source = %x, Drain = %x\n MADR = %x, STADR = %x", (psHu32(0xe000) >> 4) & 0x3, (psHu32(0xe000) >> 6) & 0x3, gif->madr, psHu32(DMAC_STADR));
|
||||||
|
|
||||||
|
if( gif->madr + (gif->qwc * 16) > psHu32(DMAC_STADR) ) {
|
||||||
|
CPU_INT(2, gscycles);
|
||||||
|
gscycles = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
prevcycles = 0;
|
||||||
|
gif->qwc = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
GSCSRr &= ~0xC000; //Clear FIFO stuff
|
||||||
|
GSCSRr |= 0x8000; //FIFO full
|
||||||
|
//psHu32(GIF_STAT)|= 0xE00; // OPH=1 | APATH=3
|
||||||
|
psHu32(GIF_STAT)|= 0x10000000; // FQC=31, hack ;)
|
||||||
|
|
||||||
|
#ifdef GSPATH3FIX
|
||||||
|
if (vif1Regs->mskpath3 || psHu32(GIF_MODE) & 0x1) {
|
||||||
|
if(gif->qwc == 0) {
|
||||||
|
if((gif->chcr & 0x10e) == 0x104) {
|
||||||
|
ptag = (u32*)dmaGetAddr(gif->tadr); //Set memory pointer to TADR
|
||||||
|
|
||||||
|
if (ptag == NULL) { //Is ptag empty?
|
||||||
|
psHu32(DMAC_STAT)|= 1<<15; //If yes, set BEIS (BUSERR) in DMAC_STAT register
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gscycles += 2;
|
||||||
|
gif->chcr = ( gif->chcr & 0xFFFF ) | ( (*ptag) & 0xFFFF0000 ); //Transfer upper part of tag to CHCR bits 31-15
|
||||||
|
id = (ptag[0] >> 28) & 0x7; //ID for DmaChain copied from bit 28 of the tag
|
||||||
|
gif->qwc = (u16)ptag[0]; //QWC set to lower 16bits of the tag
|
||||||
|
gif->madr = ptag[1]; //MADR = ADDR field
|
||||||
|
gspath3done = hwDmacSrcChainWithStack(gif, id);
|
||||||
|
GIF_LOG("PTH3 MASK gifdmaChain %8.8x_%8.8x size=%d, id=%d, addr=%lx\n", ptag[1], ptag[0], gif->qwc, id, gif->madr);
|
||||||
|
|
||||||
|
if ((gif->chcr & 0x80) && ptag[0] >> 31) { //Check TIE bit of CHCR and IRQ bit of tag
|
||||||
|
GIF_LOG("PATH3 MSK dmaIrq Set\n");
|
||||||
|
SysPrintf("GIF TIE\n");
|
||||||
|
gspath3done |= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// When MTGS is enabled, Gifchain calls WRITERING_DMA, which calls GSRINGBUF_DONECOPY, which freezes
|
||||||
|
// the registers inside of the FreezeXMMRegs calls here and in the other two below..
|
||||||
|
// I'm not really sure that is intentional. --arcum42
|
||||||
|
FreezeXMMRegs(1);
|
||||||
|
FreezeMMXRegs(1);
|
||||||
|
GIFchain();
|
||||||
|
FreezeXMMRegs(0); // Theres a comment below that says not to unfreeze the xmm regs, so not sure about this.
|
||||||
|
FreezeMMXRegs(0);
|
||||||
|
|
||||||
|
if((gspath3done == 1 || (gif->chcr & 0xc) == 0) && gif->qwc == 0){
|
||||||
|
if(gif->qwc > 0) SysPrintf("Horray\n");
|
||||||
|
gspath3done = 0;
|
||||||
|
gif->chcr &= ~0x100;
|
||||||
|
//psHu32(GIF_MODE)&= ~0x4;
|
||||||
|
GSCSRr &= ~0xC000;
|
||||||
|
GSCSRr |= 0x4000;
|
||||||
|
Path3transfer = 0;
|
||||||
|
psHu32(GIF_STAT)&= ~0x1F000E00; // OPH=0 | APATH=0 | QFC=0
|
||||||
|
hwDmacIrq(DMAC_GIF);
|
||||||
|
}
|
||||||
|
//Dont unfreeze xmm regs here, Masked PATH3 can only be called by VIF, which is already handling it.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
//gscycles = 0;
|
||||||
|
// Transfer Dn_QWC from Dn_MADR to GIF
|
||||||
|
if ((gif->chcr & 0xc) == 0 || gif->qwc > 0) { // Normal Mode
|
||||||
|
//gscount++;
|
||||||
|
if ((psHu32(DMAC_CTRL) & 0xC0) == 0x80 && (gif->chcr & 0xc) == 0) {
|
||||||
|
SysPrintf("DMA Stall Control on GIF normal\n");
|
||||||
|
}
|
||||||
|
FreezeXMMRegs(1);
|
||||||
|
FreezeMMXRegs(1);
|
||||||
|
GIFchain(); //Transfers the data set by the switch
|
||||||
|
FreezeXMMRegs(0);
|
||||||
|
FreezeMMXRegs(0);
|
||||||
|
if(gif->qwc == 0 && (gif->chcr & 0xc) == 0) gspath3done = 1;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// Chain Mode
|
||||||
|
while (gspath3done == 0 && gif->qwc == 0) { //Loop if the transfers aren't intermittent
|
||||||
|
ptag = (u32*)dmaGetAddr(gif->tadr); //Set memory pointer to TADR
|
||||||
|
if (ptag == NULL) { //Is ptag empty?
|
||||||
|
psHu32(DMAC_STAT)|= 1<<15; //If yes, set BEIS (BUSERR) in DMAC_STAT register
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gscycles+=2; // Add 1 cycles from the QW read for the tag
|
||||||
|
|
||||||
|
// Transfer dma tag if tte is set
|
||||||
|
if (gif->chcr & 0x40) {
|
||||||
|
//u32 temptag[4] = {0};
|
||||||
|
//SysPrintf("GIF TTE: %x_%x\n", ptag[3], ptag[2]);
|
||||||
|
|
||||||
|
//temptag[0] = ptag[2];
|
||||||
|
//temptag[1] = ptag[3];
|
||||||
|
//GSGIFTRANSFER3(ptag, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
gif->chcr = ( gif->chcr & 0xFFFF ) | ( (*ptag) & 0xFFFF0000 ); //Transfer upper part of tag to CHCR bits 31-15
|
||||||
|
|
||||||
|
id = (ptag[0] >> 28) & 0x7; //ID for DmaChain copied from bit 28 of the tag
|
||||||
|
gif->qwc = (u16)ptag[0]; //QWC set to lower 16bits of the tag
|
||||||
|
gif->madr = ptag[1]; //MADR = ADDR field
|
||||||
|
|
||||||
|
gspath3done = hwDmacSrcChainWithStack(gif, id);
|
||||||
|
GIF_LOG("gifdmaChain %8.8x_%8.8x size=%d, id=%d, addr=%lx\n", ptag[1], ptag[0], gif->qwc, id, gif->madr);
|
||||||
|
|
||||||
|
if ((psHu32(DMAC_CTRL) & 0xC0) == 0x80) { // STD == GIF
|
||||||
|
// there are still bugs, need to also check if gif->madr +16*qwc >= stadr, if not, stall
|
||||||
|
if(!gspath3done && gif->madr + (gif->qwc * 16) > psHu32(DMAC_STADR) && id == 4) {
|
||||||
|
// stalled
|
||||||
|
SysPrintf("GS Stall Control Source = %x, Drain = %x\n MADR = %x, STADR = %x", (psHu32(0xe000) >> 4) & 0x3, (psHu32(0xe000) >> 6) & 0x3,gif->madr, psHu32(DMAC_STADR));
|
||||||
|
prevcycles = gscycles;
|
||||||
|
gif->tadr -= 16;
|
||||||
|
hwDmacIrq(13);
|
||||||
|
CPU_INT(2, gscycles);
|
||||||
|
gscycles = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
FreezeXMMRegs(1);
|
||||||
|
FreezeMMXRegs(1);
|
||||||
|
GIFchain(); //Transfers the data set by the switch
|
||||||
|
FreezeXMMRegs(0);
|
||||||
|
FreezeMMXRegs(0);
|
||||||
|
|
||||||
|
if ((gif->chcr & 0x80) && ptag[0] >> 31) { //Check TIE bit of CHCR and IRQ bit of tag
|
||||||
|
GIF_LOG("dmaIrq Set\n");
|
||||||
|
gspath3done = 1;
|
||||||
|
//gif->qwc = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
prevtag = NULL;
|
||||||
|
prevcycles = 0;
|
||||||
|
if (!(vif1Regs->mskpath3 || (psHu32(GIF_MODE) & 0x1))) {
|
||||||
|
CPU_INT(2, gscycles);
|
||||||
|
gscycles = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void dmaGIF() {
|
||||||
|
//if(vif1Regs->mskpath3 || (psHu32(GIF_MODE) & 0x1)){
|
||||||
|
// CPU_INT(2, 48); //Wait time for the buffer to fill, fixes some timing problems in path 3 masking
|
||||||
|
//} //It takes the time of 24 QW for the BUS to become ready - The Punisher, And1 Streetball
|
||||||
|
//else
|
||||||
|
gspath3done = 0; // For some reason this doesnt clear? So when the system starts the thread, we will clear it :)
|
||||||
|
|
||||||
|
if(gif->qwc > 0 && (gif->chcr & 0x4) == 0x4)
|
||||||
|
gspath3done = 1; //Halflife sets a QWC amount in chain mode, no tadr set.
|
||||||
|
|
||||||
|
if ((psHu32(DMAC_CTRL) & 0xC) == 0xC ) { // GIF MFIFO
|
||||||
|
//SysPrintf("GIF MFIFO\n");
|
||||||
|
gifMFIFOInterrupt();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GIFdma();
|
||||||
|
}
|
||||||
|
|
||||||
|
#define spr0 ((DMACh*)&PS2MEM_HW[0xD000])
|
||||||
|
|
||||||
|
static unsigned int mfifocycles;
|
||||||
|
static unsigned int gifqwc = 0;
|
||||||
|
static unsigned int gifdone = 0;
|
||||||
|
|
||||||
|
// called from only one location, so forceinline it:
|
||||||
|
static __forceinline int mfifoGIFrbTransfer() {
|
||||||
|
u32 qwc = (psHu32(GIF_MODE) & 0x4 && vif1Regs->mskpath3) ? min(8, (int)gif->qwc) : gif->qwc;
|
||||||
|
int mfifoqwc = min(gifqwc, qwc);
|
||||||
|
u32 *src;
|
||||||
|
|
||||||
|
|
||||||
|
/* Check if the transfer should wrap around the ring buffer */
|
||||||
|
if ((gif->madr+mfifoqwc*16) > (psHu32(DMAC_RBOR) + psHu32(DMAC_RBSR)+16)) {
|
||||||
|
int s1 = ((psHu32(DMAC_RBOR) + psHu32(DMAC_RBSR)+16) - gif->madr) >> 4;
|
||||||
|
|
||||||
|
// fixme - I don't think these should use WRITERING_DMA, since our source
|
||||||
|
// isn't the DmaGetAddr(gif->madr) address that WRITERING_DMA expects.
|
||||||
|
|
||||||
|
/* it does, so first copy 's1' bytes from 'addr' to 'data' */
|
||||||
|
src = (u32*)PSM(gif->madr);
|
||||||
|
if (src == NULL) return -1;
|
||||||
|
WRITERING_DMA(src, s1);
|
||||||
|
|
||||||
|
/* and second copy 's2' bytes from 'maddr' to '&data[s1]' */
|
||||||
|
src = (u32*)PSM(psHu32(DMAC_RBOR));
|
||||||
|
if (src == NULL) return -1;
|
||||||
|
WRITERING_DMA(src, (mfifoqwc - s1));
|
||||||
|
|
||||||
|
} else {
|
||||||
|
/* it doesn't, so just transfer 'qwc*16' words
|
||||||
|
from 'gif->madr' to GS */
|
||||||
|
src = (u32*)PSM(gif->madr);
|
||||||
|
if (src == NULL) return -1;
|
||||||
|
|
||||||
|
WRITERING_DMA(src, mfifoqwc);
|
||||||
|
gif->madr = psHu32(DMAC_RBOR) + (gif->madr & psHu32(DMAC_RBSR));
|
||||||
|
}
|
||||||
|
|
||||||
|
gifqwc -= mfifoqwc;
|
||||||
|
gif->qwc -= mfifoqwc;
|
||||||
|
gif->madr+= mfifoqwc*16;
|
||||||
|
mfifocycles+= (mfifoqwc) * 2; /* guessing */
|
||||||
|
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// called from only one location, so forceinline it:
|
||||||
|
static __forceinline int mfifoGIFchain() {
|
||||||
|
/* Is QWC = 0? if so there is nothing to transfer */
|
||||||
|
|
||||||
|
if (gif->qwc == 0) return 0;
|
||||||
|
|
||||||
|
if (gif->madr >= psHu32(DMAC_RBOR) &&
|
||||||
|
gif->madr <= (psHu32(DMAC_RBOR)+psHu32(DMAC_RBSR))) {
|
||||||
|
if (mfifoGIFrbTransfer() == -1) return -1;
|
||||||
|
} else {
|
||||||
|
int mfifoqwc = (psHu32(GIF_MODE) & 0x4 && vif1Regs->mskpath3) ? min(8, (int)gif->qwc) : gif->qwc;
|
||||||
|
u32 *pMem = (u32*)dmaGetAddr(gif->madr);
|
||||||
|
if (pMem == NULL) return -1;
|
||||||
|
|
||||||
|
WRITERING_DMA(pMem, mfifoqwc);
|
||||||
|
gif->madr+= mfifoqwc*16;
|
||||||
|
gif->qwc -= mfifoqwc;
|
||||||
|
mfifocycles+= (mfifoqwc) * 2; /* guessing */
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void mfifoGIFtransfer(int qwc) {
|
||||||
|
u32 *ptag;
|
||||||
|
int id;
|
||||||
|
u32 temp = 0;
|
||||||
|
mfifocycles = 0;
|
||||||
|
|
||||||
|
if(qwc > 0 ) {
|
||||||
|
gifqwc += qwc;
|
||||||
|
if(!(gif->chcr & 0x100))return;
|
||||||
|
}
|
||||||
|
SPR_LOG("mfifoGIFtransfer %x madr %x, tadr %x\n", gif->chcr, gif->madr, gif->tadr);
|
||||||
|
|
||||||
|
if(gif->qwc == 0){
|
||||||
|
if(gif->tadr == spr0->madr) {
|
||||||
|
#ifdef PCSX2_DEVBUILD
|
||||||
|
/*if( gifqwc > 1 )
|
||||||
|
SysPrintf("gif mfifo tadr==madr but qwc = %d\n", gifqwc);*/
|
||||||
|
#endif
|
||||||
|
//hwDmacIrq(14);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gif->tadr = psHu32(DMAC_RBOR) + (gif->tadr & psHu32(DMAC_RBSR));
|
||||||
|
ptag = (u32*)dmaGetAddr(gif->tadr);
|
||||||
|
|
||||||
|
id = (ptag[0] >> 28) & 0x7;
|
||||||
|
gif->qwc = (ptag[0] & 0xffff);
|
||||||
|
gif->madr = ptag[1];
|
||||||
|
mfifocycles += 2;
|
||||||
|
|
||||||
|
gif->chcr = ( gif->chcr & 0xFFFF ) | ( (*ptag) & 0xFFFF0000 );
|
||||||
|
SPR_LOG("dmaChain %8.8x_%8.8x size=%d, id=%d, madr=%lx, tadr=%lx mfifo qwc = %x spr0 madr = %x\n",
|
||||||
|
ptag[1], ptag[0], gif->qwc, id, gif->madr, gif->tadr, gifqwc, spr0->madr);
|
||||||
|
|
||||||
|
gifqwc--;
|
||||||
|
switch (id) {
|
||||||
|
case 0: // Refe - Transfer Packet According to ADDR field
|
||||||
|
gif->tadr = psHu32(DMAC_RBOR) + ((gif->tadr + 16) & psHu32(DMAC_RBSR));
|
||||||
|
gifdone = 2; //End Transfer
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 1: // CNT - Transfer QWC following the tag.
|
||||||
|
gif->madr = psHu32(DMAC_RBOR) + ((gif->tadr + 16) & psHu32(DMAC_RBSR)); //Set MADR to QW after Tag
|
||||||
|
gif->tadr = psHu32(DMAC_RBOR) + ((gif->madr + (gif->qwc << 4)) & psHu32(DMAC_RBSR)); //Set TADR to QW following the data
|
||||||
|
gifdone = 0;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 2: // Next - Transfer QWC following tag. TADR = ADDR
|
||||||
|
temp = gif->madr; //Temporarily Store ADDR
|
||||||
|
gif->madr = psHu32(DMAC_RBOR) + ((gif->tadr + 16) & psHu32(DMAC_RBSR)); //Set MADR to QW following the tag
|
||||||
|
gif->tadr = temp; //Copy temporarily stored ADDR to Tag
|
||||||
|
gifdone = 0;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 3: // Ref - Transfer QWC from ADDR field
|
||||||
|
case 4: // Refs - Transfer QWC from ADDR field (Stall Control)
|
||||||
|
gif->tadr = psHu32(DMAC_RBOR) + ((gif->tadr + 16) & psHu32(DMAC_RBSR)); //Set TADR to next tag
|
||||||
|
gifdone = 0;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 7: // End - Transfer QWC following the tag
|
||||||
|
gif->madr = psHu32(DMAC_RBOR) + ((gif->tadr + 16) & psHu32(DMAC_RBSR)); //Set MADR to data following the tag
|
||||||
|
gif->tadr = psHu32(DMAC_RBOR) + ((gif->madr + (gif->qwc << 4)) & psHu32(DMAC_RBSR)); //Set TADR to QW following the data
|
||||||
|
gifdone = 2; //End Transfer
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if ((gif->chcr & 0x80) && (ptag[0] >> 31)) {
|
||||||
|
SPR_LOG("dmaIrq Set\n");
|
||||||
|
gifdone = 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FreezeXMMRegs(1);
|
||||||
|
FreezeMMXRegs(1);
|
||||||
|
if (mfifoGIFchain() == -1) {
|
||||||
|
SysPrintf("GIF dmaChain error size=%d, madr=%lx, tadr=%lx\n",
|
||||||
|
gif->qwc, gif->madr, gif->tadr);
|
||||||
|
gifdone = 1;
|
||||||
|
}
|
||||||
|
FreezeXMMRegs(0);
|
||||||
|
FreezeMMXRegs(0);
|
||||||
|
|
||||||
|
if(gif->qwc == 0 && gifdone == 2) gifdone = 1;
|
||||||
|
CPU_INT(11,mfifocycles);
|
||||||
|
|
||||||
|
SPR_LOG("mfifoGIFtransfer end %x madr %x, tadr %x\n", gif->chcr, gif->madr, gif->tadr);
|
||||||
|
}
|
||||||
|
|
||||||
|
void gifMFIFOInterrupt()
|
||||||
|
{
|
||||||
|
if(!(gif->chcr & 0x100)) { SysPrintf("WTF GIFMFIFO\n");cpuRegs.interrupt &= ~(1 << 11); return ; }
|
||||||
|
|
||||||
|
if(gifdone != 1) {
|
||||||
|
if(gifqwc <= 0) {
|
||||||
|
//SysPrintf("Empty\n");
|
||||||
|
psHu32(GIF_STAT)&= ~0xE00; // OPH=0 | APATH=0
|
||||||
|
hwDmacIrq(14);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
mfifoGIFtransfer(0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#ifdef PCSX2_DEVBUILD
|
||||||
|
if(gifdone == 0 || gif->qwc > 0) {
|
||||||
|
Console::Error("gifMFIFO Panic > Shouldnt go here!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
//if(gifqwc > 0)SysPrintf("GIF MFIFO ending with stuff in it %x\n", gifqwc);
|
||||||
|
gifqwc = 0;
|
||||||
|
gifdone = 0;
|
||||||
|
gif->chcr &= ~0x100;
|
||||||
|
hwDmacIrq(DMAC_GIF);
|
||||||
|
GSCSRr &= ~0xC000; //Clear FIFO stuff
|
||||||
|
GSCSRr |= 0x4000; //FIFO empty
|
||||||
|
//psHu32(GIF_MODE)&= ~0x4;
|
||||||
|
psHu32(GIF_STAT)&= ~0xE00; // OPH=0 | APATH=0
|
||||||
|
psHu32(GIF_STAT)&= ~0x1F000000; // QFC=0
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -655,8 +655,8 @@ void mtgsThreadObject::PrepEventWait()
|
||||||
|
|
||||||
void mtgsThreadObject::PostEventWait() const
|
void mtgsThreadObject::PostEventWait() const
|
||||||
{
|
{
|
||||||
FreezeXMMRegs(0);
|
|
||||||
FreezeMMXRegs(0);
|
FreezeMMXRegs(0);
|
||||||
|
FreezeXMMRegs(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
u8* mtgsThreadObject::GetDataPacketPtr() const
|
u8* mtgsThreadObject::GetDataPacketPtr() const
|
||||||
|
|
@ -713,14 +713,14 @@ void mtgsThreadObject::SendDataPacket()
|
||||||
// 8 - roughly 2% slower on HT machines.
|
// 8 - roughly 2% slower on HT machines.
|
||||||
|
|
||||||
m_CopyDataTally += m_packet_size;
|
m_CopyDataTally += m_packet_size;
|
||||||
if( ( m_CopyDataTally > 0x4000 ) || ( ++m_CopyCommandTally > 16 ) )
|
if( ( m_CopyDataTally > 0x8000 ) || ( ++m_CopyCommandTally > 16 ) )
|
||||||
{
|
{
|
||||||
FreezeXMMRegs(1);
|
FreezeXMMRegs(1);
|
||||||
FreezeMMXRegs(1);
|
FreezeMMXRegs(1);
|
||||||
//Console::Status( "MTGS Kick! DataSize : 0x%5.8x, CommandTally : %d", m_CopyDataTally, m_CopyCommandTally );
|
//Console::Status( "MTGS Kick! DataSize : 0x%5.8x, CommandTally : %d", m_CopyDataTally, m_CopyCommandTally );
|
||||||
SetEvent();
|
SetEvent();
|
||||||
FreezeXMMRegs(0);
|
|
||||||
FreezeMMXRegs(0);
|
FreezeMMXRegs(0);
|
||||||
|
FreezeXMMRegs(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -830,19 +830,22 @@ int mtgsThreadObject::PrepDataPacket( GIF_PATH pathidx, const u8* srcdata, u32 s
|
||||||
if( writepos + size < m_RingBufferSize )
|
if( writepos + size < m_RingBufferSize )
|
||||||
{
|
{
|
||||||
// generic gs wait/stall.
|
// generic gs wait/stall.
|
||||||
// Waits until the readpos is outside the scope of the write area.
|
|
||||||
|
|
||||||
// if the writepos is past the readpos then we're safe.
|
// if the writepos is past the readpos then we're safe.
|
||||||
// But if not then we need to make sure the readpos is outside the scope of
|
// But if not then we need to make sure the readpos is outside the scope of
|
||||||
// the block about to be written (writepos + size)
|
// the block about to be written (writepos + size)
|
||||||
|
|
||||||
if( writepos < volatize(m_RingPos) )
|
if( writepos < volatize(m_RingPos) )
|
||||||
{
|
{
|
||||||
// writepos is behind the readpos, so we need to wait until
|
// writepos is behind the readpos, so we need to wait until
|
||||||
// readpos is out past the end of the future write pos:
|
// readpos is out past the end of the future write pos, or until it wraps
|
||||||
|
// around (in which case writepos will be >= readpos)
|
||||||
|
|
||||||
PrepEventWait();
|
PrepEventWait();
|
||||||
while( writepos+size < volatize(m_RingPos) )
|
while( true )
|
||||||
{
|
{
|
||||||
|
uint readpos = volatize(m_RingPos);
|
||||||
|
if( writepos >= readpos ) break;
|
||||||
|
if( writepos+size < readpos ) break;
|
||||||
SpinWait();
|
SpinWait();
|
||||||
}
|
}
|
||||||
PostEventWait();
|
PostEventWait();
|
||||||
|
|
|
||||||
|
|
@ -2488,6 +2488,10 @@
|
||||||
<Filter
|
<Filter
|
||||||
Name="GS"
|
Name="GS"
|
||||||
>
|
>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\Gif.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\GS.cpp"
|
RelativePath="..\..\GS.cpp"
|
||||||
>
|
>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue