From patchwork Sat Nov 1 21:47:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 3550 Received: (qmail 30958 invoked by alias); 1 Nov 2014 21:47:17 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 30895 invoked by uid 89); 1 Nov 2014 21:47:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.3 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sat, 01 Nov 2014 21:47:15 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sA1LlEYr019378 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Sat, 1 Nov 2014 17:47:14 -0400 Received: from host1.jankratochvil.net (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sA1LlCdq026277 for ; Sat, 1 Nov 2014 17:47:13 -0400 Subject: [PATCH v3 11/14] export dwarf2_reg_to_regnum_or_error From: Jan Kratochvil To: gdb-patches@sourceware.org Date: Sat, 01 Nov 2014 22:47:12 +0100 Message-ID: <20141101214712.13230.8564.stgit@host1.jankratochvil.net> In-Reply-To: <20141101214552.13230.45564.stgit@host1.jankratochvil.net> References: <20141101214552.13230.45564.stgit@host1.jankratochvil.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-IsSubscribed: yes This exports a utility function, dwarf2_reg_to_regnum_or_error, that was previously private to dwarf2loc.c. 2014-10-07 Jan Kratochvil * 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 + + * 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 Jan Kratochvil 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 */