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

wxgui: A few Linux related changes. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1692 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-08-28 01:20:40 +00:00
parent f39c52f5d1
commit 282abf816d
7 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/build/Utilities/Utilities.cbp
View File

@ -35,6 +35,8 @@
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" />
<Add option="-DNDEBUG" /> <Add option="-DNDEBUG" />
<Add directory="../../include" />
<Add directory="../../include/Utilities" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
@ -51,6 +53,8 @@
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
<Add option="-DNDEBUG" /> <Add option="-DNDEBUG" />
<Add directory="../../include" />
<Add directory="../../include/Utilities" />
</Compiler> </Compiler>
</Target> </Target>
</Build> </Build>

1
pcsx2/Linux/pcsx2.cbp
View File

@ -109,6 +109,7 @@
<Unit filename="../../common/include/Pcsx2Config.h" /> <Unit filename="../../common/include/Pcsx2Config.h" />
<Unit filename="../../common/include/Pcsx2Defs.h" /> <Unit filename="../../common/include/Pcsx2Defs.h" />
<Unit filename="../../common/include/Pcsx2Types.h" /> <Unit filename="../../common/include/Pcsx2Types.h" />
<Unit filename="../../common/include/Utilities/Dependencies.h" />
<Unit filename="../../common/include/wx/folderdesc.txt" /> <Unit filename="../../common/include/wx/folderdesc.txt" />
<Unit filename="../../common/include/wx/scopedarray.h" /> <Unit filename="../../common/include/wx/scopedarray.h" />
<Unit filename="../../common/include/wx/scopedptr.h" /> <Unit filename="../../common/include/wx/scopedptr.h" />

5
pcsx2/NakedAsm.h
View File

@ -47,16 +47,17 @@ extern "C"
void* SuperVUGetProgram(u32 startpc, int vuindex); void* SuperVUGetProgram(u32 startpc, int vuindex);
void SuperVUCleanupProgram(u32 startpc, int vuindex); void SuperVUCleanupProgram(u32 startpc, int vuindex);
void svudispfn(); void svudispfn();
// aR3000A.S // aR3000A.S
void iopJITCompile(); void iopJITCompile();
void iopJITCompileInBlock(); void iopJITCompileInBlock();
void iopDispatcherReg(); void iopDispatcherReg();
// aR5900-32.S // aR5900-32.S
void JITCompile(); void JITCompile();
void JITCompileInBlock(); void JITCompileInBlock();
void DispatcherReg(); void DispatcherReg();
void DispatcherEvent();
} }
#endif #endif

4
pcsx2/gui/App.h
View File

@ -123,7 +123,7 @@ public:
bool PrepForExit(); bool PrepForExit();
void OnAssertFailure( const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg ); //void ( const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg );
const wxBitmap& GetLogoBitmap(); const wxBitmap& GetLogoBitmap();
wxImageList& GetImgList_Config(); wxImageList& GetImgList_Config();
@ -154,7 +154,7 @@ public:
// disable future console log messages from being sent to the window. // disable future console log messages from being sent to the window.
m_ProgramLogBox = NULL; m_ProgramLogBox = NULL;
} }
void ProgramLog_CountMsg() void ProgramLog_CountMsg()
{ {
if( m_ProgramLogBox == NULL ) return; if( m_ProgramLogBox == NULL ) return;

3
pcsx2/ps2/CoreEmuThread.cpp
View File

@ -16,7 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "Common.h"
#include "System.h" #include "System.h"
#include "SaveState.h" #include "SaveState.h"
#include "Elfheader.h" #include "Elfheader.h"

9
pcsx2/x86/ix86-32/aR5900-32.S
View File

@ -16,7 +16,8 @@
.extern REGINFO .extern REGINFO
.extern RECLUT .extern RECLUT
.extern recRecompile .extern recRecompile
.extern recEventTest
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// The address for all cleared blocks. It recompiles the current pc and then // The address for all cleared blocks. It recompiles the current pc and then
@ -48,3 +49,9 @@ DispatcherReg:
shr eax, 16 shr eax, 16
mov ecx, dword ptr [RECLUT+eax*4] mov ecx, dword ptr [RECLUT+eax*4]
jmp dword ptr [ecx+ebx] jmp dword ptr [ecx+ebx]
.globl DispatcherEvent
DispatcherEvent:
call recEventTest
jmp DispatcherReg

68
pcsx2/x86/ix86-32/iR5900-32.cpp
View File

@ -91,7 +91,7 @@ static u32 s_nInstCacheSize = 0;
static BASEBLOCK* s_pCurBlock = NULL; static BASEBLOCK* s_pCurBlock = NULL;
static BASEBLOCKEX* s_pCurBlockEx = NULL; static BASEBLOCKEX* s_pCurBlockEx = NULL;
u32 s_nEndBlock = 0; // what pc the current block ends u32 s_nEndBlock = 0; // what pc the current block ends
static bool s_nBlockFF; static bool s_nBlockFF;
// save states for branches // save states for branches
@ -187,7 +187,7 @@ void _eeFlushAllUnused()
continue; continue;
if( i < 32 && GPR_IS_CONST1(i) ) _flushConstReg(i); if( i < 32 && GPR_IS_CONST1(i) ) _flushConstReg(i);
else { else {
_deleteMMXreg(MMX_GPR+i, 1); _deleteMMXreg(MMX_GPR+i, 1);
_deleteGPRtoXMMreg(i, 1); _deleteGPRtoXMMreg(i, 1);
} }
@ -210,7 +210,7 @@ u32* _eeGetConstReg(int reg)
// if written in the future, don't flush // if written in the future, don't flush
if( _recIsRegWritten(g_pCurInstInfo+1, (s_nEndBlock-pc)/4, XMMTYPE_GPRREG, reg) ) if( _recIsRegWritten(g_pCurInstInfo+1, (s_nEndBlock-pc)/4, XMMTYPE_GPRREG, reg) )
return recGetImm64(g_cpuConstRegs[reg].UL[1], g_cpuConstRegs[reg].UL[0]); return recGetImm64(g_cpuConstRegs[reg].UL[1], g_cpuConstRegs[reg].UL[0]);
_flushConstReg(reg); _flushConstReg(reg);
return &cpuRegs.GPR.r[ reg ].UL[0]; return &cpuRegs.GPR.r[ reg ].UL[0];
} }
@ -223,7 +223,7 @@ void _eeMoveGPRtoR(x86IntRegType to, int fromgpr)
MOV32ItoR( to, g_cpuConstRegs[fromgpr].UL[0] ); MOV32ItoR( to, g_cpuConstRegs[fromgpr].UL[0] );
else { else {
int mmreg; int mmreg;
if( (mmreg = _checkXMMreg(XMMTYPE_GPRREG, fromgpr, MODE_READ)) >= 0 && (xmmregs[mmreg].mode&MODE_WRITE)) { if( (mmreg = _checkXMMreg(XMMTYPE_GPRREG, fromgpr, MODE_READ)) >= 0 && (xmmregs[mmreg].mode&MODE_WRITE)) {
SSE2_MOVD_XMM_to_R(to, mmreg); SSE2_MOVD_XMM_to_R(to, mmreg);
} }
@ -243,7 +243,7 @@ void _eeMoveGPRtoM(u32 to, int fromgpr)
MOV32ItoM( to, g_cpuConstRegs[fromgpr].UL[0] ); MOV32ItoM( to, g_cpuConstRegs[fromgpr].UL[0] );
else { else {
int mmreg; int mmreg;
if( (mmreg = _checkXMMreg(XMMTYPE_GPRREG, fromgpr, MODE_READ)) >= 0 ) { if( (mmreg = _checkXMMreg(XMMTYPE_GPRREG, fromgpr, MODE_READ)) >= 0 ) {
SSEX_MOVD_XMM_to_M32(to, mmreg); SSEX_MOVD_XMM_to_M32(to, mmreg);
} }
@ -264,7 +264,7 @@ void _eeMoveGPRtoRm(x86IntRegType to, int fromgpr)
MOV32ItoRm( to, g_cpuConstRegs[fromgpr].UL[0] ); MOV32ItoRm( to, g_cpuConstRegs[fromgpr].UL[0] );
else { else {
int mmreg; int mmreg;
if( (mmreg = _checkXMMreg(XMMTYPE_GPRREG, fromgpr, MODE_READ)) >= 0 ) { if( (mmreg = _checkXMMreg(XMMTYPE_GPRREG, fromgpr, MODE_READ)) >= 0 ) {
SSEX_MOVD_XMM_to_Rm(to, mmreg); SSEX_MOVD_XMM_to_Rm(to, mmreg);
} }
@ -284,7 +284,7 @@ int _flushXMMunused()
int i; int i;
for (i=0; i<iREGCNT_XMM; i++) { for (i=0; i<iREGCNT_XMM; i++) {
if (!xmmregs[i].inuse || xmmregs[i].needed || !(xmmregs[i].mode&MODE_WRITE) ) continue; if (!xmmregs[i].inuse || xmmregs[i].needed || !(xmmregs[i].mode&MODE_WRITE) ) continue;
if (xmmregs[i].type == XMMTYPE_GPRREG ) { if (xmmregs[i].type == XMMTYPE_GPRREG ) {
//if( !(g_pCurInstInfo->regs[xmmregs[i].reg]&EEINST_USED) ) { //if( !(g_pCurInstInfo->regs[xmmregs[i].reg]&EEINST_USED) ) {
if( !_recIsRegWritten(g_pCurInstInfo+1, (s_nEndBlock-pc)/4, XMMTYPE_GPRREG, xmmregs[i].reg) ) { if( !_recIsRegWritten(g_pCurInstInfo+1, (s_nEndBlock-pc)/4, XMMTYPE_GPRREG, xmmregs[i].reg) ) {
@ -303,7 +303,7 @@ int _flushMMXunused()
int i; int i;
for (i=0; i<iREGCNT_MMX; i++) { for (i=0; i<iREGCNT_MMX; i++) {
if (!mmxregs[i].inuse || mmxregs[i].needed || !(mmxregs[i].mode&MODE_WRITE) ) continue; if (!mmxregs[i].inuse || mmxregs[i].needed || !(mmxregs[i].mode&MODE_WRITE) ) continue;
if( MMX_ISGPR(mmxregs[i].reg) ) { if( MMX_ISGPR(mmxregs[i].reg) ) {
//if( !(g_pCurInstInfo->regs[mmxregs[i].reg-MMX_GPR]&EEINST_USED) ) { //if( !(g_pCurInstInfo->regs[mmxregs[i].reg-MMX_GPR]&EEINST_USED) ) {
if( !_recIsRegWritten(g_pCurInstInfo+1, (s_nEndBlock-pc)/4, XMMTYPE_GPRREG, mmxregs[i].reg-MMX_GPR) ) { if( !_recIsRegWritten(g_pCurInstInfo+1, (s_nEndBlock-pc)/4, XMMTYPE_GPRREG, mmxregs[i].reg-MMX_GPR) ) {
@ -383,11 +383,11 @@ static void __fastcall dyna_block_discard(u32 start,u32 sz);
// memory allocation handle for the entire BASEBLOCK and stack allocations. // memory allocation handle for the entire BASEBLOCK and stack allocations.
static u8* m_recBlockAlloc = NULL; static u8* m_recBlockAlloc = NULL;
static const uint m_recBlockAllocSize = static const uint m_recBlockAllocSize =
(((Ps2MemSize::Base + Ps2MemSize::Rom + Ps2MemSize::Rom1) / 4) * sizeof(BASEBLOCK)) (((Ps2MemSize::Base + Ps2MemSize::Rom + Ps2MemSize::Rom1) / 4) * sizeof(BASEBLOCK))
+ RECCONSTBUF_SIZE * sizeof(u32) + Ps2MemSize::Base; + RECCONSTBUF_SIZE * sizeof(u32) + Ps2MemSize::Base;
static void recAlloc() static void recAlloc()
{ {
// Hardware Requirements Check... // Hardware Requirements Check...
@ -535,12 +535,13 @@ static void recShutdown( void )
#pragma warning(disable:4731) // frame pointer register 'ebp' modified by inline assembly code #pragma warning(disable:4731) // frame pointer register 'ebp' modified by inline assembly code
#endif #endif
void recStep( void ) { void recStep( void )
{
} }
extern "C"
{
static void recEventTest() void recEventTest()
{ {
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
// dont' remove this check unless doing an official release // dont' remove this check unless doing an official release
@ -559,6 +560,7 @@ static void recEventTest()
assert( !g_globalXMMSaved && !g_globalMMXSaved); assert( !g_globalXMMSaved && !g_globalMMXSaved);
#endif #endif
} }
}
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
@ -637,7 +639,7 @@ void recExecute()
push ebp push ebp
call DispatcherReg call DispatcherReg
pop ebp pop ebp
pop edi pop edi
pop esi pop esi
@ -663,7 +665,7 @@ __forceinline void recExecute()
"push ebp\n" "push ebp\n"
"call DispatcherReg\n" "call DispatcherReg\n"
"pop ebp\n" "pop ebp\n"
"pop edi\n" "pop edi\n"
"pop esi\n" "pop esi\n"
@ -734,7 +736,7 @@ void recClear(u32 addr, u32 size)
else __asm emms; else __asm emms;
#else #else
if( x86caps.has3DNOWInstructionExtensions )__asm__("femms"); if( x86caps.has3DNOWInstructionExtensions )__asm__("femms");
else else
__asm__("emms"); __asm__("emms");
#endif #endif
#endif #endif
@ -831,7 +833,7 @@ void SetBranchReg( u32 reg )
// MOV32ItoM( (uptr)&cpuRegs.pc, g_cpuConstRegs[reg].UL[0] ); // MOV32ItoM( (uptr)&cpuRegs.pc, g_cpuConstRegs[reg].UL[0] );
// else { // else {
// int mmreg; // int mmreg;
// //
// if( (mmreg = _checkXMMreg(XMMTYPE_GPRREG, reg, MODE_READ)) >= 0 ) { // if( (mmreg = _checkXMMreg(XMMTYPE_GPRREG, reg, MODE_READ)) >= 0 ) {
// SSE_MOVSS_XMM_to_M32((u32)&cpuRegs.pc, mmreg); // SSE_MOVSS_XMM_to_M32((u32)&cpuRegs.pc, mmreg);
// } // }
@ -1011,7 +1013,7 @@ static u32 eeScaleBlockCycles()
// the jump is assumed to be to a register (dynamic). For any other value the // the jump is assumed to be to a register (dynamic). For any other value the
// jump is assumed to be static, in which case the block will be "hardlinked" after // jump is assumed to be static, in which case the block will be "hardlinked" after
// the first time it's dispatched. // the first time it's dispatched.
// //
// noDispatch - When set true, then jump to Dispatcher. Used by the recs // noDispatch - When set true, then jump to Dispatcher. Used by the recs
// for blocks which perform exception checks without branching (it's enabled by // for blocks which perform exception checks without branching (it's enabled by
// setting "branch = 2"; // setting "branch = 2";
@ -1040,7 +1042,7 @@ static void iBranchTest(u32 newpc)
// the if() block below (it would be paired with recBlocks.Link) breaks the sub/jcc // the if() block below (it would be paired with recBlocks.Link) breaks the sub/jcc
// pairing that modern CPUs optimize (applies to all P4+ and AMD X2+ CPUs). So let's do // pairing that modern CPUs optimize (applies to all P4+ and AMD X2+ CPUs). So let's do
// it up here instead. :D // it up here instead. :D
if( newpc != 0xffffffff ) if( newpc != 0xffffffff )
xMOV( ptr32[&cpuRegs.pc], newpc ); xMOV( ptr32[&cpuRegs.pc], newpc );
@ -1060,7 +1062,7 @@ static void iBranchTest(u32 newpc)
xJMP( DispatcherEvent ); xJMP( DispatcherEvent );
} }
} }
/* /*
else else
{ {
@ -1131,7 +1133,7 @@ void recompileNextInstruction(int delayslot)
x86SetJ8( j8Ptr[ 1 ] ); x86SetJ8( j8Ptr[ 1 ] );
PUSH32I(s_pCurBlockEx->startpc); PUSH32I(s_pCurBlockEx->startpc);
ADD32ItoR(ESP, 4); ADD32ItoR(ESP, 4);
x86SetJ8( j8Ptr[ 2 ] ); x86SetJ8( j8Ptr[ 2 ] );
} }
#endif #endif
#endif #endif
@ -1330,7 +1332,7 @@ void recRecompile( const u32 startpc )
// go until the next branch // go until the next branch
i = startpc; i = startpc;
s_nEndBlock = 0xffffffff; s_nEndBlock = 0xffffffff;
while(1) { while(1) {
BASEBLOCK* pblock = PC_GETBLOCK(i); BASEBLOCK* pblock = PC_GETBLOCK(i);
@ -1363,9 +1365,9 @@ void recRecompile( const u32 startpc )
goto StartRecomp; goto StartRecomp;
} }
break; break;
case 1: // regimm case 1: // regimm
if( _Rt_ < 4 || (_Rt_ >= 16 && _Rt_ < 20) ) { if( _Rt_ < 4 || (_Rt_ >= 16 && _Rt_ < 20) ) {
// branches // branches
branchTo = _Imm_ * 4 + i + 4; branchTo = _Imm_ * 4 + i + 4;
@ -1382,12 +1384,12 @@ void recRecompile( const u32 startpc )
goto StartRecomp; goto StartRecomp;
// branches // branches
case 4: case 5: case 6: case 7: case 4: case 5: case 6: case 7:
case 20: case 21: case 22: case 23: case 20: case 21: case 22: case 23:
branchTo = _Imm_ * 4 + i + 4; branchTo = _Imm_ * 4 + i + 4;
if( branchTo > startpc && branchTo < i ) s_nEndBlock = branchTo; if( branchTo > startpc && branchTo < i ) s_nEndBlock = branchTo;
else s_nEndBlock = i+8; else s_nEndBlock = i+8;
goto StartRecomp; goto StartRecomp;
case 16: // cp0 case 16: // cp0
@ -1408,7 +1410,7 @@ void recRecompile( const u32 startpc )
branchTo = _Imm_ * 4 + i + 4; branchTo = _Imm_ * 4 + i + 4;
if( branchTo > startpc && branchTo < i ) s_nEndBlock = branchTo; if( branchTo > startpc && branchTo < i ) s_nEndBlock = branchTo;
else s_nEndBlock = i+8; else s_nEndBlock = i+8;
goto StartRecomp; goto StartRecomp;
} }
break; break;
@ -1461,7 +1463,7 @@ StartRecomp:
vucycle = 0; vucycle = 0;
usecop2 = 1; usecop2 = 1;
} }
VU0.code = cpuRegs.code; VU0.code = cpuRegs.code;
_vuRegsCOP22( &VU0, &g_pCurInstInfo->vuregs ); _vuRegsCOP22( &VU0, &g_pCurInstInfo->vuregs );
continue; continue;
@ -1521,7 +1523,7 @@ StartRecomp:
xMOV( ecx, inpage_ptr ); xMOV( ecx, inpage_ptr );
xMOV( edx, pgsz / 4 ); xMOV( edx, pgsz / 4 );
//xMOV( eax, startpc ); // uncomment this to access startpc (as eax) in dyna_block_discard //xMOV( eax, startpc ); // uncomment this to access startpc (as eax) in dyna_block_discard
u32 lpc = inpage_ptr; u32 lpc = inpage_ptr;
u32 stg = pgsz; u32 stg = pgsz;
while(stg>0) while(stg>0)
@ -1532,7 +1534,7 @@ StartRecomp:
stg -= 4; stg -= 4;
lpc += 4; lpc += 4;
} }
// Tweakpoint! 3 is a 'magic' number representing the number of times a counted block // Tweakpoint! 3 is a 'magic' number representing the number of times a counted block
// is re-protected before the recompiler gives up and sets it up as an uncounted (permanent) // is re-protected before the recompiler gives up and sets it up as an uncounted (permanent)
// manual block. Higher thresholds result in more recompilations for blocks that share code // manual block. Higher thresholds result in more recompilations for blocks that share code
@ -1542,7 +1544,7 @@ StartRecomp:
// (ideally, perhaps, manual_counter should be reset to 0 every few minutes?) // (ideally, perhaps, manual_counter should be reset to 0 every few minutes?)
if (startpc != 0x81fc0 && manual_counter[inpage_ptr >> 12] <= 3) { if (startpc != 0x81fc0 && manual_counter[inpage_ptr >> 12] <= 3) {
// Counted blocks add a weighted (by block size) value into manual_page each time they're // Counted blocks add a weighted (by block size) value into manual_page each time they're
// run. If the block gets run a lot, it resets and re-protects itself in the hope // run. If the block gets run a lot, it resets and re-protects itself in the hope
// that whatever forced it to be manually-checked before was a 1-time deal. // that whatever forced it to be manually-checked before was a 1-time deal.
@ -1574,7 +1576,7 @@ StartRecomp:
} }
} }
// Finally: Generate x86 recompiled code! // Finally: Generate x86 recompiled code!
g_pCurInstInfo = s_pInstCache; g_pCurInstInfo = s_pInstCache;
while (!branch && pc < s_nEndBlock) { while (!branch && pc < s_nEndBlock) {