* c-valprint.c (c_value_print): Fix up some formatting. Use

[deliverable/binutils-gdb.git] / gdb / sh64-tdep.c

diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c
index a7532133463bfc6f3189ebf100ceb46ed431a959..16520974375074ca0a91fb0bbb3d2311a7d118fe 100644 (file)
--- a/gdb/sh64-tdep.c
+++ b/gdb/sh64-tdep.c
@@ -1,7 +1,7 @@
 /* Target-dependent code for Renesas Super-H, for GDB.
 
    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -1494,7 +1494,7 @@ sh64_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
 
   /* Now make sure there's space on the stack */
   for (argnum = 0, stack_alloc = 0; argnum < nargs; argnum++)
-    stack_alloc += ((TYPE_LENGTH (VALUE_TYPE (args[argnum])) + 7) & ~7);
+    stack_alloc += ((TYPE_LENGTH (value_type (args[argnum])) + 7) & ~7);
   sp -= stack_alloc;           /* make room on stack for args */
 
   /* Now load as many as possible of the first arguments into
@@ -1507,7 +1507,7 @@ sh64_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
 
   for (argnum = 0, stack_offset = 0; argnum < nargs; argnum++)
     {
-      type = VALUE_TYPE (args[argnum]);
+      type = value_type (args[argnum]);
       len = TYPE_LENGTH (type);
       memset (valbuf, 0, sizeof (valbuf));
       
@@ -1520,14 +1520,14 @@ sh64_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
              /* value gets right-justified in the register or stack word */
              if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
                memcpy (valbuf + argreg_size - len,
-                       (char *) VALUE_CONTENTS (args[argnum]), len);
+                       (char *) value_contents (args[argnum]), len);
              else
-               memcpy (valbuf, (char *) VALUE_CONTENTS (args[argnum]), len);
+               memcpy (valbuf, (char *) value_contents (args[argnum]), len);
 
              val = valbuf;
            }
          else
-           val = (char *) VALUE_CONTENTS (args[argnum]);
+           val = (char *) value_contents (args[argnum]);
 
          while (len > 0)
            {
@@ -1557,7 +1557,7 @@ sh64_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
        }
       else
        {
-         val = (char *) VALUE_CONTENTS (args[argnum]);
+         val = (char *) value_contents (args[argnum]);
          if (len == 4)
            {
              /* Where is it going to be stored? */
@@ -2538,7 +2538,7 @@ sh_do_fp_register (struct gdbarch *gdbarch, struct ui_file *file, int regnum)
   raw_buffer = (char *) alloca (register_size (gdbarch, FP0_REGNUM));
 
   /* Get the data in raw format.  */
-  if (!frame_register_read (get_selected_frame (), regnum, raw_buffer))
+  if (!frame_register_read (get_selected_frame (NULL), regnum, raw_buffer))
     error ("can't read register %d (%s)", regnum, REGISTER_NAME (regnum));
 
   /* Get the register as a number */ 
@@ -2574,7 +2574,7 @@ sh64_do_pseudo_register (int regnum)
   if (regnum < NUM_REGS 
       || regnum >= NUM_REGS + NUM_PSEUDO_REGS_SH_MEDIA + NUM_PSEUDO_REGS_SH_COMPACT)
     internal_error (__FILE__, __LINE__,
-                   "Invalid pseudo register number %d\n", regnum);
+                   _("Invalid pseudo register number %d\n"), regnum);
 
   else if ((regnum >= DR0_REGNUM
            && regnum <= DR_LAST_REGNUM))
@@ -2618,7 +2618,7 @@ sh_do_register (struct gdbarch *gdbarch, struct ui_file *file, int regnum)
   print_spaces_filtered (15 - strlen (REGISTER_NAME (regnum)), file);
 
   /* Get the data in raw format.  */
-  if (!frame_register_read (get_selected_frame (), regnum, raw_buffer))
+  if (!frame_register_read (get_selected_frame (NULL), regnum, raw_buffer))
     fprintf_filtered (file, "*value not available*\n");
       
   val_print (gdbarch_register_type (gdbarch, regnum), raw_buffer, 0, 0,
@@ -2634,7 +2634,7 @@ sh_print_register (struct gdbarch *gdbarch, struct ui_file *file, int regnum)
 {
   if (regnum < 0 || regnum >= NUM_REGS + NUM_PSEUDO_REGS)
     internal_error (__FILE__, __LINE__,
-                   "Invalid register number %d\n", regnum);
+                   _("Invalid register number %d\n"), regnum);
 
   else if (regnum >= 0 && regnum < NUM_REGS)
     {
@@ -2736,8 +2736,6 @@ sh64_do_registers_info (int regnum, int fpregs)
    sh_compact_do_registers_info (regnum, fpregs);
 }
 
-#ifdef SVR4_SHARED_LIBS
-
 /* Fetch (and possibly build) an appropriate link_map_offsets structure
    for native i386 linux targets using the struct offsets defined in
    link.h (but without actual reference to that file).
@@ -2778,7 +2776,6 @@ sh_linux_svr4_fetch_link_map_offsets (void)
 
     return lmp;
 }
-#endif /* SVR4_SHARED_LIBS */
 
 gdbarch_init_ftype sh64_gdbarch_init;
 
@@ -2850,9 +2847,6 @@ sh64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   /* The number of real registers is the same whether we are in 
      ISA16(compact) or ISA32(media).  */
   set_gdbarch_num_regs (gdbarch, SIM_SH64_NR_REGS);
-  set_gdbarch_deprecated_register_bytes (gdbarch,
-                                        ((SIM_SH64_NR_FP_REGS + 1) * 4)
-                                        + (SIM_SH64_NR_REGS - SIM_SH64_NR_FP_REGS -1) * 8);
 
   set_gdbarch_register_name (gdbarch, sh64_register_name);
   set_gdbarch_register_type (gdbarch, sh64_register_type);