Skip to content

Commit 54ef790

Browse files
pmamonovborneoa
authored andcommitted
target: use proper macro for parsing watchpoint address
Currently wp/rwp commands fail on 64-bit targets: > wp 0xffffffff80001400 4 addr option value ('0xffffffff80001400') is not valid Change-Id: I94d4af906b02b7bd463c8d79a6235a3646dfc434 Signed-off-by: Peter Mamonov <[email protected]> Reviewed-on: http://openocd.zylin.com/6058 Tested-by: jenkins Reviewed-by: Andreas Fritiofson <[email protected]> Reviewed-by: Antonio Borneo <[email protected]>
1 parent 84a2302 commit 54ef790

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/target/target.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4056,7 +4056,7 @@ COMMAND_HANDLER(handle_wp_command)
40564056
}
40574057

40584058
enum watchpoint_rw type = WPT_ACCESS;
4059-
uint32_t addr = 0;
4059+
target_addr_t addr = 0;
40604060
uint32_t length = 0;
40614061
uint32_t data_value = 0x0;
40624062
uint32_t data_mask = 0xffffffff;
@@ -4086,7 +4086,7 @@ COMMAND_HANDLER(handle_wp_command)
40864086
/* fall through */
40874087
case 2:
40884088
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], length);
4089-
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
4089+
COMMAND_PARSE_ADDRESS(CMD_ARGV[0], addr);
40904090
break;
40914091

40924092
default:
@@ -4106,8 +4106,8 @@ COMMAND_HANDLER(handle_rwp_command)
41064106
if (CMD_ARGC != 1)
41074107
return ERROR_COMMAND_SYNTAX_ERROR;
41084108

4109-
uint32_t addr;
4110-
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
4109+
target_addr_t addr;
4110+
COMMAND_PARSE_ADDRESS(CMD_ARGV[0], addr);
41114111

41124112
struct target *target = get_current_target(CMD_CTX);
41134113
watchpoint_remove(target, addr);

0 commit comments

Comments
 (0)