From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16809 invoked by alias); 26 Feb 2004 23:48:51 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 16739 invoked from network); 26 Feb 2004 23:48:50 -0000 Received: from unknown (HELO localhost.redhat.com) (216.129.200.20) by sources.redhat.com with SMTP; 26 Feb 2004 23:48:50 -0000 Received: from gnu.org (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id 99DBC2B92; Thu, 26 Feb 2004 18:48:47 -0500 (EST) Message-ID: <403E85DF.4030007@gnu.org> Date: Thu, 26 Feb 2004 23:48:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-US; rv:1.4.1) Gecko/20040217 MIME-Version: 1.0 To: Ulrich Weigand Cc: gdb-patches@sources.redhat.com Subject: Re: [PATCH] Enable DWARF-2 frames on S/390 References: <200402262303.AAA00593@faui1d.informatik.uni-erlangen.de> In-Reply-To: <200402262303.AAA00593@faui1d.informatik.uni-erlangen.de> Content-Type: multipart/mixed; boundary="------------040104090203060902050203" X-SW-Source: 2004-02/txt/msg00790.txt.bz2 This is a multi-part message in MIME format. --------------040104090203060902050203 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 521 > The change consists of installing a dwarf2_frame_set_init_reg > callback that overrides the default register state initializtion > to instead perform the following: set all call-saved registers to > DWARF2_FRAME_REG_SAME_VALUE, all call-clobbered registers to > DWARF2_FRAME_REG_UNDEFINED, and the virtual PC register to > DWARF2_FRAME_REG_RA. Which registers count as call-saved vs. > call-clobbered is defined by the Linux for S/390 and Linux for > zSeries ABI documents. Ok, I've committed the attached. Andrew --------------040104090203060902050203 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 5791 Index: ChangeLog 2004-02-26 Andrew Cagney * Makefile.in: Update dependencies. Changes from Ulrich Weigand, * s390-tdep.c: Include "dwarf2-frame.h". (s390_dwarf2_frame_init_reg): New function. (s390_gdbarch_init): Install dwarf2_frame_sniffer and dwarf2_frame_base_sniffer. Call dwarf2_frame_set_init_reg. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.516 diff -u -r1.516 Makefile.in --- Makefile.in 25 Feb 2004 20:45:30 -0000 1.516 +++ Makefile.in 26 Feb 2004 23:34:23 -0000 @@ -617,7 +617,9 @@ ada_lang_h = ada-lang.h $(value_h) $(gdbtypes_h) alphabsd_tdep_h = alphabsd-tdep.h alpha_tdep_h = alpha-tdep.h +amd64_linux_tdep_h = amd64-linux-tdep.h amd64_nat_h = amd64-nat.h +amd64_tdep_h = amd64-tdep.h $(i386_tdep_h) annotate_h = annotate.h $(symtab_h) $(gdbtypes_h) arch_utils_h = arch-utils.h arm_tdep_h = arm-tdep.h @@ -770,8 +772,6 @@ version_h = version.h wince_stub_h = wince-stub.h wrapper_h = wrapper.h $(gdb_h) -amd64_linux_tdep_h = amd64-linux-tdep.h -amd64_tdep_h = amd64-tdep.h $(i386_tdep_h) xcoffsolib_h = xcoffsolib.h xmodem_h = xmodem.h @@ -1532,9 +1532,9 @@ $(regcache_h) $(linux_nat_h) $(gdb_assert_h) $(gdb_string_h) \ $(gdb_proc_service_h) $(gregset_h) $(amd64_tdep_h) \ $(amd64_linux_tdep_h) $(i386_linux_tdep_h) $(amd64_nat_h) -amd64-linux-tdep.o: amd64-linux-tdep.c $(defs_h) $(inferior_h) \ - $(gdbcore_h) $(regcache_h) $(osabi_h) $(gdb_string_h) \ - $(amd64_tdep_h) $(amd64_linux_tdep_h) +amd64-linux-tdep.o: amd64-linux-tdep.c $(defs_h) $(inferior_h) $(gdbcore_h) \ + $(regcache_h) $(osabi_h) $(gdb_string_h) $(amd64_tdep_h) \ + $(amd64_linux_tdep_h) amd64-nat.o: amd64-nat.c $(defs_h) $(gdbarch_h) $(regcache_h) \ $(gdb_assert_h) $(i386_tdep_h) $(amd64_tdep_h) amd64nbsd-nat.o: amd64nbsd-nat.c $(defs_h) $(gdb_assert_h) $(amd64_tdep_h) \ @@ -1892,7 +1892,7 @@ ia64-linux-nat.o: ia64-linux-nat.c $(defs_h) $(gdb_string_h) $(inferior_h) \ $(target_h) $(gdbcore_h) $(regcache_h) $(gdb_wait_h) $(gregset_h) ia64-linux-tdep.o: ia64-linux-tdep.c $(defs_h) $(ia64_tdep_h) \ - $(arch_utils_h) $(gdbcore_h) + $(arch_utils_h) $(gdbcore_h) $(regcache_h) ia64-tdep.o: ia64-tdep.c $(defs_h) $(inferior_h) $(gdbcore_h) \ $(arch_utils_h) $(floatformat_h) $(regcache_h) $(reggroups_h) \ $(frame_h) $(frame_base_h) $(frame_unwind_h) $(doublest_h) \ @@ -2247,9 +2247,9 @@ s390-tdep.o: s390-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) $(inferior_h) \ $(symtab_h) $(target_h) $(gdbcore_h) $(gdbcmd_h) $(objfiles_h) \ $(tm_h) $(__bfd_bfd_h) $(floatformat_h) $(regcache_h) \ - $(trad_frame_h) $(frame_base_h) $(frame_unwind_h) $(reggroups_h) \ - $(regset_h) $(value_h) $(gdb_assert_h) $(dis_asm_h) $(solib_svr4_h) \ - $(s390_tdep_h) + $(trad_frame_h) $(frame_base_h) $(frame_unwind_h) $(dwarf2_frame_h) \ + $(reggroups_h) $(regset_h) $(value_h) $(gdb_assert_h) $(dis_asm_h) \ + $(solib_svr4_h) $(s390_tdep_h) scm-exp.o: scm-exp.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(expression_h) \ $(parser_defs_h) $(language_h) $(value_h) $(c_lang_h) $(scm_lang_h) \ $(scm_tags_h) Index: s390-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/s390-tdep.c,v retrieving revision 1.128 diff -u -r1.128 s390-tdep.c --- s390-tdep.c 18 Feb 2004 04:17:35 -0000 1.128 +++ s390-tdep.c 26 Feb 2004 23:34:23 -0000 @@ -38,6 +38,7 @@ #include "trad-frame.h" #include "frame-base.h" #include "frame-unwind.h" +#include "dwarf2-frame.h" #include "reggroups.h" #include "regset.h" #include "value.h" @@ -2298,6 +2299,53 @@ } +/* DWARF-2 frame support. */ + +static void +s390_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, + struct dwarf2_frame_state_reg *reg) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + switch (tdep->abi) + { + case ABI_LINUX_S390: + /* Call-saved registers. */ + if ((regnum >= S390_R6_REGNUM && regnum <= S390_R15_REGNUM) + || regnum == S390_F4_REGNUM + || regnum == S390_F6_REGNUM) + reg->how = DWARF2_FRAME_REG_SAME_VALUE; + + /* Call-clobbered registers. */ + else if ((regnum >= S390_R0_REGNUM && regnum <= S390_R5_REGNUM) + || (regnum >= S390_F0_REGNUM && regnum <= S390_F15_REGNUM + && regnum != S390_F4_REGNUM && regnum != S390_F6_REGNUM)) + reg->how = DWARF2_FRAME_REG_UNDEFINED; + + /* The return address column. */ + else if (regnum == S390_PC_REGNUM) + reg->how = DWARF2_FRAME_REG_RA; + break; + + case ABI_LINUX_ZSERIES: + /* Call-saved registers. */ + if ((regnum >= S390_R6_REGNUM && regnum <= S390_R15_REGNUM) + || (regnum >= S390_F8_REGNUM && regnum <= S390_F15_REGNUM)) + reg->how = DWARF2_FRAME_REG_SAME_VALUE; + + /* Call-clobbered registers. */ + else if ((regnum >= S390_R0_REGNUM && regnum <= S390_R5_REGNUM) + || (regnum >= S390_F0_REGNUM && regnum <= S390_F7_REGNUM)) + reg->how = DWARF2_FRAME_REG_UNDEFINED; + + /* The return address column. */ + else if (regnum == S390_PC_REGNUM) + reg->how = DWARF2_FRAME_REG_RA; + break; + } +} + + /* Dummy function calls. */ /* Return non-zero if TYPE is an integer-like type, zero otherwise. @@ -2977,6 +3025,9 @@ /* Frame handling. */ set_gdbarch_in_solib_call_trampoline (gdbarch, in_plt_section); + dwarf2_frame_set_init_reg (gdbarch, s390_dwarf2_frame_init_reg); + frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer); + frame_base_append_sniffer (gdbarch, dwarf2_frame_base_sniffer); frame_unwind_append_sniffer (gdbarch, s390_pltstub_frame_sniffer); frame_unwind_append_sniffer (gdbarch, s390_sigtramp_frame_sniffer); frame_unwind_append_sniffer (gdbarch, s390_frame_sniffer); --------------040104090203060902050203--