Merge /spare/repo/linux-2.6/

[linux-2.6-omap-h63xx.git] / include / asm-ia64 / kprobes.h

diff --git a/include/asm-ia64/kprobes.h b/include/asm-ia64/kprobes.h
index 2a6f2a148890086f4ad972aa663bbee7713ebed4..573a3574a24fe86ebcd4ecb5be7800c3057b4df5 100644 (file)
--- a/include/asm-ia64/kprobes.h
+++ b/include/asm-ia64/kprobes.h
@@ -28,8 +28,28 @@
 #include <linux/ptrace.h>
 #include <asm/break.h>
 
+#define MAX_INSN_SIZE   16
 #define BREAK_INST     (long)(__IA64_BREAK_KPROBE << 6)
 
+typedef union cmp_inst {
+       struct {
+       unsigned long long qp : 6;
+       unsigned long long p1 : 6;
+       unsigned long long c  : 1;
+       unsigned long long r2 : 7;
+       unsigned long long r3 : 7;
+       unsigned long long p2 : 6;
+       unsigned long long ta : 1;
+       unsigned long long x2 : 2;
+       unsigned long long tb : 1;
+       unsigned long long opcode : 4;
+       unsigned long long reserved : 23;
+       }f;
+       unsigned long long l;
+} cmp_inst_t;
+
+struct kprobe;
+
 typedef struct _bundle {
        struct {
                unsigned long long template : 5;
@@ -44,6 +64,19 @@ typedef struct _bundle {
 
 #define JPROBE_ENTRY(pentry)   (kprobe_opcode_t *)pentry
 
+#define ARCH_SUPPORTS_KRETPROBES
+
+#define SLOT0_OPCODE_SHIFT     (37)
+#define SLOT1_p1_OPCODE_SHIFT  (37 - (64-46))
+#define SLOT2_OPCODE_SHIFT     (37)
+
+#define INDIRECT_CALL_OPCODE           (1)
+#define IP_RELATIVE_CALL_OPCODE                (5)
+#define IP_RELATIVE_BRANCH_OPCODE      (4)
+#define IP_RELATIVE_PREDICT_OPCODE     (7)
+#define LONG_BRANCH_OPCODE             (0xC)
+#define LONG_CALL_OPCODE               (0xD)
+
 typedef struct kprobe_opcode {
        bundle_t bundle;
 } kprobe_opcode_t;
@@ -55,13 +88,29 @@ struct fnptr {
 
 /* Architecture specific copy of original instruction*/
 struct arch_specific_insn {
-       /* copy of the original instruction */
+       /* copy of the instruction to be emulated */
        kprobe_opcode_t insn;
+ #define INST_FLAG_FIX_RELATIVE_IP_ADDR                1
+ #define INST_FLAG_FIX_BRANCH_REG              2
+ #define INST_FLAG_BREAK_INST                  4
+       unsigned long inst_flag;
+       unsigned short target_br_reg;
 };
 
+/* ia64 does not need this */
+static inline void arch_copy_kprobe(struct kprobe *p)
+{
+}
+
 #ifdef CONFIG_KPROBES
 extern int kprobe_exceptions_notify(struct notifier_block *self,
                                    unsigned long val, void *data);
+
+/* ia64 does not need this */
+static inline void jprobe_return(void)
+{
+}
+
 #else                          /* !CONFIG_KPROBES */
 static inline int kprobe_exceptions_notify(struct notifier_block *self,
                                           unsigned long val, void *data)