|
@@ -24,6 +24,7 @@
|
|
|
#include <asm/processor.h>
|
|
|
#include <asm/machdep.h>
|
|
|
#include <asm/debug.h>
|
|
|
+#include <asm/code-patching.h>
|
|
|
#include <linux/slab.h>
|
|
|
|
|
|
/*
|
|
@@ -144,7 +145,7 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs)
|
|
|
if (kgdb_handle_exception(1, SIGTRAP, 0, regs) != 0)
|
|
|
return 0;
|
|
|
|
|
|
- if (*(u32 *) (regs->nip) == *(u32 *) (&arch_kgdb_ops.gdb_bpt_instr))
|
|
|
+ if (*(u32 *)regs->nip == BREAK_INSTR)
|
|
|
regs->nip += BREAK_INSTR_SIZE;
|
|
|
|
|
|
return 1;
|
|
@@ -441,16 +442,42 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,
|
|
|
return -1;
|
|
|
}
|
|
|
|
|
|
+int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
|
|
|
+{
|
|
|
+ int err;
|
|
|
+ unsigned int instr;
|
|
|
+ unsigned int *addr = (unsigned int *)bpt->bpt_addr;
|
|
|
+
|
|
|
+ err = probe_kernel_address(addr, instr);
|
|
|
+ if (err)
|
|
|
+ return err;
|
|
|
+
|
|
|
+ err = patch_instruction(addr, BREAK_INSTR);
|
|
|
+ if (err)
|
|
|
+ return -EFAULT;
|
|
|
+
|
|
|
+ *(unsigned int *)bpt->saved_instr = instr;
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
|
|
|
+{
|
|
|
+ int err;
|
|
|
+ unsigned int instr = *(unsigned int *)bpt->saved_instr;
|
|
|
+ unsigned int *addr = (unsigned int *)bpt->bpt_addr;
|
|
|
+
|
|
|
+ err = patch_instruction(addr, instr);
|
|
|
+ if (err)
|
|
|
+ return -EFAULT;
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* Global data
|
|
|
*/
|
|
|
-struct kgdb_arch arch_kgdb_ops = {
|
|
|
-#ifdef __LITTLE_ENDIAN__
|
|
|
- .gdb_bpt_instr = {0x08, 0x10, 0x82, 0x7d},
|
|
|
-#else
|
|
|
- .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
|
|
|
-#endif
|
|
|
-};
|
|
|
+struct kgdb_arch arch_kgdb_ops;
|
|
|
|
|
|
static int kgdb_not_implemented(struct pt_regs *regs)
|
|
|
{
|