Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3aee91ba authored by Jie Zhang's avatar Jie Zhang Committed by Bryan Wu
Browse files

Blackfin arch: fix 2 bugs related to debug 



 - unable to single step over emuexcpt instruction
 - gdbproxy goes into infinite loop when doing gdb does "next" over
   "emuexcpt"

Don't decrement PC after software breakpoint.

Signed-off-by: default avatarJie Zhang <jie.zhang@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 1c302b6c

arch/blackfin/mach-common/entry.S

+1 −8
Original line number Diff line number Diff line
@@ -151,13 +151,6 @@ ENTRY(_ex_syscall) 
	jump.s _bfin_return_from_exception;

ENDPROC(_ex_syscall)



ENTRY(_ex_soft_bp)

	r7 = retx;

	r7 += -2;

	retx = r7;

	jump.s _ex_trap_c;

ENDPROC(_ex_soft_bp)



ENTRY(_ex_single_step)

	/* If we just returned from an interrupt, the single step event is

	   for the RTI instruction.  */
@@ -1087,7 +1080,7 @@ ENTRY(_ex_table) 
	 * EXCPT instruction can provide 4 bits of EXCAUSE, allowing 16 to be user defined

	 */

	.long _ex_syscall       /* 0x00 - User Defined - Linux Syscall */

	.long _ex_soft_bp       /* 0x01 - User Defined - Software breakpoint */

	.long _ex_trap_c        /* 0x01 - User Defined - Software breakpoint */

#ifdef	CONFIG_KGDB

	.long _ex_trap_c	/* 0x02 - User Defined - KGDB initial connection

							 and break signal trap */