/////////////////////////////////////////////////////////////////////////////
-// Name: msw/stackwalk.cpp
+// Name: src/msw/stackwalk.cpp
// Purpose: wxStackWalker implementation for Win32
// Author: Vadim Zeitlin
-// Modified by:
+// Modified by: Artur Bac 2010-10-01 AMD64 Port
// Created: 2005-01-08
// RCS-ID: $Id$
// Copyright: (c) 2003-2005 Vadim Zeitlin <vadim@wxwindows.org>
wxZeroMemory(symbolBuffer);
PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)symbolBuffer;
- pSymbol->SizeOfStruct = sizeof(symbolBuffer);
+ pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
pSymbol->MaxNameLen = MAX_NAME_LEN;
DWORD64 symDisplacement = 0;
pSymbol
) )
{
- wxDbgHelpDLL::LogError(_T("SymFromAddr"));
+ wxDbgHelpDLL::LogError(wxT("SymFromAddr"));
return;
}
{
// it is normal that we don't have source info for some symbols,
// notably all the ones from the system DLLs...
- //wxDbgHelpDLL::LogError(_T("SymGetLineFromAddr"));
+ //wxDbgHelpDLL::LogError(wxT("SymGetLineFromAddr"));
return;
}
BOOL CALLBACK
EnumSymbolsProc(PSYMBOL_INFO pSymInfo, ULONG WXUNUSED(SymSize), PVOID data)
{
- wxStackFrame *frame = wx_static_cast(wxStackFrame *, data);
+ wxStackFrame *frame = static_cast<wxStackFrame *>(data);
// we're only interested in parameters
if ( pSymInfo->Flags & IMAGEHLP_SYMBOL_INFO_PARAMETER )
// address, this is not a real error
if ( ::GetLastError() != ERROR_INVALID_ADDRESS )
{
- wxDbgHelpDLL::LogError(_T("SymSetContext"));
+ wxDbgHelpDLL::LogError(wxT("SymSetContext"));
}
return;
this // data to pass to it
) )
{
- wxDbgHelpDLL::LogError(_T("SymEnumSymbols"));
+ wxDbgHelpDLL::LogError(wxT("SymEnumSymbols"));
}
}
// wxStackWalker
// ----------------------------------------------------------------------------
-void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip)
+void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip, size_t maxDepth)
{
if ( !wxDbgHelpDLL::Init() )
{
- wxLogError(_("Failed to get stack backtrace:\n%s"),
+ // don't log a user-visible error message here because the stack trace
+ // is only needed for debugging/diagnostics anyhow and we shouldn't
+ // confuse the user by complaining that we couldn't generate it
+ wxLogDebug(wxT("Failed to get stack backtrace: %s"),
wxDbgHelpDLL::GetErrorMessage().c_str());
return;
}
TRUE // load symbols for all loaded modules
) )
{
- wxDbgHelpDLL::LogError(_T("SymInitialize"));
+ wxDbgHelpDLL::LogError(wxT("SymInitialize"));
return;
}
STACKFRAME sf;
wxZeroMemory(sf);
-#ifdef _M_IX86
+#if defined(_M_AMD64)
+ sf.AddrPC.Offset = ctx.Rip;
+ sf.AddrPC.Mode = AddrModeFlat;
+ sf.AddrStack.Offset = ctx.Rsp;
+ sf.AddrStack.Mode = AddrModeFlat;
+ sf.AddrFrame.Offset = ctx.Rbp;
+ sf.AddrFrame.Mode = AddrModeFlat;
+
+ dwMachineType = IMAGE_FILE_MACHINE_AMD64;
+#elif defined(_M_IX86)
sf.AddrPC.Offset = ctx.Eip;
sf.AddrPC.Mode = AddrModeFlat;
sf.AddrStack.Offset = ctx.Esp;
#endif // _M_IX86
// iterate over all stack frames
- for ( size_t nLevel = 0; ; nLevel++ )
+ for ( size_t nLevel = 0; nLevel < maxDepth; nLevel++ )
{
// get the next stack frame
if ( !wxDbgHelpDLL::StackWalk
) )
{
if ( ::GetLastError() )
- wxDbgHelpDLL::LogError(_T("StackWalk"));
+ wxDbgHelpDLL::LogError(wxT("StackWalk"));
break;
}
if ( nLevel >= skip )
{
wxStackFrame frame(nLevel - skip,
- (void *)sf.AddrPC.Offset,
+ wxUIntToPtr(sf.AddrPC.Offset),
sf.AddrFrame.Offset);
OnStackFrame(frame);
}
}
- // this results in crashes inside ntdll.dll when called from
- // exception handler ...
-#if 0
if ( !wxDbgHelpDLL::SymCleanup(hProcess) )
{
- wxDbgHelpDLL::LogError(_T("SymCleanup"));
+ wxDbgHelpDLL::LogError(wxT("SymCleanup"));
}
-#endif
}
-void wxStackWalker::WalkFrom(const _EXCEPTION_POINTERS *ep, size_t skip)
+void wxStackWalker::WalkFrom(const _EXCEPTION_POINTERS *ep, size_t skip, size_t maxDepth)
{
- WalkFrom(ep->ContextRecord, skip);
+ WalkFrom(ep->ContextRecord, skip, maxDepth);
}
-void wxStackWalker::WalkFromException()
+#if wxUSE_ON_FATAL_EXCEPTION
+
+void wxStackWalker::WalkFromException(size_t maxDepth)
{
extern EXCEPTION_POINTERS *wxGlobalSEInformation;
wxCHECK_RET( wxGlobalSEInformation,
- _T("wxStackWalker::WalkFromException() can only be called from wxApp::OnFatalException()") );
+ wxT("wxStackWalker::WalkFromException() can only be called from wxApp::OnFatalException()") );
// don't skip any frames, the first one is where we crashed
- WalkFrom(wxGlobalSEInformation, 0);
+ WalkFrom(wxGlobalSEInformation, 0, maxDepth);
}
-void wxStackWalker::Walk(size_t skip)
+#endif // wxUSE_ON_FATAL_EXCEPTION
+
+void wxStackWalker::Walk(size_t skip, size_t WXUNUSED(maxDepth))
{
// to get a CONTEXT for the current location, simply force an exception and
// get EXCEPTION_POINTERS from it
//
// note:
- // 1. we additionally skip RaiseException() and WalkFromException() frames
+ // 1. we additionally skip RaiseException() and WalkFrom() frames
// 2. explicit cast to EXCEPTION_POINTERS is needed with VC7.1 even if it
// shouldn't have been according to the docs
__try
__except( WalkFrom((EXCEPTION_POINTERS *)GetExceptionInformation(),
skip + 2), EXCEPTION_CONTINUE_EXECUTION )
{
- // never executed because of WalkFromException() return value
+ // never executed because the above expression always evaluates to
+ // EXCEPTION_CONTINUE_EXECUTION
}
}
// ----------------------------------------------------------------------------
void
-wxStackWalker::WalkFrom(const CONTEXT * WXUNUSED(pCtx), size_t WXUNUSED(skip))
+wxStackWalker::WalkFrom(const CONTEXT * WXUNUSED(pCtx),
+ size_t WXUNUSED(skip),
+ size_t WXUNUSED(maxDepth))
{
}
void
wxStackWalker::WalkFrom(const _EXCEPTION_POINTERS * WXUNUSED(ep),
- size_t WXUNUSED(skip))
+ size_t WXUNUSED(skip),
+ size_t WXUNUSED(maxDepth))
{
}
-void wxStackWalker::WalkFromException()
+#if wxUSE_ON_FATAL_EXCEPTION
+void wxStackWalker::WalkFromException(size_t WXUNUSED(maxDepth))
{
}
+#endif // wxUSE_ON_FATAL_EXCEPTION
-void wxStackWalker::Walk(size_t WXUNUSED(skip))
+void wxStackWalker::Walk(size_t WXUNUSED(skip), size_t WXUNUSED(maxDepth))
{
}
projects / wxWidgets.git / blobdiff