mirror of
https://github.com/tobast/libunwind-eh_elf.git
synced 2024-11-29 18:27:37 +01:00
Implement getcontext for x86
Greetings, Attached patch implements getcontext for x86. Motivation is the same as: http://lists.nongnu.org/archive/html/libunwind-devel/2008-06/msg00009.html This also fixes check-name-space on x86. Tested on Linux/86 with no new failures. Thanks, -- Paul Pluzhnikov
This commit is contained in:
parent
0cf76ed0b5
commit
54752e0df0
4 changed files with 78 additions and 7 deletions
|
@ -163,12 +163,6 @@ unw_tdep_save_loc_t;
|
||||||
/* On x86, we can directly use ucontext_t as the unwind context. */
|
/* On x86, we can directly use ucontext_t as the unwind context. */
|
||||||
typedef ucontext_t unw_tdep_context_t;
|
typedef ucontext_t unw_tdep_context_t;
|
||||||
|
|
||||||
/* XXX this is not ideal: an application should not be prevented from
|
|
||||||
using the "getcontext" name just because it's using libunwind. We
|
|
||||||
can't just use __getcontext() either, because that isn't exported
|
|
||||||
by glibc... */
|
|
||||||
#define unw_tdep_getcontext(uc) (getcontext (uc), 0)
|
|
||||||
|
|
||||||
#include "libunwind-dynamic.h"
|
#include "libunwind-dynamic.h"
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
|
@ -179,6 +173,9 @@ unw_tdep_proc_info_t;
|
||||||
|
|
||||||
#include "libunwind-common.h"
|
#include "libunwind-common.h"
|
||||||
|
|
||||||
|
#define unw_tdep_getcontext UNW_ARCH_OBJ(getcontext)
|
||||||
|
extern int unw_tdep_getcontext (unw_tdep_context_t *);
|
||||||
|
|
||||||
#define unw_tdep_is_fpreg UNW_ARCH_OBJ(is_fpreg)
|
#define unw_tdep_is_fpreg UNW_ARCH_OBJ(is_fpreg)
|
||||||
extern int unw_tdep_is_fpreg (int);
|
extern int unw_tdep_is_fpreg (int);
|
||||||
|
|
||||||
|
|
|
@ -227,7 +227,7 @@ libunwind_la_SOURCES_x86 = $(libunwind_la_SOURCES_x86_common) \
|
||||||
x86/Lcreate_addr_space.c x86/Lget_save_loc.c x86/Lglobal.c \
|
x86/Lcreate_addr_space.c x86/Lget_save_loc.c x86/Lglobal.c \
|
||||||
x86/Linit.c x86/Linit_local.c x86/Linit_remote.c \
|
x86/Linit.c x86/Linit_local.c x86/Linit_remote.c \
|
||||||
x86/Lis_signal_frame.c x86/Lget_proc_info.c x86/Lregs.c \
|
x86/Lis_signal_frame.c x86/Lget_proc_info.c x86/Lregs.c \
|
||||||
x86/Lresume.c x86/Lstep.c
|
x86/Lresume.c x86/Lstep.c x86/getcontext.S
|
||||||
|
|
||||||
# The list of files that go into libunwind-x86:
|
# The list of files that go into libunwind-x86:
|
||||||
libunwind_x86_la_SOURCES_x86 = $(libunwind_la_SOURCES_x86_common) \
|
libunwind_x86_la_SOURCES_x86 = $(libunwind_la_SOURCES_x86_common) \
|
||||||
|
|
73
src/x86/getcontext.S
Normal file
73
src/x86/getcontext.S
Normal file
|
@ -0,0 +1,73 @@
|
||||||
|
/* libunwind - a platform-independent unwind library
|
||||||
|
Copyright (C) 2009 Google, Inc
|
||||||
|
Contributed by Paul Pluzhnikov <ppluzhnikov@google.com>
|
||||||
|
|
||||||
|
This file is part of libunwind.
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
a copy of this software and associated documentation files (the
|
||||||
|
"Software"), to deal in the Software without restriction, including
|
||||||
|
without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be
|
||||||
|
included in all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
|
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||||
|
|
||||||
|
#include "offsets.h"
|
||||||
|
|
||||||
|
/* int _Ux86_getcontext (ucontext_t *ucp)
|
||||||
|
|
||||||
|
Saves the machine context in UCP necessary for libunwind.
|
||||||
|
Unlike the libc implementation, we don't save the signal mask
|
||||||
|
and hence avoid the cost of a system call per unwind.
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
.global _Ux86_getcontext
|
||||||
|
.type _Ux86_getcontext, @function
|
||||||
|
_Ux86_getcontext:
|
||||||
|
mov 4(%esp),%eax /* ucontext_t* */
|
||||||
|
|
||||||
|
/* EAX is not preserved. */
|
||||||
|
movl $0, (LINUX_UC_MCONTEXT_OFF+LINUX_SC_EAX_OFF)(%eax)
|
||||||
|
|
||||||
|
movl %ebx, (LINUX_UC_MCONTEXT_OFF+LINUX_SC_EBX_OFF)(%eax)
|
||||||
|
movl %ecx, (LINUX_UC_MCONTEXT_OFF+LINUX_SC_ECX_OFF)(%eax)
|
||||||
|
movl %edx, (LINUX_UC_MCONTEXT_OFF+LINUX_SC_EDX_OFF)(%eax)
|
||||||
|
movl %edi, (LINUX_UC_MCONTEXT_OFF+LINUX_SC_EDI_OFF)(%eax)
|
||||||
|
movl %esi, (LINUX_UC_MCONTEXT_OFF+LINUX_SC_ESI_OFF)(%eax)
|
||||||
|
movl %ebp, (LINUX_UC_MCONTEXT_OFF+LINUX_SC_EBP_OFF)(%eax)
|
||||||
|
|
||||||
|
movl (%esp), %ecx
|
||||||
|
movl %ecx, (LINUX_UC_MCONTEXT_OFF+LINUX_SC_EIP_OFF)(%eax)
|
||||||
|
|
||||||
|
leal 4(%esp), %ecx /* Exclude the return address. */
|
||||||
|
movl %ecx, (LINUX_UC_MCONTEXT_OFF+LINUX_SC_ESP_OFF)(%eax)
|
||||||
|
|
||||||
|
/* glibc getcontext saves FS, but not GS */
|
||||||
|
xorl %ecx, %ecx
|
||||||
|
movw %fs, %cx
|
||||||
|
movl %ecx, (LINUX_UC_MCONTEXT_OFF+LINUX_SC_FS_OFF)(%eax)
|
||||||
|
|
||||||
|
leal LINUX_UC_FPREGS_MEM_OFF(%eax), %ecx
|
||||||
|
movl %ecx, (LINUX_UC_MCONTEXT_OFF+LINUX_SC_FPSTATE_OFF)(%eax)
|
||||||
|
fnstenv (%ecx)
|
||||||
|
fldenv (%ecx)
|
||||||
|
|
||||||
|
xor %eax, %eax
|
||||||
|
ret
|
||||||
|
|
||||||
|
#ifdef __linux__
|
||||||
|
/* We do not need executable stack. */
|
||||||
|
.section .note.GNU-stack,"",@progbits
|
||||||
|
#endif
|
|
@ -9,6 +9,7 @@
|
||||||
#define LINUX_UC_STACK_OFF 0x08
|
#define LINUX_UC_STACK_OFF 0x08
|
||||||
#define LINUX_UC_MCONTEXT_OFF 0x14
|
#define LINUX_UC_MCONTEXT_OFF 0x14
|
||||||
#define LINUX_UC_SIGMASK_OFF 0x6c
|
#define LINUX_UC_SIGMASK_OFF 0x6c
|
||||||
|
#define LINUX_UC_FPREGS_MEM_OFF 0xec
|
||||||
|
|
||||||
/* The struct sigcontext is located at an offset of 4
|
/* The struct sigcontext is located at an offset of 4
|
||||||
from the stack pointer in the signal frame. */
|
from the stack pointer in the signal frame. */
|
||||||
|
|
Loading…
Reference in a new issue