diff options
| author | daco65 <daco65@gmail.com> | 2008-09-06 23:38:12 +0000 |
|---|---|---|
| committer | daco65 <daco65@gmail.com> | 2008-09-06 23:38:12 +0000 |
| commit | 72ca1e2355401cdf8e340fe56cadf4e4f95340c0 (patch) | |
| tree | 754dc63c8a2d2d31b10b0f9c5e0ea1880ed149aa /Source/Core | |
| parent | 3078f66763cedea081b5d4855d657d421edf7200 (diff) | |
refixed. my mistake sorry
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@450 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/Src/ExtendedTrace.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/src/Main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/Common/Src/ExtendedTrace.cpp b/Source/Core/Common/Src/ExtendedTrace.cpp index 625d74892f..8cc0ac486a 100644 --- a/Source/Core/Common/Src/ExtendedTrace.cpp +++ b/Source/Core/Common/Src/ExtendedTrace.cpp @@ -158,7 +158,7 @@ static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, L _tcscpy( lpszSymbol, _T("?") );
// Get symbol info for IP
-#ifdef _M_IX86
+#ifndef _M_X64
if ( SymGetSymFromAddr( GetCurrentProcess(), (ULONG)fnAddress, &dwDisp, pSym ) )
#else
//makes it compile but hell im not sure if this works...
@@ -309,7 +309,7 @@ void StackTrace( HANDLE hThread, LPCTSTR lpszMessage, FILE *file ) }
::ZeroMemory( &callStack, sizeof(callStack) );
-#ifdef _M_IX86
+#ifndef _M_X64
callStack.AddrPC.Offset = context.Eip;
callStack.AddrStack.Offset = context.Esp;
callStack.AddrFrame.Offset = context.Ebp;
diff --git a/Source/Core/DolphinWX/src/Main.cpp b/Source/Core/DolphinWX/src/Main.cpp index 562459ffa6..23da10a48e 100644 --- a/Source/Core/DolphinWX/src/Main.cpp +++ b/Source/Core/DolphinWX/src/Main.cpp @@ -50,7 +50,7 @@ LONG WINAPI MyUnhandledExceptionFilter(LPEXCEPTION_POINTERS e) { //dumpCurrentDate(file);
etfprintf(file, "Unhandled Exception\n Code: 0x%08X\n",
e->ExceptionRecord->ExceptionCode);
-#ifdef _M_IX86
+#ifndef _M_X64
STACKTRACE2(file, e->ContextRecord->Eip, e->ContextRecord->Esp, e->ContextRecord->Ebp);
#else
STACKTRACE2(file, e->ContextRecord->Rip, e->ContextRecord->Rsp, e->ContextRecord->Rbp);
|