From patchwork Fri Nov 28 15:48:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Weigand X-Patchwork-Id: 3991 Received: (qmail 30541 invoked by alias); 28 Nov 2014 15:48:33 -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 30488 invoked by uid 89); 28 Nov 2014 15:48:32 -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, MSGID_FROM_MTA_HEADER, SPF_SOFTFAIL, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: e34.co.us.ibm.com Received: from e34.co.us.ibm.com (HELO e34.co.us.ibm.com) (32.97.110.152) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 28 Nov 2014 15:48:31 +0000 Received: from /spool/local by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 28 Nov 2014 08:48:29 -0700 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 28 Nov 2014 08:48:28 -0700 Received: from b03cxnp08025.gho.boulder.ibm.com (b03cxnp08025.gho.boulder.ibm.com [9.17.130.17]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 1DCDC3E4003E for ; Fri, 28 Nov 2014 08:45:41 -0700 (MST) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sASFmsUJ23396472 for ; Fri, 28 Nov 2014 08:48:54 -0700 Received: from d03av02.boulder.ibm.com (localhost [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sASFmRVQ001419 for ; Fri, 28 Nov 2014 08:48:27 -0700 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d03av02.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with SMTP id sASFmPd9001359; Fri, 28 Nov 2014 08:48:25 -0700 Message-Id: <201411281548.sASFmPd9001359@d03av02.boulder.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Fri, 28 Nov 2014 16:48:25 +0100 Subject: [RFC/RFT] Use core regset iterators on Sparc Solaris To: gdb-patches@sourceware.org Date: Fri, 28 Nov 2014 16:48:25 +0100 (CET) From: "Ulrich Weigand" Cc: davem@redhat.com MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14112815-0017-0000-0000-000006A61FC2 Hello, Sparc/Solaris is another native target still does not use the new-style iterate_over_regset_sections core file logic (allowing cross-debugging of core files and core file generation). Fortunately, it should be straightforward to enable to generic sparc logic here by simply providing an appropriate register map. In fact, the map itself is already present, and can just be reused. The only remaining parameters needed are the total sizes of the register sections in core files, which I've taken from public OpenSolaris sources. The patch is untested so far since I don't have access to a Sparc/Solaris system. Testing by Solaris maintainers would be much appreciated. Bye, Ulrich gdb/ * config/sparc/sol2.mh (NATDEPFILES): Remove core-regset.o. * sparc-sol2-tdep.c: Include "regset.h". (sparc32_sol2_supply_core_gregset): New function. (sparc32_sol2_collect_core_gregset): Likewise. (sparc32_sol2_supply_core_fpregset): Likewise. (sparc32_sol2_collect_core_fpregset): Likewise. (sparc32_sol2_gregset, sparc32_sol2_fpregset): New variables. (sparc32_sol2_init_abi): Set tdep->gregset/sizeof_gregset and tdep->fpregset/sizeof_fpregset. * sparc64-sol2-tdep.c: Include "regset.h". (sparc64_sol2_supply_core_gregset): New function. (sparc64_sol2_collect_core_gregset): Likewise. (sparc64_sol2_supply_core_fpregset): Likewise. (sparc64_sol2_collect_core_fpregset): Likewise. (sparc64_sol2_gregset, sparc64_sol2_fpregset): New variables. (sparc64_sol2_init_abi): Set tdep->gregset/sizeof_gregset and tdep->fpregset/sizeof_fpregset. Index: binutils-gdb/gdb/config/sparc/sol2.mh =================================================================== --- binutils-gdb.orig/gdb/config/sparc/sol2.mh 2014-11-10 14:31:38.337160834 +0100 +++ binutils-gdb/gdb/config/sparc/sol2.mh 2014-11-28 15:18:43.966265980 +0100 @@ -1,6 +1,6 @@ # Host: Solaris SPARC & UltraSPARC NAT_FILE= nm-sol2.h NATDEPFILES= sparc-sol2-nat.o \ - core-regset.o fork-child.o \ + fork-child.o \ procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o HAVE_NATIVE_GCORE_HOST = 1 Index: binutils-gdb/gdb/sparc-sol2-tdep.c =================================================================== --- binutils-gdb.orig/gdb/sparc-sol2-tdep.c 2014-11-11 16:31:28.142902997 +0100 +++ binutils-gdb/gdb/sparc-sol2-tdep.c 2014-11-28 15:18:43.971266013 +0100 @@ -25,6 +25,7 @@ #include "objfiles.h" #include "osabi.h" #include "regcache.h" +#include "regset.h" #include "target.h" #include "trad-frame.h" @@ -50,6 +51,52 @@ const struct sparc_fpregmap sparc32_sol2 0 * 4, /* %f0 */ 33 * 4, /* %fsr */ }; + +static void +sparc32_sol2_supply_core_gregset (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *gregs, size_t len) +{ + sparc32_supply_gregset (&sparc32_sol2_gregmap, regcache, regnum, gregs); +} + +static void +sparc32_sol2_collect_core_gregset (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *gregs, size_t len) +{ + sparc32_collect_gregset (&sparc32_sol2_gregmap, regcache, regnum, gregs); +} + +static void +sparc32_sol2_supply_core_fpregset (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *fpregs, size_t len) +{ + sparc32_supply_fpregset (&sparc32_sol2_fpregmap, regcache, regnum, fpregs); +} + +static void +sparc32_sol2_collect_core_fpregset (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *fpregs, size_t len) +{ + sparc32_collect_fpregset (&sparc32_sol2_fpregmap, regcache, regnum, fpregs); +} + +static const struct regset sparc32_sol2_gregset = + { + NULL, + sparc32_sol2_supply_core_gregset, + sparc32_sol2_collect_core_gregset + }; + +static const struct regset sparc32_sol2_fpregset = + { + NULL, + sparc32_sol2_supply_core_fpregset, + sparc32_sol2_collect_core_fpregset + }; /* The Solaris signal trampolines reside in libc. For normal signals, @@ -211,6 +258,12 @@ sparc32_sol2_init_abi (struct gdbarch_in { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + tdep->gregset = &sparc32_sol2_gregset; + tdep->sizeof_gregset = 152; + + tdep->fpregset = &sparc32_sol2_fpregset; + tdep->sizeof_fpregset = 400; + /* The Sun compilers (Sun ONE Studio, Forte Developer, Sun WorkShop, SunPRO) compiler puts out 0 instead of the address in N_SO stabs. Starting with SunPRO 3.0, the compiler does this for N_FUN stabs too. */ Index: binutils-gdb/gdb/sparc64-sol2-tdep.c =================================================================== --- binutils-gdb.orig/gdb/sparc64-sol2-tdep.c 2014-11-11 16:31:28.163903116 +0100 +++ binutils-gdb/gdb/sparc64-sol2-tdep.c 2014-11-28 15:18:43.975266040 +0100 @@ -25,6 +25,7 @@ #include "objfiles.h" #include "osabi.h" #include "trad-frame.h" +#include "regset.h" #include "sol2-tdep.h" #include "sparc64-tdep.h" @@ -49,6 +50,52 @@ const struct sparc_fpregmap sparc64_sol2 0 * 8, /* %f0 */ 33 * 8, /* %fsr */ }; + +static void +sparc64_sol2_supply_core_gregset (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *gregs, size_t len) +{ + sparc64_supply_gregset (&sparc64_sol2_gregmap, regcache, regnum, gregs); +} + +static void +sparc64_sol2_collect_core_gregset (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *gregs, size_t len) +{ + sparc64_collect_gregset (&sparc64_sol2_gregmap, regcache, regnum, gregs); +} + +static void +sparc64_sol2_supply_core_fpregset (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *fpregs, size_t len) +{ + sparc64_supply_fpregset (&sparc64_sol2_fpregmap, regcache, regnum, fpregs); +} + +static void +sparc64_sol2_collect_core_fpregset (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *fpregs, size_t len) +{ + sparc64_collect_fpregset (&sparc64_sol2_fpregmap, regcache, regnum, fpregs); +} + +static const struct regset sparc64_sol2_gregset = + { + NULL, + sparc64_sol2_supply_core_gregset, + sparc64_sol2_collect_core_gregset + }; + +static const struct regset sparc64_sol2_fpregset = + { + NULL, + sparc64_sol2_supply_core_fpregset, + sparc64_sol2_collect_core_fpregset + }; static struct sparc_frame_cache * @@ -159,6 +206,12 @@ sparc64_sol2_init_abi (struct gdbarch_in { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + tdep->gregset = &sparc64_sol2_gregset; + tdep->sizeof_gregset = 304; + + tdep->fpregset = &sparc64_sol2_fpregset; + tdep->sizeof_fpregset = 544; + frame_unwind_append_unwinder (gdbarch, &sparc64_sol2_sigtramp_frame_unwind); sparc64_init_abi (info, gdbarch);