From 37bd6bb849301dbc51ad4a0fbf39f462ab3134cd Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 5 Feb 2020 20:06:35 +0000 Subject: [PATCH] Read the breakpoint instruction to determine its length in BKPT_SKIP. 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 --- sys/riscv/include/db_machdep.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/riscv/include/db_machdep.h b/sys/riscv/include/db_machdep.h index 9271a2757cb8..d32e3bc53419 100644 --- a/sys/riscv/include/db_machdep.h +++ b/sys/riscv/include/db_machdep.h @@ -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