From: Jan Kratochvil <jan.kratochvil@redhat.com>
To: gdb-patches@sourceware.org
Subject: [PATCH v4 09/14] split dwarf2_fetch_cfa_info from dwarf2_compile_expr_to_ax
Date: Sun, 23 Nov 2014 19:28:00 -0000 [thread overview]
Message-ID: <20141123192825.32193.41507.stgit@host1.jankratochvil.net> (raw)
In-Reply-To: <20141123192713.32193.57150.stgit@host1.jankratochvil.net>
From: Tom Tromey <tromey@redhat.com>
This removes dwarf2_compile_expr_to_ax, replacing it with a utility
function that fetches the CFA data and adding the code to actually
compile to an agent expression directly into
dwarf2_compile_expr_to_ax. This refactoring lets a later patch reuse
the new dwarf2_fetch_cfa_info.
2014-10-07 Tom Tromey <tromey@redhat.com>
* dwarf2loc.c (dwarf2_compile_expr_to_ax) <DW_OP_call_frame_cfa>:
Update.
* dwarf2-frame.c (dwarf2_fetch_cfa_info): New function, based on
dwarf2_compile_cfa_to_ax.
(dwarf2_compile_cfa_to_ax): Remove.
* dwarf2-frame.h (dwarf2_fetch_cfa_info): Declare.
(dwarf2_compile_cfa_to_ax): Remove.
---
gdb/ChangeLog | 10 ++++++++++
gdb/dwarf2-frame.c | 40 +++++++++++++++++++---------------------
gdb/dwarf2-frame.h | 31 +++++++++++++++++++++----------
gdb/dwarf2loc.c | 30 ++++++++++++++++++++++++++++--
4 files changed, 78 insertions(+), 33 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fc60169..922d8c9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2014-10-07 Tom Tromey <tromey@redhat.com>
+
+ * dwarf2loc.c (dwarf2_compile_expr_to_ax) <DW_OP_call_frame_cfa>:
+ Update.
+ * dwarf2-frame.c (dwarf2_fetch_cfa_info): New function, based on
+ dwarf2_compile_cfa_to_ax.
+ (dwarf2_compile_cfa_to_ax): Remove.
+ * dwarf2-frame.h (dwarf2_fetch_cfa_info): Declare.
+ (dwarf2_compile_cfa_to_ax): Remove.
+
2014-10-07 Jan Kratochvil <jan.kratochvil@redhat.com>
* infcall.h (call_function_by_hand_dummy): Declare.
diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index 586f134..db21cd4 100644
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -882,11 +882,15 @@ dwarf2_frame_find_quirks (struct dwarf2_frame_state *fs,
}
\f
-void
-dwarf2_compile_cfa_to_ax (struct agent_expr *expr, struct axs_value *loc,
- struct gdbarch *gdbarch,
- CORE_ADDR pc,
- struct dwarf2_per_cu_data *data)
+/* See dwarf2-frame.h. */
+
+int
+dwarf2_fetch_cfa_info (struct gdbarch *gdbarch, CORE_ADDR pc,
+ struct dwarf2_per_cu_data *data,
+ int *regnum_out, LONGEST *offset_out,
+ CORE_ADDR *text_offset_out,
+ const gdb_byte **cfa_start_out,
+ const gdb_byte **cfa_end_out)
{
struct dwarf2_fde *fde;
CORE_ADDR text_offset;
@@ -932,26 +936,20 @@ dwarf2_compile_cfa_to_ax (struct agent_expr *expr, struct axs_value *loc,
if (regnum == -1)
error (_("Unable to access DWARF register number %d"),
(int) fs.regs.cfa_reg); /* FIXME */
- ax_reg (expr, regnum);
- if (fs.regs.cfa_offset != 0)
- {
- if (fs.armcc_cfa_offsets_reversed)
- ax_const_l (expr, -fs.regs.cfa_offset);
- else
- ax_const_l (expr, fs.regs.cfa_offset);
- ax_simple (expr, aop_add);
- }
+ *regnum_out = regnum;
+ if (fs.armcc_cfa_offsets_reversed)
+ *offset_out = -fs.regs.cfa_offset;
+ else
+ *offset_out = fs.regs.cfa_offset;
+ return 1;
}
- break;
case CFA_EXP:
- ax_const_l (expr, text_offset);
- dwarf2_compile_expr_to_ax (expr, loc, gdbarch, addr_size,
- fs.regs.cfa_exp,
- fs.regs.cfa_exp + fs.regs.cfa_exp_len,
- data);
- break;
+ *text_offset_out = text_offset;
+ *cfa_start_out = fs.regs.cfa_exp;
+ *cfa_end_out = fs.regs.cfa_exp + fs.regs.cfa_exp_len;
+ return 0;
default:
internal_error (__FILE__, __LINE__, _("Unknown CFA rule."));
diff --git a/gdb/dwarf2-frame.h b/gdb/dwarf2-frame.h
index 0470cac..5ccf0c8 100644
--- a/gdb/dwarf2-frame.h
+++ b/gdb/dwarf2-frame.h
@@ -120,15 +120,26 @@ extern const struct frame_base *
CORE_ADDR dwarf2_frame_cfa (struct frame_info *this_frame);
-/* Update the agent expression EXPR with code to compute the CFA for a
- frame at PC. GDBARCH is the architecture of the function at PC.
- This function may call dwarf2_compile_expr_to_ax; DATA is passed
- through to that function if needed. */
-
-extern void dwarf2_compile_cfa_to_ax (struct agent_expr *expr,
- struct axs_value *loc,
- struct gdbarch *gdbarch,
- CORE_ADDR pc,
- struct dwarf2_per_cu_data *data);
+/* Find the CFA information for PC.
+
+ Return 1 if a register is used for the CFA, or 0 if another
+ expression is used. Throw an exception on error.
+
+ GDBARCH is the architecture to use.
+ DATA is the per-CU data.
+
+ REGNUM_OUT is an out parameter that is set to the register number.
+ OFFSET_OUT is the offset to use from this register.
+ These are only filled in when 1 is returned.
+
+ TEXT_OFFSET_OUT, CFA_START_OUT, and CFA_END_OUT describe the CFA
+ in other cases. These are only used when 0 is returned. */
+
+extern int dwarf2_fetch_cfa_info (struct gdbarch *gdbarch, CORE_ADDR pc,
+ struct dwarf2_per_cu_data *data,
+ int *regnum_out, LONGEST *offset_out,
+ CORE_ADDR *text_offset_out,
+ const gdb_byte **cfa_start_out,
+ const gdb_byte **cfa_end_out);
#endif /* dwarf2-frame.h */
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 6e461bc..ffae7a5 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -3282,8 +3282,34 @@ dwarf2_compile_expr_to_ax (struct agent_expr *expr, struct axs_value *loc,
break;
case DW_OP_call_frame_cfa:
- dwarf2_compile_cfa_to_ax (expr, loc, arch, expr->scope, per_cu);
- loc->kind = axs_lvalue_memory;
+ {
+ int regnum;
+ CORE_ADDR text_offset;
+ LONGEST off;
+ const gdb_byte *cfa_start, *cfa_end;
+
+ if (dwarf2_fetch_cfa_info (arch, expr->scope, per_cu,
+ ®num, &off,
+ &text_offset, &cfa_start, &cfa_end))
+ {
+ /* Register. */
+ ax_reg (expr, regnum);
+ if (off != 0)
+ {
+ ax_const_l (expr, off);
+ ax_simple (expr, aop_add);
+ }
+ }
+ else
+ {
+ /* Another expression. */
+ ax_const_l (expr, text_offset);
+ dwarf2_compile_expr_to_ax (expr, loc, arch, addr_size,
+ cfa_start, cfa_end, per_cu);
+ }
+
+ loc->kind = axs_lvalue_memory;
+ }
break;
case DW_OP_GNU_push_tls_address:
next prev parent reply other threads:[~2014-11-23 19:28 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-23 19:27 [PATCH v4 00/14] let gdb reuse gcc's C compiler Jan Kratochvil
2014-11-23 19:27 ` [PATCH v4 03/14] add some missing ops to DWARF assembler Jan Kratochvil
2014-11-23 19:27 ` [PATCH v4 02/14] add gcc/gdb interface files Jan Kratochvil
2014-11-23 19:27 ` [PATCH v4 01/14] introduce ui_file_write_for_put Jan Kratochvil
2014-11-23 19:27 ` [PATCH v4 04/14] add make_unqualified_type Jan Kratochvil
2014-11-23 19:28 ` Jan Kratochvil [this message]
2014-11-23 19:28 ` [PATCH v4 06/14] add infcall_mmap and gcc_target_options gdbarch methods Jan Kratochvil
2014-11-23 19:28 ` [PATCH v4 12/14] add linux_infcall_mmap Jan Kratochvil
2014-12-15 12:41 ` Ulrich Weigand
2014-12-15 13:49 ` Yao Qi
2014-12-15 16:48 ` Jan Kratochvil
2014-12-16 5:27 ` Yao Qi
2014-11-23 19:28 ` [PATCH v4 11/14] export dwarf2_reg_to_regnum_or_error Jan Kratochvil
2014-11-23 19:28 ` [PATCH v4 13/14] add s390_gcc_target_options Jan Kratochvil
2014-11-23 19:28 ` [PATCH v4 05/14] add dummy frame destructor Jan Kratochvil
2014-11-23 19:28 ` [PATCH v4 10/14] make dwarf_expr_frame_base_1 public Jan Kratochvil
2014-11-23 19:28 ` [PATCH v4 08/14] introduce call_function_by_hand_dummy Jan Kratochvil
2014-11-23 19:28 ` [PATCH v4 07/14] add gnu_triplet_regexp gdbarch method Jan Kratochvil
2014-11-23 19:29 ` [PATCH v4 14/14] the "compile" command Jan Kratochvil
2014-12-14 6:05 ` Yao Qi
2014-12-14 7:53 ` Jan Kratochvil
2014-12-14 8:54 ` Yao Qi
2014-12-14 18:24 ` [mingw rfc] Add mkdtemp to gdb/gnulib/ [Re: [PATCH v4 14/14] the "compile" command] Jan Kratochvil
2014-12-15 3:16 ` Yao Qi
2014-12-15 12:44 ` Joel Brobecker
2014-12-15 13:11 ` Kai Tietz
2014-12-15 13:24 ` Yao Qi
2014-12-15 17:12 ` Jan Kratochvil
2014-12-15 17:48 ` Eli Zaretskii
2014-12-15 18:14 ` Joel Brobecker
2014-12-15 18:21 ` Jan Kratochvil
2014-12-15 18:35 ` Joel Brobecker
2014-12-15 18:40 ` Jan Kratochvil
2014-12-15 18:57 ` Eli Zaretskii
2014-12-15 22:28 ` [patch] compile: Fix MinGW build [Re: [mingw rfc] Add mkdtemp to gdb/gnulib/] Jan Kratochvil
2014-12-15 22:56 ` Jan Kratochvil
2014-12-16 3:40 ` Eli Zaretskii
2014-12-16 9:04 ` Kai Tietz
2014-12-17 21:02 ` [patch] compile: rm -rf -> ftw()+rmdir()+unlink() [Re: [patch] compile: Fix MinGW build] Jan Kratochvil
2014-12-17 22:07 ` Steve Ellcey
2014-12-17 22:42 ` Pedro Alves
2014-12-18 18:14 ` Jan Kratochvil
2014-12-18 18:24 ` Pedro Alves
2014-12-18 18:41 ` Jan Kratochvil
2014-12-18 19:07 ` Pedro Alves
2014-12-18 21:05 ` Jan Kratochvil
2014-12-18 21:11 ` Eli Zaretskii
2014-12-18 21:24 ` Jan Kratochvil
2014-12-18 22:18 ` Sergio Durigan Junior
2014-12-18 23:06 ` Pedro Alves
2014-12-19 0:12 ` Jan Kratochvil
2014-12-19 10:48 ` Pedro Alves
2014-12-19 8:24 ` Eli Zaretskii
2014-12-19 12:59 ` Joel Brobecker
2014-12-18 20:26 ` Eli Zaretskii
2014-12-18 5:38 ` Yao Qi
2014-12-18 17:23 ` Eli Zaretskii
2014-12-18 17:31 ` Jan Kratochvil
2014-12-18 17:40 ` Eli Zaretskii
2014-12-18 20:15 ` Kai Tietz
2014-12-18 20:47 ` Eli Zaretskii
2014-12-18 20:55 ` Kai Tietz
2014-12-18 23:47 ` Pedro Alves
2014-12-19 9:28 ` Kai Tietz
2014-12-19 19:25 ` Jan Kratochvil
2014-12-19 20:55 ` Jan Kratochvil
2014-12-20 12:26 ` Joel Brobecker
2014-12-18 20:56 ` Sergio Durigan Junior
2014-12-17 17:30 ` [patch] compile: Fix MinGW build [Re: [mingw rfc] Add mkdtemp to gdb/gnulib/] Steve Ellcey
2014-12-16 3:37 ` Eli Zaretskii
2014-12-16 9:06 ` Kai Tietz
2014-12-17 19:18 ` Jan Kratochvil
2014-12-17 19:31 ` Eli Zaretskii
2014-12-17 19:37 ` Jan Kratochvil
2014-12-17 20:34 ` Pedro Alves
2014-12-18 17:22 ` Eli Zaretskii
2014-12-18 18:00 ` Pedro Alves
2014-12-16 12:40 ` Pierre Muller
2014-12-17 18:21 ` Jan Kratochvil
2014-12-17 1:22 ` Yao Qi
2014-12-17 10:57 ` Pedro Alves
2014-12-17 11:40 ` Yao Qi
2014-12-17 11:43 ` Pedro Alves
2014-12-17 11:56 ` Yao Qi
2014-12-17 19:15 ` Jan Kratochvil
2014-12-17 11:16 ` Pedro Alves
2014-12-17 18:17 ` [patchv2] " Jan Kratochvil
2014-12-17 18:33 ` Pedro Alves
2014-12-17 19:12 ` [commit] " Jan Kratochvil
2014-12-05 18:29 ` [patch 15/14] GDB/GCC compile function pointers [Re: [PATCH v4 00/14] let gdb reuse gcc's C compiler] Jan Kratochvil
2014-12-12 21:51 ` obsolete: " Jan Kratochvil
2014-12-12 14:40 ` [PATCH v4 00/14] let gdb reuse gcc's C compiler Pedro Alves
2014-12-12 21:46 ` [commit all 14 parts] " Jan Kratochvil
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=20141123192825.32193.41507.stgit@host1.jankratochvil.net \
--to=jan.kratochvil@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).