diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-04-16 18:24:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:24:17 -0400 |
| commit | 6c26e03b2db4b66d79bfb774628c1fc9b458b943 (patch) | |
| tree | 1e50046a2daa30da849a88b3ec562a410ebe6f80 /arch/ppc | |
| parent | e378cc16b0d3c1610857c4444345907020e03ece (diff) | |
[PATCH] ppc32: fix single-stepping of emulated instructions
On ppc, we emulate instructions that cause alignment exceptions. If we are
single-stepping an instruction and it causes an alignment exception, we
will currently do the next instruction as well before taking the
single-step exception. This patch fixes that, so we take the single-step
exception after emulating the instruction.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/kernel/traps.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c index aec225b402ae..002322a1f3ce 100644 --- a/arch/ppc/kernel/traps.c +++ b/arch/ppc/kernel/traps.c | |||
| @@ -679,6 +679,7 @@ void AlignmentException(struct pt_regs *regs) | |||
| 679 | fixed = fix_alignment(regs); | 679 | fixed = fix_alignment(regs); |
| 680 | if (fixed == 1) { | 680 | if (fixed == 1) { |
| 681 | regs->nip += 4; /* skip over emulated instruction */ | 681 | regs->nip += 4; /* skip over emulated instruction */ |
| 682 | emulate_single_step(regs); | ||
| 682 | return; | 683 | return; |
| 683 | } | 684 | } |
| 684 | if (fixed == -EFAULT) { | 685 | if (fixed == -EFAULT) { |