X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Frs6000-tdep.c;h=82c18c1dac2e9210aba04013c97ce9ce07724731;hb=1d9d99f32d861ae85dd59689ada801cc51d3ac91;hp=2ae392923f15b67d9eaefeefdba22c75ad00de07;hpb=51cc5b073771099289e43e0d4a15f71fb0515f0b;p=binutils-gdb.git

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 2ae392923f1..82c18c1dac2 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -31,6 +31,7 @@
 #include "objfiles.h"
 #include "arch-utils.h"
 #include "regcache.h"
+#include "doublest.h"
 
 #include "bfd/libbfd.h"		/* for bfd_default_set_arch_mach */
 #include "coff/internal.h"	/* for libcoff.h */
@@ -845,7 +846,7 @@ rs6000_pop_frame (void)
 
 static void
 rs6000_fix_call_dummy (char *dummyname, CORE_ADDR pc, CORE_ADDR fun,
-		       int nargs, value_ptr *args, struct type *type,
+		       int nargs, struct value **args, struct type *type,
 		       int gcc_p)
 {
 #define	TOC_ADDR_OFFSET		20
@@ -878,7 +879,7 @@ rs6000_fix_call_dummy (char *dummyname, CORE_ADDR pc, CORE_ADDR fun,
    starting from r4. */
 
 static CORE_ADDR
-rs6000_push_arguments (int nargs, value_ptr *args, CORE_ADDR sp,
+rs6000_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
 		       int struct_return, CORE_ADDR struct_addr)
 {
   int ii;
@@ -889,7 +890,7 @@ rs6000_push_arguments (int nargs, value_ptr *args, CORE_ADDR sp,
   int f_argno = 0;		/* current floating point argno */
   int wordsize = TDEP->wordsize;
 
-  value_ptr arg = 0;
+  struct value *arg = 0;
   struct type *type;
 
   CORE_ADDR saved_sp;
@@ -1008,7 +1009,7 @@ ran_out_of_registers_for_arguments:
 
       for (; jj < nargs; ++jj)
 	{
-	  value_ptr val = args[jj];
+	  struct value *val = args[jj];
 	  space += ((TYPE_LENGTH (VALUE_TYPE (val))) + 3) & -4;
 	}
 
@@ -2162,8 +2163,8 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
   osabi = get_elfosabi (info.abfd);
 
-  /* Check word size.  If INFO is from a binary file, infer it from that,
-     else use the previously-inferred size. */
+  /* Check word size.  If INFO is from a binary file, infer it from
+     that, else choose a likely default. */
   if (from_xcoff_exec)
     {
       if (xcoff_data (info.abfd)->xcoff64)
@@ -2180,11 +2181,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
     }
   else
     {
-      tdep = TDEP;
-      if (tdep)
-	wordsize = tdep->wordsize;
-      else
-	wordsize = 4;
+      wordsize = 4;
     }
 
   /* Find a candidate among extant architectures. */