Commit 6c26e03b authored by Paul Mackerras's avatar Paul Mackerras Committed by Linus Torvalds
Browse files

[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: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e378cc16

arch/ppc/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -679,6 +679,7 @@ void AlignmentException(struct pt_regs *regs) 
	fixed = fix_alignment(regs);

	if (fixed == 1) {

		regs->nip += 4;	/* skip over emulated instruction */

		emulate_single_step(regs);

		return;

	}

	if (fixed == -EFAULT) {