|
From: openocd-gerrit <ope...@us...> - 2026-05-17 20:54:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 2fb8a4752ac59c134209ffec497ba96e3f51f520 (commit)
from eeacc589af6062e38658e19dfb6f315f9e5db26c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2fb8a4752ac59c134209ffec497ba96e3f51f520
Author: Evgeniy Naydanov <eu...@gm...>
Date: Thu Mar 12 14:52:21 2026 +0300
target/riscv: drop version-specific `arch_state()`
Drop these placeholders.
This is a part of the effort to eliminate "fake" `riscv013_target` and
`riscv011_target` `target_type`s.
Change-Id: I055ce3114178cc870a6679aa91bc5477870bbeea
Signed-off-by: Evgeniy Naydanov <eu...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/9587
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/src/target/riscv/riscv-011.c b/src/target/riscv/riscv-011.c
index 2bef2228e..8fd3792bf 100644
--- a/src/target/riscv/riscv-011.c
+++ b/src/target/riscv/riscv-011.c
@@ -2347,11 +2347,6 @@ static int access_memory(struct target *target, const struct riscv_mem_access_ar
return read_memory(target, args);
}
-static int arch_state(struct target *target)
-{
- return ERROR_OK;
-}
-
static COMMAND_HELPER(riscv011_print_info, struct target *target)
{
/* Abstract description. */
@@ -2472,6 +2467,4 @@ struct target_type riscv011_target = {
.assert_reset = assert_reset,
.deassert_reset = deassert_reset,
-
- .arch_state = arch_state,
};
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index 23485d34f..1b47d5e77 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -5074,10 +5074,6 @@ static unsigned int riscv013_get_progbufsize(const struct target *target)
return r->progbufsize;
}
-static int arch_state(struct target *target)
-{
- return ERROR_OK;
-}
struct target_type riscv013_target = {
.name = "riscv",
@@ -5092,8 +5088,6 @@ struct target_type riscv013_target = {
.assert_reset = assert_reset,
.deassert_reset = deassert_reset,
-
- .arch_state = arch_state
};
/*** 0.13-specific implementations of various RISC-V helper functions. ***/
diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
index 0688ad327..1e2b9caa3 100644
--- a/src/target/riscv/riscv.c
+++ b/src/target/riscv/riscv.c
@@ -3573,11 +3573,7 @@ static int riscv_arch_state(struct target *target)
target_name(target),
debug_reason_name(target),
semihosting_active ? " Semihosting is active." : "");
- struct target_type *tt = get_target_type(target);
- if (!tt)
- return ERROR_FAIL;
- assert(tt->arch_state);
- return tt->arch_state(target);
+ return ERROR_OK;
}
/* Algorithm must end with a software breakpoint instruction. */
-----------------------------------------------------------------------
Summary of changes:
src/target/riscv/riscv-011.c | 7 -------
src/target/riscv/riscv-013.c | 6 ------
src/target/riscv/riscv.c | 6 +-----
3 files changed, 1 insertion(+), 18 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|