interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

target/breakpoints: Use 'unsigned int' for length 

Change-Id: I233efb5b18de5f043fdc976807437db0a94236d1
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: https://review.openocd.org/c/openocd/+/7056
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Tested-by: jenkins
This commit is contained in:
Marc Schink 2024-07-31 09:35:03 +02:00 committed by Antonio Borneo
parent 941fa8538f
commit 0bf3373e80
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/target/breakpoints.c
View File

@ -38,7 +38,7 @@ static int bpwp_unique_id;
static int breakpoint_add_internal(struct target *target, static int breakpoint_add_internal(struct target *target,
target_addr_t address, target_addr_t address,
uint32_t length, unsigned int length,
enum breakpoint_type type) enum breakpoint_type type)
{ {
struct breakpoint *breakpoint = target->breakpoints; struct breakpoint *breakpoint = target->breakpoints;
@ -101,7 +101,7 @@ fail:
static int context_breakpoint_add_internal(struct target *target, static int context_breakpoint_add_internal(struct target *target,
uint32_t asid, uint32_t asid,
uint32_t length, unsigned int length,
enum breakpoint_type type) enum breakpoint_type type)
{ {
struct breakpoint *breakpoint = target->breakpoints; 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, static int hybrid_breakpoint_add_internal(struct target *target,
target_addr_t address, target_addr_t address,
uint32_t asid, uint32_t asid,
uint32_t length, unsigned int length,
enum breakpoint_type type) enum breakpoint_type type)
{ {
struct breakpoint *breakpoint = target->breakpoints; struct breakpoint *breakpoint = target->breakpoints;
@ -207,7 +207,7 @@ static int hybrid_breakpoint_add_internal(struct target *target,
int breakpoint_add(struct target *target, int breakpoint_add(struct target *target,
target_addr_t address, target_addr_t address,
uint32_t length, unsigned int length,
enum breakpoint_type type) enum breakpoint_type type)
{ {
if (target->smp) { if (target->smp) {
@ -233,7 +233,7 @@ int breakpoint_add(struct target *target,
int context_breakpoint_add(struct target *target, int context_breakpoint_add(struct target *target,
uint32_t asid, uint32_t asid,
uint32_t length, unsigned int length,
enum breakpoint_type type) enum breakpoint_type type)
{ {
if (target->smp) { if (target->smp) {
@ -255,7 +255,7 @@ int context_breakpoint_add(struct target *target,
int hybrid_breakpoint_add(struct target *target, int hybrid_breakpoint_add(struct target *target,
target_addr_t address, target_addr_t address,
uint32_t asid, uint32_t asid,
uint32_t length, unsigned int length,
enum breakpoint_type type) enum breakpoint_type type)
{ {
if (target->smp) { 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, 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 = target->watchpoints;
struct watchpoint **watchpoint_p = &target->watchpoints; struct watchpoint **watchpoint_p = &target->watchpoints;
@ -556,7 +556,7 @@ bye:
} }
LOG_TARGET_DEBUG(target, "added %s watchpoint at " TARGET_ADDR_FMT 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_rw_strings[(*watchpoint_p)->rw],
(*watchpoint_p)->address, (*watchpoint_p)->address,
(*watchpoint_p)->length, (*watchpoint_p)->length,
@ -566,7 +566,7 @@ bye:
} }
int watchpoint_add(struct target *target, target_addr_t address, 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) { if (target->smp) {
struct target_list *head; struct target_list *head;

13
src/target/breakpoints.h
View File

@ -26,7 +26,7 @@ enum watchpoint_rw {
struct breakpoint { struct breakpoint {
target_addr_t address; target_addr_t address;
uint32_t asid; uint32_t asid;
int length; unsigned int length;
enum breakpoint_type type; enum breakpoint_type type;
bool is_set; bool is_set;
unsigned int number; unsigned int number;
@ -40,7 +40,7 @@ struct breakpoint {
struct watchpoint { struct watchpoint {
target_addr_t address; target_addr_t address;
uint32_t length; unsigned int length;
uint64_t mask; uint64_t mask;
uint64_t value; uint64_t value;
enum watchpoint_rw rw; enum watchpoint_rw rw;
@ -52,11 +52,12 @@ struct watchpoint {
int breakpoint_clear_target(struct target *target); int breakpoint_clear_target(struct target *target);
int breakpoint_add(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, 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, 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(struct target *target, target_addr_t address);
int breakpoint_remove_all(struct target *target); 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_clear_target(struct target *target);
int watchpoint_add(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); enum watchpoint_rw rw, uint64_t value, uint64_t mask);
int watchpoint_remove(struct target *target, target_addr_t address); int watchpoint_remove(struct target *target, target_addr_t address);
int watchpoint_remove_all(struct target *target); int watchpoint_remove_all(struct target *target);

4
src/target/target.c
View File

@ -3950,7 +3950,7 @@ static int handle_bp_command_list(struct command_invocation *cmd)
} }
static int handle_bp_command_set(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); struct target *target = get_current_target(cmd->ctx);
int retval; int retval;
@ -4067,7 +4067,7 @@ COMMAND_HANDLER(handle_wp_command)
while (watchpoint) { while (watchpoint) {
char wp_type = (watchpoint->rw == WPT_READ ? 'r' : (watchpoint->rw == WPT_WRITE ? 'w' : 'a')); char wp_type = (watchpoint->rw == WPT_READ ? 'r' : (watchpoint->rw == WPT_WRITE ? 'w' : 'a'));
command_print(CMD, "address: " TARGET_ADDR_FMT 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 ", r/w/a: %c, value: 0x%8.8" PRIx64
", mask: 0x%8.8" PRIx64, ", mask: 0x%8.8" PRIx64,
watchpoint->address, watchpoint->address,