From: Keith Seitz <keiths@redhat.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 7/8] Move compile_instance to compile.c
Date: Thu, 03 May 2018 18:50:00 -0000 [thread overview]
Message-ID: <20180503184153.31183-8-keiths@redhat.com> (raw)
In-Reply-To: <20180503184153.31183-1-keiths@redhat.com>
This simple patch moves any code related to compile_instance into
compile.c, reserving compile-c-* files strictly for C language support.
gdb/ChangeLog:
* compile/compile-c-symbols.c (compile_instance::insert_symbol_error)
(compile_instance::error_symbol_once): Move to compile.c.
* compile/compile-c-types.c (compile_instance::insert_type): Move
to ...
* compile/compile.c: Here.
---
gdb/compile/compile-c-symbols.c | 30 ---------------------------
gdb/compile/compile-c-types.c | 20 ------------------
gdb/compile/compile.c | 45 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 45 insertions(+), 50 deletions(-)
diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c
index 0b74e4b4cd..61ef5e378e 100644
--- a/gdb/compile/compile-c-symbols.c
+++ b/gdb/compile/compile-c-symbols.c
@@ -31,36 +31,6 @@
#include "gdbtypes.h"
#include "dwarf2loc.h"
-\f
-
-/* See compile-internal.h. */
-
-void
-compile_instance::insert_symbol_error (const struct symbol *sym,
- std::string text)
-{
- symbol_err_map_t::iterator pos = m_symbol_err_map.find (sym);
-
- if (pos == m_symbol_err_map.end ())
- m_symbol_err_map.insert (std::make_pair (sym, text));
-}
-
-/* See compile-internal.h. */
-
-void
-compile_instance::error_symbol_once (const struct symbol *sym)
-{
- symbol_err_map_t::iterator pos = m_symbol_err_map.find (sym);
- if (pos == m_symbol_err_map.end () || pos->second.length () == 0)
- return;
-
- std::string message (pos->second);
- pos->second.clear ();
- ::error (_("%s"), message.c_str ());
-}
-
-\f
-
/* Compute the name of the pointer representing a local symbol's
address. */
diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c
index 1ad6c2a4da..f5f99e4062 100644
--- a/gdb/compile/compile-c-types.c
+++ b/gdb/compile/compile-c-types.c
@@ -24,26 +24,6 @@
#include "compile-c.h"
#include "objfiles.h"
-/* See compile-internal.h. */
-
-void
-compile_instance::insert_type (struct type *type, gcc_type gcc_type)
-{
- type_map_t::iterator pos = m_type_map.find (type);
-
- if (pos != m_type_map.end ())
- {
- /* The type might have already been inserted in order to handle
- recursive types. */
- if (pos->second != gcc_type)
- error (_("Unexpected type id from GCC, check for recent "
- "enough GCC."));
- }
- else
- m_type_map.insert (std::make_pair (type, gcc_type));
-
-}
-
/* Convert a pointer type to its gcc representation. */
static gcc_type
diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c
index c965f575fd..3d8a93907d 100644
--- a/gdb/compile/compile.c
+++ b/gdb/compile/compile.c
@@ -661,6 +661,51 @@ compile_register_name_demangle (struct gdbarch *gdbarch,
error (_("Cannot find gdbarch register \"%s\"."), regname);
}
+/* See compile-internal.h. */
+
+void
+compile_instance::insert_type (struct type *type, gcc_type gcc_type)
+{
+ type_map_t::iterator pos = m_type_map.find (type);
+
+ if (pos != m_type_map.end ())
+ {
+ /* The type might have already been inserted in order to handle
+ recursive types. */
+ if (pos->second != gcc_type)
+ error (_("Unexpected type id from GCC, check for recent "
+ "enough GCC."));
+ }
+ else
+ m_type_map.insert (std::make_pair (type, gcc_type));
+}
+
+/* See compile-internal.h. */
+
+void
+compile_instance::insert_symbol_error (const struct symbol *sym,
+ std::string text)
+{
+ symbol_err_map_t::iterator pos = m_symbol_err_map.find (sym);
+
+ if (pos == m_symbol_err_map.end ())
+ m_symbol_err_map.insert (std::make_pair (sym, text));
+}
+
+/* See compile-internal.h. */
+
+void
+compile_instance::error_symbol_once (const struct symbol *sym)
+{
+ symbol_err_map_t::iterator pos = m_symbol_err_map.find (sym);
+ if (pos == m_symbol_err_map.end () || pos->second.length () == 0)
+ return;
+
+ std::string message (pos->second);
+ pos->second.clear ();
+ ::error (_("%s"), message.c_str ());
+}
+
/* Forwards to the plug-in. */
#define FORWARD(OP,...) (m_gcc_fe->ops->OP (m_gcc_fe, ##__VA_ARGS__))
--
2.13.6
next prev parent reply other threads:[~2018-05-03 18:50 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-03 18:42 [PATCH 0/8] Convert C compile to C++ Keith Seitz
2018-05-03 18:41 ` [PATCH 2/8] Rename symbol_substitution_name Keith Seitz
2018-05-03 18:42 ` [PATCH 3/8] Move C-related declarations to compile-c.h Keith Seitz
2018-06-06 14:34 ` Pedro Alves
2018-05-03 18:42 ` [PATCH 1/8] Return unique_xmalloc_ptr for generate_c_for_variable_locations Keith Seitz
2018-05-03 18:49 ` [PATCH 6/8] Use std::unordered_map instead of htab_t Keith Seitz
2018-06-06 14:35 ` Pedro Alves
2018-07-10 17:05 ` Keith Seitz
2018-07-11 11:21 ` Pedro Alves
2018-08-07 14:57 ` Keith Seitz
2018-08-08 12:29 ` Pedro Alves
2018-08-10 18:18 ` Keith Seitz
2018-05-03 18:49 ` [PATCH 4/8] Add a C++ wrapper for GCC C plug-in Keith Seitz
2018-06-06 14:34 ` Pedro Alves
2018-07-10 16:58 ` Keith Seitz
2018-05-03 18:50 ` [PATCH 8/8] Use policies for code generation Keith Seitz
2018-05-03 18:50 ` Keith Seitz [this message]
2018-05-03 18:51 ` [PATCH 5/8] Change compile_instance/compile_c_instance into classes Keith Seitz
2018-06-06 14:38 ` [PATCH 0/8] Convert C compile to C++ Pedro Alves
2018-07-10 17:07 ` Keith Seitz
2018-07-11 11:31 ` Pedro Alves
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=20180503184153.31183-8-keiths@redhat.com \
--to=keiths@redhat.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).