Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030641AbWHIKSf (ORCPT ); Wed, 9 Aug 2006 06:18:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030650AbWHIKSe (ORCPT ); Wed, 9 Aug 2006 06:18:34 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:5005 "EHLO e35.co.us.ibm.com") by vger.kernel.org with ESMTP id S1030649AbWHIKSc (ORCPT ); Wed, 9 Aug 2006 06:18:32 -0400 Date: Wed, 9 Aug 2006 15:49:48 +0530 From: Ananth N Mavinakayanahalli To: Andi Kleen Cc: Christoph Hellwig , linux-kernel@vger.kernel.org, Prasanna S Panchamukhi , Anil S Keshavamurthy , Jim Keniston , linux-arch@vger.kernel.org Subject: Re: [PATCH 2/3] Kprobes: Define retval helper Message-ID: <20060809101948.GA1701@in.ibm.com> Reply-To: ananth@in.ibm.com References: <20060807115537.GA15253@in.ibm.com> <20060809094311.GA20050@in.ibm.com> <20060809094516.GA17993@infradead.org> <200608091155.50842.ak@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200608091155.50842.ak@suse.de> User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3075 Lines: 83 On Wed, Aug 09, 2006 at 11:55:50AM +0200, Andi Kleen wrote: > > > > #define instruction_pointer(regs) ((regs)->eip) > > > +#define get_retval(regs) ((regs)->eax) > > return_value() would match the names of the existing macro better Updated patch ... Add the "return_value" macro that just extracts the return value given the pt_regs. Useful in situations such as while using function-return probes. Signed-off-by: Ananth N Mavinakayanahalli --- include/asm-i386/ptrace.h | 3 +++ include/asm-ia64/ptrace.h | 3 +++ include/asm-powerpc/ptrace.h | 2 ++ include/asm-x86_64/ptrace.h | 2 ++ 4 files changed, 10 insertions(+) Index: linux-2.6.18-rc3/include/asm-i386/ptrace.h =================================================================== --- linux-2.6.18-rc3.orig/include/asm-i386/ptrace.h +++ linux-2.6.18-rc3/include/asm-i386/ptrace.h @@ -79,7 +79,10 @@ static inline int user_mode_vm(struct pt { return ((regs->xcs & 3) | (regs->eflags & VM_MASK)) != 0; } + #define instruction_pointer(regs) ((regs)->eip) +#define return_value(regs) ((regs)->eax) + #if defined(CONFIG_SMP) && defined(CONFIG_FRAME_POINTER) extern unsigned long profile_pc(struct pt_regs *regs); #else Index: linux-2.6.18-rc3/include/asm-ia64/ptrace.h =================================================================== --- linux-2.6.18-rc3.orig/include/asm-ia64/ptrace.h +++ linux-2.6.18-rc3/include/asm-ia64/ptrace.h @@ -237,6 +237,9 @@ struct switch_stack { * the canonical representation by adding to instruction pointer. */ # define instruction_pointer(regs) ((regs)->cr_iip + ia64_psr(regs)->ri) + +#define return_value(regs) ((regs)->r8) + /* Conserve space in histogram by encoding slot bits in address * bits 2 and 3 rather than bits 0 and 1. */ Index: linux-2.6.18-rc3/include/asm-powerpc/ptrace.h =================================================================== --- linux-2.6.18-rc3.orig/include/asm-powerpc/ptrace.h +++ linux-2.6.18-rc3/include/asm-powerpc/ptrace.h @@ -73,6 +73,8 @@ struct pt_regs { #ifndef __ASSEMBLY__ #define instruction_pointer(regs) ((regs)->nip) +#define return_value(regs) ((regs)->gpr[3]) + #ifdef CONFIG_SMP extern unsigned long profile_pc(struct pt_regs *regs); #else Index: linux-2.6.18-rc3/include/asm-x86_64/ptrace.h =================================================================== --- linux-2.6.18-rc3.orig/include/asm-x86_64/ptrace.h +++ linux-2.6.18-rc3/include/asm-x86_64/ptrace.h @@ -84,6 +84,8 @@ struct pt_regs { #define user_mode(regs) (!!((regs)->cs & 3)) #define user_mode_vm(regs) user_mode(regs) #define instruction_pointer(regs) ((regs)->rip) +#define return_value(regs) ((regs)->rax) + extern unsigned long profile_pc(struct pt_regs *regs); void signal_fault(struct pt_regs *regs, void __user *frame, char *where); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/