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

Mostly unbreak Linux 64 and debug builds, though it still needs more testing. (With thanks to Jake) 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@371 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2008-12-02 06:27:46 +00:00 committed by Gregory Hainaut
parent 3c91c750e7
commit 816ffb7cba
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/GS.cpp
View File

@ -1483,7 +1483,7 @@ extern "C" void GSPostVsyncEnd()
if( CHECK_MULTIGS ) if( CHECK_MULTIGS )
{ {
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
InterlockedIncrement( (volatile LONG*)&g_pGSvSyncCount ); //InterlockedIncrement( (volatile LONG*)&g_pGSvSyncCount );
//SysPrintf( " Sending VSync : %d \n", *(volatile LONG*)&g_pGSvSyncCount ); //SysPrintf( " Sending VSync : %d \n", *(volatile LONG*)&g_pGSvSyncCount );
#endif #endif
GSRingBufSimplePacket(GS_RINGTYPE_VSYNC, (*(u32*)(PS2MEM_GS+0x1000)&0x2000), 0, 0); GSRingBufSimplePacket(GS_RINGTYPE_VSYNC, (*(u32*)(PS2MEM_GS+0x1000)&0x2000), 0, 0);
@ -1625,7 +1625,7 @@ void* GSThreadProc(void* lpParam)
# ifdef PCSX2_DEVBUILD # ifdef PCSX2_DEVBUILD
//SysPrintf( " Processing VSync : %d \n", *(volatile LONG*)&g_pGSvSyncCount ); //SysPrintf( " Processing VSync : %d \n", *(volatile LONG*)&g_pGSvSyncCount );
InterlockedDecrement( (volatile LONG*)&g_pGSvSyncCount ); //InterlockedDecrement( (volatile LONG*)&g_pGSvSyncCount );
// vSyncCount should never dip below zero. // vSyncCount should never dip below zero.
assert( *(volatile LONG*)&g_pGSvSyncCount >= 0 ); assert( *(volatile LONG*)&g_pGSvSyncCount >= 0 );
# endif # endif

10
pcsx2/x86/aR3000A.S
View File

@ -24,8 +24,6 @@
#define REG_BLOCK %r12 #define REG_BLOCK %r12
#define REG_BLOCKd %r12d #define REG_BLOCKd %r12d
.extern EEsCycle
.globl R3000AExecute .globl R3000AExecute
R3000AExecute: R3000AExecute:
@ -36,11 +34,6 @@ R3000AExecute:
push %r14 push %r14
push %r15 push %r15
//while (EEsCycle > 0) {
Execute_CheckCycles:
cmp dword ptr [EEsCycle], 0
jle Execute_Exit
// calc PSX_GETBLOCK // calc PSX_GETBLOCK
// ((BASEBLOCK*)(recLUT[((u32)(x)) >> 16] + (sizeof(BASEBLOCK)/4)*((x) & 0xffff))) // ((BASEBLOCK*)(recLUT[((u32)(x)) >> 16] + (sizeof(BASEBLOCK)/4)*((x) & 0xffff)))
mov %eax, dword ptr [psxRegs + PCOFFSET] mov %eax, dword ptr [psxRegs + PCOFFSET]
@ -72,9 +65,6 @@ Execute_Recompile:
Execute_Function: Execute_Function:
call %rdx call %rdx
jmp Execute_CheckCycles
Execute_Exit:
pop %r15 pop %r15
pop %r14 pop %r14
pop %r13 pop %r13