From 6a22b77413d01fe2b5a1968b8512d88b3da39d07 Mon Sep 17 00:00:00 2001 From: Vasiliy Ulyanov Date: Mon, 9 Jul 2012 12:47:31 +0400 Subject: [PATCH] 1. POCOMON ported to x86 tizen emulator 2. Made several minor fixes --- driver/us_proc_inst.h | 2 -- kprobe/arch/asm-x86/dbi_kprobes.c | 5 +++++ kprobe/arch/asm-x86/dbi_kprobes.h | 10 ---------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/driver/us_proc_inst.h b/driver/us_proc_inst.h index 93d70fd..cd92cfa 100644 --- a/driver/us_proc_inst.h +++ b/driver/us_proc_inst.h @@ -56,8 +56,6 @@ extern pid_t gl_nNotifyTgid; #define US_PROC_FORK_INSTLD 0x8 //#define US_PROC_SS_INSTLD 0x4 -#define MAX_STACK_SIZE 2*4096 - /* forward declarations */ struct task_struct; struct pt_regs; diff --git a/kprobe/arch/asm-x86/dbi_kprobes.c b/kprobe/arch/asm-x86/dbi_kprobes.c index b05f208..adb56c4 100644 --- a/kprobe/arch/asm-x86/dbi_kprobes.c +++ b/kprobe/arch/asm-x86/dbi_kprobes.c @@ -1215,6 +1215,11 @@ int kprobe_exceptions_notify (struct notifier_block *self, unsigned long val, vo return ret; } +static struct notifier_block kprobe_exceptions_nb = { + .notifier_call = kprobe_exceptions_notify, + .priority = INT_MAX +}; + int longjmp_break_handler (struct kprobe *p, struct pt_regs *regs) { struct kprobe_ctlblk *kcb = get_kprobe_ctlblk (); diff --git a/kprobe/arch/asm-x86/dbi_kprobes.h b/kprobe/arch/asm-x86/dbi_kprobes.h index 2b17223..a27d3a0 100644 --- a/kprobe/arch/asm-x86/dbi_kprobes.h +++ b/kprobe/arch/asm-x86/dbi_kprobes.h @@ -160,11 +160,6 @@ static inline int dbi_fp_backtrace(struct task_struct *task, unsigned long *buf, extern int kprobe_exceptions_notify (struct notifier_block *self, unsigned long val, void *data); -static struct notifier_block kprobe_exceptions_nb = { - .notifier_call = kprobe_exceptions_notify, - .priority = INT_MAX -}; - struct prev_kprobe; /* per-cpu kprobe control block */ @@ -179,11 +174,6 @@ struct kprobe_ctlblk { }; -static void resume_execution -(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb); - -static int post_kprobe_handler (struct pt_regs *regs); - int kprobe_fault_handler (struct pt_regs *regs, int trapnr); void * trampoline_probe_handler_x86 (struct pt_regs *regs); -- 2.7.4