Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
card10
openocd
Commits
72b42141
Commit
72b42141
authored
Nov 13, 2009
by
Zachary T Welch
Browse files
watchpoint_t -> struct watchpoint
Remove misleading typedef and redundant suffix from struct watchpoint.
parent
e7f65c5a
Changes
12
Hide whitespace changes
Inline
Side-by-side
src/target/arm11.c
View file @
72b42141
...
...
@@ -1596,7 +1596,7 @@ static int arm11_remove_breakpoint(struct target_s *target,
}
static
int
arm11_add_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
struct
watchpoint
*
watchpoint
)
{
FNC_INFO_NOTIMPLEMENTED
;
...
...
@@ -1604,7 +1604,7 @@ static int arm11_add_watchpoint(struct target_s *target,
}
static
int
arm11_remove_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
struct
watchpoint
*
watchpoint
)
{
FNC_INFO_NOTIMPLEMENTED
;
...
...
src/target/arm7_9_common.c
View file @
72b42141
...
...
@@ -520,7 +520,7 @@ int arm7_9_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
* @return Error status if watchpoint set fails or the result of executing the
* JTAG queue
*/
int
arm7_9_set_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
int
arm7_9_set_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
)
{
int
retval
=
ERROR_OK
;
struct
arm7_9_common
*
arm7_9
=
target_to_arm7_9
(
target
);
...
...
@@ -591,7 +591,7 @@ int arm7_9_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
* @return Error status while trying to unset the watchpoint or the result of
* executing the JTAG queue
*/
int
arm7_9_unset_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
int
arm7_9_unset_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
)
{
int
retval
=
ERROR_OK
;
struct
arm7_9_common
*
arm7_9
=
target_to_arm7_9
(
target
);
...
...
@@ -639,7 +639,7 @@ int arm7_9_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
* @param watchpoint Pointer to the watchpoint to be added
* @return Error status while trying to add the watchpoint
*/
int
arm7_9_add_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
int
arm7_9_add_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
)
{
struct
arm7_9_common
*
arm7_9
=
target_to_arm7_9
(
target
);
...
...
@@ -672,7 +672,7 @@ int arm7_9_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
* @param watchpoint Pointer to the watchpoint to be removed
* @return Result of trying to unset the watchpoint
*/
int
arm7_9_remove_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
int
arm7_9_remove_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
)
{
int
retval
=
ERROR_OK
;
struct
arm7_9_common
*
arm7_9
=
target_to_arm7_9
(
target
);
...
...
@@ -1770,7 +1770,7 @@ int arm7_9_restart_core(struct target_s *target)
*/
void
arm7_9_enable_watchpoints
(
struct
target_s
*
target
)
{
watchpoint
_t
*
watchpoint
=
target
->
watchpoints
;
struct
watchpoint
*
watchpoint
=
target
->
watchpoints
;
while
(
watchpoint
)
{
...
...
src/target/arm7_9_common.h
View file @
72b42141
...
...
@@ -145,8 +145,8 @@ int arm7_9_run_algorithm(struct target_s *target, int num_mem_params, struct mem
int
arm7_9_add_breakpoint
(
struct
target_s
*
target
,
breakpoint_t
*
breakpoint
);
int
arm7_9_remove_breakpoint
(
struct
target_s
*
target
,
breakpoint_t
*
breakpoint
);
int
arm7_9_add_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
);
int
arm7_9_remove_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
);
int
arm7_9_add_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
);
int
arm7_9_remove_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
);
void
arm7_9_enable_eice_step
(
target_t
*
target
,
uint32_t
next_pc
);
void
arm7_9_disable_eice_step
(
target_t
*
target
);
...
...
src/target/breakpoints.c
View file @
72b42141
...
...
@@ -181,8 +181,8 @@ breakpoint_t* breakpoint_find(target_t *target, uint32_t address)
int
watchpoint_add
(
target_t
*
target
,
uint32_t
address
,
uint32_t
length
,
enum
watchpoint_rw
rw
,
uint32_t
value
,
uint32_t
mask
)
{
watchpoint
_t
*
watchpoint
=
target
->
watchpoints
;
watchpoint
_t
**
watchpoint_p
=
&
target
->
watchpoints
;
struct
watchpoint
*
watchpoint
=
target
->
watchpoints
;
struct
watchpoint
**
watchpoint_p
=
&
target
->
watchpoints
;
int
retval
;
char
*
reason
;
...
...
@@ -206,7 +206,7 @@ int watchpoint_add(target_t *target, uint32_t address, uint32_t length,
watchpoint
=
watchpoint
->
next
;
}
(
*
watchpoint_p
)
=
calloc
(
1
,
sizeof
(
watchpoint
_t
));
(
*
watchpoint_p
)
=
calloc
(
1
,
sizeof
(
struct
watchpoint
));
(
*
watchpoint_p
)
->
address
=
address
;
(
*
watchpoint_p
)
->
length
=
length
;
(
*
watchpoint_p
)
->
value
=
value
;
...
...
@@ -244,10 +244,10 @@ bye:
return
ERROR_OK
;
}
static
void
watchpoint_free
(
target_t
*
target
,
watchpoint
_t
*
watchpoint_remove
)
static
void
watchpoint_free
(
target_t
*
target
,
struct
watchpoint
*
watchpoint_remove
)
{
watchpoint
_t
*
watchpoint
=
target
->
watchpoints
;
watchpoint
_t
**
watchpoint_p
=
&
target
->
watchpoints
;
struct
watchpoint
*
watchpoint
=
target
->
watchpoints
;
struct
watchpoint
**
watchpoint_p
=
&
target
->
watchpoints
;
while
(
watchpoint
)
{
...
...
@@ -267,8 +267,8 @@ static void watchpoint_free(target_t *target, watchpoint_t *watchpoint_remove)
void
watchpoint_remove
(
target_t
*
target
,
uint32_t
address
)
{
watchpoint
_t
*
watchpoint
=
target
->
watchpoints
;
watchpoint
_t
**
watchpoint_p
=
&
target
->
watchpoints
;
struct
watchpoint
*
watchpoint
=
target
->
watchpoints
;
struct
watchpoint
**
watchpoint_p
=
&
target
->
watchpoints
;
while
(
watchpoint
)
{
...
...
@@ -290,7 +290,7 @@ void watchpoint_remove(target_t *target, uint32_t address)
void
watchpoint_clear_target
(
target_t
*
target
)
{
watchpoint
_t
*
watchpoint
;
struct
watchpoint
*
watchpoint
;
LOG_DEBUG
(
"Delete all watchpoints for target: %s"
,
target_get_name
(
target
));
while
((
watchpoint
=
target
->
watchpoints
)
!=
NULL
)
{
...
...
src/target/breakpoints.h
View file @
72b42141
...
...
@@ -46,7 +46,7 @@ typedef struct breakpoint_s
int
unique_id
;
}
breakpoint_t
;
typedef
struct
watchpoint
_s
struct
watchpoint
{
uint32_t
address
;
uint32_t
length
;
...
...
@@ -54,9 +54,9 @@ typedef struct watchpoint_s
uint32_t
value
;
enum
watchpoint_rw
rw
;
int
set
;
struct
watchpoint
_s
*
next
;
struct
watchpoint
*
next
;
int
unique_id
;
}
watchpoint_t
;
};
void
breakpoint_clear_target
(
struct
target_s
*
target
);
int
breakpoint_add
(
struct
target_s
*
target
,
...
...
src/target/cortex_m3.c
View file @
72b42141
...
...
@@ -1032,7 +1032,7 @@ cortex_m3_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
}
static
int
cortex_m3_set_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
cortex_m3_set_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
)
{
int
dwt_num
=
0
;
uint32_t
mask
,
temp
;
...
...
@@ -1097,7 +1097,7 @@ cortex_m3_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
}
static
int
cortex_m3_unset_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
cortex_m3_unset_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
)
{
struct
cortex_m3_common_s
*
cortex_m3
=
target_to_cm3
(
target
);
cortex_m3_dwt_comparator_t
*
comparator
;
...
...
@@ -1134,7 +1134,7 @@ cortex_m3_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
}
static
int
cortex_m3_add_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
cortex_m3_add_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
)
{
struct
cortex_m3_common_s
*
cortex_m3
=
target_to_cm3
(
target
);
...
...
@@ -1192,7 +1192,7 @@ cortex_m3_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
}
static
int
cortex_m3_remove_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
cortex_m3_remove_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
)
{
struct
cortex_m3_common_s
*
cortex_m3
=
target_to_cm3
(
target
);
...
...
@@ -1216,7 +1216,7 @@ cortex_m3_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
static
void
cortex_m3_enable_watchpoints
(
struct
target_s
*
target
)
{
watchpoint
_t
*
watchpoint
=
target
->
watchpoints
;
struct
watchpoint
*
watchpoint
=
target
->
watchpoints
;
/* set any pending watchpoints */
while
(
watchpoint
)
...
...
src/target/mips_m4k.c
View file @
72b42141
...
...
@@ -699,7 +699,7 @@ int mips_m4k_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint
return
ERROR_OK
;
}
int
mips_m4k_set_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
int
mips_m4k_set_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
)
{
mips32_common_t
*
mips32
=
target
->
arch_info
;
mips32_comparator_t
*
comparator_list
=
mips32
->
data_break_list
;
...
...
@@ -767,7 +767,7 @@ int mips_m4k_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
return
ERROR_OK
;
}
int
mips_m4k_unset_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
int
mips_m4k_unset_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
)
{
/* get pointers to arch-specific information */
mips32_common_t
*
mips32
=
target
->
arch_info
;
...
...
@@ -793,7 +793,7 @@ int mips_m4k_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
return
ERROR_OK
;
}
int
mips_m4k_add_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
int
mips_m4k_add_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
)
{
mips32_common_t
*
mips32
=
target
->
arch_info
;
...
...
@@ -809,7 +809,7 @@ int mips_m4k_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
return
ERROR_OK
;
}
int
mips_m4k_remove_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
int
mips_m4k_remove_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
)
{
/* get pointers to arch-specific information */
mips32_common_t
*
mips32
=
target
->
arch_info
;
...
...
@@ -832,7 +832,7 @@ int mips_m4k_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint
void
mips_m4k_enable_watchpoints
(
struct
target_s
*
target
)
{
watchpoint
_t
*
watchpoint
=
target
->
watchpoints
;
struct
watchpoint
*
watchpoint
=
target
->
watchpoints
;
/* set any pending watchpoints */
while
(
watchpoint
)
...
...
src/target/mips_m4k.h
View file @
72b42141
...
...
@@ -45,9 +45,9 @@ int mips_m4k_add_breakpoint(struct target_s *target, breakpoint_t *bp);
int
mips_m4k_remove_breakpoint
(
struct
target_s
*
target
,
breakpoint_t
*
bp
);
void
mips_m4k_enable_watchpoints
(
struct
target_s
*
target
);
int
mips_m4k_set_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
wp
);
int
mips_m4k_unset_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
wp
);
int
mips_m4k_add_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
wp
);
int
mips_m4k_remove_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
wp
);
int
mips_m4k_set_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
wp
);
int
mips_m4k_unset_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
wp
);
int
mips_m4k_add_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
wp
);
int
mips_m4k_remove_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
wp
);
#endif
/*MIPS_M4K_H*/
src/target/target.c
View file @
72b42141
...
...
@@ -611,12 +611,12 @@ int target_remove_breakpoint(struct target_s *target,
}
int
target_add_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
_s
*
watchpoint
)
struct
watchpoint
*
watchpoint
)
{
return
target
->
type
->
add_watchpoint
(
target
,
watchpoint
);
}
int
target_remove_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
_s
*
watchpoint
)
struct
watchpoint
*
watchpoint
)
{
return
target
->
type
->
remove_watchpoint
(
target
,
watchpoint
);
}
...
...
@@ -2797,7 +2797,7 @@ COMMAND_HANDLER(handle_wp_command)
if
(
argc
==
0
)
{
watchpoint
_t
*
watchpoint
=
target
->
watchpoints
;
struct
watchpoint
*
watchpoint
=
target
->
watchpoints
;
while
(
watchpoint
)
{
...
...
src/target/target.h
View file @
72b42141
...
...
@@ -156,7 +156,7 @@ typedef struct target_s
enum
target_state
state
;
/* the current backend-state (running, halted, ...) */
struct
reg_cache_s
*
reg_cache
;
/* the first register cache of the target (core regs) */
struct
breakpoint_s
*
breakpoints
;
/* list of breakpoints */
struct
watchpoint
_s
*
watchpoints
;
/* list of watchpoints */
struct
watchpoint
*
watchpoints
;
/* list of watchpoints */
struct
trace_s
*
trace_info
;
/* generic trace information */
struct
debug_msg_receiver_s
*
dbgmsg
;
/* list of debug message receivers */
uint32_t
dbg_msg_enabled
;
/* debug message status */
...
...
@@ -330,14 +330,14 @@ int target_remove_breakpoint(struct target_s *target,
* This routine is a wrapper for target->type->add_watchpoint.
*/
int
target_add_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
_s
*
watchpoint
);
struct
watchpoint
*
watchpoint
);
/**
* Remove the @a watchpoint for @a target.
*
* This routine is a wrapper for target->type->remove_watchpoint.
*/
int
target_remove_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
_s
*
watchpoint
);
struct
watchpoint
*
watchpoint
);
/**
* Obtain the registers for GDB.
...
...
src/target/target_type.h
View file @
72b42141
...
...
@@ -137,11 +137,11 @@ struct target_type_s
* However, this method can be invoked on unresponsive targets.
*/
int
(
*
remove_breakpoint
)(
struct
target_s
*
target
,
breakpoint_t
*
breakpoint
);
int
(
*
add_watchpoint
)(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
);
int
(
*
add_watchpoint
)(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
);
/* remove watchpoint. hw will only be updated if the target is currently halted.
* However, this method can be invoked on unresponsive targets.
*/
int
(
*
remove_watchpoint
)(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
);
int
(
*
remove_watchpoint
)(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
);
/* target algorithm support */
int
(
*
run_algorithm_imp
)(
struct
target_s
*
target
,
int
num_mem_params
,
struct
mem_param
*
mem_params
,
int
num_reg_params
,
struct
reg_param
*
reg_param
,
uint32_t
entry_point
,
uint32_t
exit_point
,
int
timeout_ms
,
void
*
arch_info
);
...
...
src/target/xscale.c
View file @
72b42141
...
...
@@ -64,7 +64,7 @@ static int xscale_restore_context(target_t *);
static
int
xscale_get_reg
(
reg_t
*
reg
);
static
int
xscale_set_reg
(
reg_t
*
reg
,
uint8_t
*
buf
);
static
int
xscale_set_breakpoint
(
struct
target_s
*
,
breakpoint_t
*
);
static
int
xscale_set_watchpoint
(
struct
target_s
*
,
watchpoint
_t
*
);
static
int
xscale_set_watchpoint
(
struct
target_s
*
,
struct
watchpoint
*
);
static
int
xscale_unset_breakpoint
(
struct
target_s
*
,
breakpoint_t
*
);
static
int
xscale_read_trace
(
target_t
*
);
...
...
@@ -1163,7 +1163,7 @@ static int xscale_disable_single_step(struct target_s *target)
static
void
xscale_enable_watchpoints
(
struct
target_s
*
target
)
{
watchpoint
_t
*
watchpoint
=
target
->
watchpoints
;
struct
watchpoint
*
watchpoint
=
target
->
watchpoints
;
while
(
watchpoint
)
{
...
...
@@ -2226,7 +2226,7 @@ static int xscale_remove_breakpoint(struct target_s *target, breakpoint_t *break
}
static
int
xscale_set_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
struct
watchpoint
*
watchpoint
)
{
struct
xscale_common_s
*
xscale
=
target_to_xscale
(
target
);
uint8_t
enable
=
0
;
...
...
@@ -2282,7 +2282,7 @@ static int xscale_set_watchpoint(struct target_s *target,
}
static
int
xscale_add_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
struct
watchpoint
*
watchpoint
)
{
struct
xscale_common_s
*
xscale
=
target_to_xscale
(
target
);
...
...
@@ -2308,7 +2308,7 @@ static int xscale_add_watchpoint(struct target_s *target,
}
static
int
xscale_unset_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
struct
watchpoint
*
watchpoint
)
{
struct
xscale_common_s
*
xscale
=
target_to_xscale
(
target
);
reg_t
*
dbcon
=
&
xscale
->
reg_cache
->
reg_list
[
XSCALE_DBCON
];
...
...
@@ -2343,7 +2343,7 @@ static int xscale_unset_watchpoint(struct target_s *target,
return
ERROR_OK
;
}
static
int
xscale_remove_watchpoint
(
struct
target_s
*
target
,
watchpoint
_t
*
watchpoint
)
static
int
xscale_remove_watchpoint
(
struct
target_s
*
target
,
struct
watchpoint
*
watchpoint
)
{
struct
xscale_common_s
*
xscale
=
target_to_xscale
(
target
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment