X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=gdb%2Fppc-nbsd-tdep.c;h=7959046bfcb8294b3dfb62ab743a389fc7298705;hb=dc7ff8a60818f002d7b759210202e0aaabfeebc3;hp=a730ebdf6e650b69876857f4b31e75d16839849d;hpb=03b62bbbce3dc5f15131d9e78f77d035cd1cffb3;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/ppc-nbsd-tdep.c b/gdb/ppc-nbsd-tdep.c
index a730ebdf6e..7959046bfc 100644
--- a/gdb/ppc-nbsd-tdep.c
+++ b/gdb/ppc-nbsd-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for NetBSD/powerpc.
 
-   Copyright (C) 2002-2016 Free Software Foundation, Inc.
+   Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
    Contributed by Wasabi Systems, Inc.
 
@@ -59,8 +59,8 @@ ppcnbsd_iterate_over_regset_sections (struct gdbarch *gdbarch,
 				      void *cb_data,
 				      const struct regcache *regcache)
 {
-  cb (".reg", 148, &ppcnbsd_gregset, NULL, cb_data);
-  cb (".reg2", 264, &ppcnbsd_fpregset, NULL, cb_data);
+  cb (".reg", 148, 148, &ppcnbsd_gregset, NULL, cb_data);
+  cb (".reg2", 264, 264, &ppcnbsd_fpregset, NULL, cb_data);
 }
 
 
@@ -137,14 +137,14 @@ static const struct tramp_frame ppcnbsd_sigtramp =
   SIGTRAMP_FRAME,
   4,
   {
-    { 0x3821fff0, -1 },		/* add r1,r1,-16 */
-    { 0x4e800021, -1 },		/* blrl */
-    { 0x38610018, -1 },		/* addi r3,r1,24 */
-    { 0x38000127, -1 },		/* li r0,295 */
-    { 0x44000002, -1 },		/* sc */
-    { 0x38000001, -1 },		/* li r0,1 */
-    { 0x44000002, -1 },		/* sc */
-    { TRAMP_SENTINEL_INSN, -1 }
+    { 0x3821fff0, ULONGEST_MAX },		/* add r1,r1,-16 */
+    { 0x4e800021, ULONGEST_MAX },		/* blrl */
+    { 0x38610018, ULONGEST_MAX },		/* addi r3,r1,24 */
+    { 0x38000127, ULONGEST_MAX },		/* li r0,295 */
+    { 0x44000002, ULONGEST_MAX },		/* sc */
+    { 0x38000001, ULONGEST_MAX },		/* li r0,1 */
+    { 0x44000002, ULONGEST_MAX },		/* sc */
+    { TRAMP_SENTINEL_INSN, ULONGEST_MAX }
   },
   ppcnbsd_sigtramp_cache_init
 };
@@ -156,14 +156,14 @@ const struct tramp_frame ppcnbsd2_sigtramp =
   SIGTRAMP_FRAME,
   4,
   {
-    { 0x3821fff0, -1 },		/* add r1,r1,-16 */
-    { 0x4e800021, -1 },		/* blrl */
-    { 0x38610010, -1 },		/* addi r3,r1,16 */
-    { 0x38000127, -1 },		/* li r0,295 */
-    { 0x44000002, -1 },		/* sc */
-    { 0x38000001, -1 },		/* li r0,1 */
-    { 0x44000002, -1 },		/* sc */
-    { TRAMP_SENTINEL_INSN, -1 }
+    { 0x3821fff0, ULONGEST_MAX },		/* add r1,r1,-16 */
+    { 0x4e800021, ULONGEST_MAX },		/* blrl */
+    { 0x38610010, ULONGEST_MAX },		/* addi r3,r1,16 */
+    { 0x38000127, ULONGEST_MAX },		/* li r0,295 */
+    { 0x44000002, ULONGEST_MAX },		/* sc */
+    { 0x38000001, ULONGEST_MAX },		/* li r0,1 */
+    { 0x44000002, ULONGEST_MAX },		/* sc */
+    { TRAMP_SENTINEL_INSN, ULONGEST_MAX }
   },
   ppcnbsd_sigtramp_cache_init
 };
@@ -187,15 +187,11 @@ ppcnbsd_init_abi (struct gdbarch_info info,
   tramp_frame_prepend_unwinder (gdbarch, &ppcnbsd_sigtramp);
   tramp_frame_prepend_unwinder (gdbarch, &ppcnbsd2_sigtramp);
 }
-
-
-/* Provide a prototype to silence -Wmissing-prototypes.  */
-void _initialize_ppcnbsd_tdep (void);
 
 void
 _initialize_ppcnbsd_tdep (void)
 {
-  gdbarch_register_osabi (bfd_arch_powerpc, 0, GDB_OSABI_NETBSD_ELF,
+  gdbarch_register_osabi (bfd_arch_powerpc, 0, GDB_OSABI_NETBSD,
 			  ppcnbsd_init_abi);
 
   /* Avoid initializing the register offsets again if they were
@@ -219,9 +215,5 @@ _initialize_ppcnbsd_tdep (void)
       ppcnbsd_reg_offsets.fpscr_offset = 256;
       ppcnbsd_reg_offsets.fpscr_size = 4;
 
-      /* AltiVec registers.  */
-      ppcnbsd_reg_offsets.vr0_offset = 0;
-      ppcnbsd_reg_offsets.vrsave_offset = 512;
-      ppcnbsd_reg_offsets.vscr_offset = 524;
     }
 }