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

linux compilation fix: 

* use c++11 for pcsx2
* rename __rdtsc so I won't conflict with gnu version
* add a bunch of .data() method to get string data



git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5913 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2014-02-23 09:57:01 +00:00
parent c374343ae9
commit 220f55d760
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/include/intrin_x86.h
View File

@ -843,7 +843,9 @@ static __inline__ __attribute__((always_inline)) unsigned long long __xgetbv(uns
return ((unsigned long long)edx << 32) | eax; return ((unsigned long long)edx << 32) | eax;
} }
static __inline__ __attribute__((always_inline)) unsigned long long __rdtsc(void) // gcc 4.8 define __rdtsc but unfortunately the compiler crash...
// The redefine allow to skip the gcc __rdtsc version -- Gregory
static __inline__ __attribute__((always_inline)) unsigned long long __pcsx2__rdtsc(void)
{ {
unsigned long long retval; unsigned long long retval;
__asm__ __volatile__("rdtsc" : "=A"(retval)); __asm__ __volatile__("rdtsc" : "=A"(retval));

4
common/src/x86emitter/cpudetect.cpp
View File

@ -93,12 +93,12 @@ s64 x86capabilities::_CPUSpeedHz( u64 time ) const
do { do {
timeStart = GetCPUTicks(); timeStart = GetCPUTicks();
startCycle = __rdtsc(); startCycle = __pcsx2__rdtsc();
} while( GetCPUTicks() == timeStart ); } while( GetCPUTicks() == timeStart );
do { do {
timeStop = GetCPUTicks(); timeStop = GetCPUTicks();
endCycle = __rdtsc(); endCycle = __pcsx2__rdtsc();
} while( ( timeStop - timeStart ) < time ); } while( ( timeStop - timeStart ) < time );
s64 cycleCount = endCycle - startCycle; s64 cycleCount = endCycle - startCycle;

1
pcsx2/CMakeLists.txt
View File

@ -19,6 +19,7 @@ set(CommonFlags
-fno-tree-dse -fno-tree-dse
-fno-strict-aliasing -fno-strict-aliasing
-Wstrict-aliasing # Allow to track strict aliasing issue. -Wstrict-aliasing # Allow to track strict aliasing issue.
-std=c++0x
-pipe) -pipe)
if (SPARSEHASH_NEW_FOUND) if (SPARSEHASH_NEW_FOUND)

10
pcsx2/gui/Debugger/BreakpointWindow.cpp
View File

@ -232,7 +232,7 @@ bool BreakpointWindow::fetchDialogData()
wxCharBuffer addressText = editAddress->GetLabel().ToUTF8(); wxCharBuffer addressText = editAddress->GetLabel().ToUTF8();
if (cpu->initExpression(addressText,exp) == false) if (cpu->initExpression(addressText,exp) == false)
{ {
swprintf(errorMessage,512,L"Invalid expression \"%s\".",editAddress->GetLabel().wchar_str()); swprintf(errorMessage,512,L"Invalid expression \"%s\".",editAddress->GetLabel().wchar_str().data());
wxMessageBox(errorMessage,L"Error",wxICON_ERROR); wxMessageBox(errorMessage,L"Error",wxICON_ERROR);
return false; return false;
} }
@ -240,7 +240,7 @@ bool BreakpointWindow::fetchDialogData()
u64 value; u64 value;
if (cpu->parseExpression(exp,value) == false) if (cpu->parseExpression(exp,value) == false)
{ {
swprintf(errorMessage,512,L"Invalid expression \"%s\".",editAddress->GetLabel().wchar_str()); swprintf(errorMessage,512,L"Invalid expression \"%s\".",editAddress->GetLabel().wchar_str().data());
wxMessageBox(errorMessage,L"Error",wxICON_ERROR); wxMessageBox(errorMessage,L"Error",wxICON_ERROR);
return false; return false;
} }
@ -252,14 +252,14 @@ bool BreakpointWindow::fetchDialogData()
wxCharBuffer sizeText = editSize->GetLabel().ToUTF8(); wxCharBuffer sizeText = editSize->GetLabel().ToUTF8();
if (cpu->initExpression(sizeText,exp) == false) if (cpu->initExpression(sizeText,exp) == false)
{ {
swprintf(errorMessage,512,L"Invalid expression \"%s\".",editSize->GetLabel().wchar_str()); swprintf(errorMessage,512,L"Invalid expression \"%s\".",editSize->GetLabel().wchar_str().data());
wxMessageBox(errorMessage,L"Error",wxICON_ERROR); wxMessageBox(errorMessage,L"Error",wxICON_ERROR);
return false; return false;
} }
if (cpu->parseExpression(exp,value) == false) if (cpu->parseExpression(exp,value) == false)
{ {
swprintf(errorMessage,512,L"Invalid expression \"%s\".",editSize->GetLabel().wchar_str()); swprintf(errorMessage,512,L"Invalid expression \"%s\".",editSize->GetLabel().wchar_str().data());
wxMessageBox(errorMessage,L"Error",wxICON_ERROR); wxMessageBox(errorMessage,L"Error",wxICON_ERROR);
return false; return false;
} }
@ -276,7 +276,7 @@ bool BreakpointWindow::fetchDialogData()
{ {
if (cpu->initExpression(condition,compiledCondition) == false) if (cpu->initExpression(condition,compiledCondition) == false)
{ {
swprintf(errorMessage,512,L"Invalid expression \"%s\".",editCondition->GetLabel().wchar_str()); swprintf(errorMessage,512,L"Invalid expression \"%s\".",editCondition->GetLabel().wchar_str().data());
wxMessageBox(errorMessage,L"Error",wxICON_ERROR); wxMessageBox(errorMessage,L"Error",wxICON_ERROR);
return false; return false;
} }