From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17949 invoked by alias); 22 Dec 2008 21:10:33 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 17923 invoked by uid 9519); 22 Dec 2008 21:10:32 -0000 Date: Mon, 22 Dec 2008 21:10:00 -0000 Message-ID: <20081222211032.17908.qmail@sourceware.org> From: rmoseley@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-rmoseley-demo-merge: Fix completion_function parameters. X-Git-Refname: refs/heads/archer-rmoseley-demo-merge X-Git-Reftype: branch X-Git-Oldrev: cd8b25df41e5a4b25e15e6a3e3c9f71f60be613a X-Git-Newrev: 59fff21d925af72b65cbf267bbaaeb0c4185e8e7 X-SW-Source: 2008-q4/txt/msg00234.txt.bz2 List-Id: The branch, archer-rmoseley-demo-merge has been updated via 59fff21d925af72b65cbf267bbaaeb0c4185e8e7 (commit) from cd8b25df41e5a4b25e15e6a3e3c9f71f60be613a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 59fff21d925af72b65cbf267bbaaeb0c4185e8e7 Author: Rick Moseley Date: Mon Dec 22 15:08:58 2008 -0600 Fix completion_function parameters. ----------------------------------------------------------------------- Summary of changes: gdb/breakpoint.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) First 500 lines of diff: diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index bd8fba3..c85f90b 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -930,7 +930,7 @@ update_watchpoint (struct breakpoint *b, int reparse) int len, type; struct bp_location *loc, **tmp; - addr = value_address (v); + addr = VALUE_ADDRESS (v) + value_offset (v); len = TYPE_LENGTH (value_type (v)); type = hw_write; if (b->type == bp_read_watchpoint) @@ -3120,13 +3120,14 @@ bpstat_what (bpstat bs) back and decide something of a lower priority is better. The ordering is: - kc < clr sgl shl slr sn sr ss - sgl < shl slr sn sr ss - slr < err shl sn sr ss - clr < err shl sn sr ss - ss < shl sn sr - sn < shl sr - shl < sr + kc < clr sgl shl shlr slr sn sr ss + sgl < shl shlr slr sn sr ss + slr < err shl shlr sn sr ss + clr < err shl shlr sn sr ss + ss < shl shlr sn sr + sn < shl shlr sr + shl < shlr sr + shlr < sr sr < What I think this means is that we don't need a damned table @@ -3146,7 +3147,6 @@ bpstat_what (bpstat bs) /* kc ss sn sgl slr clr sr shl shlr entrybp */ /*no_effect */ - {kc, ss, sn, sgl, slr, clr, sr, shl, shlr, shlr}, /*wp_silent */ {ss, ss, sn, ss, ss, ss, sr, shl, shlr, shlr}, @@ -6404,7 +6404,7 @@ can_use_hardware_watchpoint (struct value *v) || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT && TYPE_CODE (vtype) != TYPE_CODE_ARRAY)) { - CORE_ADDR vaddr = value_address (v); + CORE_ADDR vaddr = VALUE_ADDRESS (v) + value_offset (v); int len = TYPE_LENGTH (value_type (v)); if (!TARGET_REGION_OK_FOR_HW_WATCHPOINT (vaddr, len)) @@ -8503,7 +8503,7 @@ catching_syscall_number (int syscall_number) /* Complete syscall names. Used by "catch syscall". */ static char ** -catch_syscall_completer (char *text, char *word) +catch_syscall_completer (struct cmd_list_element *self, char *text, char *word) { const char **list = gdbarch_get_syscall_names (current_gdbarch); @@ -8542,7 +8542,8 @@ static void add_catch_command (char *name, char *docstring, void (*sfunc) (char *args, int from_tty, struct cmd_list_element *command), - char ** (*completion_function) (char *text, char *word), + char ** (*completion_function) (struct cmd_list_element *self, + char *text, char *word), void *user_data_catch, void *user_data_tcatch) { @@ -8552,13 +8553,13 @@ add_catch_command (char *name, char *docstring, &catch_cmdlist); set_cmd_sfunc (command, sfunc); set_cmd_context (command, user_data_catch); - set_cmd_completer (command, location_completer); + set_cmd_completer (command, completion_function); command = add_cmd (name, class_breakpoint, NULL, docstring, &tcatch_cmdlist); set_cmd_sfunc (command, sfunc); set_cmd_context (command, user_data_tcatch); - set_cmd_completer (command, location_completer); + set_cmd_completer (command, completion_function); } void hooks/post-receive -- Repository for Project Archer.