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

target: Rename 'linked_BRP' to 'linked_brp' 

Change-Id: I9dd67ac3e8cd5dd9cdeffce56020b387a8f298fa
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/6316
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Marc Schink 2021-06-13 10:49:17 +02:00 committed by Antonio Borneo
parent cb5d9e0098
commit 3e8ca67d1f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/target/aarch64.c
View File

@ -1433,7 +1433,7 @@ static int aarch64_set_hybrid_breakpoint(struct target *target, struct breakpoin
} }
breakpoint->set = brp_1 + 1; breakpoint->set = brp_1 + 1;
breakpoint->linked_BRP = brp_2; breakpoint->linked_brp = brp_2;
control_CTX = ((CTX_machmode & 0x7) << 20) control_CTX = ((CTX_machmode & 0x7) << 20)
| (brp_2 << 16) | (brp_2 << 16)
| (0 << 14) | (0 << 14)
@ -1495,7 +1495,7 @@ static int aarch64_unset_breakpoint(struct target *target, struct breakpoint *br
if (breakpoint->type == BKPT_HARD) { if (breakpoint->type == BKPT_HARD) {
if ((breakpoint->address != 0) && (breakpoint->asid != 0)) { if ((breakpoint->address != 0) && (breakpoint->asid != 0)) {
int brp_i = breakpoint->set - 1; int brp_i = breakpoint->set - 1;
int brp_j = breakpoint->linked_BRP; int brp_j = breakpoint->linked_brp;
if ((brp_i < 0) || (brp_i >= aarch64->brp_num)) { if ((brp_i < 0) || (brp_i >= aarch64->brp_num)) {
LOG_DEBUG("Invalid BRP number in breakpoint"); LOG_DEBUG("Invalid BRP number in breakpoint");
return ERROR_OK; return ERROR_OK;
@ -1545,7 +1545,7 @@ static int aarch64_unset_breakpoint(struct target *target, struct breakpoint *br
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
breakpoint->linked_BRP = 0; breakpoint->linked_brp = 0;
breakpoint->set = 0; breakpoint->set = 0;
return ERROR_OK; return ERROR_OK;

2
src/target/breakpoints.h
View File

@ -43,7 +43,7 @@ struct breakpoint {
uint8_t *orig_instr; uint8_t *orig_instr;
struct breakpoint *next; struct breakpoint *next;
uint32_t unique_id; uint32_t unique_id;
int linked_BRP; int linked_brp;
}; };
struct watchpoint { struct watchpoint {

6
src/target/cortex_a.c
View File

@ -1444,7 +1444,7 @@ static int cortex_a_set_hybrid_breakpoint(struct target *target, struct breakpoi
} }
breakpoint->set = brp_1 + 1; breakpoint->set = brp_1 + 1;
breakpoint->linked_BRP = brp_2; breakpoint->linked_brp = brp_2;
control_CTX = ((CTX_machmode & 0x7) << 20) control_CTX = ((CTX_machmode & 0x7) << 20)
| (brp_2 << 16) | (brp_2 << 16)
| (0 << 14) | (0 << 14)
@ -1500,7 +1500,7 @@ static int cortex_a_unset_breakpoint(struct target *target, struct breakpoint *b
if (breakpoint->type == BKPT_HARD) { if (breakpoint->type == BKPT_HARD) {
if ((breakpoint->address != 0) && (breakpoint->asid != 0)) { if ((breakpoint->address != 0) && (breakpoint->asid != 0)) {
int brp_i = breakpoint->set - 1; int brp_i = breakpoint->set - 1;
int brp_j = breakpoint->linked_BRP; int brp_j = breakpoint->linked_brp;
if ((brp_i < 0) || (brp_i >= cortex_a->brp_num)) { if ((brp_i < 0) || (brp_i >= cortex_a->brp_num)) {
LOG_DEBUG("Invalid BRP number in breakpoint"); LOG_DEBUG("Invalid BRP number in breakpoint");
return ERROR_OK; return ERROR_OK;
@ -1539,7 +1539,7 @@ static int cortex_a_unset_breakpoint(struct target *target, struct breakpoint *b
brp_list[brp_j].value); brp_list[brp_j].value);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
breakpoint->linked_BRP = 0; breakpoint->linked_brp = 0;
breakpoint->set = 0; breakpoint->set = 0;
return ERROR_OK; return ERROR_OK;

2
src/target/nds32.c
View File

@ -1660,7 +1660,7 @@ int nds32_init_arch_info(struct target *target, struct nds32 *nds32)
nds32->syscall_break.orig_instr = NULL; nds32->syscall_break.orig_instr = NULL;
nds32->syscall_break.next = NULL; nds32->syscall_break.next = NULL;
nds32->syscall_break.unique_id = 0x515CAll + target->target_number; nds32->syscall_break.unique_id = 0x515CAll + target->target_number;
nds32->syscall_break.linked_BRP = 0; nds32->syscall_break.linked_brp = 0;
nds32_reg_init(); nds32_reg_init();