From patchwork Fri Feb 19 20:05:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tremblay X-Patchwork-Id: 10943 Received: (qmail 69794 invoked by alias); 19 Feb 2016 20:06:24 -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 69755 invoked by uid 89); 19 Feb 2016 20:06:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.5 required=5.0 tests=BAYES_05, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 spammy=neon, Neon, 878, mfpu X-HELO: usplmg20.ericsson.net Received: from usplmg20.ericsson.net (HELO usplmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 19 Feb 2016 20:06:17 +0000 Received: from EUSAAHC001.ericsson.se (Unknown_Domain [147.117.188.75]) by usplmg20.ericsson.net (Symantec Mail Security) with SMTP id 6B.90.12433.6C177C65; Fri, 19 Feb 2016 20:49:27 +0100 (CET) Received: from elxa4wqvvz1.dyn.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.75) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 19 Feb 2016 15:06:14 -0500 From: Antoine Tremblay To: , CC: Antoine Tremblay Subject: [PATCH v4] Enable tracing of pseudo-registers on ARM Date: Fri, 19 Feb 2016 15:05:39 -0500 Message-ID: <1455912339-32444-1-git-send-email-antoine.tremblay@ericsson.com> In-Reply-To: <1455910116-13237-1-git-send-email-antoine.tremblay@ericsson.com> References: <1455910116-13237-1-git-send-email-antoine.tremblay@ericsson.com> MIME-Version: 1.0 X-IsSubscribed: yes In this v4: * Use patch -M to reflect the test file rename - This patch implements the ax_pseudo_register_push_stack and ax_pseudo_register_collect gdbarch functions so that a pseudo-register can be traced. No regressions, tested on ubuntu 14.04 ARMv7 and x86. With gdbserver-{native,extended} / { -marm -mthumb } gdb/ChangeLog: * arm-tdep.c (arm_pseudo_register_to_register): New function. (arm_ax_pseudo_register_collect): New function. (arm_ax_pseudo_register_push_stack): New function. (arm_gdbarch_init): Set gdbarch_ax_pseudo_register_{collect,push_stack} functions. gdb/testsuite/ChangeLog: * gdb.trace/tfile-avx.c: Move to... * gdb.trace/tracefile-pseudo-reg.c: Here. * gdb.trace/tfile-avx.exp: Move to... * gdb.trace/tracefile-pseudo-reg.exp: Here. --- gdb/arm-tdep.c | 71 ++++++++++++++++++++++ .../{tfile-avx.c => tracefile-pseudo-reg.c} | 12 ++++ .../{tfile-avx.exp => tracefile-pseudo-reg.exp} | 35 ++++++++--- 3 files changed, 111 insertions(+), 7 deletions(-) rename gdb/testsuite/gdb.trace/{tfile-avx.c => tracefile-pseudo-reg.c} (80%) rename gdb/testsuite/gdb.trace/{tfile-avx.exp => tracefile-pseudo-reg.exp} (65%) diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index ccfefa8..1728de1 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -8718,6 +8718,73 @@ arm_pseudo_write (struct gdbarch *gdbarch, struct regcache *regcache, } } +/* Map the pseudo register number REG to the proper register number. */ + +static int +arm_pseudo_register_to_register (struct gdbarch *gdbarch, int reg) +{ + int double_regnum = 0; + int num_regs = gdbarch_num_regs (gdbarch); + char name_buf[4]; + + /* Single precision pseudo registers. s0-s31. */ + if (reg >= num_regs && reg < num_regs + 32) + { + xsnprintf (name_buf, sizeof (name_buf), "d%d", (reg - num_regs) / 2); + double_regnum = user_reg_map_name_to_regnum (gdbarch, name_buf, + strlen (name_buf)); + } + /* Quadruple precision pseudo regisers. q0-q15. */ + else if (reg >= num_regs + 32 && reg < num_regs + 32 + 16) + { + xsnprintf (name_buf, sizeof (name_buf), "d%d", (reg - num_regs - 32) * 2); + double_regnum = user_reg_map_name_to_regnum (gdbarch, name_buf, + strlen (name_buf)); + } + /* Error bad register number. */ + else + return -1; + + /* Get the remote/tdesc register number. */ + double_regnum = gdbarch_remote_register_number (gdbarch, double_regnum); + + return double_regnum; +} + +/* Implementation of the ax_pseudo_register_collect gdbarch function. */ + +static int +arm_ax_pseudo_register_collect (struct gdbarch *gdbarch, + struct agent_expr *ax, int reg) +{ + int rawnum = arm_pseudo_register_to_register (gdbarch, reg); + + /* Error. */ + if (rawnum < 0) + return 1; + + ax_reg_mask (ax, rawnum); + + return 0; +} + +/* Implementation of the ax_pseudo_register_push_stack gdbarch function. */ + +static int +arm_ax_pseudo_register_push_stack (struct gdbarch *gdbarch, + struct agent_expr *ax, int reg) +{ + int rawnum = arm_pseudo_register_to_register (gdbarch, reg); + + /* Error. */ + if (rawnum < 0) + return 1; + + ax_reg (ax, rawnum); + + return 0; +} + static struct value * value_of_arm_user_reg (struct frame_info *frame, const void *baton) { @@ -9379,6 +9446,10 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_num_pseudo_regs (gdbarch, num_pseudos); set_gdbarch_pseudo_register_read (gdbarch, arm_pseudo_read); set_gdbarch_pseudo_register_write (gdbarch, arm_pseudo_write); + set_gdbarch_ax_pseudo_register_push_stack + (gdbarch, arm_ax_pseudo_register_push_stack); + set_gdbarch_ax_pseudo_register_collect + (gdbarch, arm_ax_pseudo_register_collect); } if (tdesc_data) diff --git a/gdb/testsuite/gdb.trace/tfile-avx.c b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.c similarity index 80% rename from gdb/testsuite/gdb.trace/tfile-avx.c rename to gdb/testsuite/gdb.trace/tracefile-pseudo-reg.c index 3cc3ec0..473d805 100644 --- a/gdb/testsuite/gdb.trace/tfile-avx.c +++ b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.c @@ -20,7 +20,11 @@ * registers on x86_64. */ +#if (defined __x86_64__) #include +#elif (defined __arm__ || defined __thumb2__ || defined __thumb__) +#include +#endif void dummy (void) @@ -37,6 +41,7 @@ main (void) { /* Strictly speaking, it should be ymm15 (xmm15 is 128-bit), but gcc older than 4.9 doesn't recognize "ymm15" as a valid register name. */ +#if (defined __x86_64__) register __v8si a asm("xmm15") = { 0x12340001, 0x12340002, @@ -48,6 +53,13 @@ main (void) 0x12340008, }; asm volatile ("traceme: call dummy" : : "x" (a)); +#elif (defined __arm__ || defined __thumb2__ || defined __thumb__) + register uint32_t a asm("s5") = { + 0x2 + }; + asm volatile ("traceme: bl dummy" : : "x" (a)); +#endif + end (); return 0; } diff --git a/gdb/testsuite/gdb.trace/tfile-avx.exp b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp similarity index 65% rename from gdb/testsuite/gdb.trace/tfile-avx.exp rename to gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp index 4c52c64..12a2740 100644 --- a/gdb/testsuite/gdb.trace/tfile-avx.exp +++ b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp @@ -12,8 +12,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { ! [is_amd64_regs_target] } { - verbose "Skipping tfile AVX test (target is not x86_64)." +if { ! [is_amd64_regs_target] && ! [istarget "arm*-*-*"] } { + verbose "Skipping tracefile pseudo register tests, target is not supported." return } @@ -21,8 +21,14 @@ load_lib "trace-support.exp" standard_testfile +if { [is_amd64_regs_target] } { + set add_flags "-mavx" +} elseif { [istarget "arm*-*-*"] } { + set add_flags "-mfpu=neon" +} + if {[prepare_for_testing $testfile.exp $testfile $srcfile \ - [list debug additional_flags=-mavx]]} { + [list debug additional_flags=$add_flags]]} { return -1 } @@ -36,20 +42,31 @@ if ![gdb_target_supports_trace] { return -1 } -gdb_test_multiple "print \$ymm15" "check for AVX support" { +if { [is_amd64_regs_target] } { + set reg "\$ymm15" + set reg_message "check for AVX support" +} elseif { [istarget "arm*-*-*"] } { + set reg "\$s5" + set reg_message "check for Neon support" +} + +gdb_test_multiple "print $reg" $reg_message { -re " = void.*$gdb_prompt $" { - verbose "Skipping tfile AVX test (target doesn't support AVX)." + verbose "Skipping tracefile pseudo register tests, target is not supported." return } -re " = \\{.*}.*$gdb_prompt $" { # All is well. } + -re " = 0.*$gdb_prompt $" { + # All is well. + } } gdb_test "trace traceme" ".*" gdb_trace_setactions "set actions for tracepoint" "" \ - "collect \$ymm15" "^$" + "collect $reg" "^$" gdb_breakpoint "end" @@ -70,4 +87,8 @@ gdb_test "target tfile ${tracefile}.tf" "" "change to tfile target" \ gdb_test "tfind 0" "Found trace frame 0, tracepoint .*" -gdb_test "print/x \$ymm15.v8_int32" " = \\{0x12340001, .*, 0x12340008}" +if { [is_amd64_regs_target] } { + gdb_test "print/x \$ymm15.v8_int32" " = \\{0x12340001, .*, 0x12340008}" +} elseif { [istarget "arm*-*-*"] } { + gdb_test "print \$s5" "2.80259693e-45" +}