From 949e84da2d80837b192209efb4122f2ff59ab54d Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Tue, 25 Mar 2008 11:46:14 -0400 Subject: add (back) runtime/unwind files --- runtime/unwind/i386.h | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 runtime/unwind/i386.h (limited to 'runtime/unwind/i386.h') diff --git a/runtime/unwind/i386.h b/runtime/unwind/i386.h new file mode 100644 index 00000000..de68c67b --- /dev/null +++ b/runtime/unwind/i386.h @@ -0,0 +1,97 @@ +#ifndef _STP_I386_UNWIND_H +#define _STP_I386_UNWIND_H + +/* + * Copyright (C) 2002-2006 Novell, Inc. + * Jan Beulich + * This code is released under version 2 of the GNU GPL. + */ + + +#include +#include +#include +#include + +/* these are simple for i386 */ +#define _stp_get_unaligned(ptr) (*(ptr)) +#define _stp_put_unaligned(val, ptr) ((void)( *(ptr) = (val) )) + +struct unwind_frame_info +{ + struct pt_regs regs; + struct task_struct *task; + unsigned call_frame:1; +}; + +#define UNW_PC(frame) (frame)->regs.eip +#define UNW_SP(frame) (frame)->regs.esp +#ifdef CONFIG_FRAME_POINTER +#define UNW_FP(frame) (frame)->regs.ebp +#define FRAME_RETADDR_OFFSET 4 +#define FRAME_LINK_OFFSET 0 +#define STACK_BOTTOM(tsk) STACK_LIMIT((tsk)->thread.esp0) +#define STACK_TOP(tsk) ((tsk)->thread.esp0) +#else +#define UNW_FP(frame) ((void)(frame), 0) +#endif +#define STACK_LIMIT(ptr) (((ptr) - 1) & ~(THREAD_SIZE - 1)) + +#define UNW_REGISTER_INFO \ + PTREGS_INFO(eax), \ + PTREGS_INFO(ecx), \ + PTREGS_INFO(edx), \ + PTREGS_INFO(ebx), \ + PTREGS_INFO(esp), \ + PTREGS_INFO(ebp), \ + PTREGS_INFO(esi), \ + PTREGS_INFO(edi), \ + PTREGS_INFO(eip) + +#define UNW_DEFAULT_RA(raItem, dataAlign) \ + ((raItem).where == Memory && \ + !((raItem).value * (dataAlign) + 4)) + +static inline void arch_unw_init_frame_info(struct unwind_frame_info *info, + /*const*/ struct pt_regs *regs) +{ + if (user_mode_vm(regs)) + info->regs = *regs; + else { + memcpy(&info->regs, regs, offsetof(struct pt_regs, esp)); + info->regs.esp = (unsigned long)®s->esp; + info->regs.xss = __KERNEL_DS; + } +} + +static inline void arch_unw_init_blocked(struct unwind_frame_info *info) +{ + memset(&info->regs, 0, sizeof(info->regs)); + info->regs.eip = info->task->thread.eip; + info->regs.xcs = __KERNEL_CS; + __get_user(info->regs.ebp, (long *)info->task->thread.esp); + info->regs.esp = info->task->thread.esp; + info->regs.xss = __KERNEL_DS; + info->regs.xds = __USER_DS; + info->regs.xes = __USER_DS; +} + +extern asmlinkage int arch_unwind_init_running(struct unwind_frame_info *, + asmlinkage int (*callback)(struct unwind_frame_info *, + void *arg), + void *arg); + +static inline int arch_unw_user_mode(const struct unwind_frame_info *info) +{ +#if 0 /* This can only work when selector register and EFLAGS saves/restores + are properly annotated (and tracked in UNW_REGISTER_INFO). */ + return user_mode_vm(&info->regs); +#else + return info->regs.eip < PAGE_OFFSET + || (info->regs.eip >= __fix_to_virt(FIX_VDSO) + && info->regs.eip < __fix_to_virt(FIX_VDSO) + PAGE_SIZE) + || info->regs.esp < PAGE_OFFSET; +#endif +} + +#endif /* _STP_I386_UNWIND_H */ -- cgit From b56639bb84656464efbf88912f68c36e7f099d49 Mon Sep 17 00:00:00 2001 From: Martin Hunt Date: Tue, 25 Mar 2008 12:26:46 -0400 Subject: Cleanup. --- runtime/unwind/i386.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'runtime/unwind/i386.h') diff --git a/runtime/unwind/i386.h b/runtime/unwind/i386.h index de68c67b..1a6b678b 100644 --- a/runtime/unwind/i386.h +++ b/runtime/unwind/i386.h @@ -1,3 +1,14 @@ +/* -*- linux-c -*- + * + * 32-bit x86 dwarf unwinder header file + * Copyright (C) 2008 Red Hat Inc. + * Copyright (C) 2002-2006 Novell, Inc. + * + * This file is part of systemtap, and is free software. You can + * redistribute it and/or modify it under the terms of the GNU General + * Public License (GPL); either version 2, or (at your option) any + * later version. + */ #ifndef _STP_I386_UNWIND_H #define _STP_I386_UNWIND_H -- cgit From fd2ef8221625866219d6fc8e99ac36520ac6017b Mon Sep 17 00:00:00 2001 From: Martin Hunt Date: Wed, 26 Mar 2008 10:06:19 -0400 Subject: i386 fixes. --- runtime/unwind/i386.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'runtime/unwind/i386.h') diff --git a/runtime/unwind/i386.h b/runtime/unwind/i386.h index 1a6b678b..cb2efab7 100644 --- a/runtime/unwind/i386.h +++ b/runtime/unwind/i386.h @@ -12,13 +12,6 @@ #ifndef _STP_I386_UNWIND_H #define _STP_I386_UNWIND_H -/* - * Copyright (C) 2002-2006 Novell, Inc. - * Jan Beulich - * This code is released under version 2 of the GNU GPL. - */ - - #include #include #include @@ -73,6 +66,7 @@ static inline void arch_unw_init_frame_info(struct unwind_frame_info *info, info->regs.esp = (unsigned long)®s->esp; info->regs.xss = __KERNEL_DS; } + info->call_frame = 1; } static inline void arch_unw_init_blocked(struct unwind_frame_info *info) @@ -87,10 +81,6 @@ static inline void arch_unw_init_blocked(struct unwind_frame_info *info) info->regs.xes = __USER_DS; } -extern asmlinkage int arch_unwind_init_running(struct unwind_frame_info *, - asmlinkage int (*callback)(struct unwind_frame_info *, - void *arg), - void *arg); static inline int arch_unw_user_mode(const struct unwind_frame_info *info) { -- cgit From 20d2c2c26b42b27a4881a46364a33330b2a6ea31 Mon Sep 17 00:00:00 2001 From: Martin Hunt Date: Sun, 30 Mar 2008 19:47:51 -0400 Subject: Support for kernels built with CONFIG_FRAME_POINTER --- runtime/unwind/i386.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/unwind/i386.h') diff --git a/runtime/unwind/i386.h b/runtime/unwind/i386.h index cb2efab7..354807a0 100644 --- a/runtime/unwind/i386.h +++ b/runtime/unwind/i386.h @@ -30,7 +30,7 @@ struct unwind_frame_info #define UNW_PC(frame) (frame)->regs.eip #define UNW_SP(frame) (frame)->regs.esp -#ifdef CONFIG_FRAME_POINTER +#ifdef STP_USE_FRAME_POINTER #define UNW_FP(frame) (frame)->regs.ebp #define FRAME_RETADDR_OFFSET 4 #define FRAME_LINK_OFFSET 0 -- cgit From b53c1feef55dc74501a90257e4beff6c1a9cf03b Mon Sep 17 00:00:00 2001 From: Martin Hunt Date: Wed, 9 Apr 2008 17:02:40 -0400 Subject: Fixes for 2.6.25 pt_regs changes. --- runtime/unwind/i386.h | 59 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) (limited to 'runtime/unwind/i386.h') diff --git a/runtime/unwind/i386.h b/runtime/unwind/i386.h index 354807a0..1f69b4a9 100644 --- a/runtime/unwind/i386.h +++ b/runtime/unwind/i386.h @@ -28,6 +28,35 @@ struct unwind_frame_info unsigned call_frame:1; }; +#define STACK_LIMIT(ptr) (((ptr) - 1) & ~(THREAD_SIZE - 1)) + +#ifdef STAPCONF_X86_UNIREGS + +#define UNW_PC(frame) (frame)->regs.ip +#define UNW_SP(frame) (frame)->regs.sp +#ifdef STP_USE_FRAME_POINTER +#define UNW_FP(frame) (frame)->regs.bp +#define FRAME_RETADDR_OFFSET 4 +#define FRAME_LINK_OFFSET 0 +#define STACK_BOTTOM(tsk) STACK_LIMIT((tsk)->thread.sp0) +#define STACK_TOP(tsk) ((tsk)->thread.sp0) +#else +#define UNW_FP(frame) ((void)(frame), 0) +#endif + +#define UNW_REGISTER_INFO \ + PTREGS_INFO(ax), \ + PTREGS_INFO(cx), \ + PTREGS_INFO(dx), \ + PTREGS_INFO(bx), \ + PTREGS_INFO(sp), \ + PTREGS_INFO(bp), \ + PTREGS_INFO(si), \ + PTREGS_INFO(di), \ + PTREGS_INFO(ip) + +#else /* !STAPCONF_X86_UNIREGS */ + #define UNW_PC(frame) (frame)->regs.eip #define UNW_SP(frame) (frame)->regs.esp #ifdef STP_USE_FRAME_POINTER @@ -39,7 +68,6 @@ struct unwind_frame_info #else #define UNW_FP(frame) ((void)(frame), 0) #endif -#define STACK_LIMIT(ptr) (((ptr) - 1) & ~(THREAD_SIZE - 1)) #define UNW_REGISTER_INFO \ PTREGS_INFO(eax), \ @@ -52,6 +80,8 @@ struct unwind_frame_info PTREGS_INFO(edi), \ PTREGS_INFO(eip) +#endif /* STAPCONF_X86_UNIREGS */ + #define UNW_DEFAULT_RA(raItem, dataAlign) \ ((raItem).where == Memory && \ !((raItem).value * (dataAlign) + 4)) @@ -62,9 +92,16 @@ static inline void arch_unw_init_frame_info(struct unwind_frame_info *info, if (user_mode_vm(regs)) info->regs = *regs; else { +#ifdef STAPCONF_X86_UNIREGS + memcpy(&info->regs, regs, offsetof(struct pt_regs, sp)); + info->regs.sp = (unsigned long)®s->sp; + info->regs.ss = __KERNEL_DS; +#else memcpy(&info->regs, regs, offsetof(struct pt_regs, esp)); info->regs.esp = (unsigned long)®s->esp; - info->regs.xss = __KERNEL_DS; + info->regs.xss = __KERNEL_DS; +#endif + } info->call_frame = 1; } @@ -72,6 +109,15 @@ static inline void arch_unw_init_frame_info(struct unwind_frame_info *info, static inline void arch_unw_init_blocked(struct unwind_frame_info *info) { memset(&info->regs, 0, sizeof(info->regs)); +#ifdef STAPCONF_X86_UNIREGS + info->regs.ip = info->task->thread.ip; + info->regs.cs = __KERNEL_CS; + __get_user(info->regs.bp, (long *)info->task->thread.sp); + info->regs.sp = info->task->thread.sp; + info->regs.ss = __KERNEL_DS; + info->regs.ds = __USER_DS; + info->regs.es = __USER_DS; +#else info->regs.eip = info->task->thread.eip; info->regs.xcs = __KERNEL_CS; __get_user(info->regs.ebp, (long *)info->task->thread.esp); @@ -79,6 +125,8 @@ static inline void arch_unw_init_blocked(struct unwind_frame_info *info) info->regs.xss = __KERNEL_DS; info->regs.xds = __USER_DS; info->regs.xes = __USER_DS; +#endif + } @@ -87,11 +135,18 @@ static inline int arch_unw_user_mode(const struct unwind_frame_info *info) #if 0 /* This can only work when selector register and EFLAGS saves/restores are properly annotated (and tracked in UNW_REGISTER_INFO). */ return user_mode_vm(&info->regs); +#else +#ifdef STAPCONF_X86_UNIREGS + return info->regs.ip < PAGE_OFFSET + || (info->regs.ip >= __fix_to_virt(FIX_VDSO) + && info->regs.ip < __fix_to_virt(FIX_VDSO) + PAGE_SIZE) + || info->regs.sp < PAGE_OFFSET; #else return info->regs.eip < PAGE_OFFSET || (info->regs.eip >= __fix_to_virt(FIX_VDSO) && info->regs.eip < __fix_to_virt(FIX_VDSO) + PAGE_SIZE) || info->regs.esp < PAGE_OFFSET; +#endif #endif } -- cgit