RISC-V Semihosting 1 of 3: Remove dead code

Variable `target->semihosting` is always initialized in risv_init_target() to a non-NULL value. For that reason, checks like `if (target->semihosting)` are redundant (dead code). Remove them to not confuse code readers. Replace them by assertions. Change-Id: I85ef52300e240cfcb0119db6169993bc4767de8f Signed-off-by: Jan Matyas <[email protected]>
riscv-collab · Jan 7, 2025 · ecb2ad4 · ecb2ad4
1 parent f82c5a7
commit ecb2ad4
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/target/riscv/riscv_semihosting.c b/src/target/riscv/riscv_semihosting.c
@@ -57,10 +57,7 @@ void riscv_semihosting_init(struct target *target)
 enum semihosting_result riscv_semihosting(struct target *target, int *retval)
 {
 	struct semihosting *semihosting = target->semihosting;
-	if (!semihosting) {
-		LOG_TARGET_DEBUG(target, "   -> NONE (!semihosting)");
-		return SEMIHOSTING_NONE;
-	}
+	assert(semihosting);
 
 	if (!semihosting->is_active) {
 		LOG_TARGET_DEBUG(target, "   -> NONE (!semihosting->is_active)");
@@ -170,19 +167,16 @@ static int riscv_semihosting_setup(struct target *target, int enable)
 	LOG_TARGET_DEBUG(target, "enable=%d", enable);
 
 	struct semihosting *semihosting = target->semihosting;
-	if (semihosting)
-		semihosting->setup_time = clock();
+	assert(semihosting);
 
+	semihosting->setup_time = clock();
 	return ERROR_OK;
 }
 
 static int riscv_semihosting_post_result(struct target *target)
 {
 	struct semihosting *semihosting = target->semihosting;
-	if (!semihosting) {
-		/* If not enabled, silently ignored. */
-		return 0;
-	}
+	assert(semihosting);
 
 	LOG_TARGET_DEBUG(target, "Result: 0x%" PRIx64, semihosting->result);
 	riscv_reg_set(target, GDB_REGNO_A0, semihosting->result);