From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12193 invoked by alias); 15 Mar 2004 23:10:46 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 12162 invoked from network); 15 Mar 2004 23:10:42 -0000 Received: from unknown (HELO localhost.redhat.com) (66.30.197.194) by sources.redhat.com with SMTP; 15 Mar 2004 23:10:42 -0000 Received: from gnu.org (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id 2D5A02B9B; Mon, 15 Mar 2004 18:10:37 -0500 (EST) Message-ID: <405637ED.9020706@gnu.org> Date: Mon, 15 Mar 2004 23:10:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-GB; rv:1.4.1) Gecko/20040217 MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Subject: [commit] Use gdbarch_data_register_pre_init in frame-unwind Content-Type: multipart/mixed; boundary="------------070601060708010401020500" X-SW-Source: 2004-03.o/txt/msg00347.txt This is a multi-part message in MIME format. --------------070601060708010401020500 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 288 Hello, This re-implements the internals of frame-unwind so that it uses the just added gdbarch_data_register_pre_init method. Doing this ment also changing its table data structure to a linked list (it could no longer use realloc). It makes no interface changes, committed, Andrew --------------070601060708010401020500 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 5002 2004-03-15 Andrew Cagney * Makefile.in (frame-unwind.o): Update dependencies. * frame-unwind.c: Include "gdb_obstack.h". (frame_unwind_init): Replace "gdbarch" parameter with an "obstack" parameter. (append_predicate): Delete function. (struct frame_unwind_table_entry): New structure. (struct frame_unwind_table): Replace "sniffer" with "head" and "tail". (frame_unwind_append_sniffer): Update. (frame_unwind_find_by_frame): Update. (_initialize_frame_unwind): Registe frame_unwind_init using gdbarch_data_register_pre_init. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.523 diff -u -r1.523 Makefile.in --- Makefile.in 15 Mar 2004 19:42:24 -0000 1.523 +++ Makefile.in 15 Mar 2004 23:02:59 -0000 @@ -1765,7 +1765,7 @@ $(annotate_h) $(language_h) $(frame_unwind_h) $(frame_base_h) \ $(command_h) $(gdbcmd_h) frame-unwind.o: frame-unwind.c $(defs_h) $(frame_h) $(frame_unwind_h) \ - $(gdb_assert_h) $(dummy_frame_h) + $(gdb_assert_h) $(dummy_frame_h) $(gdb_obstack_h) frv-linux-tdep.o: frv-linux-tdep.c $(defs_h) $(target_h) $(osabi_h) \ $(elf_bfd_h) $(elf_frv_h) $(frv_tdep_h) frv-tdep.o: frv-tdep.c $(defs_h) $(gdb_string_h) $(inferior_h) $(gdbcore_h) \ Index: frame-unwind.c =================================================================== RCS file: /cvs/src/src/gdb/frame-unwind.c,v retrieving revision 1.9 diff -u -r1.9 frame-unwind.c --- frame-unwind.c 15 Mar 2004 20:38:08 -0000 1.9 +++ frame-unwind.c 15 Mar 2004 23:02:59 -0000 @@ -1,6 +1,6 @@ /* Definitions for frame unwinder, for GDB, the GNU debugger. - Copyright 2003 Free Software Foundation, Inc. + Copyright 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -24,31 +24,30 @@ #include "frame-unwind.h" #include "gdb_assert.h" #include "dummy-frame.h" +#include "gdb_obstack.h" static struct gdbarch_data *frame_unwind_data; -struct frame_unwind_table +struct frame_unwind_table_entry { - frame_unwind_sniffer_ftype **sniffer; - int nr; + frame_unwind_sniffer_ftype *sniffer; + struct frame_unwind_table_entry *next; }; -/* Append a predicate to the end of the table. */ -static void -append_predicate (struct frame_unwind_table *table, - frame_unwind_sniffer_ftype *sniffer) -{ - table->sniffer = xrealloc (table->sniffer, ((table->nr + 1) - * sizeof (frame_unwind_sniffer_ftype *))); - table->sniffer[table->nr] = sniffer; - table->nr++; -} +struct frame_unwind_table +{ + struct frame_unwind_table_entry *head; + struct frame_unwind_table_entry **tail; +}; static void * -frame_unwind_init (struct gdbarch *gdbarch) +frame_unwind_init (struct obstack *obstack) { - struct frame_unwind_table *table = XCALLOC (1, struct frame_unwind_table); - append_predicate (table, dummy_frame_sniffer); + struct frame_unwind_table *table + = OBSTACK_ZALLOC (obstack, struct frame_unwind_table); + table->head = OBSTACK_ZALLOC (obstack, struct frame_unwind_table_entry); + table->head->sniffer = dummy_frame_sniffer; + table->tail = &table->head->next; return table; } @@ -56,16 +55,10 @@ frame_unwind_append_sniffer (struct gdbarch *gdbarch, frame_unwind_sniffer_ftype *sniffer) { - struct frame_unwind_table *table = - gdbarch_data (gdbarch, frame_unwind_data); - if (table == NULL) - { - /* ULGH, called during architecture initialization. Patch - things up. */ - table = frame_unwind_init (gdbarch); - deprecated_set_gdbarch_data (gdbarch, frame_unwind_data, table); - } - append_predicate (table, sniffer); + struct frame_unwind_table *table = gdbarch_data (gdbarch, frame_unwind_data); + (*table->tail) = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_unwind_table_entry); + (*table->tail)->sniffer = sniffer; + table->tail = &((*table->tail)->next); } const struct frame_unwind * @@ -74,16 +67,17 @@ int i; struct gdbarch *gdbarch = get_frame_arch (next_frame); struct frame_unwind_table *table = gdbarch_data (gdbarch, frame_unwind_data); + struct frame_unwind_table_entry *entry; if (!DEPRECATED_USE_GENERIC_DUMMY_FRAMES && legacy_frame_p (gdbarch)) /* Seriously old code. Don't even try to use this new mechanism. (Note: The variable USE_GENERIC_DUMMY_FRAMES is deprecated, not the dummy frame mechanism. All architectures should be using generic dummy frames). */ return legacy_saved_regs_unwind; - for (i = 0; i < table->nr; i++) + for (entry = table->head; entry != NULL; entry = entry->next) { const struct frame_unwind *desc; - desc = table->sniffer[i] (next_frame); + desc = entry->sniffer (next_frame); if (desc != NULL) return desc; } @@ -95,5 +89,5 @@ void _initialize_frame_unwind (void) { - frame_unwind_data = gdbarch_data_register_post_init (frame_unwind_init); + frame_unwind_data = gdbarch_data_register_pre_init (frame_unwind_init); } --------------070601060708010401020500-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12193 invoked by alias); 15 Mar 2004 23:10:46 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 12162 invoked from network); 15 Mar 2004 23:10:42 -0000 Received: from unknown (HELO localhost.redhat.com) (66.30.197.194) by sources.redhat.com with SMTP; 15 Mar 2004 23:10:42 -0000 Received: from gnu.org (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id 2D5A02B9B; Mon, 15 Mar 2004 18:10:37 -0500 (EST) Message-ID: <405637ED.9020706@gnu.org> Date: Fri, 19 Mar 2004 00:09:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-GB; rv:1.4.1) Gecko/20040217 MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Subject: [commit] Use gdbarch_data_register_pre_init in frame-unwind Content-Type: multipart/mixed; boundary="------------070601060708010401020500" X-SW-Source: 2004-03/txt/msg00347.txt.bz2 Message-ID: <20040319000900.eHfxMd3qfaJJ9kSmffULo0rbIuJw6I5fNfgLjly0TiY@z> This is a multi-part message in MIME format. --------------070601060708010401020500 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 288 Hello, This re-implements the internals of frame-unwind so that it uses the just added gdbarch_data_register_pre_init method. Doing this ment also changing its table data structure to a linked list (it could no longer use realloc). It makes no interface changes, committed, Andrew --------------070601060708010401020500 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 5002 2004-03-15 Andrew Cagney * Makefile.in (frame-unwind.o): Update dependencies. * frame-unwind.c: Include "gdb_obstack.h". (frame_unwind_init): Replace "gdbarch" parameter with an "obstack" parameter. (append_predicate): Delete function. (struct frame_unwind_table_entry): New structure. (struct frame_unwind_table): Replace "sniffer" with "head" and "tail". (frame_unwind_append_sniffer): Update. (frame_unwind_find_by_frame): Update. (_initialize_frame_unwind): Registe frame_unwind_init using gdbarch_data_register_pre_init. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.523 diff -u -r1.523 Makefile.in --- Makefile.in 15 Mar 2004 19:42:24 -0000 1.523 +++ Makefile.in 15 Mar 2004 23:02:59 -0000 @@ -1765,7 +1765,7 @@ $(annotate_h) $(language_h) $(frame_unwind_h) $(frame_base_h) \ $(command_h) $(gdbcmd_h) frame-unwind.o: frame-unwind.c $(defs_h) $(frame_h) $(frame_unwind_h) \ - $(gdb_assert_h) $(dummy_frame_h) + $(gdb_assert_h) $(dummy_frame_h) $(gdb_obstack_h) frv-linux-tdep.o: frv-linux-tdep.c $(defs_h) $(target_h) $(osabi_h) \ $(elf_bfd_h) $(elf_frv_h) $(frv_tdep_h) frv-tdep.o: frv-tdep.c $(defs_h) $(gdb_string_h) $(inferior_h) $(gdbcore_h) \ Index: frame-unwind.c =================================================================== RCS file: /cvs/src/src/gdb/frame-unwind.c,v retrieving revision 1.9 diff -u -r1.9 frame-unwind.c --- frame-unwind.c 15 Mar 2004 20:38:08 -0000 1.9 +++ frame-unwind.c 15 Mar 2004 23:02:59 -0000 @@ -1,6 +1,6 @@ /* Definitions for frame unwinder, for GDB, the GNU debugger. - Copyright 2003 Free Software Foundation, Inc. + Copyright 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -24,31 +24,30 @@ #include "frame-unwind.h" #include "gdb_assert.h" #include "dummy-frame.h" +#include "gdb_obstack.h" static struct gdbarch_data *frame_unwind_data; -struct frame_unwind_table +struct frame_unwind_table_entry { - frame_unwind_sniffer_ftype **sniffer; - int nr; + frame_unwind_sniffer_ftype *sniffer; + struct frame_unwind_table_entry *next; }; -/* Append a predicate to the end of the table. */ -static void -append_predicate (struct frame_unwind_table *table, - frame_unwind_sniffer_ftype *sniffer) -{ - table->sniffer = xrealloc (table->sniffer, ((table->nr + 1) - * sizeof (frame_unwind_sniffer_ftype *))); - table->sniffer[table->nr] = sniffer; - table->nr++; -} +struct frame_unwind_table +{ + struct frame_unwind_table_entry *head; + struct frame_unwind_table_entry **tail; +}; static void * -frame_unwind_init (struct gdbarch *gdbarch) +frame_unwind_init (struct obstack *obstack) { - struct frame_unwind_table *table = XCALLOC (1, struct frame_unwind_table); - append_predicate (table, dummy_frame_sniffer); + struct frame_unwind_table *table + = OBSTACK_ZALLOC (obstack, struct frame_unwind_table); + table->head = OBSTACK_ZALLOC (obstack, struct frame_unwind_table_entry); + table->head->sniffer = dummy_frame_sniffer; + table->tail = &table->head->next; return table; } @@ -56,16 +55,10 @@ frame_unwind_append_sniffer (struct gdbarch *gdbarch, frame_unwind_sniffer_ftype *sniffer) { - struct frame_unwind_table *table = - gdbarch_data (gdbarch, frame_unwind_data); - if (table == NULL) - { - /* ULGH, called during architecture initialization. Patch - things up. */ - table = frame_unwind_init (gdbarch); - deprecated_set_gdbarch_data (gdbarch, frame_unwind_data, table); - } - append_predicate (table, sniffer); + struct frame_unwind_table *table = gdbarch_data (gdbarch, frame_unwind_data); + (*table->tail) = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_unwind_table_entry); + (*table->tail)->sniffer = sniffer; + table->tail = &((*table->tail)->next); } const struct frame_unwind * @@ -74,16 +67,17 @@ int i; struct gdbarch *gdbarch = get_frame_arch (next_frame); struct frame_unwind_table *table = gdbarch_data (gdbarch, frame_unwind_data); + struct frame_unwind_table_entry *entry; if (!DEPRECATED_USE_GENERIC_DUMMY_FRAMES && legacy_frame_p (gdbarch)) /* Seriously old code. Don't even try to use this new mechanism. (Note: The variable USE_GENERIC_DUMMY_FRAMES is deprecated, not the dummy frame mechanism. All architectures should be using generic dummy frames). */ return legacy_saved_regs_unwind; - for (i = 0; i < table->nr; i++) + for (entry = table->head; entry != NULL; entry = entry->next) { const struct frame_unwind *desc; - desc = table->sniffer[i] (next_frame); + desc = entry->sniffer (next_frame); if (desc != NULL) return desc; } @@ -95,5 +89,5 @@ void _initialize_frame_unwind (void) { - frame_unwind_data = gdbarch_data_register_post_init (frame_unwind_init); + frame_unwind_data = gdbarch_data_register_pre_init (frame_unwind_init); } --------------070601060708010401020500--