From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA 2/2] Make some dwarf_expr_context methods pure virtual
Date: Thu, 20 Oct 2016 21:51:00 -0000 [thread overview]
Message-ID: <1477000280-14921-3-git-send-email-tom@tromey.com> (raw)
In-Reply-To: <1477000280-14921-1-git-send-email-tom@tromey.com>
This patch changes some dwarf_expr_context to be pure virtual, as
mentioned during the discussion of an earlier patch in this series.
2016-10-20 Tom Tromey <tom@tromey.com>
* dwarf2expr.h (class dwarf_expr_context)
<get_frame_base, get_frame_cfa, get_tls_address, dwarf_call,
push_dwarf_block_entry_value, get_addr_index, get_object_address>:
Now pure virtual.
* dwarf2-frame.c (class dwarf_expr_executor)
<get_frame_base, get_frame_cfa, get_tls_address, dwarf_call,
push_dwarf_block_entry_value, get_addr_index, get_object_address>:
New methods.
<invalid>: New method.
---
gdb/ChangeLog | 12 ++++++++++++
gdb/dwarf2-frame.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
gdb/dwarf2expr.h | 38 +++++++-------------------------------
3 files changed, 63 insertions(+), 31 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 35df7f0..ad7da6b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,17 @@
2016-10-20 Tom Tromey <tom@tromey.com>
+ * dwarf2expr.h (class dwarf_expr_context)
+ <get_frame_base, get_frame_cfa, get_tls_address, dwarf_call,
+ push_dwarf_block_entry_value, get_addr_index, get_object_address>:
+ Now pure virtual.
+ * dwarf2-frame.c (class dwarf_expr_executor)
+ <get_frame_base, get_frame_cfa, get_tls_address, dwarf_call,
+ push_dwarf_block_entry_value, get_addr_index, get_object_address>:
+ New methods.
+ <invalid>: New method.
+
+2016-10-20 Tom Tromey <tom@tromey.com>
+
* minsyms.h (minimal_symbol_reader::record_full): "copy_name" now
a bool.
(record, record_with_info): Update.
diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index c9962e1..beab304 100644
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -351,6 +351,50 @@ class dwarf_expr_executor : public dwarf_expr_context
{
read_memory (addr, buf, len);
}
+
+ void get_frame_base (const gdb_byte **start, size_t *length) OVERRIDE
+ {
+ invalid ("DW_OP_fbreg");
+ }
+
+ void push_dwarf_reg_entry_value (enum call_site_parameter_kind kind,
+ union call_site_parameter_u kind_u,
+ int deref_size) OVERRIDE
+ {
+ invalid ("DW_OP_GNU_entry_value");
+ }
+
+ CORE_ADDR get_object_address () OVERRIDE
+ {
+ invalid ("DW_OP_push_object_address");
+ }
+
+ CORE_ADDR get_frame_cfa () OVERRIDE
+ {
+ invalid ("DW_OP_call_frame_cfa");
+ }
+
+ CORE_ADDR get_tls_address (CORE_ADDR offset) OVERRIDE
+ {
+ invalid ("DW_OP_form_tls_address");
+ }
+
+ void dwarf_call (cu_offset die_offset) OVERRIDE
+ {
+ invalid ("DW_OP_call*");
+ }
+
+ CORE_ADDR get_addr_index (unsigned int index)
+ {
+ invalid ("DW_OP_GNU_addr_index");
+ }
+
+ private:
+
+ void invalid (const char *op) ATTRIBUTE_NORETURN
+ {
+ error (_("%s is invalid in this context"), op);
+ }
};
static CORE_ADDR
diff --git a/gdb/dwarf2expr.h b/gdb/dwarf2expr.h
index 63bdc6e..7bf194a 100644
--- a/gdb/dwarf2expr.h
+++ b/gdb/dwarf2expr.h
@@ -156,16 +156,10 @@ struct dwarf_expr_context
/* Return the location expression for the frame base attribute, in
START and LENGTH. The result must be live until the current
expression evaluation is complete. */
- virtual void get_frame_base (const gdb_byte **start, size_t *length)
- {
- error (_("%s is invalid in this context"), "DW_OP_fbreg");
- }
+ virtual void get_frame_base (const gdb_byte **start, size_t *length) = 0;
/* Return the CFA for the frame. */
- virtual CORE_ADDR get_frame_cfa ()
- {
- error (_("%s is invalid in this context"), "DW_OP_call_frame_cfa");
- }
+ virtual CORE_ADDR get_frame_cfa () = 0;
/* Return the PC for the frame. */
virtual CORE_ADDR get_frame_pc ()
@@ -175,19 +169,13 @@ struct dwarf_expr_context
/* Return the thread-local storage address for
DW_OP_GNU_push_tls_address or DW_OP_form_tls_address. */
- virtual CORE_ADDR get_tls_address (CORE_ADDR offset)
- {
- error (_("%s is invalid in this context"), "DW_OP_form_tls_address");
- }
+ virtual CORE_ADDR get_tls_address (CORE_ADDR offset) = 0;
/* Execute DW_AT_location expression for the DWARF expression
subroutine in the DIE at DIE_OFFSET in the CU. Do not touch
STACK while it being passed to and returned from the called DWARF
subroutine. */
- virtual void dwarf_call (cu_offset die_offset)
- {
- error (_("%s is invalid in this context"), "DW_OP_call*");
- }
+ virtual void dwarf_call (cu_offset die_offset) = 0;
/* Return the base type given by the indicated DIE. This can throw
an exception if the DIE is invalid or does not represent a base
@@ -206,26 +194,14 @@ struct dwarf_expr_context
DW_AT_GNU_call_site_value. */
virtual void push_dwarf_reg_entry_value (enum call_site_parameter_kind kind,
union call_site_parameter_u kind_u,
- int deref_size)
- {
- internal_error (__FILE__, __LINE__,
- _("Support for DW_OP_GNU_entry_value is unimplemented"));
- }
+ int deref_size) = 0;
/* Return the address indexed by DW_OP_GNU_addr_index.
This can throw an exception if the index is out of range. */
- virtual CORE_ADDR get_addr_index (unsigned int index)
- {
- error (_("%s is invalid in this context"), "DW_OP_GNU_addr_index");
- }
+ virtual CORE_ADDR get_addr_index (unsigned int index) = 0;
/* Return the `object address' for DW_OP_push_object_address. */
- virtual CORE_ADDR get_object_address ()
- {
- internal_error (__FILE__, __LINE__,
- _("Support for DW_OP_push_object_address "
- "is unimplemented"));
- }
+ virtual CORE_ADDR get_object_address () = 0;
private:
--
2.7.4
next prev parent reply other threads:[~2016-10-20 21:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-20 21:51 [RFA 0/2] c++ patch follow-ups Tom Tromey
2016-10-20 21:51 ` Tom Tromey [this message]
2016-10-20 22:21 ` [RFA 2/2] Make some dwarf_expr_context methods pure virtual Pedro Alves
2016-10-24 12:28 ` Ulrich Weigand
2016-10-24 13:36 ` Tom Tromey
2016-10-25 13:22 ` Pedro Alves
2016-10-25 13:29 ` Ulrich Weigand
2016-10-25 13:59 ` [pushed] Make dwarf_expr_context's destructor virtual (Re: [RFA 2/2] Make some dwarf_expr_context methods pure virtual) Pedro Alves
2016-10-25 13:47 ` [RFA 2/2] Make some dwarf_expr_context methods pure virtual Tom Tromey
2016-10-25 14:05 ` Pedro Alves
2016-10-25 16:25 ` Trevor Saunders
2016-10-25 16:57 ` Pedro Alves
2016-10-20 21:51 ` [RFA 1/2] Change minimal_symbol_reader::record_full to take a bool Tom Tromey
2016-10-20 22:14 ` 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=1477000280-14921-3-git-send-email-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