Cygwin: Add addresses as module offsets in .stackdump file

This adds an additional column to the stack trace in a .stackdump file,
which gives the stack frame return address as a module name+offset. This
makes it a possible to convert the address to a function name without
having to guess what module the address belongs to.

> Stack trace:
> Frame         Function     Args
> 0007FFFFCC30  0001004010E9 (000180048055, 000180046FA0, 000000000002, 00018031E160) segv-test.exe+0x10E9
> 0007FFFFCD30  0001800480C1 (000000000000, 000000000000, 000000000000, 000000000000) cygwin1.dll+0x80C1
> 0007FFFFFFF0  000180045C86 (000000000000, 000000000000, 000000000000, 000000000000) cygwin1.dll+0x5C86
> 0007FFFFFFF0  000180045D34 (000000000000, 000000000000, 000000000000, 000000000000) cygwin1.dll+0x5D34
> End of stack trace

Loosely based on this patch [1] by Brian Dessent.

[1] https://cygwin.com/pipermail/cygwin-patches/2008q1/006306.html
This commit is contained in:
Jon Turney 2022-10-28 12:26:56 +01:00
parent 4a67f89ced
commit d59651d4da
No known key found for this signature in database
GPG Key ID: C7C86F0370285C81
1 changed files with 29 additions and 1 deletions

View File

@ -324,6 +324,34 @@ stack_info::walk ()
return 1; return 1;
} }
/*
Walk the list of modules in the current process to find the one containing
'func_va'.
This implementation requires no allocation of memory and minimal system
calls, so it should be safe in the context of an exception handler.
*/
static char *
prettyprint_va (PVOID func_va)
{
static char buf[256];
buf[0] = '\0';
PLIST_ENTRY head = &NtCurrentTeb()->Peb->Ldr->InMemoryOrderModuleList;
for (PLIST_ENTRY x = head->Flink; x != head; x = x->Flink)
{
PLDR_DATA_TABLE_ENTRY mod = CONTAINING_RECORD (x, LDR_DATA_TABLE_ENTRY,
InMemoryOrderLinks);
if (mod->DllBase > func_va)
continue;
__small_sprintf (buf, "%S+0x%x", &mod->BaseDllName,
(DWORD_PTR)func_va - (DWORD_PTR)mod->DllBase);
}
return buf;
}
void void
cygwin_exception::dumpstack () cygwin_exception::dumpstack ()
{ {
@ -350,7 +378,7 @@ cygwin_exception::dumpstack ()
for (unsigned j = 0; j < NPARAMS; j++) for (unsigned j = 0; j < NPARAMS; j++)
small_printf ("%s%012X", j == 0 ? " (" : ", ", small_printf ("%s%012X", j == 0 ? " (" : ", ",
thestack.sf.Params[j]); thestack.sf.Params[j]);
small_printf (")\r\n"); small_printf (") %s\r\n", prettyprint_va((PVOID)thestack.sf.AddrPC.Offset));
} }
small_printf ("End of stack trace%s\r\n", small_printf ("End of stack trace%s\r\n",
i == DUMPSTACK_FRAME_LIMIT ? i == DUMPSTACK_FRAME_LIMIT ?