From: Jan Kratochvil <jan.kratochvil@redhat.com>
To: gdb-patches@sourceware.org
Subject: [PATCH v3 11/14] export dwarf2_reg_to_regnum_or_error
Date: Sat, 01 Nov 2014 21:47:00 -0000 [thread overview]
Message-ID: <20141101214712.13230.8564.stgit@host1.jankratochvil.net> (raw)
In-Reply-To: <20141101214552.13230.45564.stgit@host1.jankratochvil.net>
This exports a utility function, dwarf2_reg_to_regnum_or_error, that
was previously private to dwarf2loc.c.
2014-10-07 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/ChangeLog b/gdb/ChangeLog
index 187f20c..329e42b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-07 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.
+
2014-10-07 Tom Tromey <tromey@redhat.com>
Jan Kratochvil <jan.kratochvil@redhat.com>
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 35ebd9b..3a0c5ce 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -2704,14 +2704,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)
@@ -2962,14 +2958,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;
@@ -3032,7 +3028,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)
{
@@ -3044,7 +3040,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 082ccfa..76fb45b4 100644
--- a/gdb/dwarf2loc.h
+++ b/gdb/dwarf2loc.h
@@ -222,4 +222,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 */
next prev parent reply other threads:[~2014-11-01 21:47 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-01 21:45 [PATCH v3 00/14] let gdb reuse gcc's C compiler Jan Kratochvil
2014-11-01 21:46 ` [PATCH v3 08/14] introduce call_function_by_hand_dummy Jan Kratochvil
2014-11-01 21:46 ` [PATCH v3 03/14] add some missing ops to DWARF assembler Jan Kratochvil
2014-11-01 21:46 ` [PATCH v3 04/14] add make_unqualified_type Jan Kratochvil
2014-11-01 21:46 ` [PATCH v3 07/14] add gnu_triplet_regexp gdbarch method Jan Kratochvil
2014-11-01 21:46 ` [PATCH v3 02/14] add gcc/gdb interface files Jan Kratochvil
2014-11-03 12:51 ` Yao Qi
2014-11-03 12:56 ` Jan Kratochvil
2014-11-03 13:24 ` Yao Qi
2014-11-01 21:46 ` [PATCH v3 06/14] add infcall_mmap and gcc_target_options gdbarch methods Jan Kratochvil
2014-11-01 21:46 ` [PATCH v3 01/14] introduce ui_file_write_for_put Jan Kratochvil
2014-11-01 21:46 ` [PATCH v3 05/14] add dummy frame destructor Jan Kratochvil
2014-11-01 21:47 ` [PATCH v3 13/14] add s390_gcc_target_options Jan Kratochvil
2014-11-01 21:47 ` [PATCH v3 09/14] split dwarf2_fetch_cfa_info from dwarf2_compile_expr_to_ax Jan Kratochvil
2014-11-01 21:47 ` Jan Kratochvil [this message]
2014-11-01 21:47 ` [PATCH v3 10/14] make dwarf_expr_frame_base_1 public Jan Kratochvil
2014-11-01 21:47 ` [PATCH v3 12/14] add linux_infcall_mmap Jan Kratochvil
2014-11-11 16:43 ` Pedro Alves
2014-11-23 19:11 ` Jan Kratochvil
2014-12-12 14:38 ` Pedro Alves
2014-11-01 21:48 ` [PATCH v3 14/14] the "compile" command Jan Kratochvil
2014-11-02 16:03 ` Eli Zaretskii
2014-11-20 21:24 ` Jan Kratochvil
2014-11-21 7:58 ` Eli Zaretskii
2014-11-21 18:41 ` Jan Kratochvil
2014-11-21 19:47 ` Eli Zaretskii
2014-11-03 13:08 ` Yao Qi
2014-11-14 18:43 ` Jan Kratochvil
2014-11-11 18:53 ` Pedro Alves
2014-11-23 18:36 ` Jan Kratochvil
2014-12-12 14:38 ` Pedro Alves
2014-11-01 21:52 ` [PATCH v3 00/14] let gdb reuse gcc's C compiler Jan Kratochvil
2014-11-01 21:56 ` Jan Kratochvil
2014-11-03 12:47 ` Yao Qi
2014-11-03 12:49 ` 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=20141101214712.13230.8564.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).