From patchwork Mon Feb 22 07:38:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marcin_Ko=C5=9Bcielnicki?= X-Patchwork-Id: 10979 Received: (qmail 26896 invoked by alias); 22 Feb 2016 07:38:34 -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 26881 invoked by uid 89); 22 Feb 2016 07:38:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=factor, 4814, 9111, Wire X-HELO: xyzzy.0x04.net Received: from xyzzy.0x04.net (HELO xyzzy.0x04.net) (109.74.193.254) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 22 Feb 2016 07:38:32 +0000 Received: from hogfather.0x04.net (89-65-66-135.dynamic.chello.pl [89.65.66.135]) by xyzzy.0x04.net (Postfix) with ESMTPS id 2EC793FE60 for ; Mon, 22 Feb 2016 08:39:23 +0100 (CET) Received: by hogfather.0x04.net (Postfix, from userid 1000) id 9E482580108; Mon, 22 Feb 2016 08:38:29 +0100 (CET) From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= To: gdb-patches@sourceware.org Cc: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= Subject: [PATCH] gdbserver/s390: Switch on tracepoint support. Date: Mon, 22 Feb 2016 08:38:28 +0100 Message-Id: <1456126708-23285-1-git-send-email-koriakin@0x04.net> In-Reply-To: <1454853861-18581-1-git-send-email-koriakin@0x04.net> References: <1454853861-18581-1-git-send-email-koriakin@0x04.net> MIME-Version: 1.0 X-IsSubscribed: yes Also adds s390 support to gdb.trace testsuite. gdb/gdbserver/ChangeLog: * linux-s390-low.c (s390_supports_tracepoints): New function. (struct linux_target_ops): Fill supports_tracepoints hook. gdb/testsuite/ChangeLog: * gdb.trace/mi-trace-frame-collected.exp: Expect 4 registers on s390. * gdb.trace/trace-common.h: Add s390 fast tracepoint placeholder. --- Updated. This version depends on https://sourceware.org/ml/gdb-patches/2016-02/msg00627.html . gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/linux-s390-low.c | 10 +++++++++- gdb/testsuite/ChangeLog | 10 +++++----- gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp | 16 +++++++++++++--- gdb/testsuite/gdb.trace/trace-common.h | 8 ++++++++ 5 files changed, 40 insertions(+), 9 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 326c769..6132bbf 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,10 @@ 2016-02-17 Marcin KoÅ›cielnicki + * linux-s390-low.c (s390_supports_tracepoints): New function. + (struct linux_target_ops): Fill supports_tracepoints hook. + +2016-02-07 Marcin KoÅ›cielnicki + * linux-s390-low.c (s390_supports_z_point_type): New function. (struct linux_target_ops): Wire s390_supports_z_point_type in. diff --git a/gdb/gdbserver/linux-s390-low.c b/gdb/gdbserver/linux-s390-low.c index 533e384..c85c331 100644 --- a/gdb/gdbserver/linux-s390-low.c +++ b/gdb/gdbserver/linux-s390-low.c @@ -690,6 +690,14 @@ s390_regs_info (void) return ®s_info; } +/* The "supports_tracepoints" linux_target_ops method. */ + +static int +s390_supports_tracepoints (void) +{ + return 1; +} + struct linux_target_ops the_low_target = { s390_arch_setup, s390_regs_info, @@ -716,7 +724,7 @@ struct linux_target_ops the_low_target = { NULL, /* new_fork */ NULL, /* prepare_to_resume */ NULL, /* process_qsupported */ - NULL, /* supports_tracepoints */ + s390_supports_tracepoints, NULL, /* get_thread_area */ NULL, /* install_fast_tracepoint_jump_pad */ NULL, /* emit_ops */ diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8d695ec..27b2548 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-02-22 Marcin KoÅ›cielnicki + + * gdb.trace/mi-trace-frame-collected.exp: Expect 4 registers on s390. + * gdb.trace/trace-common.h: Add s390 fast tracepoint placeholder. + 2016-02-19 Marcin KoÅ›cielnicki * gdb.trace/ftrace.exp: Remove unnecessary target check. @@ -312,11 +317,6 @@ (foreach_with_prefix): Likewise. * lib/gdb.exp (foreach_with_prefix): New procedure. -2016-01-25 Marcin KoÅ›cielnicki - - * gdb.trace/backtrace.exp: Bump stack collection fudge factor. - * gdb.trace/entry-values.exp: Bump stack collection fudge factor. - 2016-01-23 Marcin KoÅ›cielnicki * gdb.trace/unavailable-dwarf-piece.exp: Fix bitfield handling on big diff --git a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp index 0daaa25..1f0baaa 100644 --- a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp +++ b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp @@ -91,11 +91,21 @@ proc test_trace_frame_collected { data_source } { ".*\\^done,found=\"1\",tracepoint=\"${decimal}\",traceframe=\"0\",frame=\{.*" \ "-trace-find frame-number 0" + set reg_pattern "\{number=\"$decimal\",value=\"$hex\"\}" + # Test MI command '-trace-frame-collected' dumps only # collected registers. - mi_gdb_test "-trace-frame-collected" \ - "\\^done,explicit-variables=\\\[\{name=\"gdb_char_test\",value=\".*\"\}\\\],computed-expressions=\\\[\\\],registers=\\\[\{number=\"$decimal\",value=\"$hex\"\}\\\],tvars=\\\[\\\],memory=\\\[\{address=\"$hex\",length=\"1\"\}\\\]"\ - "-trace-frame-collected (register)" + if { [istarget "s390*-*-*"] } { + # Only PC is collected, but on s390 PC is a pseudo-register - + # collecting it also collects the underlying PSWA register. + mi_gdb_test "-trace-frame-collected" \ + "\\^done,explicit-variables=\\\[\{name=\"gdb_char_test\",value=\".*\"\}\\\],computed-expressions=\\\[\\\],registers=\\\[$reg_pattern,$reg_pattern,$reg_pattern,$reg_pattern\\\],tvars=\\\[\\\],memory=\\\[\{address=\"$hex\",length=\"1\"\}\\\]"\ + "-trace-frame-collected (register)" + } else { + mi_gdb_test "-trace-frame-collected" \ + "\\^done,explicit-variables=\\\[\{name=\"gdb_char_test\",value=\".*\"\}\\\],computed-expressions=\\\[\\\],registers=\\\[$reg_pattern\\\],tvars=\\\[\\\],memory=\\\[\{address=\"$hex\",length=\"1\"\}\\\]"\ + "-trace-frame-collected (register)" + } mi_gdb_test "-trace-find frame-number 1" \ ".*\\^done,found=\"1\",tracepoint=\"${decimal}\",traceframe=\"1\",frame=\{.*" \ diff --git a/gdb/testsuite/gdb.trace/trace-common.h b/gdb/testsuite/gdb.trace/trace-common.h index eceb182..a330024 100644 --- a/gdb/testsuite/gdb.trace/trace-common.h +++ b/gdb/testsuite/gdb.trace/trace-common.h @@ -48,6 +48,14 @@ x86_trace_dummy () " nop\n" \ ) +#elif (defined __s390__) + +#define FAST_TRACEPOINT_LABEL(name) \ + asm (" .global " SYMBOL(name) "\n" \ + SYMBOL(name) ":\n" \ + " mvc 0(8, %r15), 0(%r15)\n" \ + ) + #else #error "unsupported architecture for trace tests"