Merge pull request #1274 from en-sc/en-sc/add-more-info-in-sample-memory

en-sc · web-flow · commit 39d4c5095081 · 2025-09-08T15:35:03.000+03:00
target/riscv: improve error messaging in case `sbasize` is zero
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
@@ -2610,8 +2610,8 @@ static int sample_memory_bus_v1(struct target *target,
 {
 	RISCV013_INFO(info);
 	unsigned int sbasize = get_field(info->sbcs, DM_SBCS_SBASIZE);
-	if (sbasize > 64) {
-		LOG_TARGET_ERROR(target, "Memory sampling is only implemented for sbasize <= 64.");
+	if (sbasize == 0 || sbasize > 64) {
+		LOG_TARGET_ERROR(target, "Memory sampling is only implemented for non-zero sbasize <= 64.");
 		return ERROR_NOT_IMPLEMENTED;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2610,8 +2610,8 @@ static int sample_memory_bus_v1(struct target *target,`
`2610`	`2610`	`{`
`2611`	`2611`	`RISCV013_INFO(info);`
`2612`	`2612`	`unsigned int sbasize = get_field(info->sbcs, DM_SBCS_SBASIZE);`
`2613`		`- if (sbasize > 64) {`
`2614`		`- LOG_TARGET_ERROR(target, "Memory sampling is only implemented for sbasize <= 64.");`
	`2613`	`+ if (sbasize == 0 \|\| sbasize > 64) {`
	`2614`	`+ LOG_TARGET_ERROR(target, "Memory sampling is only implemented for non-zero sbasize <= 64.");`
`2615`	`2615`	`return ERROR_NOT_IMPLEMENTED;`
`2616`	`2616`	`}`
`2617`	`2617`