Messages in this thread Patch in this message | | | Date | Sun, 27 Jan 2008 14:39:22 +0530 | From | Abhishek Sagar <> | Subject | [PATCH 2/3] x86: Macrofy resuable code |
| |
Encapsulate reusable code .
Signed-off-by: Abhishek Sagar <sagar.abhishek@gmail.com> ---
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c index a99e764..45f2949 100644 --- a/arch/x86/kernel/kprobes.c +++ b/arch/x86/kernel/kprobes.c @@ -74,6 +74,13 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); #define stack_addr(regs) ((unsigned long *)®s->sp) #endif +#define kprobe_bkpt_addr(regs) \ + ((unsigned long)(regs->ip - sizeof(kprobe_opcode_t))) + +#define is_jprobe_bkpt(ptr) \ + ((ptr > (u8 *)jprobe_return) && (ptr < (u8 *)jprobe_return_end)) + + #define W(row, b0, b1, b2, b3, b4, b5, b6, b7, b8, b9, ba, bb, bc, bd, be, bf)\ (((b0##UL << 0x0)|(b1##UL << 0x1)|(b2##UL << 0x2)|(b3##UL << 0x3) | \ (b4##UL << 0x4)|(b5##UL << 0x5)|(b6##UL << 0x6)|(b7##UL << 0x7) | \ @@ -519,7 +526,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) struct kprobe *p; struct kprobe_ctlblk *kcb; - addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t)); + addr = (kprobe_opcode_t *)kprobe_bkpt_addr(regs); if (*addr != BREAKPOINT_INSTRUCTION) { /* * The breakpoint instruction was removed right @@ -1032,8 +1039,7 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) u8 *addr = (u8 *) (regs->ip - 1); struct jprobe *jp = container_of(p, struct jprobe, kp); - if ((addr > (u8 *) jprobe_return) && - (addr < (u8 *) jprobe_return_end)) { + if (is_jprobe_bkpt(addr)) { if (stack_addr(regs) != kcb->jprobe_saved_sp) { struct pt_regs *saved_regs = &kcb->jprobe_saved_regs; printk(KERN_ERR
| |