Attachment 144613 Details for Bug 140532 – Existing `gdb-6.3-ppccfi-20041104.patch' difference.

[patch] Existing `gdb-6.3-ppccfi-20041104.patch' difference.

gdb-6.3-ppccfi-20041104.patch.diff (text/plain), 4.64 KB, created by Jan Kratochvil on 2007-01-01 21:20:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kratochvil

Created: 2007-01-01 21:20:46 UTC

Size: 4.64 KB

patch

obsolete

>Index: gdb-6.3-ppccfi-20041104.patch
>===================================================================
>RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ppccfi-20041104.patch,v
>retrieving revision 1.3
>diff -u -p -U10 -r1.3 gdb-6.3-ppccfi-20041104.patch
>--- gdb-6.3-ppccfi-20041104.patch	11 Jul 2006 15:36:44 -0000	1.3
>+++ gdb-6.3-ppccfi-20041104.patch	1 Jan 2007 21:11:00 -0000
>@@ -1,10 +1,17 @@
>+2007-01-01  Jan Kratochvil <jan.kratochvil@redhat.com>
>+
>+	* rs6000-tdep.c (rs6000_dwarf2_reg_to_regnum): Map also `CR' and
>+	`FPSCR'.
>+	* ppc-linux-tdep.c (ppc_linux_init_reg): Update for mapped `CR' and
>+	`FPSCR'.
>+
> 2004-11-04  Andrew Cagney  <cagney@gnu.org>
> 
> 	* dwarf2-frame.c (dwarf2_frame_prev_register): Handle
> 	DWARF2_FRAME_REG_INDIRECT.
> 	* dwarf2-frame.h (enum dwarf2_frame_reg_rule): Add
> 	DWARF2_FRAME_REG_INDIRECT.
> 	* ppc-linux-tdep.c (ppc_linux_init_reg): New function.
> 	(ppc_linux_init_abi): Enable dwarf2 frame sniffer.
> 
> Index: gdb-6.5/gdb/dwarf2-frame.c
>@@ -49,60 +56,76 @@ Index: gdb-6.5/gdb/ppc-linux-tdep.c
> --- gdb-6.5.orig/gdb/ppc-linux-tdep.c	2006-07-11 12:30:21.000000000 -0300
> +++ gdb-6.5/gdb/ppc-linux-tdep.c	2006-07-11 12:36:03.000000000 -0300
> @@ -39,6 +39,7 @@
>  #include "trad-frame.h"
>  #include "frame-unwind.h"
>  #include "tramp-frame.h"
> +#include "dwarf2-frame.h"
>  
>  /* The following instructions are used in the signal trampoline code
>     on GNU/Linux PPC. The kernel used to use magic syscalls 0x6666 and
>-@@ -1019,6 +1020,40 @@ static struct tramp_frame ppc64_linux_si
>+@@ -1019,6 +1020,41 @@ static struct tramp_frame ppc64_linux_si
>  };
>  
>  static void
> +ppc_linux_init_reg (struct gdbarch *gdbarch, int regnum,
> +		    struct dwarf2_frame_state_reg *state,
> +		    struct frame_info *frame)
> +{
> +  /* NOTE: REGNUM is a GDB register number and not a DWARF 2 register
> +     number.  */
> +  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
>-+  if (regnum == 65)
>++  /* GCC "DWARF 2" return Address register after dwarf2_reg_to_regnum ().  */
>++  if (regnum == tdep->ppc_fpscr_regnum)
> +    {
>-+      /* FIXME: cagney/2004-11-04: "65" here is a DWARF 2 register
>-+	 number.  What happens is dwarf2_reg_to_regnum fails to
>-+	 recognize it and just passes it through.  If that function
>++      /* FIXME: cagney/2004-11-04: "65" here is a GCC "DWARF 2" register
>++	 number.  What happens is dwarf2_reg_to_regnum FAILED BEFORE to
>++	 recognize it and just passed it through.  If that function
> +	 were to ever be "fixed" (return GDB's idea of the FPSCR) then
>-+	 we would be in real strife.  */
>++	 we GOT in real strife.  */
> +      state->how = DWARF2_FRAME_REG_INDIRECT;
> +      state->loc.reg = 108; /* DWARF 2 link-register.  */
> +    }
> +  else if (regnum == PC_REGNUM)
> +    {
>-+      /* FIXME: cagney/2004-11-04: "65" here is a DWARF 2 register
>-+	 number.  What happens is dwarf2_reg_to_regnum fails to
>-+	 recognize it and just passes it through.  If that function
>++      /* FIXME: cagney/2004-11-04: "65" here is a GCC "DWARF 2" register
>++	 number.  What happens is dwarf2_reg_to_regnum FAILED BEFORE to
>++	 recognize it and just passed it through.  If that function
> +	 were to ever be "fixed" (return GDB's idea of the FPSCR) then
>-+	 we would be in real strife.  */
>++	 we GOT in real strife.  */
> +      state->how = DWARF2_FRAME_REG_INDIRECT;
>-+      state->loc.reg = 65; /* DWARF 2 return Address register.  */
>++      state->loc.reg = 65; /* GCC "DWARF 2" return Address register.  */
> +    }
> +  else if (regnum == SP_REGNUM)
> +    state->how = DWARF2_FRAME_REG_CFA;
> +  else
> +    state->how = DWARF2_FRAME_REG_SAME_VALUE;
> +};
> +
> +static void
>  ppc_linux_init_abi (struct gdbarch_info info,
>                      struct gdbarch *gdbarch)
>  {
> @@ -1076,6 +1111,8 @@ ppc_linux_init_abi (struct gdbarch_info 
>        tramp_frame_prepend_unwinder (gdbarch, &ppc64_linux_sighandler_tramp_frame);
>      }
>    set_gdbarch_regset_from_core_section (gdbarch, ppc_linux_regset_from_core_section);
> +  frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer);
> +  dwarf2_frame_set_init_reg (gdbarch, ppc_linux_init_reg);
>  
>    /* Enable TLS support.  */
>    set_gdbarch_fetch_tls_load_module_address (gdbarch,
>+diff -u -rup gdb-6.5-orig/gdb/rs6000-tdep.c gdb-6.5/gdb/rs6000-tdep.c
>+--- gdb-6.5-orig/gdb/rs6000-tdep.c	2006-12-30 15:53:52.000000000 -0500
>++++ gdb-6.5/gdb/rs6000-tdep.c	2006-12-31 17:54:56.000000000 -0500
>+@@ -2272,6 +2304,11 @@ rs6000_dwarf2_reg_to_regnum (int num)
>+   else
>+     switch (num)
>+       {
>++      case 64:
>++        return tdep->ppc_cr_regnum;
>++      /* Broken GCC uses it for CIE `Return address column'.  */
>++      case 65:
>++        return tdep->ppc_fpscr_regnum;
>+       case 67:
>+         return tdep->ppc_vrsave_regnum - 1; /* vscr */
>+       case 99:

Actions: View | Diff

Attachments on bug 140532: 144612 | 144613 | 145505 | 145506 | 145513 | 230151