From 71a6d4942d28da563d906934e85404d35846d51f Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Mon, 13 Sep 2010 06:43:32 +0000 Subject: Merged change from http://forums.ngemu.com/pcsx-discussion/116599-developers-wanted-pcsx-revival-9.html#post1902678 with minor amendments. GPU DMA chain timing (FF7 opening CG and maybe other games too - not tested with rebel assault 2 though). git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@57139 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- libpcsxcore/cdrom.c | 300 ++++++++++++++++++++++++++++------------------------ libpcsxcore/cdrom.h | 2 + libpcsxcore/gpu.c | 102 +++++++++--------- libpcsxcore/misc.c | 2 +- 4 files changed, 210 insertions(+), 196 deletions(-) (limited to 'libpcsxcore') diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index dfd14656..ab8a76c1 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -184,6 +184,7 @@ void cdrInterrupt() { SetResultSize(1); cdr.Result[0] = cdr.StatP; cdr.Stat = Acknowledge; + cdr.LidCheck++; break; case CdlSetloc: @@ -235,6 +236,7 @@ void cdrInterrupt() { cdr.Result[0] = cdr.StatP; cdr.Stat = Complete; // cdr.Stat = Acknowledge; + cdr.LidCheck++; break; case CdlPause: @@ -323,7 +325,7 @@ void cdrInterrupt() { SetResultSize(8); subq = (struct SubQ *)CDR_getBufferSub(); - // DATA + AUDIO has subchannel data + // DATA + AUDIO has subchannel data if (subq != NULL) { cdr.Result[0] = subq->TrackNumber; cdr.Result[1] = subq->IndexNumber; @@ -337,7 +339,7 @@ void cdrInterrupt() { } else { cdr.Result[0] = 1; cdr.Result[1] = 1; - + // NOTE: This only works for TRACK 01 cdr.Result[2] = btoi(cdr.Prev[0]); cdr.Result[3] = btoi(cdr.Prev[1]) - 2; @@ -359,9 +361,9 @@ void cdrInterrupt() { break; case CdlGetTN: - StopReading(); - StopCdda(); - + StopReading(); + StopCdda(); + cdr.CmdProcess = 0; SetResultSize(3); cdr.StatP |= 0x2; @@ -547,12 +549,12 @@ void cdrInterrupt() { cdr.Result[5] = 0; cdr.Result[6] = 0; cdr.Result[7] = 0; - } - else - // FIXME!! + } + else + // FIXME!! //memcpy(cdr.Result, &stat.Track, 8); - 0; - + 0; + cdr.Stat = 1; SetResultSize(8); AddIrqQueue(REPPLAY_ACK, cdReadTime); @@ -566,35 +568,55 @@ void cdrInterrupt() { break; } - // check case open/close - i = stat.Status; - if (CDR_getStatus(&stat) != -1) { - if (stat.Type == 0xff) cdr.Stat = DiskError; - - // case now open - if (stat.Status & 0x10) { - if( Irq != CdlNop ) - { - cdr.Stat = DiskError; - cdr.Result[0] |= 0x01; - } - - // GameShark Lite: Wants -exactly- $10 - cdr.Result[0] |= 0x10; - cdr.Result[0] &= ~0x02; - } - // case now closed - else if (i & 0x10) { - cdr.StatP &= ~0x11; - cdr.Result[0] |= 0x2; - - // GameShark Lite: Wants -exactly- $42, then $02 - cdr.Result[0] |= 0x40; - - CheckCdrom(); - } - } - + // check case open/close + if (cdr.LidCheck > 0) { + cdr.LidCheck--; + + i = stat.Status; + if (CDR_getStatus(&stat) != -1) { + if (stat.Type == 0xff) cdr.Stat = DiskError; + + // case now open + if (stat.Status & 0x10) { + // GameShark Lite: Death if DiskError happens + // + // Vib Ribbon: Needs DiskError for CD swap + + if (Irq != CdlNop) { + cdr.Stat = DiskError; + + cdr.StatP |= 0x01; + cdr.Result[0] |= 0x01; + } + + cdr.StatP |= 0x10; + cdr.StatP &= ~0x02; + + // GameShark Lite: Wants -exactly- $10 + cdr.Result[0] |= 0x10; + cdr.Result[0] &= ~0x02; + } + + // case now closed + else if (i & 0x10) { + cdr.StatP &= ~0x11; + cdr.StatP |= 0x2; + cdr.StatP |= 0x40; + + // GameShark Lite: Wants -exactly- $42, then $02 + cdr.Result[0] |= 0x2; + cdr.Result[0] |= 0x40; + + CheckCdrom(); + } + + else if (cdr.LidCheck == 0) { + // GameShark Lite: Seek detection done + cdr.StatP &= ~0x40; + } + } + } + if (cdr.Stat != NoIntr && cdr.Reg2 != 0x18) { psxHu32ref(0x1070) |= SWAP32((u32)0x4); } @@ -1081,75 +1103,75 @@ void cdrWrite3(unsigned char rt) { break; } } - - /* - GameShark CDX 3.3 - - TODO: Can we relax the rules? - */ - if (rt == 0 && cdr.Ctrl == 0xd8 && cdr.Readed == 1) { - u32 i; - - - // low-level status access - SetResultSize(15); - - - i = stat.Status; - if (CDR_getStatus(&stat) != -1) { - // Hack: Fake CDROM seek / spin time - static int seek_time = 0; - - if (stat.Type == 0xff) { - } - else if (stat.Status & 0x10) { - // unknown #1 - status? - // unknown #2 - case open? - - cdr.Result[0] = 0x11; - cdr.Result[1] = 0x80; - } - else if ( i & 0x10 ) { - cdr.Result[0] = 0x13; - cdr.Result[1] = 0x80; - - // minimum 50 tries for GS CDX 3.3 - seek_time = 50; - } - else if ( seek_time ) { - cdr.Result[0] = 0x13; - cdr.Result[1] = 0x80; - - seek_time--; - } - else - { - cdr.Result[0] = 0x01; - cdr.Result[1] = 0x00; - } - - // unknown #3 - cdr.Result[2] = 0; - - // unknown #4 - error? - cdr.Result[3] = 0; - - // unknown #5-14 - cdr.Result[4] = 0; - cdr.Result[5] = 0; - cdr.Result[6] = 0; - cdr.Result[7] = 0; - cdr.Result[8] = 0; - cdr.Result[9] = 0; - cdr.Result[10] = 0; - cdr.Result[11] = 0; - cdr.Result[12] = 0; - cdr.Result[13] = 0; - - // unknown #15 - error? - cdr.Result[14] = 0; - } - } + + /* + GameShark CDX 3.3 + + TODO: Can we relax the rules? + */ + if (rt == 0 && cdr.Ctrl == 0xd8 && cdr.Readed == 1) { + u32 i; + + + // low-level status access + SetResultSize(15); + + + i = stat.Status; + if (CDR_getStatus(&stat) != -1) { + // Hack: Fake CDROM seek / spin time + static int seek_time = 0; + + if (stat.Type == 0xff) { + } + else if (stat.Status & 0x10) { + // unknown #1 - status? + // unknown #2 - case open? + + cdr.Result[0] = 0x11; + cdr.Result[1] = 0x80; + } + else if ( i & 0x10 ) { + cdr.Result[0] = 0x13; + cdr.Result[1] = 0x80; + + // minimum 50 tries for GS CDX 3.3 + seek_time = 50; + } + else if ( seek_time ) { + cdr.Result[0] = 0x13; + cdr.Result[1] = 0x80; + + seek_time--; + } + else + { + cdr.Result[0] = 0x01; + cdr.Result[1] = 0x00; + } + + // unknown #3 + cdr.Result[2] = 0; + + // unknown #4 - error? + cdr.Result[3] = 0; + + // unknown #5-14 + cdr.Result[4] = 0; + cdr.Result[5] = 0; + cdr.Result[6] = 0; + cdr.Result[7] = 0; + cdr.Result[8] = 0; + cdr.Result[9] = 0; + cdr.Result[10] = 0; + cdr.Result[11] = 0; + cdr.Result[12] = 0; + cdr.Result[13] = 0; + + // unknown #15 - error? + cdr.Result[14] = 0; + } + } } void psxDma3(u32 madr, u32 bcr, u32 chcr) { @@ -1179,24 +1201,24 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) { #endif break; } - - /* - GS CDX: Enhancement CD crash - - Setloc 0:0:0 - - CdlPlay - - Spams DMA3 and gets buffer overrun - */ - - if( (cdr.pTransfer-cdr.Transfer) + cdsize > 2352 ) - { - // avoid crash - probably should wrap here - //memcpy(ptr, cdr.pTransfer, cdsize); - } - else - { - memcpy(ptr, cdr.pTransfer, cdsize); - } - + + /* + GS CDX: Enhancement CD crash + - Setloc 0:0:0 + - CdlPlay + - Spams DMA3 and gets buffer overrun + */ + + if( (cdr.pTransfer-cdr.Transfer) + cdsize > 2352 ) + { + // avoid crash - probably should wrap here + //memcpy(ptr, cdr.pTransfer, cdsize); + } + else + { + memcpy(ptr, cdr.pTransfer, cdsize); + } + psxCpu->Clear(madr, cdsize / 4); cdr.pTransfer += cdsize; break; @@ -1233,18 +1255,14 @@ int cdrFreeze(gzFile f, int Mode) { return 0; } - - - - - -void LidInterrupt() -{ - // generate interrupt if none active - open or close - if( cdr.Irq == 0 || cdr.Irq == 0xff ) - { - cdr.Ctrl |= 0x80; - cdr.Stat = NoIntr; - AddIrqQueue(CdlNop, 0x800); - } -} + +void LidInterrupt() { + cdr.LidCheck = 3; // this should be enough + + // generate interrupt if none active - open or close + if (cdr.Irq == 0 || cdr.Irq == 0xff) { + cdr.Ctrl |= 0x80; + cdr.Stat = NoIntr; + AddIrqQueue(CdlNop, 0x800); + } +} diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h index 07b62924..9e4c6fa7 100644 --- a/libpcsxcore/cdrom.h +++ b/libpcsxcore/cdrom.h @@ -87,6 +87,8 @@ typedef struct { u32 eCycle; boolean Seeked; + + u8 LidCheck; } cdrStruct; extern cdrStruct cdr; diff --git a/libpcsxcore/gpu.c b/libpcsxcore/gpu.c index ee7204d8..95af7a1c 100644 --- a/libpcsxcore/gpu.c +++ b/libpcsxcore/gpu.c @@ -1,10 +1,27 @@ +/* Copyright (c) 2010, shalma. + * Portions Copyright (c) 2002, Pete Bernert. + * + * 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 02111-1307 USA + */ + #include "psxhw.h" #include "gpu.h" #include "psxdma.h" extern unsigned int hSyncCount; - #define GPUSTATUS_ODDLINES 0x80000000 #define GPUSTATUS_DMABITS 0x60000000 // Two bits #define GPUSTATUS_READYFORCOMMANDS 0x10000000 @@ -22,61 +39,46 @@ extern unsigned int hSyncCount; #define GPUSTATUS_DRAWINGALLOWED 0x00000400 #define GPUSTATUS_DITHER 0x00000200 - // Taken from PEOPS SOFTGPU -unsigned long lUsedAddr[3]; - -char CheckForEndlessLoop(unsigned long laddr) -{ - if(laddr==lUsedAddr[1]) return 1; - if(laddr==lUsedAddr[2]) return 1; +u32 lUsedAddr[3]; - if(laddr 2000000) break; - if(CheckForEndlessLoop(addr)) break; + lUsedAddr[0] = lUsedAddr[1] = lUsedAddr[2] = 0xffffff; - count = baseAddrB[addr+3]; - size += 4; - size += count; + baseAddrB = (u8 *)baseAddrL; - dmaMem=addr+4; + do { + addr &= 0x1ffffc; - //if(count>0) GPUwriteDataMem(&baseAddrL[dmaMem>>2],count); + if (DMACommandCounter++ > 2000000) break; + if (CheckForEndlessLoop(addr)) break; - addr = baseAddrL[addr>>2]&0xffffff; - } - while (addr != 0xffffff); + size += 4; + size += baseAddrB[addr + 3]; + addr = baseAddrL[addr >> 2] & 0xffffff; + } while (addr != 0xffffff); - return size; + return size; } - -int gpuReadStatus() -{ +int gpuReadStatus() { int hard; @@ -125,13 +127,11 @@ int gpuReadStatus() return hard; } - - void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU u32 *ptr; u32 size; - switch(chcr) { + switch (chcr) { case 0x01000200: // vram2mem #ifdef PSXDMA_LOG PSXDMA_LOG("*** DMA2 GPU - vram2mem *** %lx addr = %lx size = %lx\n", chcr, madr, bcr); @@ -147,10 +147,9 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU GPU_readDataMem(ptr, size); psxCpu->Clear(madr, size); - GPUDMA_INT( size / 4 ); + GPUDMA_INT(size / 4); return; - case 0x01000201: // mem2vram #ifdef PSXDMA_LOG PSXDMA_LOG("*** DMA 2 - GPU mem2vram *** %lx addr = %lx size = %lx\n", chcr, madr, bcr); @@ -165,22 +164,19 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU size = (bcr >> 16) * (bcr & 0xffff); GPU_writeDataMem(ptr, size); - GPUDMA_INT( size / 4 ); + GPUDMA_INT(size / 4); return; - - case 0x01000401: // dma chain #ifdef PSXDMA_LOG PSXDMA_LOG("*** DMA 2 - GPU dma chain *** %lx addr = %lx size = %lx\n", chcr, madr, bcr); #endif GPU_dmaChain((u32 *)psxM, madr & 0x1fffff); - // FIXME!! GPU DMA chain walking - GPUDMA_INT( 0x4000 / 4 ); + size = gpuDmaChainSize((u32 *)psxM, madr & 0x1fffff); + GPUDMA_INT(size / 4); return; - #ifdef PSXDMA_LOG default: PSXDMA_LOG("*** DMA 2 - GPU unknown *** %lx addr = %lx size = %lx\n", chcr, madr, bcr); @@ -192,8 +188,6 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU DMA_INTERRUPT(2); } - - void gpuInterrupt() { HW_DMA2_CHCR &= SWAP32(~0x01000000); DMA_INTERRUPT(2); diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c index 6d7b31dd..8b9780f6 100644 --- a/libpcsxcore/misc.c +++ b/libpcsxcore/misc.c @@ -456,7 +456,7 @@ static const char PcsxHeader[32] = "STv4 PCSX v" PACKAGE_VERSION; // Savestate Versioning! // If you make changes to the savestate version, please increment the value below. -static const u32 SaveVersion = 0x8b410005; +static const u32 SaveVersion = 0x8b410006; int SaveState(const char *file) { gzFile f; -- cgit v1.2.3