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

reverted and changed some stuff that was causing compiling problems for linux; thanks again to Shanoah 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@59 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
cottonvibes 2008-08-26 22:03:14 +00:00 committed by Gregory Hainaut
parent eba88009df
commit fc82da1f14
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2/GS.cpp
View File

@ -123,7 +123,7 @@ u32 g_MTGSDebug = 0, g_MTGSId = 0;
u32 CSRw;
void gsWaitGS();
extern HWND pDsp;
extern long pDsp;
typedef u8* PU8;
PCSX2_ALIGNED16(u8 g_MTGSMem[0x2000]); // mtgs has to have its own memory
@ -712,7 +712,6 @@ u64 gsRead64(u32 mem)
void gsIrq() {
hwIntcIrq(0);
//SysPrintf("GSIRQ called\n");
}
static void GSRegHandlerSIGNAL(u32* data)
@ -1031,7 +1030,7 @@ static u64 s_gstag=0; // used for querying the last tag
int _GIFchain() {
#ifdef GSPATH3FIX
u32 qwc = (psHu32(GIF_MODE) & 0x4 && vif1Regs->mskpath3 && gif->qwc & ~7) ? 8 : gif->qwc;
u32 qwc = (psHu32(GIF_MODE) & 0x4 && vif1Regs->mskpath3) ? min(8, (int)gif->qwc) : gif->qwc;
#else
u32 qwc = gif->qwc;
#endif
@ -1609,18 +1608,18 @@ void* GSThreadProc(void* lpParam)
int qsize = (tag>>16);
MTGS_RECREAD(g_pGSRingPos+16, (qsize<<4));
// make sure that tag>>16 is the MAX size readable
GSgifTransfer1((u32*)(g_pGSRingPos+0x10) - 0x1000 + 4*qsize, 0x4000-qsize*16);
InterlockedExchangeAdd((long*)&g_pGSRingPos, 16 + (qsize<<4));
GSgifTransfer1((u32*)(g_pGSRingPos+16) - 0x1000 + 4*qsize, 0x4000-qsize*16);
InterlockedExchangeAdd((long*)&g_pGSRingPos, 16 + ((tag>>16)<<4));
break;
}
case GS_RINGTYPE_P2:
MTGS_RECREAD(g_pGSRingPos+16, ((tag>>16)<<4));
GSgifTransfer2((u32*)(g_pGSRingPos+0x10), tag>>16);
GSgifTransfer2((u32*)(g_pGSRingPos+16), tag>>16);
InterlockedExchangeAdd((long*)&g_pGSRingPos, 16 + ((tag>>16)<<4));
break;
case GS_RINGTYPE_P3:
MTGS_RECREAD(g_pGSRingPos+16, ((tag>>16)<<4));
GSgifTransfer3((u32*)(g_pGSRingPos+0x10), tag>>16);
GSgifTransfer3((u32*)(g_pGSRingPos+16), tag>>16);
InterlockedExchangeAdd((long*)&g_pGSRingPos, 16 + ((tag>>16)<<4));
break;
case GS_RINGTYPE_VSYNC:

3
pcsx2/Plugins.c
View File

@ -251,7 +251,6 @@ int LoadSPU2plugin(char *filename) {
LoadSPU2sym1(irqCallback, "SPU2irqCallback");
LoadSPU2symN(setClockPtr, "SPU2setClockPtr");
LoadSPU2symN(setTimeStretcher, "SPU2setTimeStretcher");
LoadSPU2symN(setupRecording, "SPU2setupRecording");
@ -509,7 +508,7 @@ int LoadPlugins() {
return 0;
}
HWND pDsp;
uptr pDsp;
static pluginsopened = 0;
extern void spu2DMA4Irq();
extern void spu2DMA7Irq();

12
pcsx2/x86/iCOP2.c
View File

@ -117,6 +117,9 @@ extern void _vu0WaitMicro();
static void recCFC2()
{
int mmreg;
#ifdef __x86_64__
int creg;
#endif
if (cpuRegs.code & 1) {
iFlushCall(IS_X8664?(FLUSH_FREE_VU0|FLUSH_FREE_TEMPX86):FLUSH_NOCONST);
@ -130,7 +133,7 @@ static void recCFC2()
#ifdef __x86_64__
mmreg = _allocX86reg(-1, X86TYPE_GPR, _Rt_, MODE_WRITE);
if( (int creg = _checkX86reg(X86TYPE_VI, _Fs_, MODE_READ)) >= 0 ) {
if( (creg = _checkX86reg(X86TYPE_VI, _Fs_, MODE_READ)) >= 0 ) {
if(EEINST_ISLIVE1(_Rt_)) {
if( _Fs_ < 16 ) {
// zero extending
@ -211,6 +214,9 @@ static void recCFC2()
static void recCTC2()
{
#ifdef __x86_64__
int mmreg;
#endif
if (cpuRegs.code & 1) {
iFlushCall(IS_X8664?(FLUSH_FREE_VU0|FLUSH_FREE_TEMPX86):FLUSH_NOCONST);
CALLFunc((uptr)_vu0WaitMicro);
@ -276,7 +282,7 @@ static void recCTC2()
assert( (g_cpuConstRegs[_Rt_].UL[0]&0xffff0000)==0);
#ifdef __x86_64__
if( (int mmreg = _checkX86reg(X86TYPE_VI, _Fs_, MODE_WRITE)) >= 0 )
if( (mmreg = _checkX86reg(X86TYPE_VI, _Fs_, MODE_WRITE)) >= 0 )
MOV32ItoR(mmreg, g_cpuConstRegs[_Rt_].UL[0]);
else
#else
@ -358,7 +364,7 @@ static void recCTC2()
default:
{
#ifdef __x86_64__
if( (int mmreg = _checkX86reg(X86TYPE_VI, _Fs_, MODE_WRITE)) >= 0 )
if( (mmreg = _checkX86reg(X86TYPE_VI, _Fs_, MODE_WRITE)) >= 0 )
_eeMoveGPRtoR(mmreg, _Rt_);
else
#else