From patchwork Sun Feb 7 14:00:52 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: 10752 Received: (qmail 64275 invoked by alias); 7 Feb 2016 14:00:59 -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 64252 invoked by uid 89); 7 Feb 2016 14:00:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=2016-02-07, HContent-Transfer-Encoding:8bit 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; Sun, 07 Feb 2016 14:00:56 +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 8D3543FE0F; Sun, 7 Feb 2016 15:01:43 +0100 (CET) Received: by hogfather.0x04.net (Postfix, from userid 1000) id BA17F58008E; Sun, 7 Feb 2016 15:00:54 +0100 (CET) From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= To: arnez@linux.vnet.ibm.com Cc: gdb-patches@sourceware.org, =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= Subject: [PATCH 2/8] gdb/s390: Fill supply_pseudo_pc hook. Date: Sun, 7 Feb 2016 15:00:52 +0100 Message-Id: <1454853652-18208-1-git-send-email-koriakin@0x04.net> In-Reply-To: References: MIME-Version: 1.0 X-IsSubscribed: yes gdb/ChangeLog: * s390-linux-tdep.c (s390_supply_pseudo_pc): New function. (s390_gdbarch_init): Fill supply_pseudo_pc hook. --- Likewise, changed name and added comment. gdb/ChangeLog | 5 +++++ gdb/s390-linux-tdep.c | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e0bfd21..d24cccd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-02-07 Marcin Kościelnicki + * s390-linux-tdep.c (s390_supply_pseudo_pc): New function. + (s390_gdbarch_init): Fill supply_pseudo_pc hook. + +2016-02-07 Marcin Kościelnicki + * gdbarch.c: Regenerate. * gdbarch.h: Regenerate. * gdbarch.sh: Add supply_pseudo_pc hook. diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c index e827684..144365c 100644 --- a/gdb/s390-linux-tdep.c +++ b/gdb/s390-linux-tdep.c @@ -167,6 +167,28 @@ s390_write_pc (struct regcache *regcache, CORE_ADDR pc) regcache_cooked_write_unsigned (regcache, S390_SYSTEM_CALL_REGNUM, 0); } +/* The "supply_pseudo_pc" gdbarch method. For s390, we have to supply + the PSWA register. For 64-bit inferior, PC maps straight to PSWA. + For 31-bit, we additionally set the high bit to 1, since we have + to supply the whole register, and it's very unlikely the program + is in 24-bit addressing mode. */ + +static void +s390_supply_pseudo_pc (struct regcache *regcache, CORE_ADDR pc) +{ + struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + int sz = register_size (gdbarch, S390_PSWA_REGNUM); + gdb_byte *reg = (gdb_byte *) alloca (sz); + + /* 31-bit PSWA needs high bit set. */ + if (tdep->abi == ABI_LINUX_S390) + pc |= 0x80000000; + + store_unsigned_integer (reg, sz, gdbarch_byte_order (gdbarch), pc); + regcache_raw_supply (regcache, S390_PSWA_REGNUM, reg); +} + /* DWARF Register Mapping. */ @@ -7857,6 +7879,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_supply_pseudo_pc (gdbarch, s390_supply_pseudo_pc); 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);