From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA 10/42] Move some code from buildsym to stabsread
Date: Wed, 23 May 2018 04:59:00 -0000 [thread overview]
Message-ID: <20180523045851.11660-11-tom@tromey.com> (raw)
In-Reply-To: <20180523045851.11660-1-tom@tromey.com>
A few things that currently reside in buildsym.c turn out to be
specific to the stabs reader. This patch moves these from
buildsym.[ch] to stabsread.[ch].
gdb/ChangeLog
2018-05-22 Tom Tromey <tom@tromey.com>
* stabsread.h (HASHSIZE, hashname, symnum, next_symbol_text)
(next_symbol_text_func): Move from buildsym.h.
* stabsread.c (hashname): Move from buildsym.c.
* buildsym.h (HASHSIZE, symnum, next_symbol_text)
(next_symbol_text_func, hashname): Move to stabsread.h.
* buildsym.c: Don't include bcache.h
(hashname): Move to stasbread.c.
---
gdb/ChangeLog | 10 ++++++++++
gdb/buildsym.c | 10 ----------
gdb/buildsym.h | 15 ---------------
gdb/stabsread.c | 13 +++++++++++++
gdb/stabsread.h | 15 +++++++++++++++
5 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 85b450383e..0e69865886 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -74,7 +74,6 @@
#include "gdbtypes.h"
#include "complaints.h"
#include "expression.h" /* For "enum exp_opcode" used by... */
-#include "bcache.h"
#include "filenames.h" /* For DOSish file names. */
#include "macrotab.h"
#include "demangle.h" /* Needed by SYMBOL_INIT_DEMANGLED_NAME. */
@@ -1675,15 +1674,6 @@ pop_context (void)
\f
-/* Compute a small integer hash code for the given name. */
-
-int
-hashname (const char *name)
-{
- return (hash(name,strlen(name)) % HASHSIZE);
-}
-\f
-
void
record_debugformat (const char *format)
{
diff --git a/gdb/buildsym.h b/gdb/buildsym.h
index 191db8ca4f..0b19c39305 100644
--- a/gdb/buildsym.h
+++ b/gdb/buildsym.h
@@ -46,9 +46,6 @@ struct dynamic_prop;
#define EXTERN extern
#endif
-#define HASHSIZE 127 /* Size of things hashed via
- hashname(). */
-
/* The list of sub-source-files within the current individual
compilation. Each file gets its own symtab with its own linetable
and associated info, but they all share one blockvector. */
@@ -74,10 +71,6 @@ EXTERN struct subfile *current_subfile;
EXTERN unsigned char processing_gcc_compilation;
-/* Count symbols as they are processed, for error messages. */
-
-EXTERN unsigned int symnum;
-
/* Record the symbols defined for each context in a list. We don't
create a struct block for the context until we know how long to
make it. */
@@ -173,12 +166,6 @@ typedef void (record_line_ftype) (struct subfile *subfile, int line,
\f
-#define next_symbol_text(objfile) (*next_symbol_text_func)(objfile)
-
-/* Function to invoke get the next symbol. Return the symbol name. */
-
-EXTERN const char *(*next_symbol_text_func) (struct objfile *);
-
extern void add_symbol_to_list (struct symbol *symbol,
struct pending **listhead);
@@ -251,8 +238,6 @@ extern struct compunit_symtab *start_symtab (struct objfile *objfile,
extern void restart_symtab (struct compunit_symtab *cust,
const char *name, CORE_ADDR start_addr);
-extern int hashname (const char *name);
-
extern void free_pending_blocks (void);
/* Record the name of the debug format in the current pending symbol
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index 4cfefaa3e0..13663106dc 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -44,6 +44,7 @@
#include "target-float.h"
#include "cp-abi.h"
#include "cp-support.h"
+#include "bcache.h"
#include <ctype.h>
/* Ask stabsread.h to define the vars it normally declares `extern'. */
@@ -4839,6 +4840,18 @@ find_name_end (const char *name)
}
}
+\f
+
+/* Compute a small integer hash code for the given name. */
+
+int
+hashname (const char *name)
+{
+ return hash (name, strlen (name)) % HASHSIZE;
+}
+
+\f
+
/* Initializer for this module. */
void
diff --git a/gdb/stabsread.h b/gdb/stabsread.h
index d24b25dc72..7958990112 100644
--- a/gdb/stabsread.h
+++ b/gdb/stabsread.h
@@ -31,6 +31,21 @@ enum language;
#define EXTERN extern
#endif
+#define HASHSIZE 127 /* Size of things hashed via
+ hashname(). */
+
+extern int hashname (const char *name);
+
+/* Count symbols as they are processed, for error messages. */
+
+EXTERN unsigned int symnum;
+
+#define next_symbol_text(objfile) (*next_symbol_text_func)(objfile)
+
+/* Function to invoke get the next symbol. Return the symbol name. */
+
+EXTERN const char *(*next_symbol_text_func) (struct objfile *);
+
/* Hash table of global symbols whose values are not known yet.
They are chained thru the SYMBOL_VALUE_CHAIN, since we don't
have the correct data for that slot yet.
--
2.13.6
next prev parent reply other threads:[~2018-05-23 4:59 UTC|newest]
Thread overview: 129+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-23 4:59 [RFA 00/42] Remove globals from buildsym Tom Tromey
2018-05-23 4:59 ` Tom Tromey [this message]
2018-07-05 19:16 ` [RFA 10/42] Move some code from buildsym to stabsread Keith Seitz
2018-07-08 16:35 ` Simon Marchi
2018-07-08 16:59 ` Tom Tromey
2018-07-08 16:37 ` Tom Tromey
2018-05-23 4:59 ` [RFA 28/42] Set list_in_scope later in DWARF reader Tom Tromey
2018-07-06 18:11 ` Keith Seitz
2018-07-10 3:23 ` Simon Marchi
2018-07-15 17:55 ` Tom Tromey
2018-05-23 4:59 ` [RFA 07/42] Move last_source_start_addr to buildsym_compunit Tom Tromey
2018-07-08 16:10 ` Simon Marchi
2018-05-23 4:59 ` [RFA 08/42] Move processing_acc_compilation to dbxread.c Tom Tromey
2018-07-08 16:15 ` Simon Marchi
2018-05-23 4:59 ` [RFA 09/42] Make context_stack_size static in buildsym.c Tom Tromey
2018-07-08 16:16 ` Simon Marchi
2018-05-23 4:59 ` [RFA 16/42] Use gdb_assert in two places " Tom Tromey
2018-07-08 16:55 ` Simon Marchi
2018-07-09 23:13 ` Tom Tromey
2018-05-23 4:59 ` [RFA 19/42] Move the using directives to buildsym_compunit Tom Tromey
2018-07-05 20:14 ` Keith Seitz
2018-07-08 16:28 ` Tom Tromey
2018-07-08 17:08 ` Simon Marchi
2018-05-23 4:59 ` [RFA 20/42] Use outermost_context_p in more places Tom Tromey
2018-07-08 17:13 ` Simon Marchi
2018-05-23 4:59 ` [RFA 12/42] Move within_function to stabsread Tom Tromey
2018-07-08 16:49 ` Simon Marchi
2018-05-23 4:59 ` [RFA 14/42] Move scan_file_globals declaration to stabsread.h Tom Tromey
2018-07-08 16:52 ` Simon Marchi
2018-07-09 23:07 ` Tom Tromey
2018-05-23 4:59 ` [RFA 21/42] Move the context stack to buildsym_compunit Tom Tromey
2018-07-06 17:30 ` Keith Seitz
2018-07-15 18:09 ` Tom Tromey
[not found] ` <93a9597f-e7ff-e8ff-e873-9cee5b84d7cc@simark.ca>
2018-07-10 1:45 ` Simon Marchi
2018-07-15 18:10 ` Tom Tromey
2018-05-23 4:59 ` [RFA 01/42] Use new and delete for buildsym_compunit Tom Tromey
2018-07-05 18:50 ` Keith Seitz
2018-07-07 2:31 ` Simon Marchi
2018-07-08 16:25 ` Tom Tromey
2018-05-23 4:59 ` [RFA 04/42] Move last_source file to buildsym_compunit Tom Tromey
2018-07-07 3:51 ` Simon Marchi
2018-07-08 16:33 ` Tom Tromey
2018-07-08 16:37 ` Simon Marchi
2018-07-08 16:52 ` Tom Tromey
2018-07-08 17:01 ` Simon Marchi
2018-05-23 4:59 ` [RFA 15/42] Remove merge_symbol_lists Tom Tromey
2018-07-08 16:54 ` Simon Marchi
2018-05-23 4:59 ` [RFA 22/42] Move current_subfile to buildsym_compunit Tom Tromey
2018-07-10 1:52 ` Simon Marchi
2018-07-12 4:34 ` Tom Tromey
2018-05-23 4:59 ` [RFA 25/42] Remove the "listhead" argument from finish_block Tom Tromey
2018-07-10 2:07 ` Simon Marchi
2018-05-23 4:59 ` [RFA 27/42] Do not look at file symbols when reading psymtabs Tom Tromey
2018-07-10 3:19 ` Simon Marchi
2018-05-23 4:59 ` [RFA 13/42] Remove buildsym_new_init Tom Tromey
2018-07-08 16:51 ` Simon Marchi
2018-05-23 4:59 ` [RFA 29/42] Move the symbol lists to buildsym_compunit Tom Tromey
2018-07-06 18:35 ` Keith Seitz
2018-07-12 4:45 ` Tom Tromey
2018-07-10 3:38 ` Simon Marchi
2018-07-15 17:44 ` Tom Tromey
2018-05-23 4:59 ` [RFA 17/42] Move the subfile stack " Tom Tromey
2018-07-08 16:59 ` Simon Marchi
2018-05-23 4:59 ` [RFA 02/42] Change buildsym_compunit::comp_dir to be a unique_xmalloc_ptr Tom Tromey
2018-07-07 2:34 ` Simon Marchi
2018-05-23 4:59 ` [RFA 18/42] Make free_pending_blocks static Tom Tromey
2018-07-08 17:04 ` Simon Marchi
2018-05-23 4:59 ` [RFA 06/42] Move have_line_numbers to buildsym_compunit Tom Tromey
2018-07-05 19:01 ` Keith Seitz
2018-07-08 16:05 ` Simon Marchi
2018-07-08 16:26 ` Tom Tromey
2018-05-23 4:59 ` [RFA 23/42] Move pending addrmap globals " Tom Tromey
2018-07-10 1:56 ` Simon Marchi
2018-07-12 4:35 ` Tom Tromey
2018-05-23 4:59 ` [RFA 03/42] Add assert in prepare_for_building Tom Tromey
2018-07-07 14:06 ` Simon Marchi
2018-05-23 4:59 ` [RFA 05/42] Move pending_macros to buildsym_compunit Tom Tromey
2018-07-07 15:41 ` Simon Marchi
2018-07-08 16:35 ` Tom Tromey
2018-05-23 4:59 ` [RFA 26/42] Remove free_pendings Tom Tromey
2018-07-10 2:55 ` Simon Marchi
2018-07-10 3:16 ` Simon Marchi
2018-05-23 6:16 ` [RFA 35/42] Do not use buildsym.h in some files Tom Tromey
2018-07-10 4:10 ` Simon Marchi
2018-05-23 6:16 ` [RFA 36/42] Remove reset_symtab_globals Tom Tromey
2018-07-10 4:11 ` Simon Marchi
2018-05-23 6:16 ` [RFA 42/42] Remove record_line_ftype Tom Tromey
2018-07-10 4:38 ` Simon Marchi
2018-05-23 6:16 ` [RFA 41/42] Remove some unused buildsym functions Tom Tromey
2018-07-10 4:37 ` Simon Marchi
2018-05-23 6:16 ` [RFA 33/42] Remove parameter from record_pending_block Tom Tromey
2018-07-10 3:49 ` Simon Marchi
2018-05-23 6:16 ` [RFA 31/42] Remove a TODO Tom Tromey
2018-07-10 3:42 ` Simon Marchi
2018-05-23 6:16 ` [RFA 37/42] Move struct buildsym_compunit to buildsym.h Tom Tromey
2018-07-10 4:15 ` Simon Marchi
2018-05-23 6:16 ` [RFA 40/42] Convert the DWARF reader to new-style buildysm Tom Tromey
2018-07-06 20:10 ` Keith Seitz
2018-07-10 4:36 ` Simon Marchi
2018-07-15 17:38 ` Tom Tromey
2018-05-23 6:16 ` [RFA 34/42] Add many methods to buildsym_compunit Tom Tromey
2018-07-06 19:16 ` Keith Seitz
2018-07-08 16:39 ` Tom Tromey
2018-07-10 4:08 ` Simon Marchi
2018-07-10 4:12 ` Simon Marchi
2018-07-10 4:08 ` Simon Marchi
2018-07-12 5:18 ` Tom Tromey
2018-05-23 6:16 ` [RFA 11/42] Move processing_gcc to stabsread Tom Tromey
2018-07-08 16:46 ` Simon Marchi
2018-07-08 16:56 ` Tom Tromey
2018-05-23 6:16 ` [RFA 24/42] Move pending_blocks and pending_block_obstack to buildsym_compunit Tom Tromey
2018-07-10 2:05 ` Simon Marchi
2018-07-12 4:39 ` Tom Tromey
2018-07-12 5:03 ` Tom Tromey
2018-05-23 6:16 ` [RFA 32/42] Remove EXTERN from buildsym.h Tom Tromey
2018-07-10 3:44 ` Simon Marchi
2018-05-23 6:16 ` [RFA 39/42] Parameterize cp_scan_for_anonymous_namespaces Tom Tromey
2018-07-06 19:23 ` Keith Seitz
2018-07-08 16:40 ` Tom Tromey
2018-07-10 4:25 ` Simon Marchi
2018-05-23 7:31 ` [RFA 38/42] Introduce legacy-buildsym.h Tom Tromey
2018-07-10 4:22 ` Simon Marchi
2018-07-15 18:43 ` Tom Tromey
2018-07-15 19:46 ` Simon Marchi
2018-07-16 0:22 ` Tom Tromey
2018-05-23 8:49 ` [RFA 30/42] Remove buildsym_init Tom Tromey
2018-07-10 3:41 ` Simon Marchi
2018-06-18 14:46 ` [RFA 00/42] Remove globals from buildsym Tom Tromey
2018-07-05 18:21 ` Keith Seitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180523045851.11660-11-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).