From dc915d40f3afc34219620bd2597b2352aa8315f0 Mon Sep 17 00:00:00 2001 From: hrydgard Date: Sun, 10 Aug 2008 19:14:14 +0000 Subject: [PATCH] unix build fix, cpu detection improvement (SSSE3 detected) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@173 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/CPUDetect.cpp | 1 + Source/Core/Common/Src/CPUDetect.h | 1 + Source/Core/DebuggerWX/src/CodeWindow.cpp | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp index a8171fefab..344b5b670e 100644 --- a/Source/Core/Common/Src/CPUDetect.cpp +++ b/Source/Core/Common/Src/CPUDetect.cpp @@ -90,6 +90,7 @@ void CPUInfoStruct::Detect() nCLFLUSHcachelinesize = ((CPUInfo[1] >> 8) & 0xff) * 8; nAPICPhysicalID = (CPUInfo[1] >> 24) & 0xff; bSSE3NewInstructions = (CPUInfo[2] & 0x1) || false; + bSSSE3NewInstructions = (CPUInfo[2] & 0x200) || false; bMONITOR_MWAIT = (CPUInfo[2] & 0x8) || false; bCPLQualifiedDebugStore = (CPUInfo[2] & 0x10) || false; bThermalMonitor2 = (CPUInfo[2] & 0x100) || false; diff --git a/Source/Core/Common/Src/CPUDetect.h b/Source/Core/Common/Src/CPUDetect.h index 938f08d520..89ef2a7a71 100644 --- a/Source/Core/Common/Src/CPUDetect.h +++ b/Source/Core/Common/Src/CPUDetect.h @@ -80,6 +80,7 @@ struct CPUInfoStruct bool bSSEExtensions; bool bSSE2Extensions; bool bSSE3NewInstructions; + bool bSSSE3NewInstructions; bool bSelfSnoop; bool bHyper_threadingTechnology; bool bThermalMonitor; diff --git a/Source/Core/DebuggerWX/src/CodeWindow.cpp b/Source/Core/DebuggerWX/src/CodeWindow.cpp index 79c0f8ae8e..508cc62c2c 100644 --- a/Source/Core/DebuggerWX/src/CodeWindow.cpp +++ b/Source/Core/DebuggerWX/src/CodeWindow.cpp @@ -288,7 +288,7 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event) { return; } - Debugger::LoadSymbolMap(path.c_str()); + Debugger::LoadSymbolMap(path.ToAscii()); break; case IDM_SAVEMAPFILE: path = wxFileSelector( @@ -306,7 +306,7 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event) { return; } - Debugger::SaveSymbolMap(path.c_str()); + Debugger::SaveSymbolMap(path.ToAscii()); break; } }