[REFACTOR] move trampoline for thumb in uprobe module

from src/modules/kprobe/arch/asm-arm/dbi_kprobes_thumb.*
to src/modules/uprobe/arch/asm-arm/trampoline_thumb.*

diff --git a/kprobe/Kbuild b/kprobe/Kbuild
index 964c88b..ad90b7c 100644 (file)
--- a/kprobe/Kbuild
+++ b/kprobe/Kbuild
@@ -2,4 +2,4 @@ EXTRA_CFLAGS := $(extra_cflags)
 
 obj-m := swap_kprobe.o
 swap_kprobe-y := dbi_kprobes_deps.o dbi_insn_slots.o arch/asm/dbi_kprobes.o arch/dbi_kprobes.o dbi_kprobes.o
-swap_kprobe-$(CONFIG_ARM) += arch/asm/dbi_kprobes_arm.o arch/asm/dbi_kprobes_thumb.o
+swap_kprobe-$(CONFIG_ARM) += arch/asm/dbi_kprobes_arm.o

diff --git a/kprobe/arch/asm-arm/dbi_kprobes.c b/kprobe/arch/asm-arm/dbi_kprobes.c
index 11a809f..787ca7c 100644 (file)
--- a/kprobe/arch/asm-arm/dbi_kprobes.c
+++ b/kprobe/arch/asm-arm/dbi_kprobes.c
@@ -34,7 +34,6 @@
 
 #include "dbi_kprobes.h"
 #include "dbi_kprobes_arm.h"
-#include "dbi_kprobes_thumb.h"
 #include "../dbi_kprobes.h"
 #include "../../dbi_kprobes.h"
 

diff --git a/kprobe/arch/asm-arm/dbi_kprobes_thumb.h b/kprobe/arch/asm-arm/dbi_kprobes_thumb.h
deleted file mode 100644 (file)
index da737da..0000000
--- a/kprobe/arch/asm-arm/dbi_kprobes_thumb.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _DBI_KPROBES_THUMB_H
-#define _DBI_KPROBES_THUMB_H
-
-void gen_insn_execbuf_thumb(void);
-EXPORT_SYMBOL_GPL(gen_insn_execbuf_thumb);
-
-void pc_dep_insn_execbuf_thumb(void);
-EXPORT_SYMBOL_GPL(pc_dep_insn_execbuf_thumb);
-
-#endif /* _DBI_KPROBES_THUMB_H */

diff --git a/uprobe/Kbuild b/uprobe/Kbuild
index cb230cc..b2d8306 100644 (file)
--- a/uprobe/Kbuild
+++ b/uprobe/Kbuild
@@ -2,3 +2,4 @@ EXTRA_CFLAGS := $(extra_cflags)
 
 obj-m := swap_uprobe.o
 swap_uprobe-y := swap_uprobes.o arch/asm/swap_uprobes.o
+swap_uprobe-$(CONFIG_ARM) += arch/asm/trampoline_thumb.o
\ No newline at end of file

diff --git a/uprobe/arch/asm-arm/swap_uprobes.c b/uprobe/arch/asm-arm/swap_uprobes.c
index d47129b..8f6eb66 100644 (file)
--- a/uprobe/arch/asm-arm/swap_uprobes.c
+++ b/uprobe/arch/asm-arm/swap_uprobes.c
@@ -5,12 +5,11 @@
 #include <swap_uprobes.h>
 #include <asm/swap_uprobes.h>
 #include <dbi_insn_slots.h>
+#include "trampoline_thumb.h"
 
 // FIXME:
 #include <dbi_kdebug.h>
 extern struct hlist_head uprobe_insn_pages;
-void gen_insn_execbuf_thumb(void);
-void pc_dep_insn_execbuf_thumb(void);
 
 
 #define sign_extend(x, signbit) ((x) | (0 - ((x) & (1 << (signbit)))))

diff --git a/kprobe/arch/asm-arm/dbi_kprobes_thumb.S b/uprobe/arch/asm-arm/trampoline_thumb.S
similarity index 100%
rename from kprobe/arch/asm-arm/dbi_kprobes_thumb.S
rename to uprobe/arch/asm-arm/trampoline_thumb.S

diff --git a/uprobe/arch/asm-arm/trampoline_thumb.h b/uprobe/arch/asm-arm/trampoline_thumb.h
new file mode 100644 (file)
index 0000000..9bb84a8
--- /dev/null
+++ b/uprobe/arch/asm-arm/trampoline_thumb.h
@@ -0,0 +1,7 @@
+#ifndef __ASM_ARM_TRAMPOLINE_THUMB_H
+#define __ASM_ARM_TRAMPOLINE_THUMB_H
+
+void gen_insn_execbuf_thumb(void);
+void pc_dep_insn_execbuf_thumb(void);
+
+#endif /* __ASM_ARM_TRAMPOLINE_THUMB_H */