From 21ee61d7fc253a9711a2d16a25537e3bd4dd0339 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 27 May 2014 22:37:16 -0500 Subject: [PATCH] Remove x86_32 from DolphinWX. --- Source/Core/DolphinWX/Debugger/JitWindow.cpp | 4 ---- Source/Core/DolphinWX/Main.cpp | 6 ++---- Source/Core/DolphinWX/stdafx.h | 10 +--------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Debugger/JitWindow.cpp index 47a153a063..dc10d4ac5c 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/JitWindow.cpp @@ -134,11 +134,7 @@ void CJitWindow::Compare(u32 em_address) int num_x86_instructions = 0; while ((u8*)disasmPtr < end) { -#if _M_X86_64 disasmPtr += x64disasm.disasm64(disasmPtr, disasmPtr, (u8*)disasmPtr, sptr); -#else - disasmPtr += x64disasm.disasm32(disasmPtr, disasmPtr, (u8*)disasmPtr, sptr); -#endif sptr += strlen(sptr); *sptr++ = 13; *sptr++ = 10; diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 18a693fb82..d305a7684d 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -120,11 +120,9 @@ LONG WINAPI MyUnhandledExceptionFilter(LPEXCEPTION_POINTERS e) { //dumpCurrentDate(file); etfprintf(file.GetHandle(), "Unhandled Exception\n Code: 0x%08X\n", e->ExceptionRecord->ExceptionCode); -#if _M_X86_32 - STACKTRACE2(file.GetHandle(), e->ContextRecord->Eip, e->ContextRecord->Esp, e->ContextRecord->Ebp); -#else + STACKTRACE2(file.GetHandle(), e->ContextRecord->Rip, e->ContextRecord->Rsp, e->ContextRecord->Rbp); -#endif + file.Close(); _flushall(); diff --git a/Source/Core/DolphinWX/stdafx.h b/Source/Core/DolphinWX/stdafx.h index 547b0eb264..4ef9e5a486 100644 --- a/Source/Core/DolphinWX/stdafx.h +++ b/Source/Core/DolphinWX/stdafx.h @@ -13,15 +13,7 @@ #define NOMINMAX // Don't include windows min/max definitions #include // wxWidgets -#if _M_X86_32 - -#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"") - -#elif defined _M_IA64 - -#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='ia64' publicKeyToken='6595b64144ccf1df' language='*'\"") - -#elif _M_X86_64 +#if defined _M_X86_64 #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")