target/riscv: Reject size 2 soft breakpoints when C extension not sup…

…ported This patch disables software breakpoints of size 2 for targets which don't support compressed instructions. Change-Id: I8200b22a51c97ba2aa89e6328beadde8dd35cdd5 Signed-off-by: Marek Vrbka <[email protected]>
riscv-collab · Aug 25, 2023 · 159a49d · 159a49d
1 parent 928f2b3
commit 159a49d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
@@ -1199,7 +1199,7 @@ static int riscv_add_breakpoint(struct target *target, struct breakpoint *breakp
 	assert(breakpoint);
 	if (breakpoint->type == BKPT_SOFT) {
 		/** @todo check RVC for size/alignment */
-		if (!(breakpoint->length == 4 || breakpoint->length == 2)) {
+		if (!(breakpoint->length == 4 || (breakpoint->length == 2 && riscv_supports_extension(target, 'C')))) {
 			LOG_TARGET_ERROR(target, "Invalid breakpoint length %d", breakpoint->length);
 			return ERROR_FAIL;
 		}