Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-695-g0bf3373e8
|
From: openocd-gerrit <ope...@us...> - 2024-08-25 12:41:42
|
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 0bf3373e808a097fdf50fc04f987c26b35ddf09d (commit)
from 941fa8538f2ad491f365a3818caa7534aaf29ea3 (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 0bf3373e808a097fdf50fc04f987c26b35ddf09d
Author: Marc Schink <de...@za...>
Date: Wed Jul 31 09:35:03 2024 +0200
target/breakpoints: Use 'unsigned int' for length
Change-Id: I233efb5b18de5f043fdc976807437db0a94236d1
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: https://review.openocd.org/c/openocd/+/7056
Reviewed-by: Antonio Borneo <bor...@gm...>
Tested-by: jenkins
diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index c39a98057..2fbb69e07 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -38,7 +38,7 @@ static int bpwp_unique_id;
static int breakpoint_add_internal(struct target *target,
target_addr_t address,
- uint32_t length,
+ unsigned int length,
enum breakpoint_type type)
{
struct breakpoint *breakpoint = target->breakpoints;
@@ -101,7 +101,7 @@ fail:
static int context_breakpoint_add_internal(struct target *target,
uint32_t asid,
- uint32_t length,
+ unsigned int length,
enum breakpoint_type type)
{
struct breakpoint *breakpoint = target->breakpoints;
@@ -151,7 +151,7 @@ static int context_breakpoint_add_internal(struct target *target,
static int hybrid_breakpoint_add_internal(struct target *target,
target_addr_t address,
uint32_t asid,
- uint32_t length,
+ unsigned int length,
enum breakpoint_type type)
{
struct breakpoint *breakpoint = target->breakpoints;
@@ -207,7 +207,7 @@ static int hybrid_breakpoint_add_internal(struct target *target,
int breakpoint_add(struct target *target,
target_addr_t address,
- uint32_t length,
+ unsigned int length,
enum breakpoint_type type)
{
if (target->smp) {
@@ -233,7 +233,7 @@ int breakpoint_add(struct target *target,
int context_breakpoint_add(struct target *target,
uint32_t asid,
- uint32_t length,
+ unsigned int length,
enum breakpoint_type type)
{
if (target->smp) {
@@ -255,7 +255,7 @@ int context_breakpoint_add(struct target *target,
int hybrid_breakpoint_add(struct target *target,
target_addr_t address,
uint32_t asid,
- uint32_t length,
+ unsigned int length,
enum breakpoint_type type)
{
if (target->smp) {
@@ -500,7 +500,7 @@ struct breakpoint *breakpoint_find(struct target *target, target_addr_t address)
}
static int watchpoint_add_internal(struct target *target, target_addr_t address,
- uint32_t length, enum watchpoint_rw rw, uint64_t value, uint64_t mask)
+ unsigned int length, enum watchpoint_rw rw, uint32_t value, uint32_t mask)
{
struct watchpoint *watchpoint = target->watchpoints;
struct watchpoint **watchpoint_p = &target->watchpoints;
@@ -556,7 +556,7 @@ bye:
}
LOG_TARGET_DEBUG(target, "added %s watchpoint at " TARGET_ADDR_FMT
- " of length 0x%8.8" PRIx32 " (WPID: %d)",
+ " of length 0x%8.8x (WPID: %d)",
watchpoint_rw_strings[(*watchpoint_p)->rw],
(*watchpoint_p)->address,
(*watchpoint_p)->length,
@@ -566,7 +566,7 @@ bye:
}
int watchpoint_add(struct target *target, target_addr_t address,
- uint32_t length, enum watchpoint_rw rw, uint64_t value, uint64_t mask)
+ unsigned int length, enum watchpoint_rw rw, uint64_t value, uint64_t mask)
{
if (target->smp) {
struct target_list *head;
diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index 64c0ce2a5..0789267c7 100644
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -26,7 +26,7 @@ enum watchpoint_rw {
struct breakpoint {
target_addr_t address;
uint32_t asid;
- int length;
+ unsigned int length;
enum breakpoint_type type;
bool is_set;
unsigned int number;
@@ -40,7 +40,7 @@ struct breakpoint {
struct watchpoint {
target_addr_t address;
- uint32_t length;
+ unsigned int length;
uint64_t mask;
uint64_t value;
enum watchpoint_rw rw;
@@ -52,11 +52,12 @@ struct watchpoint {
int breakpoint_clear_target(struct target *target);
int breakpoint_add(struct target *target,
- target_addr_t address, uint32_t length, enum breakpoint_type type);
+ target_addr_t address, unsigned int length, enum breakpoint_type type);
int context_breakpoint_add(struct target *target,
- uint32_t asid, uint32_t length, enum breakpoint_type type);
+ uint32_t asid, unsigned int length, enum breakpoint_type type);
int hybrid_breakpoint_add(struct target *target,
- target_addr_t address, uint32_t asid, uint32_t length, enum breakpoint_type type);
+ target_addr_t address, uint32_t asid, unsigned int length,
+ enum breakpoint_type type);
int breakpoint_remove(struct target *target, target_addr_t address);
int breakpoint_remove_all(struct target *target);
@@ -70,7 +71,7 @@ static inline void breakpoint_hw_set(struct breakpoint *breakpoint, unsigned int
int watchpoint_clear_target(struct target *target);
int watchpoint_add(struct target *target,
- target_addr_t address, uint32_t length,
+ target_addr_t address, unsigned int length,
enum watchpoint_rw rw, uint64_t value, uint64_t mask);
int watchpoint_remove(struct target *target, target_addr_t address);
int watchpoint_remove_all(struct target *target);
diff --git a/src/target/target.c b/src/target/target.c
index 09396d878..b1a26f9e3 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -3950,7 +3950,7 @@ static int handle_bp_command_list(struct command_invocation *cmd)
}
static int handle_bp_command_set(struct command_invocation *cmd,
- target_addr_t addr, uint32_t asid, uint32_t length, int hw)
+ target_addr_t addr, uint32_t asid, unsigned int length, int hw)
{
struct target *target = get_current_target(cmd->ctx);
int retval;
@@ -4067,7 +4067,7 @@ COMMAND_HANDLER(handle_wp_command)
while (watchpoint) {
char wp_type = (watchpoint->rw == WPT_READ ? 'r' : (watchpoint->rw == WPT_WRITE ? 'w' : 'a'));
command_print(CMD, "address: " TARGET_ADDR_FMT
- ", len: 0x%8.8" PRIx32
+ ", len: 0x%8.8x"
", r/w/a: %c, value: 0x%8.8" PRIx64
", mask: 0x%8.8" PRIx64,
watchpoint->address,
-----------------------------------------------------------------------
Summary of changes:
src/target/breakpoints.c | 18 +++++++++---------
src/target/breakpoints.h | 13 +++++++------
src/target/target.c | 4 ++--
3 files changed, 18 insertions(+), 17 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
