ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the release build. Minor Sif changes. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2473 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-01-22 15:02:50 +00:00
parent 124f91920e
commit c8fa4ffd45
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/R5900OpcodeImpl.cpp
View File

@ -843,6 +843,7 @@ void SYSCALL()
} }
// The only thing this code is used for is the one log message, so don't execute it if we aren't logging bios messages. // The only thing this code is used for is the one log message, so don't execute it if we aren't logging bios messages.
#ifdef PCSX2_DEVBUILD
if (macTrace.EE.Bios() && (call == 0x77)) if (macTrace.EE.Bios() && (call == 0x77))
{ {
t_sif_dma_transfer *dmat; t_sif_dma_transfer *dmat;
@ -865,6 +866,7 @@ void SYSCALL()
dmat->dest, dmat->src); dmat->dest, dmat->src);
} }
} }
#endif
cpuRegs.pc -= 4; cpuRegs.pc -= 4;
cpuException(0x20, cpuRegs.branch); cpuException(0x20, cpuRegs.branch);

24
pcsx2/Sif.cpp
View File

@ -203,15 +203,13 @@ __forceinline void SIF1EEDma(int &cycles, int &psxCycles, bool &done)
else else
{ {
// There's some data ready to transfer into the fifo.. // There's some data ready to transfer into the fifo..
int qwTransfer = sif1dma->qwc;
tDMA_TAG *pTag; tDMA_TAG *pTag;
const int qwTransfer = min((s32)sif1dma->qwc, (FIFO_SIF_W - sif1.fifo.size) / 4);
pTag = safeDmaGetAddr(sif1dma, sif1dma->madr, DMAC_SIF1); pTag = safeDmaGetAddr(sif1dma, sif1dma->madr, DMAC_SIF1);
if (pTag == NULL) return; if (pTag == NULL) return;
if (qwTransfer > (FIFO_SIF_W - sif1.fifo.size) / 4) // Copy part of sif1dma into FIFO
qwTransfer = (FIFO_SIF_W - sif1.fifo.size) / 4;
sif1.fifo.write((u32*)pTag, qwTransfer << 2); sif1.fifo.write((u32*)pTag, qwTransfer << 2);
sif1dma->madr += qwTransfer << 4; sif1dma->madr += qwTransfer << 4;
@ -303,7 +301,9 @@ __forceinline void SIF1IOPDma(int &cycles, int &psxCycles, bool &done)
if (sif1.counter <= 0) if (sif1.counter <= 0)
{ {
if ((sif1.tagMode & 0x80) || (sif1.tagMode & 0x40)) // Stop on tag IRQ or END // Stop on tag IRQ or END
if ((sif1.tagMode & 0x80) || (sif1.tagMode & 0x40))
{ {
if (sif1.tagMode & 0x40) if (sif1.tagMode & 0x40)
SIF_LOG(" IOP SIF end"); SIF_LOG(" IOP SIF end");
@ -322,12 +322,14 @@ __forceinline void SIF1IOPDma(int &cycles, int &psxCycles, bool &done)
} }
else if (sif1.fifo.size >= 4) // Read a tag else if (sif1.fifo.size >= 4) // Read a tag
{ {
struct sifData d; sif1.fifo.read((u32*)&sif1.data, 4);
sif1.fifo.read((u32*)&d, 4); SIF_LOG(" IOP SIF dest chain tag madr:%08X wc:%04X id:%X irq:%d",
SIF_LOG(" IOP SIF dest chain tag madr:%08X wc:%04X id:%X irq:%d", d.data & 0xffffff, d.words, DMA_TAG(d.data).ID, DMA_TAG(d.data).IRQ); sif1.data.data & 0xffffff, sif1.data.words, DMA_TAG(sif1.data.data).ID,
HW_DMA10_MADR = d.data & 0xffffff; DMA_TAG(sif1.data.data).IRQ);
sif1.counter = d.words;
sif1.tagMode = (d.data >> 24) & 0xFF; HW_DMA10_MADR = sif1.data.data & 0xffffff;
sif1.counter = sif1.data.words;
sif1.tagMode = (sif1.data.data >> 24) & 0xFF;
done = false; done = false;
} }
} }