From cc5925ad7ee6c03a861ed2894f61610aea537ec5 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Sun, 7 Apr 2013 10:23:34 +0000 Subject: [PATCH] gdb/ * remote.c (remote_trace_find): Change type of parameters 'addr1' and 'addr2' to CORE_ADDR. * target.c (update_current_target): Update. * target.h (struct target_ops) : Change parameter type to CORE_ADDR. * tracepoint.c (tfind_1): Change type of parameters 'addr1' and 'addr2' to CORE_ADDR. (tfile_trace_find): Likewise. (tfile_get_traceframe_address): Change return type to CORE_ADDR. Change local variable 'addr' to type CORE_ADDR. * tracepoint.h (tfind_1): Update declaration. --- gdb/ChangeLog | 14 ++++++++++++++ gdb/remote.c | 2 +- gdb/target.c | 2 +- gdb/target.h | 2 +- gdb/tracepoint.c | 10 +++++----- gdb/tracepoint.h | 2 +- 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 21585e2e758..7e50ba13fa5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +2013-04-07 Yao Qi + + * remote.c (remote_trace_find): Change type of parameters 'addr1' + and 'addr2' to CORE_ADDR. + * target.c (update_current_target): Update. + * target.h (struct target_ops) : Change parameter + type to CORE_ADDR. + * tracepoint.c (tfind_1): Change type of parameters 'addr1' and + 'addr2' to CORE_ADDR. + (tfile_trace_find): Likewise. + (tfile_get_traceframe_address): Change return type to CORE_ADDR. + Change local variable 'addr' to type CORE_ADDR. + * tracepoint.h (tfind_1): Update declaration. + 2013-04-06 Eli Zaretskii * windows-nat.c (windows_get_absolute_argv0): Move from here... diff --git a/gdb/remote.c b/gdb/remote.c index aefbcf13bbe..740324b5461 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -10808,7 +10808,7 @@ remote_trace_stop (void) static int remote_trace_find (enum trace_find_type type, int num, - ULONGEST addr1, ULONGEST addr2, + CORE_ADDR addr1, CORE_ADDR addr2, int *tpp) { struct remote_state *rs = get_remote_state (); diff --git a/gdb/target.c b/gdb/target.c index 24cc79d4c06..8f8e46a2607 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -918,7 +918,7 @@ update_current_target (void) (void (*) (void)) tcomplain); de_fault (to_trace_find, - (int (*) (enum trace_find_type, int, ULONGEST, ULONGEST, int *)) + (int (*) (enum trace_find_type, int, CORE_ADDR, CORE_ADDR, int *)) return_minus_one); de_fault (to_get_trace_state_variable_value, (int (*) (int, LONGEST *)) diff --git a/gdb/target.h b/gdb/target.h index 4f8520cee9b..319fcc34a16 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -784,7 +784,7 @@ struct target_ops TPP. If no trace frame matches, return -1. May throw if the operation fails. */ int (*to_trace_find) (enum trace_find_type type, int num, - ULONGEST addr1, ULONGEST addr2, int *tpp); + CORE_ADDR addr1, CORE_ADDR addr2, int *tpp); /* Get the value of the trace state variable number TSV, returning 1 if the value is known and writing the value itself into the diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 009db82c901..3d8b131f86e 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -2260,7 +2260,7 @@ disconnect_tracing (int from_tty) /* Worker function for the various flavors of the tfind command. */ void tfind_1 (enum trace_find_type type, int num, - ULONGEST addr1, ULONGEST addr2, + CORE_ADDR addr1, CORE_ADDR addr2, int from_tty) { int target_frameno = -1, target_tracept = -1; @@ -4692,10 +4692,10 @@ tfile_get_tracepoint_status (struct breakpoint *tp, struct uploaded_tp *utp) value of a collected PC register, but if not available, we improvise. */ -static ULONGEST +static CORE_ADDR tfile_get_traceframe_address (off_t tframe_offset) { - ULONGEST addr = 0; + CORE_ADDR addr = 0; short tpnum; struct tracepoint *tp; off_t saved_offset = cur_offset; @@ -4727,14 +4727,14 @@ tfile_get_traceframe_address (off_t tframe_offset) static int tfile_trace_find (enum trace_find_type type, int num, - ULONGEST addr1, ULONGEST addr2, int *tpp) + CORE_ADDR addr1, CORE_ADDR addr2, int *tpp) { short tpnum; int tfnum = 0, found = 0; unsigned int data_size; struct tracepoint *tp; off_t offset, tframe_offset; - ULONGEST tfaddr; + CORE_ADDR tfaddr; if (num == -1) { diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h index c7eef7b0e7b..8df906f1144 100644 --- a/gdb/tracepoint.h +++ b/gdb/tracepoint.h @@ -383,7 +383,7 @@ extern void tvariables_info_1 (void); extern void save_trace_state_variables (struct ui_file *fp); extern void tfind_1 (enum trace_find_type type, int num, - ULONGEST addr1, ULONGEST addr2, + CORE_ADDR addr1, CORE_ADDR addr2, int from_tty); extern void trace_save_tfile (const char *filename, -- 2.30.2