Remove x86_32 from DolphinWX.
This commit is contained in:
parent
0bcebd81f6
commit
21ee61d7fc
|
@ -134,11 +134,7 @@ void CJitWindow::Compare(u32 em_address)
|
||||||
int num_x86_instructions = 0;
|
int num_x86_instructions = 0;
|
||||||
while ((u8*)disasmPtr < end)
|
while ((u8*)disasmPtr < end)
|
||||||
{
|
{
|
||||||
#if _M_X86_64
|
|
||||||
disasmPtr += x64disasm.disasm64(disasmPtr, disasmPtr, (u8*)disasmPtr, sptr);
|
disasmPtr += x64disasm.disasm64(disasmPtr, disasmPtr, (u8*)disasmPtr, sptr);
|
||||||
#else
|
|
||||||
disasmPtr += x64disasm.disasm32(disasmPtr, disasmPtr, (u8*)disasmPtr, sptr);
|
|
||||||
#endif
|
|
||||||
sptr += strlen(sptr);
|
sptr += strlen(sptr);
|
||||||
*sptr++ = 13;
|
*sptr++ = 13;
|
||||||
*sptr++ = 10;
|
*sptr++ = 10;
|
||||||
|
|
|
@ -120,11 +120,9 @@ LONG WINAPI MyUnhandledExceptionFilter(LPEXCEPTION_POINTERS e) {
|
||||||
//dumpCurrentDate(file);
|
//dumpCurrentDate(file);
|
||||||
etfprintf(file.GetHandle(), "Unhandled Exception\n Code: 0x%08X\n",
|
etfprintf(file.GetHandle(), "Unhandled Exception\n Code: 0x%08X\n",
|
||||||
e->ExceptionRecord->ExceptionCode);
|
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);
|
STACKTRACE2(file.GetHandle(), e->ContextRecord->Rip, e->ContextRecord->Rsp, e->ContextRecord->Rbp);
|
||||||
#endif
|
|
||||||
file.Close();
|
file.Close();
|
||||||
_flushall();
|
_flushall();
|
||||||
|
|
||||||
|
|
|
@ -13,15 +13,7 @@
|
||||||
#define NOMINMAX // Don't include windows min/max definitions
|
#define NOMINMAX // Don't include windows min/max definitions
|
||||||
#include <wx/wx.h> // wxWidgets
|
#include <wx/wx.h> // wxWidgets
|
||||||
|
|
||||||
#if _M_X86_32
|
#if defined _M_X86_64
|
||||||
|
|
||||||
#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
|
|
||||||
|
|
||||||
#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")
|
#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue