m2-internship/libunwind-eh_elf
1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2024-11-26 17:17:39 +01:00
Code Issues Releases Activity

More move of osdep code.

Browse source
This commit is contained in:
Konstantin Belousov 2010-04-05 16:25:36 +03:00
parent a40641f326
commit ccc0ae665b
2 changed files with 50 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/x86_64/Gos-freebsd.c
View file

@ -94,10 +94,8 @@ unw_handle_signal_frame (unw_cursor_t *cursor)
int ret; int ret;
if (c->sigcontext_format == X86_64_SCF_FREEBSD_SIGFRAME) if (c->sigcontext_format == X86_64_SCF_FREEBSD_SIGFRAME)
{
ucontext = c->dwarf.cfa + offsetof(struct sigframe, sf_uc); ucontext = c->dwarf.cfa + offsetof(struct sigframe, sf_uc);
else
return -UNW_EBADFRAME;
Debug(1, "signal frame, skip over trampoline\n"); Debug(1, "signal frame, skip over trampoline\n");
struct dwarf_loc rsp_loc = DWARF_LOC (ucontext + UC_MCONTEXT_GREGS_RSP, 0); struct dwarf_loc rsp_loc = DWARF_LOC (ucontext + UC_MCONTEXT_GREGS_RSP, 0);
@ -127,4 +125,26 @@ unw_handle_signal_frame (unw_cursor_t *cursor)
c->dwarf.loc[RIP] = DWARF_LOC (ucontext + UC_MCONTEXT_GREGS_RIP, 0); c->dwarf.loc[RIP] = DWARF_LOC (ucontext + UC_MCONTEXT_GREGS_RIP, 0);
return 0; return 0;
}
else if (c->sigcontext_format == X86_64_SCF_FREEBSD_SYSCALL)
{
c->dwarf.loc[RCX] = c->dwarf.loc[R10];
/* rsp_loc = DWARF_LOC(c->dwarf.cfa - 8, 0); */
/* rbp_loc = c->dwarf.loc[RBP]; */
c->dwarf.loc[RIP] = DWARF_LOC (c->dwarf.cfa, 0);
ret = dwarf_get (&c->dwarf, c->dwarf.loc[RIP], &c->dwarf.ip);
Debug (1, "Frame Chain [RIP=0x%Lx] = 0x%Lx\n",
(unsigned long long) DWARF_GET_LOC (c->dwarf.loc[RIP]),
(unsigned long long) c->dwarf.ip);
if (ret < 0)
{
Debug (2, "returning %d\n", ret);
return ret;
}
c->dwarf.cfa += 8;
return 1;
}
else
return -UNW_EBADFRAME;
} }

19
src/x86_64/Gstep.c
View file

@ -77,24 +77,7 @@ unw_step (unw_cursor_t *cursor)
Debug (13, "dwarf_step() failed (ret=%d), trying frame-chain\n", ret); Debug (13, "dwarf_step() failed (ret=%d), trying frame-chain\n", ret);
c->sigcontext_format = unw_is_signal_frame (cursor); if (unw_is_signal_frame (cursor))
if (c->sigcontext_format == X86_64_SCF_FREEBSD_SYSCALL) {
c->dwarf.loc[RCX] = c->dwarf.loc[R10];
// rsp_loc = DWARF_LOC(c->dwarf.cfa - 8, 0);
// rbp_loc = c->dwarf.loc[RBP];
c->dwarf.loc[RIP] = DWARF_LOC (c->dwarf.cfa, 0);
ret = dwarf_get (&c->dwarf, c->dwarf.loc[RIP], &c->dwarf.ip);
Debug (1, "Frame Chain [RIP=0x%Lx] = 0x%Lx\n",
(unsigned long long) DWARF_GET_LOC (c->dwarf.loc[RIP]),
(unsigned long long) c->dwarf.ip);
if (ret < 0)
{
Debug (2, "returning %d\n", ret);
return ret;
}
c->dwarf.cfa += 8;
return 1;
} else if (c->sigcontext_format != X86_64_SCF_NONE)
{ {
ret = unw_handle_signal_frame(cursor); ret = unw_handle_signal_frame(cursor);
if (ret < 0) if (ret < 0)