system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 09:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Read the breakpoint instruction to determine its length in BKPT_SKIP.

Browse source 
This fixes continuing from debug.kdb.enter=1 after enabling the use of
compressed instructions since the compiler can emit the two byte
c.ebreak instead of the 4 byte ebreak.

Reviewed by:	br
MFC after:	1 week
Sponsored by:	DARPA
Differential Revision:	https://reviews.freebsd.org/D23507
This commit is contained in:
John Baldwin 2020-02-05 20:06:35 +00:00
parent 7283901ae9
commit 37bd6bb849
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=357591
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/riscv/include/db_machdep.h
View file

@ -53,8 +53,14 @@ typedef long db_expr_t;
#define BKPT_SIZE (INSN_SIZE)
#define BKPT_SET(inst) (BKPT_INST)
#define BKPT_SKIP do { \
kdb_frame->tf_sepc += BKPT_SIZE; \
#define BKPT_SKIP do { \
uint32_t _instr; \
\
_instr = db_get_value(PC_REGS(), sizeof(uint32_t), FALSE); \
if ((_instr & 0x3) == 0x3) \
kdb_frame->tf_sepc += 4; /* ebreak */ \
else \
kdb_frame->tf_sepc += 2; /* c.ebreak */ \
} while (0)
#define db_clear_single_step kdb_cpu_clear_singlestep