From patchwork Thu Feb 18 16:36:34 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: 10893 Received: (qmail 27951 invoked by alias); 18 Feb 2016 16:36:40 -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 27941 invoked by uid 89); 18 Feb 2016 16:36:39 -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=sk:mi-trac, sk:mitrac, fills, unfortunate 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; Thu, 18 Feb 2016 16:36:38 +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 546363FE37; Thu, 18 Feb 2016 17:37:28 +0100 (CET) Received: by hogfather.0x04.net (Postfix, from userid 1000) id D0DBD58008B; Thu, 18 Feb 2016 17:36:35 +0100 (CET) From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= To: uweigand@de.ibm.com Cc: arnez@linux.vnet.ibm.com, gdb-patches@sourceware.org, =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= Subject: [PATCH] gdb/s390: Fill guess_tracepoint_registers hook. Date: Thu, 18 Feb 2016 17:36:34 +0100 Message-Id: <1455813394-1430-1-git-send-email-koriakin@0x04.net> In-Reply-To: <20160218160333.427426B9A@oc7340732750.ibm.com> References: <20160218160333.427426B9A@oc7340732750.ibm.com> MIME-Version: 1.0 X-IsSubscribed: yes gdb/ChangeLog: * s390-linux-tdep.c (s390_guess_tracepoint_registers): New function. (s390_gdbarch_init): Fill guess_tracepoint_registers hook. --- This version fills PSWM too. This causes two failures in tests when combined with the later patches: - gdb.trace/mi-trace-frame-collected.exp: will have to be changed to expect $pswa and $cc to be available. - gdb.trace/unavailable.exp: likewise. An unfortunate side effect is that $cc is now considered available (which unavailable.exp rightly complains about). There isn't a way to mark individual bitfields as unavailable, is there? gdb/ChangeLog | 5 +++++ gdb/s390-linux-tdep.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c8832c9..2b6050d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-02-18 Marcin Kościelnicki + * s390-linux-tdep.c (s390_guess_tracepoint_registers): New function. + (s390_gdbarch_init): Fill guess_tracepoint_registers hook. + +2016-02-18 Marcin Kościelnicki + * arch-utils.c (default_guess_tracepoint_registers): New function. * arch-utils.h (default_guess_tracepoint_registers): New prototype. * gdbarch.c: Regenerate. diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c index e827684..57e25b4 100644 --- a/gdb/s390-linux-tdep.c +++ b/gdb/s390-linux-tdep.c @@ -167,6 +167,40 @@ s390_write_pc (struct regcache *regcache, CORE_ADDR pc) regcache_cooked_write_unsigned (regcache, S390_SYSTEM_CALL_REGNUM, 0); } +/* The "guess_tracepoint_registers" gdbarch method. */ + +static void +s390_guess_tracepoint_registers (struct gdbarch *gdbarch, + struct regcache *regcache, + CORE_ADDR addr) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + int sz = register_size (gdbarch, S390_PSWA_REGNUM); + gdb_byte *reg = (gdb_byte *) alloca (sz); + ULONGEST pswm, pswa; + + /* Set PSWA from the location and a default PSWM (the only part we're + unlikely to get right is the CC). */ + if (tdep->abi == ABI_LINUX_S390) + { + /* 31-bit PSWA needs high bit set (it's very unlikely the target + was in 24-bit mode). */ + pswa = addr | 0x80000000UL; + pswm = 0x070d0000UL; + } + else + { + pswa = addr; + pswm = 0x0705000180000000ULL; + } + + store_unsigned_integer (reg, sz, gdbarch_byte_order (gdbarch), pswa); + regcache_raw_supply (regcache, S390_PSWA_REGNUM, reg); + + store_unsigned_integer (reg, sz, gdbarch_byte_order (gdbarch), pswm); + regcache_raw_supply (regcache, S390_PSWM_REGNUM, reg); +} + /* DWARF Register Mapping. */ @@ -7857,6 +7891,7 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) s390_iterate_over_regset_sections); set_gdbarch_cannot_store_register (gdbarch, s390_cannot_store_register); set_gdbarch_write_pc (gdbarch, s390_write_pc); + set_gdbarch_guess_tracepoint_registers (gdbarch, s390_guess_tracepoint_registers); set_gdbarch_pseudo_register_read (gdbarch, s390_pseudo_register_read); set_gdbarch_pseudo_register_write (gdbarch, s390_pseudo_register_write); set_tdesc_pseudo_register_name (gdbarch, s390_pseudo_register_name);