diff options
| author | Jason Wessel <jason.wessel@windriver.com> | 2010-05-20 21:04:20 -0500 |
|---|---|---|
| committer | Jason Wessel <jason.wessel@windriver.com> | 2010-05-20 21:04:20 -0500 |
| commit | 489022cc86ec8817a30226d00d35c67d74dd24a0 (patch) | |
| tree | 4390b147ff1d1bbd554f263e078e427456ddafb5 /arch/sh | |
| parent | c75fbb05b523571c0fdc48d4b968b73f0e20acbb (diff) | |
| download | lwn-489022cc86ec8817a30226d00d35c67d74dd24a0.tar.gz lwn-489022cc86ec8817a30226d00d35c67d74dd24a0.zip | |
kgdb,sh: update superh kgdb exception handling
Implement kgdb_arch_pc() which adjusts the pc if it needs to be
adjusted after a software breakpoint trap.
Implement kgdb_arch_set_pc() which is a new required function in the
kgdb debug core.
When processing a single step return zero in the error exception field
so that the debug core can distinguish between a single step trap and
a breakpoint trap generically.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/kgdb.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/sh/kernel/kgdb.c b/arch/sh/kernel/kgdb.c index 70c69659b846..efb6d398dec3 100644 --- a/arch/sh/kernel/kgdb.c +++ b/arch/sh/kernel/kgdb.c @@ -237,6 +237,18 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code, return -1; } +unsigned long kgdb_arch_pc(int exception, struct pt_regs *regs) +{ + if (exception == 60) + return instruction_pointer(regs) - 2; + return instruction_pointer(regs); +} + +void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip) +{ + regs->pc = ip; +} + /* * The primary entry points for the kgdb debug trap table entries. */ @@ -247,7 +259,7 @@ BUILD_TRAP_HANDLER(singlestep) local_irq_save(flags); regs->pc -= instruction_size(__raw_readw(regs->pc - 4)); - kgdb_handle_exception(vec >> 2, SIGTRAP, 0, regs); + kgdb_handle_exception(0, SIGTRAP, 0, regs); local_irq_restore(flags); } |