From: Tom Tromey <tromey@redhat.com>
To: gdb-patches@sourceware.org
Cc: Jan Kratochvil <jan.kratochvil@redhat.com>
Subject: [PATCH v2 11/14] export dwarf2_reg_to_regnum_or_error
Date: Fri, 20 Jun 2014 15:58:00 -0000 [thread overview]
Message-ID: <1403279874-23781-12-git-send-email-tromey@redhat.com> (raw)
In-Reply-To: <1403279874-23781-1-git-send-email-tromey@redhat.com>
From: Jan Kratochvil <jan.kratochvil@redhat.com>
This exports a utility function, dwarf2_reg_to_regnum_or_error, that
was previously private to dwarf2loc.c.
2014-06-20 Jan Kratochvil <jan.kratochvil@redhat.com>
* dwarf2loc.h (dwarf2_reg_to_regnum_or_error): Declare.
* dwarf2loc.c (dwarf2_reg_to_regnum_or_error): Rename from
translate_register. Now public.
(dwarf2_compile_expr_to_ax): Update.
---
gdb/ChangeLog | 7 +++++++
gdb/dwarf2loc.c | 18 +++++++-----------
gdb/dwarf2loc.h | 8 ++++++++
3 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index db3ee7d..9d7f8c5 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -2733,14 +2733,10 @@ unimplemented (unsigned int op)
op);
}
-/* A helper function to convert a DWARF register to an arch register.
- ARCH is the architecture.
- DWARF_REG is the register.
- This will throw an exception if the DWARF register cannot be
- translated to an architecture register. */
+/* See dwarf2loc.h. */
-static int
-translate_register (struct gdbarch *arch, int dwarf_reg)
+int
+dwarf2_reg_to_regnum_or_error (struct gdbarch *arch, int dwarf_reg)
{
int reg = gdbarch_dwarf2_reg_to_regnum (arch, dwarf_reg);
if (reg == -1)
@@ -2991,14 +2987,14 @@ dwarf2_compile_expr_to_ax (struct agent_expr *expr, struct axs_value *loc,
case DW_OP_reg30:
case DW_OP_reg31:
dwarf_expr_require_composition (op_ptr, op_end, "DW_OP_regx");
- loc->u.reg = translate_register (arch, op - DW_OP_reg0);
+ loc->u.reg = dwarf2_reg_to_regnum_or_error (arch, op - DW_OP_reg0);
loc->kind = axs_lvalue_register;
break;
case DW_OP_regx:
op_ptr = safe_read_uleb128 (op_ptr, op_end, ®);
dwarf_expr_require_composition (op_ptr, op_end, "DW_OP_regx");
- loc->u.reg = translate_register (arch, reg);
+ loc->u.reg = dwarf2_reg_to_regnum_or_error (arch, reg);
loc->kind = axs_lvalue_register;
break;
@@ -3061,7 +3057,7 @@ dwarf2_compile_expr_to_ax (struct agent_expr *expr, struct axs_value *loc,
case DW_OP_breg30:
case DW_OP_breg31:
op_ptr = safe_read_sleb128 (op_ptr, op_end, &offset);
- i = translate_register (arch, op - DW_OP_breg0);
+ i = dwarf2_reg_to_regnum_or_error (arch, op - DW_OP_breg0);
ax_reg (expr, i);
if (offset != 0)
{
@@ -3073,7 +3069,7 @@ dwarf2_compile_expr_to_ax (struct agent_expr *expr, struct axs_value *loc,
{
op_ptr = safe_read_uleb128 (op_ptr, op_end, ®);
op_ptr = safe_read_sleb128 (op_ptr, op_end, &offset);
- i = translate_register (arch, reg);
+ i = dwarf2_reg_to_regnum_or_error (arch, reg);
ax_reg (expr, i);
if (offset != 0)
{
diff --git a/gdb/dwarf2loc.h b/gdb/dwarf2loc.h
index 341f64d..bc7dfb7 100644
--- a/gdb/dwarf2loc.h
+++ b/gdb/dwarf2loc.h
@@ -219,4 +219,12 @@ extern struct call_site_chain *call_site_find_chain (struct gdbarch *gdbarch,
CORE_ADDR caller_pc,
CORE_ADDR callee_pc);
+/* A helper function to convert a DWARF register to an arch register.
+ ARCH is the architecture.
+ DWARF_REG is the register.
+ This will throw an exception if the DWARF register cannot be
+ translated to an architecture register. */
+
+extern int dwarf2_reg_to_regnum_or_error (struct gdbarch *arch, int dwarf_reg);
+
#endif /* dwarf2loc.h */
--
1.9.3
next prev parent reply other threads:[~2014-06-20 15:58 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-20 15:58 [PATCH v2 00/15] let gdb reuse gcc's C compiler Tom Tromey
2014-06-20 15:58 ` [PATCH v2 14/14] the "compile" command Tom Tromey
2014-06-20 19:17 ` Eli Zaretskii
2014-10-08 17:45 ` Jan Kratochvil
2014-10-08 18:42 ` Eli Zaretskii
2014-10-08 19:42 ` Jan Kratochvil
2014-06-20 15:58 ` [PATCH v2 01/14] introduce ui_file_write_for_put Tom Tromey
2014-06-20 15:58 ` [PATCH v2 02/14] add gcc/gdb interface files Tom Tromey
2014-06-20 15:58 ` [PATCH v2 03/14] add some missing ops to DWARF assembler Tom Tromey
2014-06-20 15:58 ` [PATCH v2 09/14] split dwarf2_fetch_cfa_info from dwarf2_compile_expr_to_ax Tom Tromey
2014-06-20 15:58 ` [PATCH v2 04/14] add make_unqualified_type Tom Tromey
2014-06-20 15:58 ` Tom Tromey [this message]
2014-06-20 16:26 ` [PATCH v2 13/14] add s390_gcc_target_options Tom Tromey
2014-06-20 16:32 ` [PATCH v2 07/14] add gnu_triplet_regexp gdbarch method Tom Tromey
2014-06-20 16:32 ` [PATCH v2 05/14] add dummy frame destructor Tom Tromey
2014-06-20 16:32 ` [PATCH v2 12/14] add linux_infcall_mmap Tom Tromey
2014-06-20 16:33 ` [PATCH v2 10/14] make dwarf_expr_frame_base_1 public Tom Tromey
2014-06-20 20:05 ` Doug Evans
2014-06-23 8:18 ` Gary Benson
2014-06-23 14:57 ` Eli Zaretskii
2014-06-24 10:18 ` Gary Benson
2014-06-24 13:04 ` Pedro Alves
2014-10-08 16:57 ` Jan Kratochvil
2014-06-20 16:39 ` [PATCH v2 08/14] introduce call_function_by_hand_dummy Tom Tromey
2014-06-20 16:51 ` [PATCH v2 06/14] add infcall_mmap and gcc_target_options gdbarch methods Tom Tromey
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=1403279874-23781-12-git-send-email-tromey@redhat.com \
--to=tromey@redhat.com \
--cc=gdb-patches@sourceware.org \
--cc=jan.kratochvil@redhat.com \
/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