[Ada] Make the symbol cache per-program-space.

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

diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c
index 7190ef888a8de31b697102f50be02c980e72215b..262de84cf99a53bd3d606a65c403866760fd31e4 100644 (file)
--- a/gdb/sh64-tdep.c
+++ b/gdb/sh64-tdep.c
@@ -1,13 +1,12 @@
 /* Target-dependent code for Renesas Super-H, for GDB.
 
 /* Target-dependent code for Renesas Super-H, for GDB.
 

-   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1993-2014 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,14 +15,10 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

-/*
-   Contributed by Steve Chamberlain
-   sac@cygnus.com
- */
+/* Contributed by Steve Chamberlain
+   sac@cygnus.com.  */

 
 #include "defs.h"
 #include "frame.h"
 
 #include "defs.h"
 #include "frame.h"


@@ -37,18 +32,21 @@
 #include "value.h"
 #include "dis-asm.h"
 #include "inferior.h"
 #include "value.h"
 #include "dis-asm.h"
 #include "inferior.h"

-#include "gdb_string.h"
+#include <string.h>

 #include "gdb_assert.h"
 #include "arch-utils.h"
 #include "regcache.h"
 #include "osabi.h"
 #include "gdb_assert.h"
 #include "arch-utils.h"
 #include "regcache.h"
 #include "osabi.h"

+#include "valprint.h"

 
 #include "elf-bfd.h"
 
 /* sh flags */
 #include "elf/sh.h"
 
 #include "elf-bfd.h"
 
 /* sh flags */
 #include "elf/sh.h"

-/* registers numbers shared with the simulator */
+/* Register numbers shared with the simulator.  */

 #include "gdb/sim-sh.h"
 #include "gdb/sim-sh.h"

+#include "language.h"
+#include "sh64-tdep.h"

 
 /* Information that is dependent on the processor variant.  */
 enum sh_abi
 
 /* Information that is dependent on the processor variant.  */
 enum sh_abi


@@ -70,7 +68,7 @@ struct sh64_frame_cache
   LONGEST sp_offset;
   CORE_ADDR pc;
 
   LONGEST sp_offset;
   CORE_ADDR pc;
 

-  /* Flag showing that a frame has been created in the prologue code. */
+  /* Flag showing that a frame has been created in the prologue code.  */

   int uses_fp;
 
   int media_mode;
   int uses_fp;
 
   int media_mode;


@@ -96,7 +94,7 @@ enum
     DR_LAST_REGNUM = 172,
     /* FPP stands for Floating Point Pair, to avoid confusion with
        GDB's gdbarch_fp0_regnum, which is the number of the first Floating
     DR_LAST_REGNUM = 172,
     /* FPP stands for Floating Point Pair, to avoid confusion with
        GDB's gdbarch_fp0_regnum, which is the number of the first Floating

-       point register. Unfortunately on the sh5, the floating point
+       point register.  Unfortunately on the sh5, the floating point

        registers are called FR, and the floating point pairs are called FP.  */
     FPP0_REGNUM = 173,
     FPP_LAST_REGNUM = 204,
        registers are called FR, and the floating point pairs are called FP.  */
     FPP0_REGNUM = 173,
     FPP_LAST_REGNUM = 204,


@@ -126,7 +124,7 @@ enum
   };
 
 static const char *
   };
 
 static const char *

-sh64_register_name (int reg_nr)
+sh64_register_name (struct gdbarch *gdbarch, int reg_nr)

 {
   static char *register_names[] =
   {
 {
   static char *register_names[] =
   {


@@ -147,13 +145,13 @@ sh64_register_name (int reg_nr)
     /* status reg., saved status reg., saved pc reg. (64-bit) 65-67 */
     "sr",  "ssr",  "spc", 
 
     /* status reg., saved status reg., saved pc reg. (64-bit) 65-67 */
     "sr",  "ssr",  "spc", 
 

-    /* target registers (64-bit) 68-75*/
+    /* target registers (64-bit) 68-75 */

     "tr0",  "tr1",  "tr2",  "tr3",  "tr4",  "tr5",  "tr6",  "tr7",
 
     /* floating point state control register (32-bit) 76 */
     "fpscr",
 
     "tr0",  "tr1",  "tr2",  "tr3",  "tr4",  "tr5",  "tr6",  "tr7",
 
     /* floating point state control register (32-bit) 76 */
     "fpscr",
 

-    /* single precision floating point registers (32-bit) 77-140*/
+    /* single precision floating point registers (32-bit) 77-140 */

     "fr0",  "fr1",  "fr2",  "fr3",  "fr4",  "fr5",  "fr6",  "fr7",
     "fr8",  "fr9",  "fr10", "fr11", "fr12", "fr13", "fr14", "fr15",
     "fr16", "fr17", "fr18", "fr19", "fr20", "fr21", "fr22", "fr23",
     "fr0",  "fr1",  "fr2",  "fr3",  "fr4",  "fr5",  "fr6",  "fr7",
     "fr8",  "fr9",  "fr10", "fr11", "fr12", "fr13", "fr14", "fr15",
     "fr16", "fr17", "fr18", "fr19", "fr20", "fr21", "fr22", "fr23",


@@ -169,27 +167,30 @@ sh64_register_name (int reg_nr)
     "dr32", "dr34", "dr36", "dr38", "dr40", "dr42", "dr44", "dr46",
     "dr48", "dr50", "dr52", "dr54", "dr56", "dr58", "dr60", "dr62",
 
     "dr32", "dr34", "dr36", "dr38", "dr40", "dr42", "dr44", "dr46",
     "dr48", "dr50", "dr52", "dr54", "dr56", "dr58", "dr60", "dr62",
 

-    /* floating point pairs (pseudo) 173-204*/
+    /* floating point pairs (pseudo) 173-204 */

     "fp0",  "fp2",  "fp4",  "fp6",  "fp8",  "fp10", "fp12", "fp14",
     "fp16", "fp18", "fp20", "fp22", "fp24", "fp26", "fp28", "fp30",
     "fp32", "fp34", "fp36", "fp38", "fp40", "fp42", "fp44", "fp46",
     "fp48", "fp50", "fp52", "fp54", "fp56", "fp58", "fp60", "fp62",
 
     "fp0",  "fp2",  "fp4",  "fp6",  "fp8",  "fp10", "fp12", "fp14",
     "fp16", "fp18", "fp20", "fp22", "fp24", "fp26", "fp28", "fp30",
     "fp32", "fp34", "fp36", "fp38", "fp40", "fp42", "fp44", "fp46",
     "fp48", "fp50", "fp52", "fp54", "fp56", "fp58", "fp60", "fp62",
 

-    /* floating point vectors (4 floating point regs) (pseudo) 205-220*/
+    /* floating point vectors (4 floating point regs) (pseudo) 205-220 */

     "fv0",  "fv4",  "fv8",  "fv12", "fv16", "fv20", "fv24", "fv28",
     "fv32", "fv36", "fv40", "fv44", "fv48", "fv52", "fv56", "fv60",
 
     "fv0",  "fv4",  "fv8",  "fv12", "fv16", "fv20", "fv24", "fv28",
     "fv32", "fv36", "fv40", "fv44", "fv48", "fv52", "fv56", "fv60",
 

-    /* SH COMPACT MODE (ISA 16) (all pseudo) 221-272*/
+    /* SH COMPACT MODE (ISA 16) (all pseudo) 221-272 */

     "r0_c", "r1_c", "r2_c",  "r3_c",  "r4_c",  "r5_c",  "r6_c",  "r7_c",
     "r8_c", "r9_c", "r10_c", "r11_c", "r12_c", "r13_c", "r14_c", "r15_c",
     "pc_c",
     "gbr_c", "mach_c", "macl_c", "pr_c", "t_c",
     "fpscr_c", "fpul_c",
     "r0_c", "r1_c", "r2_c",  "r3_c",  "r4_c",  "r5_c",  "r6_c",  "r7_c",
     "r8_c", "r9_c", "r10_c", "r11_c", "r12_c", "r13_c", "r14_c", "r15_c",
     "pc_c",
     "gbr_c", "mach_c", "macl_c", "pr_c", "t_c",
     "fpscr_c", "fpul_c",

-    "fr0_c", "fr1_c", "fr2_c",  "fr3_c",  "fr4_c",  "fr5_c",  "fr6_c",  "fr7_c",
-    "fr8_c", "fr9_c", "fr10_c", "fr11_c", "fr12_c", "fr13_c", "fr14_c", "fr15_c",
-    "dr0_c", "dr2_c", "dr4_c",  "dr6_c",  "dr8_c",  "dr10_c", "dr12_c", "dr14_c",
+    "fr0_c",  "fr1_c",  "fr2_c",  "fr3_c",
+    "fr4_c",  "fr5_c",  "fr6_c",  "fr7_c",
+    "fr8_c",  "fr9_c",  "fr10_c", "fr11_c",
+    "fr12_c", "fr13_c", "fr14_c", "fr15_c",
+    "dr0_c",  "dr2_c",  "dr4_c",  "dr6_c",
+    "dr8_c",  "dr10_c", "dr12_c", "dr14_c",

     "fv0_c", "fv4_c", "fv8_c",  "fv12_c",
     "fv0_c", "fv4_c", "fv8_c",  "fv12_c",

-    /* FIXME!!!! XF0 XF15, XD0 XD14 ?????*/
+    /* FIXME!!!! XF0 XF15, XD0 XD14 ?????  */

   };
 
   if (reg_nr < 0)
   };
 
   if (reg_nr < 0)


@@ -212,7 +213,7 @@ sh64_register_name (int reg_nr)
    MSYMBOL_IS_SPECIAL   tests the "special" bit in a minimal symbol  */
 
 #define MSYMBOL_IS_SPECIAL(msym) \
    MSYMBOL_IS_SPECIAL   tests the "special" bit in a minimal symbol  */
 
 #define MSYMBOL_IS_SPECIAL(msym) \

-  (((long) MSYMBOL_INFO (msym) & 0x80000000) != 0)
+  MSYMBOL_TARGET_FLAG_1 (msym)

 
 static void
 sh64_elf_make_msymbol_special (asymbol *sym, struct minimal_symbol *msym)
 
 static void
 sh64_elf_make_msymbol_special (asymbol *sym, struct minimal_symbol *msym)


@@ -222,7 +223,7 @@ sh64_elf_make_msymbol_special (asymbol *sym, struct minimal_symbol *msym)
 
   if (((elf_symbol_type *)(sym))->internal_elf_sym.st_other == STO_SH5_ISA32)
     {
 
   if (((elf_symbol_type *)(sym))->internal_elf_sym.st_other == STO_SH5_ISA32)
     {

-      MSYMBOL_INFO (msym) = (char *) (((long) MSYMBOL_INFO (msym)) | 0x80000000);
+      MSYMBOL_TARGET_FLAG_1 (msym) = 1;

       SYMBOL_VALUE_ADDRESS (msym) |= 1;
     }
 }
       SYMBOL_VALUE_ADDRESS (msym) |= 1;
     }
 }


@@ -236,7 +237,7 @@ sh64_elf_make_msymbol_special (asymbol *sym, struct minimal_symbol *msym)
 static int
 pc_is_isa32 (bfd_vma memaddr)
 {
 static int
 pc_is_isa32 (bfd_vma memaddr)
 {

-  struct minimal_symbol *sym;
+  struct bound_minimal_symbol sym;

 
   /* If bit 0 of the address is set, assume this is a
      ISA32 (shmedia) address.  */
 
   /* If bit 0 of the address is set, assume this is a
      ISA32 (shmedia) address.  */


@@ -247,14 +248,15 @@ pc_is_isa32 (bfd_vma memaddr)
      the high bit of the info field.  Use this to decide if the function is
      ISA16 or ISA32.  */
   sym = lookup_minimal_symbol_by_pc (memaddr);
      the high bit of the info field.  Use this to decide if the function is
      ISA16 or ISA32.  */
   sym = lookup_minimal_symbol_by_pc (memaddr);

-  if (sym)
-    return MSYMBOL_IS_SPECIAL (sym);
+  if (sym.minsym)
+    return MSYMBOL_IS_SPECIAL (sym.minsym);

   else
     return 0;
 }
 
 static const unsigned char *
   else
     return 0;
 }
 
 static const unsigned char *

-sh64_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
+sh64_breakpoint_from_pc (struct gdbarch *gdbarch,
+                        CORE_ADDR *pcptr, int *lenptr)

 {
   /* The BRK instruction for shmedia is 
      01101111 11110101 11111111 11110000
 {
   /* The BRK instruction for shmedia is 
      01101111 11110101 11111111 11110000


@@ -264,13 +266,15 @@ sh64_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
   /* The BRK instruction for shcompact is
      00000000 00111011
      which translates in big endian mode to 0x0, 0x3b
   /* The BRK instruction for shcompact is
      00000000 00111011
      which translates in big endian mode to 0x0, 0x3b

-     and in little endian mode to 0x3b, 0x0*/
+     and in little endian mode to 0x3b, 0x0 */

 
 

-  if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_BIG)
+  if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)

     {
       if (pc_is_isa32 (*pcptr))
        {
     {
       if (pc_is_isa32 (*pcptr))
        {

-         static unsigned char big_breakpoint_media[] = {0x6f, 0xf5, 0xff, 0xf0};
+         static unsigned char big_breakpoint_media[] = {
+           0x6f, 0xf5, 0xff, 0xf0
+         };

          *pcptr = UNMAKE_ISA32_ADDR (*pcptr);
          *lenptr = sizeof (big_breakpoint_media);
          return big_breakpoint_media;
          *pcptr = UNMAKE_ISA32_ADDR (*pcptr);
          *lenptr = sizeof (big_breakpoint_media);
          return big_breakpoint_media;


@@ -286,7 +290,9 @@ sh64_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
     {
       if (pc_is_isa32 (*pcptr))
        {
     {
       if (pc_is_isa32 (*pcptr))
        {

-         static unsigned char little_breakpoint_media[] = {0xf0, 0xff, 0xf5, 0x6f};
+         static unsigned char little_breakpoint_media[] = {
+           0xf0, 0xff, 0xf5, 0x6f
+         };

          *pcptr = UNMAKE_ISA32_ADDR (*pcptr);
          *lenptr = sizeof (little_breakpoint_media);
          return little_breakpoint_media;
          *pcptr = UNMAKE_ISA32_ADDR (*pcptr);
          *lenptr = sizeof (little_breakpoint_media);
          return little_breakpoint_media;


@@ -380,7 +386,8 @@ sh64_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
    R15 + R63 --> R14 */
 #define IS_ADD_SP_FP_MEDIA(x)          ((x) == 0x00f9fce0)
 
    R15 + R63 --> R14 */
 #define IS_ADD_SP_FP_MEDIA(x)          ((x) == 0x00f9fce0)
 

-#define IS_MOV_SP_FP_MEDIA(x)          (IS_ADDL_SP_FP_MEDIA(x) || IS_ADD_SP_FP_MEDIA(x))
+#define IS_MOV_SP_FP_MEDIA(x)          \
+  (IS_ADDL_SP_FP_MEDIA(x) || IS_ADD_SP_FP_MEDIA(x))

 
 /* MOV #imm, R0    1110 0000 ssss ssss 
    #imm-->R0 */
 
 /* MOV #imm, R0    1110 0000 ssss ssss 
    #imm-->R0 */


@@ -399,9 +406,11 @@ sh64_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
 
 /* ADD Rm,R63,Rn  Rm+R63-->Rn  0000 00mm mmmm 1001 1111 11nn nnnn 0000
    where Rm is one of r2-r9 which are the argument registers.  */
 
 /* ADD Rm,R63,Rn  Rm+R63-->Rn  0000 00mm mmmm 1001 1111 11nn nnnn 0000
    where Rm is one of r2-r9 which are the argument registers.  */

-/* FIXME: Recognize the float and double register moves too! */
+/* FIXME: Recognize the float and double register moves too!  */

 #define IS_MEDIA_IND_ARG_MOV(x) \
 #define IS_MEDIA_IND_ARG_MOV(x) \

-((((x) & 0xfc0ffc0f) == 0x0009fc00) && (((x) & 0x03f00000) >= 0x00200000 && ((x) & 0x03f00000) <= 0x00900000))
+  ((((x) & 0xfc0ffc0f) == 0x0009fc00) \
+   && (((x) & 0x03f00000) >= 0x00200000 \
+       && ((x) & 0x03f00000) <= 0x00900000))

 
 /* ST.Q Rn,0,Rm  Rm-->Rn+0  1010 11nn nnnn 0000 0000 00mm mmmm 0000
    or ST.L Rn,0,Rm  Rm-->Rn+0  1010 10nn nnnn 0000 0000 00mm mmmm 0000
 
 /* ST.Q Rn,0,Rm  Rm-->Rn+0  1010 11nn nnnn 0000 0000 00mm mmmm 0000
    or ST.L Rn,0,Rm  Rm-->Rn+0  1010 10nn nnnn 0000 0000 00mm mmmm 0000


@@ -410,11 +419,11 @@ sh64_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
 (((((x) & 0xfc0ffc0f) == 0xac000000) || (((x) & 0xfc0ffc0f) == 0xa8000000)) \
    && (((x) & 0x000003f0) >= 0x00000020 && ((x) & 0x000003f0) <= 0x00000090))
 
 (((((x) & 0xfc0ffc0f) == 0xac000000) || (((x) & 0xfc0ffc0f) == 0xa8000000)) \
    && (((x) & 0x000003f0) >= 0x00000020 && ((x) & 0x000003f0) <= 0x00000090))
 

-/* ST.B R14,0,Rn     Rn-->(R14+0) 1010 0000 1110 0000 0000 00nn nnnn 0000*/
-/* ST.W R14,0,Rn     Rn-->(R14+0) 1010 0100 1110 0000 0000 00nn nnnn 0000*/
-/* ST.L R14,0,Rn     Rn-->(R14+0) 1010 1000 1110 0000 0000 00nn nnnn 0000*/
-/* FST.S R14,0,FRn   Rn-->(R14+0) 1011 0100 1110 0000 0000 00nn nnnn 0000*/
-/* FST.D R14,0,DRn   Rn-->(R14+0) 1011 1100 1110 0000 0000 00nn nnnn 0000*/
+/* ST.B R14,0,Rn     Rn-->(R14+0) 1010 0000 1110 0000 0000 00nn nnnn 0000 */
+/* ST.W R14,0,Rn     Rn-->(R14+0) 1010 0100 1110 0000 0000 00nn nnnn 0000 */
+/* ST.L R14,0,Rn     Rn-->(R14+0) 1010 1000 1110 0000 0000 00nn nnnn 0000 */
+/* FST.S R14,0,FRn   Rn-->(R14+0) 1011 0100 1110 0000 0000 00nn nnnn 0000 */
+/* FST.D R14,0,DRn   Rn-->(R14+0) 1011 1100 1110 0000 0000 00nn nnnn 0000 */

 #define IS_MEDIA_MOV_TO_R14(x)  \
 ((((x) & 0xfffffc0f) == 0xa0e00000) \
 || (((x) & 0xfffffc0f) == 0xa4e00000) \
 #define IS_MEDIA_MOV_TO_R14(x)  \
 ((((x) & 0xfffffc0f) == 0xa0e00000) \
 || (((x) & 0xfffffc0f) == 0xa4e00000) \


@@ -425,12 +434,14 @@ sh64_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
 /* MOV Rm, Rn  Rm-->Rn 0110 nnnn mmmm 0011
    where Rm is r2-r9 */
 #define IS_COMPACT_IND_ARG_MOV(x) \
 /* MOV Rm, Rn  Rm-->Rn 0110 nnnn mmmm 0011
    where Rm is r2-r9 */
 #define IS_COMPACT_IND_ARG_MOV(x) \

-((((x) & 0xf00f) == 0x6003) && (((x) & 0x00f0) >= 0x0020) && (((x) & 0x00f0) <= 0x0090))
+  ((((x) & 0xf00f) == 0x6003) && (((x) & 0x00f0) >= 0x0020) \
+   && (((x) & 0x00f0) <= 0x0090))

 
 /* compact direct arg move! 
    MOV.L Rn, @r14     0010 1110 mmmm 0010 */
 #define IS_COMPACT_ARG_MOV(x) \
 
 /* compact direct arg move! 
    MOV.L Rn, @r14     0010 1110 mmmm 0010 */
 #define IS_COMPACT_ARG_MOV(x) \

-(((((x) & 0xff0f) == 0x2e02) && (((x) & 0x00f0) >= 0x0020) && ((x) & 0x00f0) <= 0x0090))
+  (((((x) & 0xff0f) == 0x2e02) && (((x) & 0x00f0) >= 0x0020) \
+    && ((x) & 0x00f0) <= 0x0090))

 
 /* MOV.B Rm, @R14     0010 1110 mmmm 0000 
    MOV.W Rm, @R14     0010 1110 mmmm 0001 */
 
 /* MOV.B Rm, @R14     0010 1110 mmmm 0000 
    MOV.W Rm, @R14     0010 1110 mmmm 0001 */


@@ -449,7 +460,7 @@ sh64_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
    r15+imm-->r15 */
 #define IS_ADD_SP(x)           (((x) & 0xff00) == 0x7f00)
 
    r15+imm-->r15 */
 #define IS_ADD_SP(x)           (((x) & 0xff00) == 0x7f00)
 

-/* Skip any prologue before the guts of a function */
+/* Skip any prologue before the guts of a function.  */

 
 /* Skip the prologue using the debug information.  If this fails we'll
    fall back on the 'guess' method below.  */
 
 /* Skip the prologue using the debug information.  If this fails we'll
    fall back on the 'guess' method below.  */


@@ -481,8 +492,10 @@ after_prologue (CORE_ADDR pc)
 }
 
 static CORE_ADDR 
 }
 
 static CORE_ADDR 

-look_for_args_moves (CORE_ADDR start_pc, int media_mode)
+look_for_args_moves (struct gdbarch *gdbarch,
+                    CORE_ADDR start_pc, int media_mode)

 {
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);

   CORE_ADDR here, end;
   int w;
   int insn_size = (media_mode ? 4 : 2);
   CORE_ADDR here, end;
   int w;
   int insn_size = (media_mode ? 4 : 2);


@@ -491,16 +504,17 @@ look_for_args_moves (CORE_ADDR start_pc, int media_mode)
     {
       if (media_mode)
        {
     {
       if (media_mode)
        {

-         w = read_memory_integer (UNMAKE_ISA32_ADDR (here), insn_size);
+         w = read_memory_integer (UNMAKE_ISA32_ADDR (here),
+                                  insn_size, byte_order);

          here += insn_size;
          if (IS_MEDIA_IND_ARG_MOV (w))
            {
              /* This must be followed by a store to r14, so the argument
          here += insn_size;
          if (IS_MEDIA_IND_ARG_MOV (w))
            {
              /* This must be followed by a store to r14, so the argument

-                is where the debug info says it is. This can happen after
+                is where the debug info says it is.  This can happen after

                 the SP has been saved, unfortunately.  */
         
              int next_insn = read_memory_integer (UNMAKE_ISA32_ADDR (here),
                 the SP has been saved, unfortunately.  */
         
              int next_insn = read_memory_integer (UNMAKE_ISA32_ADDR (here),

-                                                  insn_size);
+                                                  insn_size, byte_order);

              here += insn_size;
              if (IS_MEDIA_MOV_TO_R14 (next_insn))
                start_pc = here;          
              here += insn_size;
              if (IS_MEDIA_MOV_TO_R14 (next_insn))
                start_pc = here;          


@@ -515,16 +529,17 @@ look_for_args_moves (CORE_ADDR start_pc, int media_mode)
        }
       else
        {
        }
       else
        {

-         w = read_memory_integer (here, insn_size);
+         w = read_memory_integer (here, insn_size, byte_order);

          w = w & 0xffff;
          here += insn_size;
          if (IS_COMPACT_IND_ARG_MOV (w))
            {
              /* This must be followed by a store to r14, so the argument
          w = w & 0xffff;
          here += insn_size;
          if (IS_COMPACT_IND_ARG_MOV (w))
            {
              /* This must be followed by a store to r14, so the argument

-                is where the debug info says it is. This can happen after
+                is where the debug info says it is.  This can happen after

                 the SP has been saved, unfortunately.  */
         
                 the SP has been saved, unfortunately.  */
         

-             int next_insn = 0xffff & read_memory_integer (here, insn_size);
+             int next_insn = 0xffff & read_memory_integer (here, insn_size,
+                                                           byte_order);

              here += insn_size;
              if (IS_COMPACT_MOV_TO_R14 (next_insn))
                start_pc = here;
              here += insn_size;
              if (IS_COMPACT_MOV_TO_R14 (next_insn))
                start_pc = here;


@@ -537,9 +552,9 @@ look_for_args_moves (CORE_ADDR start_pc, int media_mode)
          else if (IS_MOVL_R0 (w))
            {
              /* There is a function that gcc calls to get the arguments
          else if (IS_MOVL_R0 (w))
            {
              /* There is a function that gcc calls to get the arguments

-                passed correctly to the function. Only after this
+                passed correctly to the function.  Only after this

                 function call the arguments will be found at the place
                 function call the arguments will be found at the place

-                where they are supposed to be. This happens in case the
+                where they are supposed to be.  This happens in case the

                 argument has to be stored into a 64-bit register (for
                 instance doubles, long longs).  SHcompact doesn't have
                 access to the full 64-bits, so we store the register in
                 argument has to be stored into a 64-bit register (for
                 instance doubles, long longs).  SHcompact doesn't have
                 access to the full 64-bits, so we store the register in


@@ -551,17 +566,19 @@ look_for_args_moves (CORE_ADDR start_pc, int media_mode)
                 value in a stack slot and stores the address of the
                 stack slot in the register.  GCC thinks the argument is
                 just passed by transparent reference, but this is only
                 value in a stack slot and stores the address of the
                 stack slot in the register.  GCC thinks the argument is
                 just passed by transparent reference, but this is only

-                true after the argument decoder is called. Such a call
+                true after the argument decoder is called.  Such a call

                 needs to be considered part of the prologue.  */
 
              /* This must be followed by a JSR @r0 instruction and by
                 needs to be considered part of the prologue.  */
 
              /* This must be followed by a JSR @r0 instruction and by

-                 a NOP instruction. After these, the prologue is over!  */
+                 a NOP instruction.  After these, the prologue is over!  */

         
         

-             int next_insn = 0xffff & read_memory_integer (here, insn_size);
+             int next_insn = 0xffff & read_memory_integer (here, insn_size,
+                                                           byte_order);

              here += insn_size;
              if (IS_JSR_R0 (next_insn))
                {
              here += insn_size;
              if (IS_JSR_R0 (next_insn))
                {

-                 next_insn = 0xffff & read_memory_integer (here, insn_size);
+                 next_insn = 0xffff & read_memory_integer (here, insn_size,
+                                                           byte_order);

                  here += insn_size;
 
                  if (IS_NOP (next_insn))
                  here += insn_size;
 
                  if (IS_NOP (next_insn))


@@ -577,8 +594,9 @@ look_for_args_moves (CORE_ADDR start_pc, int media_mode)
 }
 
 static CORE_ADDR
 }
 
 static CORE_ADDR

-sh64_skip_prologue_hard_way (CORE_ADDR start_pc)
+sh64_skip_prologue_hard_way (struct gdbarch *gdbarch, CORE_ADDR start_pc)

 {
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);

   CORE_ADDR here, end;
   int updated_fp = 0;
   int insn_size = 4;
   CORE_ADDR here, end;
   int updated_fp = 0;
   int insn_size = 4;


@@ -598,11 +616,13 @@ sh64_skip_prologue_hard_way (CORE_ADDR start_pc)
 
       if (media_mode)
        {
 
       if (media_mode)
        {

-         int w = read_memory_integer (UNMAKE_ISA32_ADDR (here), insn_size);
+         int w = read_memory_integer (UNMAKE_ISA32_ADDR (here),
+                                      insn_size, byte_order);

          here += insn_size;
          if (IS_STQ_R18_R14 (w) || IS_STQ_R18_R15 (w) || IS_STQ_R14_R15 (w)
              || IS_STL_R14_R15 (w) || IS_STL_R18_R15 (w)
          here += insn_size;
          if (IS_STQ_R18_R14 (w) || IS_STQ_R18_R15 (w) || IS_STQ_R14_R15 (w)
              || IS_STL_R14_R15 (w) || IS_STL_R18_R15 (w)

-             || IS_ADDIL_SP_MEDIA (w) || IS_ADDI_SP_MEDIA (w) || IS_PTABSL_R18 (w))
+             || IS_ADDIL_SP_MEDIA (w) || IS_ADDI_SP_MEDIA (w)
+             || IS_PTABSL_R18 (w))

            {
              start_pc = here;
            }
            {
              start_pc = here;
            }


@@ -617,13 +637,14 @@ sh64_skip_prologue_hard_way (CORE_ADDR start_pc)
                /* Don't bail out yet, we may have arguments stored in
                   registers here, according to the debug info, so that
                   gdb can print the frames correctly.  */
                /* Don't bail out yet, we may have arguments stored in
                   registers here, according to the debug info, so that
                   gdb can print the frames correctly.  */

-               start_pc = look_for_args_moves (here - insn_size, media_mode);
+               start_pc = look_for_args_moves (gdbarch,
+                                               here - insn_size, media_mode);

                break;
              }
        }
       else
        {
                break;
              }
        }
       else
        {

-         int w = 0xffff & read_memory_integer (here, insn_size);
+         int w = 0xffff & read_memory_integer (here, insn_size, byte_order);

          here += insn_size;
 
          if (IS_STS_R0 (w) || IS_STS_PR (w)
          here += insn_size;
 
          if (IS_STS_R0 (w) || IS_STS_PR (w)


@@ -643,7 +664,8 @@ sh64_skip_prologue_hard_way (CORE_ADDR start_pc)
                /* Don't bail out yet, we may have arguments stored in
                   registers here, according to the debug info, so that
                   gdb can print the frames correctly.  */
                /* Don't bail out yet, we may have arguments stored in
                   registers here, according to the debug info, so that
                   gdb can print the frames correctly.  */

-               start_pc = look_for_args_moves (here - insn_size, media_mode);
+               start_pc = look_for_args_moves (gdbarch,
+                                               here - insn_size, media_mode);

                break;
              }
        }
                break;
              }
        }


@@ -653,7 +675,7 @@ sh64_skip_prologue_hard_way (CORE_ADDR start_pc)
 }
 
 static CORE_ADDR
 }
 
 static CORE_ADDR

-sh64_skip_prologue (CORE_ADDR pc)
+sh64_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)

 {
   CORE_ADDR post_prologue_pc;
 
 {
   CORE_ADDR post_prologue_pc;
 


@@ -667,7 +689,7 @@ sh64_skip_prologue (CORE_ADDR pc)
   if (post_prologue_pc != 0)
     return max (pc, post_prologue_pc);
   else
   if (post_prologue_pc != 0)
     return max (pc, post_prologue_pc);
   else

-    return sh64_skip_prologue_hard_way (pc);
+    return sh64_skip_prologue_hard_way (gdbarch, pc);

 }
 
 /* Should call_function allocate stack space for a struct return?  */
 }
 
 /* Should call_function allocate stack space for a struct return?  */


@@ -677,44 +699,33 @@ sh64_use_struct_convention (struct type *type)
   return (TYPE_LENGTH (type) > 8);
 }
 
   return (TYPE_LENGTH (type) > 8);
 }
 

-/* Disassemble an instruction.  */
-static int
-gdb_print_insn_sh64 (bfd_vma memaddr, disassemble_info *info)
-{
-  info->endian = gdbarch_byte_order (current_gdbarch);
-  return print_insn_sh (memaddr, info);
-}
-

 /* For vectors of 4 floating point registers.  */
 static int
 /* For vectors of 4 floating point registers.  */
 static int

-sh64_fv_reg_base_num (int fv_regnum)
+sh64_fv_reg_base_num (struct gdbarch *gdbarch, int fv_regnum)

 {
   int fp_regnum;
 
 {
   int fp_regnum;
 

-  fp_regnum = gdbarch_fp0_regnum (current_gdbarch) +
-    (fv_regnum - FV0_REGNUM) * 4;
+  fp_regnum = gdbarch_fp0_regnum (gdbarch) + (fv_regnum - FV0_REGNUM) * 4;

   return fp_regnum;
 }
 
   return fp_regnum;
 }
 

-/* For double precision floating point registers, i.e 2 fp regs.*/
+/* For double precision floating point registers, i.e 2 fp regs.  */

 static int
 static int

-sh64_dr_reg_base_num (int dr_regnum)
+sh64_dr_reg_base_num (struct gdbarch *gdbarch, int dr_regnum)

 {
   int fp_regnum;
 
 {
   int fp_regnum;
 

-  fp_regnum = gdbarch_fp0_regnum (current_gdbarch) +
-    (dr_regnum - DR0_REGNUM) * 2;
+  fp_regnum = gdbarch_fp0_regnum (gdbarch) + (dr_regnum - DR0_REGNUM) * 2;

   return fp_regnum;
 }
 
   return fp_regnum;
 }
 

-/* For pairs of floating point registers */
+/* For pairs of floating point registers.  */

 static int
 static int

-sh64_fpp_reg_base_num (int fpp_regnum)
+sh64_fpp_reg_base_num (struct gdbarch *gdbarch, int fpp_regnum)

 {
   int fp_regnum;
 
 {
   int fp_regnum;
 

-  fp_regnum = gdbarch_fp0_regnum (current_gdbarch) +
-    (fpp_regnum - FPP0_REGNUM) * 2;
+  fp_regnum = gdbarch_fp0_regnum (gdbarch) + (fpp_regnum - FPP0_REGNUM) * 2;

   return fp_regnum;
 }
 
   return fp_regnum;
 }
 


@@ -781,7 +792,7 @@ sh64_fpp_reg_base_num (int fpp_regnum)
 */
 /* *INDENT-ON* */
 static int
 */
 /* *INDENT-ON* */
 static int

-sh64_compact_reg_base_num (int reg_nr)
+sh64_compact_reg_base_num (struct gdbarch *gdbarch, int reg_nr)

 {
   int base_regnum = reg_nr;
 
 {
   int base_regnum = reg_nr;
 


@@ -793,20 +804,22 @@ sh64_compact_reg_base_num (int reg_nr)
   /* floating point register N maps to floating point register N */
   else if (reg_nr >= FP0_C_REGNUM 
            && reg_nr <= FP_LAST_C_REGNUM)
   /* floating point register N maps to floating point register N */
   else if (reg_nr >= FP0_C_REGNUM 
            && reg_nr <= FP_LAST_C_REGNUM)

-    base_regnum = reg_nr - FP0_C_REGNUM + gdbarch_fp0_regnum (current_gdbarch);
+    base_regnum = reg_nr - FP0_C_REGNUM + gdbarch_fp0_regnum (gdbarch);

 
   /* double prec register N maps to base regnum for double prec register N */
   else if (reg_nr >= DR0_C_REGNUM 
            && reg_nr <= DR_LAST_C_REGNUM)
 
   /* double prec register N maps to base regnum for double prec register N */
   else if (reg_nr >= DR0_C_REGNUM 
            && reg_nr <= DR_LAST_C_REGNUM)

-    base_regnum = sh64_dr_reg_base_num (DR0_REGNUM + reg_nr - DR0_C_REGNUM);
+    base_regnum = sh64_dr_reg_base_num (gdbarch,
+                                       DR0_REGNUM + reg_nr - DR0_C_REGNUM);

 
   /* vector N maps to base regnum for vector register N */
   else if (reg_nr >= FV0_C_REGNUM 
            && reg_nr <= FV_LAST_C_REGNUM)
 
   /* vector N maps to base regnum for vector register N */
   else if (reg_nr >= FV0_C_REGNUM 
            && reg_nr <= FV_LAST_C_REGNUM)

-    base_regnum = sh64_fv_reg_base_num (FV0_REGNUM + reg_nr - FV0_C_REGNUM);
+    base_regnum = sh64_fv_reg_base_num (gdbarch,
+                                       FV0_REGNUM + reg_nr - FV0_C_REGNUM);

 
   else if (reg_nr == PC_C_REGNUM)
 
   else if (reg_nr == PC_C_REGNUM)

-    base_regnum = gdbarch_pc_regnum (current_gdbarch);
+    base_regnum = gdbarch_pc_regnum (gdbarch);

 
   else if (reg_nr == GBR_C_REGNUM) 
     base_regnum = 16;
 
   else if (reg_nr == GBR_C_REGNUM) 
     base_regnum = 16;


@@ -825,7 +838,7 @@ sh64_compact_reg_base_num (int reg_nr)
     base_regnum = FPSCR_REGNUM; /*???? this register is a mess.  */
 
   else if (reg_nr == FPUL_C_REGNUM) 
     base_regnum = FPSCR_REGNUM; /*???? this register is a mess.  */
 
   else if (reg_nr == FPUL_C_REGNUM) 

-    base_regnum = gdbarch_fp0_regnum (current_gdbarch) + 32;
+    base_regnum = gdbarch_fp0_regnum (gdbarch) + 32;

   
   return base_regnum;
 }
   
   return base_regnum;
 }


@@ -845,7 +858,6 @@ sh64_analyze_prologue (struct gdbarch *gdbarch,
                       CORE_ADDR func_pc,
                       CORE_ADDR current_pc)
 {
                       CORE_ADDR func_pc,
                       CORE_ADDR current_pc)
 {

-  int reg_nr;

   int pc;
   int opc;
   int insn;
   int pc;
   int opc;
   int insn;


@@ -854,6 +866,7 @@ sh64_analyze_prologue (struct gdbarch *gdbarch,
   int gdb_register_number;
   int register_number;
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
   int gdb_register_number;
   int register_number;
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);

   
   cache->sp_offset = 0;
 
   
   cache->sp_offset = 0;
 


@@ -875,17 +888,19 @@ sh64_analyze_prologue (struct gdbarch *gdbarch,
     {
       insn = read_memory_integer (cache->media_mode ? UNMAKE_ISA32_ADDR (pc)
                                                    : pc,
     {
       insn = read_memory_integer (cache->media_mode ? UNMAKE_ISA32_ADDR (pc)
                                                    : pc,

-                                 insn_size);
+                                 insn_size, byte_order);

 
       if (!cache->media_mode)
        {
          if (IS_STS_PR (insn))
            {
 
       if (!cache->media_mode)
        {
          if (IS_STS_PR (insn))
            {

-             int next_insn = read_memory_integer (pc + insn_size, insn_size);
+             int next_insn = read_memory_integer (pc + insn_size,
+                                                  insn_size, byte_order);

              if (IS_MOV_TO_R15 (next_insn))
                {
              if (IS_MOV_TO_R15 (next_insn))
                {

-                 cache->saved_regs[PR_REGNUM] =
-                   cache->sp_offset - ((((next_insn & 0xf) ^ 0x8) - 0x8) << 2);
+                 cache->saved_regs[PR_REGNUM]
+                   = cache->sp_offset - ((((next_insn & 0xf) ^ 0x8)
+                                          - 0x8) << 2);

                  pc += insn_size;
                }
            }
                  pc += insn_size;
                }
            }


@@ -897,7 +912,7 @@ sh64_analyze_prologue (struct gdbarch *gdbarch,
          else if (IS_MOV_R0 (insn))
            {
              /* Put in R0 the offset from SP at which to store some
          else if (IS_MOV_R0 (insn))
            {
              /* Put in R0 the offset from SP at which to store some

-                registers. We are interested in this value, because it
+                registers.  We are interested in this value, because it

                 will tell us where the given registers are stored within
                 the frame.  */
              r0_val = ((insn & 0xff) ^ 0x80) - 0x80;
                 will tell us where the given registers are stored within
                 the frame.  */
              r0_val = ((insn & 0xff) ^ 0x80) - 0x80;


@@ -911,14 +926,14 @@ sh64_analyze_prologue (struct gdbarch *gdbarch,
 
          else if (IS_STS_R0 (insn))
            {
 
          else if (IS_STS_R0 (insn))
            {

-             /* Store PR at r0_val-4 from SP. Decrement r0 by 4*/
+             /* Store PR at r0_val-4 from SP.  Decrement r0 by 4.  */

              cache->saved_regs[PR_REGNUM] = cache->sp_offset - (r0_val - 4);
              r0_val -= 4;
            }
 
          else if (IS_MOV_R14_R0 (insn))
            {
              cache->saved_regs[PR_REGNUM] = cache->sp_offset - (r0_val - 4);
              r0_val -= 4;
            }
 
          else if (IS_MOV_R14_R0 (insn))
            {

-             /* Store R14 at r0_val-4 from SP. Decrement r0 by 4 */
+             /* Store R14 at r0_val-4 from SP.  Decrement r0 by 4.  */

              cache->saved_regs[MEDIA_FP_REGNUM] = cache->sp_offset
                                                   - (r0_val - 4);
              r0_val -= 4;
              cache->saved_regs[MEDIA_FP_REGNUM] = cache->sp_offset
                                                   - (r0_val - 4);
              r0_val -= 4;


@@ -937,20 +952,24 @@ sh64_analyze_prologue (struct gdbarch *gdbarch,
              sign_extend ((((insn & 0xffc00) ^ 0x80000) - 0x80000) >> 10, 9);
 
          else if (IS_STQ_R18_R15 (insn))
              sign_extend ((((insn & 0xffc00) ^ 0x80000) - 0x80000) >> 10, 9);
 
          else if (IS_STQ_R18_R15 (insn))

-           cache->saved_regs[PR_REGNUM] = 
-             cache->sp_offset - (sign_extend ((insn & 0xffc00) >> 10, 9) << 3);
+           cache->saved_regs[PR_REGNUM]
+             = cache->sp_offset - (sign_extend ((insn & 0xffc00) >> 10,
+                                                9) << 3);

 
          else if (IS_STL_R18_R15 (insn))
 
          else if (IS_STL_R18_R15 (insn))

-           cache->saved_regs[PR_REGNUM] = 
-             cache->sp_offset - (sign_extend ((insn & 0xffc00) >> 10, 9) << 2);
+           cache->saved_regs[PR_REGNUM]
+             = cache->sp_offset - (sign_extend ((insn & 0xffc00) >> 10,
+                                                9) << 2);

 
          else if (IS_STQ_R14_R15 (insn))
 
          else if (IS_STQ_R14_R15 (insn))

-           cache->saved_regs[MEDIA_FP_REGNUM] =
-             cache->sp_offset - (sign_extend ((insn & 0xffc00) >> 10, 9) << 3);
+           cache->saved_regs[MEDIA_FP_REGNUM]
+             = cache->sp_offset - (sign_extend ((insn & 0xffc00) >> 10,
+                                                9) << 3);

 
          else if (IS_STL_R14_R15 (insn))
 
          else if (IS_STL_R14_R15 (insn))

-           cache->saved_regs[MEDIA_FP_REGNUM] =
-             cache->sp_offset - (sign_extend ((insn & 0xffc00) >> 10, 9) << 2);
+           cache->saved_regs[MEDIA_FP_REGNUM]
+             = cache->sp_offset - (sign_extend ((insn & 0xffc00) >> 10,
+                                                9) << 2);

 
          else if (IS_MOV_SP_FP_MEDIA (insn))
            break;
 
          else if (IS_MOV_SP_FP_MEDIA (insn))
            break;


@@ -961,17 +980,6 @@ sh64_analyze_prologue (struct gdbarch *gdbarch,
     cache->uses_fp = 1;
 }
 
     cache->uses_fp = 1;
 }
 

-static CORE_ADDR
-sh64_extract_struct_value_address (struct regcache *regcache)
-{
-  /* FIXME: cagney/2004-01-17: Does the ABI guarantee that the return
-     address regster is preserved across function calls?  Probably
-     not, making this function wrong.  */
-  ULONGEST val;
-  regcache_raw_read_unsigned (regcache, STRUCT_RETURN_REGNUM, &val);
-  return val;
-}
-

 static CORE_ADDR
 sh64_frame_align (struct gdbarch *ignore, CORE_ADDR sp)
 {
 static CORE_ADDR
 sh64_frame_align (struct gdbarch *ignore, CORE_ADDR sp)
 {


@@ -994,7 +1002,7 @@ sh64_frame_align (struct gdbarch *ignore, CORE_ADDR sp)
    Arguments that are larger than 4 bytes may be split between two or 
    more registers.  If there are not enough registers free, an argument
    may be passed partly in a register (or registers), and partly on the
    Arguments that are larger than 4 bytes may be split between two or 
    more registers.  If there are not enough registers free, an argument
    may be passed partly in a register (or registers), and partly on the

-   stack.  This includes doubles, long longs, and larger aggregates. 
+   stack.  This includes doubles, long longs, and larger aggregates.

    As far as I know, there is no upper limit to the size of aggregates 
    that will be passed in this way; in other words, the convention of 
    passing a pointer to a large aggregate instead of a copy is not used.
    As far as I know, there is no upper limit to the size of aggregates 
    that will be passed in this way; in other words, the convention of 
    passing a pointer to a large aggregate instead of a copy is not used.


@@ -1019,7 +1027,7 @@ sh64_frame_align (struct gdbarch *ignore, CORE_ADDR sp)
    is greater than one byte).  In this case, a pointer to the return 
    value location is passed into the callee in register R2, which does 
    not displace any of the other arguments passed in via registers R4
    is greater than one byte).  In this case, a pointer to the return 
    value location is passed into the callee in register R2, which does 
    not displace any of the other arguments passed in via registers R4

-   to R7.   */
+   to R7.  */

 
 /* R2-R9 for integer types and integer equivalent (char, pointers) and
    non-scalar (struct, union) elements (even if the elements are
 
 /* R2-R9 for integer types and integer equivalent (char, pointers) and
    non-scalar (struct, union) elements (even if the elements are


@@ -1029,13 +1037,13 @@ sh64_frame_align (struct gdbarch *ignore, CORE_ADDR sp)
    
    If a float is argument number 3 (for instance) and arguments number
    1,2, and 4 are integer, the mapping will be:
    
    If a float is argument number 3 (for instance) and arguments number
    1,2, and 4 are integer, the mapping will be:

-   arg1 -->R2, arg2 --> R3, arg3 -->FR0, arg4 --> R5. I.e. R4 is not used.
+   arg1 -->R2, arg2 --> R3, arg3 -->FR0, arg4 --> R5.  I.e. R4 is not used.

    
    If a float is argument number 10 (for instance) and arguments number
    1 through 10 are integer, the mapping will be:
    arg1->R2, arg2->R3, arg3->R4, arg4->R5, arg5->R6, arg6->R7, arg7->R8,
    
    If a float is argument number 10 (for instance) and arguments number
    1 through 10 are integer, the mapping will be:
    arg1->R2, arg2->R3, arg3->R4, arg4->R5, arg5->R6, arg6->R7, arg7->R8,

-   arg8->R9, arg9->(0,SP)stack(8-byte aligned), arg10->FR0, arg11->stack(16,SP).
-   I.e. there is hole in the stack.
+   arg8->R9, arg9->(0,SP)stack(8-byte aligned), arg10->FR0,
+   arg11->stack(16,SP).  I.e. there is hole in the stack.

 
    Different rules apply for variable arguments functions, and for functions
    for which the prototype is not known.  */
 
    Different rules apply for variable arguments functions, and for functions
    for which the prototype is not known.  */


@@ -1049,6 +1057,7 @@ sh64_push_dummy_call (struct gdbarch *gdbarch,
                      CORE_ADDR sp, int struct_return,
                      CORE_ADDR struct_addr)
 {
                      CORE_ADDR sp, int struct_return,
                      CORE_ADDR struct_addr)
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);

   int stack_offset, stack_alloc;
   int int_argreg;
   int float_argreg;
   int stack_offset, stack_alloc;
   int int_argreg;
   int float_argreg;


@@ -1058,36 +1067,35 @@ sh64_push_dummy_call (struct gdbarch *gdbarch,
   int argnum;
   struct type *type;
   CORE_ADDR regval;
   int argnum;
   struct type *type;
   CORE_ADDR regval;

-  char *val;
-  char valbuf[8];
-  char valbuf_tmp[8];
+  const gdb_byte *val;
+  gdb_byte valbuf[8];

   int len;
   int argreg_size;
   int fp_args[12];
 
   memset (fp_args, 0, sizeof (fp_args));
 
   int len;
   int argreg_size;
   int fp_args[12];
 
   memset (fp_args, 0, sizeof (fp_args));
 

-  /* first force sp to a 8-byte alignment */
+  /* First force sp to a 8-byte alignment.  */

   sp = sh64_frame_align (gdbarch, sp);
 
   /* The "struct return pointer" pseudo-argument has its own dedicated 
   sp = sh64_frame_align (gdbarch, sp);
 
   /* The "struct return pointer" pseudo-argument has its own dedicated 

-     register */
+     register.  */

 
   if (struct_return)
     regcache_cooked_write_unsigned (regcache, 
                                    STRUCT_RETURN_REGNUM, struct_addr);
 
 
   if (struct_return)
     regcache_cooked_write_unsigned (regcache, 
                                    STRUCT_RETURN_REGNUM, struct_addr);
 

-  /* Now make sure there's space on the stack */
+  /* 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);
   for (argnum = 0, stack_alloc = 0; argnum < nargs; argnum++)
     stack_alloc += ((TYPE_LENGTH (value_type (args[argnum])) + 7) & ~7);

-  sp -= stack_alloc;           /* make room on stack for args */
+  sp -= stack_alloc;           /* Make room on stack for args.  */

 
   /* Now load as many as possible of the first arguments into
      registers, and push the rest onto the stack.  There are 64 bytes
      in eight registers available.  Loop thru args from first to last.  */
 
   int_argreg = ARG0_REGNUM;
 
   /* Now load as many as possible of the first arguments into
      registers, and push the rest onto the stack.  There are 64 bytes
      in eight registers available.  Loop thru args from first to last.  */
 
   int_argreg = ARG0_REGNUM;

-  float_argreg = gdbarch_fp0_regnum (current_gdbarch);
+  float_argreg = gdbarch_fp0_regnum (gdbarch);

   double_argreg = DR0_REGNUM;
 
   for (argnum = 0, stack_offset = 0; argnum < nargs; argnum++)
   double_argreg = DR0_REGNUM;
 
   for (argnum = 0, stack_offset = 0; argnum < nargs; argnum++)


@@ -1098,29 +1106,28 @@ sh64_push_dummy_call (struct gdbarch *gdbarch,
       
       if (TYPE_CODE (type) != TYPE_CODE_FLT)
        {
       
       if (TYPE_CODE (type) != TYPE_CODE_FLT)
        {

-         argreg_size = register_size (current_gdbarch, int_argreg);
+         argreg_size = register_size (gdbarch, int_argreg);

 
          if (len < argreg_size)
            {
 
          if (len < argreg_size)
            {

-             /* value gets right-justified in the register or stack word */
-             if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_BIG)
+             /* value gets right-justified in the register or stack word.  */
+             if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)

                memcpy (valbuf + argreg_size - len,
                memcpy (valbuf + argreg_size - len,

-                       (char *) value_contents (args[argnum]), len);
+                       value_contents (args[argnum]), len);

              else
              else

-               memcpy (valbuf, (char *) value_contents (args[argnum]), len);
+               memcpy (valbuf, value_contents (args[argnum]), len);

 
              val = valbuf;
            }
          else
 
              val = valbuf;
            }
          else

-           val = (char *) value_contents (args[argnum]);
+           val = value_contents (args[argnum]);

 
          while (len > 0)
            {
              if (int_argreg > ARGLAST_REGNUM)
                {                       
 
          while (len > 0)
            {
              if (int_argreg > ARGLAST_REGNUM)
                {                       

-                 /* must go on the stack */
-                 write_memory (sp + stack_offset, (const bfd_byte *) val,
-                               argreg_size);
+                 /* Must go on the stack.  */
+                 write_memory (sp + stack_offset, val, argreg_size);

                  stack_offset += 8;/*argreg_size;*/
                }
              /* NOTE WELL!!!!!  This is not an "else if" clause!!!
                  stack_offset += 8;/*argreg_size;*/
                }
              /* NOTE WELL!!!!!  This is not an "else if" clause!!!


@@ -1128,13 +1135,15 @@ sh64_push_dummy_call (struct gdbarch *gdbarch,
                 AND in the registers!   */
              if (int_argreg <= ARGLAST_REGNUM)
                {                       
                 AND in the registers!   */
              if (int_argreg <= ARGLAST_REGNUM)
                {                       

-                 /* there's room in a register */
-                 regval = extract_unsigned_integer (val, argreg_size);
-                 regcache_cooked_write_unsigned (regcache, int_argreg, regval);
+                 /* There's room in a register.  */
+                 regval = extract_unsigned_integer (val, argreg_size,
+                                                    byte_order);
+                 regcache_cooked_write_unsigned (regcache,
+                                                 int_argreg, regval);

                }
              /* Store the value 8 bytes at a time.  This means that
                 things larger than 8 bytes may go partly in registers
                }
              /* Store the value 8 bytes at a time.  This means that
                 things larger than 8 bytes may go partly in registers

-                and partly on the stack. FIXME: argreg is incremented
+                and partly on the stack.  FIXME: argreg is incremented

                 before we use its size.  */
              len -= argreg_size;
              val += argreg_size;
                 before we use its size.  */
              len -= argreg_size;
              val += argreg_size;


@@ -1143,21 +1152,21 @@ sh64_push_dummy_call (struct gdbarch *gdbarch,
        }
       else
        {
        }
       else
        {

-         val = (char *) value_contents (args[argnum]);
+         val = value_contents (args[argnum]);

          if (len == 4)
            {
          if (len == 4)
            {

-             /* Where is it going to be stored? */
+             /* Where is it going to be stored?  */

              while (fp_args[float_arg_index])
                float_arg_index ++;
 
              /* Now float_argreg points to the register where it
                 should be stored.  Are we still within the allowed
              while (fp_args[float_arg_index])
                float_arg_index ++;
 
              /* Now float_argreg points to the register where it
                 should be stored.  Are we still within the allowed

-                register set? */
+                register set?  */

              if (float_arg_index <= FLOAT_ARGLAST_REGNUM)
                {
                  /* Goes in FR0...FR11 */
                  regcache_cooked_write (regcache,
              if (float_arg_index <= FLOAT_ARGLAST_REGNUM)
                {
                  /* Goes in FR0...FR11 */
                  regcache_cooked_write (regcache,

-                                        gdbarch_fp0_regnum (current_gdbarch)
+                                        gdbarch_fp0_regnum (gdbarch)

                                         + float_arg_index,
                                         val);
                  fp_args[float_arg_index] = 1;
                                         + float_arg_index,
                                         val);
                  fp_args[float_arg_index] = 1;


@@ -1165,19 +1174,19 @@ sh64_push_dummy_call (struct gdbarch *gdbarch,
                  int_argreg ++;
                }
              else 
                  int_argreg ++;
                }
              else 

-               ;
-               /* Store it as the integers, 8 bytes at the time, if
-                  necessary spilling on the stack.  */
-             
+               {
+                 /* Store it as the integers, 8 bytes at the time, if
+                    necessary spilling on the stack.  */
+               }

            }
            else if (len == 8)
              {
            }
            else if (len == 8)
              {

-               /* Where is it going to be stored? */
+               /* Where is it going to be stored?  */

                while (fp_args[double_arg_index])
                  double_arg_index += 2;
                /* Now double_argreg points to the register
                   where it should be stored.
                while (fp_args[double_arg_index])
                  double_arg_index += 2;
                /* Now double_argreg points to the register
                   where it should be stored.

-                  Are we still within the allowed register set? */
+                  Are we still within the allowed register set?  */

                if (double_arg_index < FLOAT_ARGLAST_REGNUM)
                  {
                    /* Goes in DR0...DR10 */
                if (double_arg_index < FLOAT_ARGLAST_REGNUM)
                  {
                    /* Goes in DR0...DR10 */


@@ -1192,18 +1201,19 @@ sh64_push_dummy_call (struct gdbarch *gdbarch,
                    int_argreg ++;
                  }
                else
                    int_argreg ++;
                  }
                else

-                 ;
-                 /* Store it as the integers, 8 bytes at the time, if
-                     necessary spilling on the stack.  */
+                 {
+                   /* Store it as the integers, 8 bytes at the time, if
+                      necessary spilling on the stack.  */
+                 }

              }
        }
     }
              }
        }
     }

-  /* Store return address. */
+  /* Store return address.  */

   regcache_cooked_write_unsigned (regcache, PR_REGNUM, bp_addr);
 
   /* Update stack pointer.  */
   regcache_cooked_write_unsigned (regcache,
   regcache_cooked_write_unsigned (regcache, PR_REGNUM, bp_addr);
 
   /* Update stack pointer.  */
   regcache_cooked_write_unsigned (regcache,

-                                 gdbarch_sp_regnum (current_gdbarch), sp);
+                                 gdbarch_sp_regnum (gdbarch), sp);

 
   return sp;
 }
 
   return sp;
 }


@@ -1216,25 +1226,27 @@ static void
 sh64_extract_return_value (struct type *type, struct regcache *regcache,
                           void *valbuf)
 {
 sh64_extract_return_value (struct type *type, struct regcache *regcache,
                           void *valbuf)
 {

+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);

   int len = TYPE_LENGTH (type);
   int len = TYPE_LENGTH (type);

-  
+

   if (TYPE_CODE (type) == TYPE_CODE_FLT)
     {
       if (len == 4)
        {
   if (TYPE_CODE (type) == TYPE_CODE_FLT)
     {
       if (len == 4)
        {

-         /* Return value stored in gdbarch_fp0_regnum */
+         /* Return value stored in gdbarch_fp0_regnum.  */

          regcache_raw_read (regcache,
          regcache_raw_read (regcache,

-                            gdbarch_fp0_regnum (current_gdbarch), valbuf);
+                            gdbarch_fp0_regnum (gdbarch), valbuf);

        }
       else if (len == 8)
        {
        }
       else if (len == 8)
        {

-         /* return value stored in DR0_REGNUM */
+         /* return value stored in DR0_REGNUM.  */

          DOUBLEST val;
          gdb_byte buf[8];
 
          regcache_cooked_read (regcache, DR0_REGNUM, buf);
          
          DOUBLEST val;
          gdb_byte buf[8];
 
          regcache_cooked_read (regcache, DR0_REGNUM, buf);
          

-         if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_LITTLE)
+         if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_LITTLE)

            floatformat_to_doublest (&floatformat_ieee_double_littlebyte_bigword,
                                     buf, &val);
          else
            floatformat_to_doublest (&floatformat_ieee_double_littlebyte_bigword,
                                     buf, &val);
          else


@@ -1248,20 +1260,20 @@ sh64_extract_return_value (struct type *type, struct regcache *regcache,
       if (len <= 8)
        {
          int offset;
       if (len <= 8)
        {
          int offset;

-         char buf[8];
-         /* Result is in register 2. If smaller than 8 bytes, it is padded 
+         gdb_byte buf[8];
+         /* Result is in register 2.  If smaller than 8 bytes, it is padded 

             at the most significant end.  */
          regcache_raw_read (regcache, DEFAULT_RETURN_REGNUM, buf);
 
             at the most significant end.  */
          regcache_raw_read (regcache, DEFAULT_RETURN_REGNUM, buf);
 

-         if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_BIG)
-           offset = register_size (current_gdbarch, DEFAULT_RETURN_REGNUM)
+         if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)
+           offset = register_size (gdbarch, DEFAULT_RETURN_REGNUM)

                     - len;
          else
            offset = 0;
          memcpy (valbuf, buf + offset, len);
        }
       else
                     - len;
          else
            offset = 0;
          memcpy (valbuf, buf + offset, len);
        }
       else

-       error ("bad size for return value");
+       error (_("bad size for return value"));

     }
 }
 
     }
 }
 


@@ -1269,40 +1281,41 @@ sh64_extract_return_value (struct type *type, struct regcache *regcache,
    of type TYPE, given in virtual format.
    If the architecture is sh4 or sh3e, store a function's return value
    in the R0 general register or in the FP0 floating point register,
    of type TYPE, given in virtual format.
    If the architecture is sh4 or sh3e, store a function's return value
    in the R0 general register or in the FP0 floating point register,

-   depending on the type of the return value. In all the other cases
+   depending on the type of the return value.  In all the other cases

    the result is stored in r0, left-justified.  */
 
 static void
 sh64_store_return_value (struct type *type, struct regcache *regcache,
    the result is stored in r0, left-justified.  */
 
 static void
 sh64_store_return_value (struct type *type, struct regcache *regcache,

-                        const void *valbuf)
+                        const gdb_byte *valbuf)

 {
 {

-  char buf[64];        /* more than enough...  */
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  gdb_byte buf[64];    /* more than enough...  */

   int len = TYPE_LENGTH (type);
 
   if (TYPE_CODE (type) == TYPE_CODE_FLT)
     {
   int len = TYPE_LENGTH (type);
 
   if (TYPE_CODE (type) == TYPE_CODE_FLT)
     {

-      int i, regnum = gdbarch_fp0_regnum (current_gdbarch);
+      int i, regnum = gdbarch_fp0_regnum (gdbarch);

       for (i = 0; i < len; i += 4)
       for (i = 0; i < len; i += 4)

-       if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_LITTLE)
+       if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_LITTLE)

          regcache_raw_write (regcache, regnum++,
          regcache_raw_write (regcache, regnum++,

-                             (char *) valbuf + len - 4 - i);
+                             valbuf + len - 4 - i);

        else
        else

-         regcache_raw_write (regcache, regnum++, (char *) valbuf + i);
+         regcache_raw_write (regcache, regnum++, valbuf + i);

     }
   else
     {
       int return_register = DEFAULT_RETURN_REGNUM;
       int offset = 0;
 
     }
   else
     {
       int return_register = DEFAULT_RETURN_REGNUM;
       int offset = 0;
 

-      if (len <= register_size (current_gdbarch, return_register))
+      if (len <= register_size (gdbarch, return_register))

        {
          /* Pad with zeros.  */
        {
          /* Pad with zeros.  */

-         memset (buf, 0, register_size (current_gdbarch, return_register));
-         if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_LITTLE)
-           offset = 0; /*register_size (current_gdbarch, 
+         memset (buf, 0, register_size (gdbarch, return_register));
+         if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_LITTLE)
+           offset = 0; /*register_size (gdbarch, 

                          return_register) - len;*/
          else
                          return_register) - len;*/
          else

-           offset = register_size (current_gdbarch, return_register) - len;
+           offset = register_size (gdbarch, return_register) - len;

 
          memcpy (buf + offset, valbuf, len);
          regcache_raw_write (regcache, return_register, buf);
 
          memcpy (buf + offset, valbuf, len);
          regcache_raw_write (regcache, return_register, buf);


@@ -1313,8 +1326,8 @@ sh64_store_return_value (struct type *type, struct regcache *regcache,
 }
 
 static enum return_value_convention
 }
 
 static enum return_value_convention

-sh64_return_value (struct gdbarch *gdbarch, struct type *type,
-                  struct regcache *regcache,
+sh64_return_value (struct gdbarch *gdbarch, struct value *function,
+                  struct type *type, struct regcache *regcache,

                   gdb_byte *readbuf, const gdb_byte *writebuf)
 {
   if (sh64_use_struct_convention (type))
                   gdb_byte *readbuf, const gdb_byte *writebuf)
 {
   if (sh64_use_struct_convention (type))


@@ -1326,123 +1339,6 @@ sh64_return_value (struct gdbarch *gdbarch, struct type *type,
   return RETURN_VALUE_REGISTER_CONVENTION;
 }
 
   return RETURN_VALUE_REGISTER_CONVENTION;
 }
 

-static void
-sh64_show_media_regs (struct frame_info *frame)
-{
-  int i;
-
-  printf_filtered
-    ("PC=%s SR=%016llx \n",
-     paddr (get_frame_register_unsigned (frame,
-                                        gdbarch_pc_regnum (current_gdbarch))),
-     (long long) get_frame_register_unsigned (frame, SR_REGNUM));
-
-  printf_filtered
-    ("SSR=%016llx SPC=%016llx \n",
-     (long long) get_frame_register_unsigned (frame, SSR_REGNUM),
-     (long long) get_frame_register_unsigned (frame, SPC_REGNUM));
-  printf_filtered
-    ("FPSCR=%016lx\n ",
-     (long) get_frame_register_unsigned (frame, FPSCR_REGNUM));
-
-  for (i = 0; i < 64; i = i + 4)
-    printf_filtered
-      ("\nR%d-R%d  %016llx %016llx %016llx %016llx\n",
-       i, i + 3,
-      (long long) get_frame_register_unsigned (frame, i + 0),
-      (long long) get_frame_register_unsigned (frame, i + 1),
-      (long long) get_frame_register_unsigned (frame, i + 2),
-      (long long) get_frame_register_unsigned (frame, i + 3));
-
-  printf_filtered ("\n");
-  
-  for (i = 0; i < 64; i = i + 8)
-    printf_filtered
-      ("FR%d-FR%d  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
-       i, i + 7,
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 0),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 1),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 2),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 3),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 4),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 5),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 6),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 7));
-}
-
-static void
-sh64_show_compact_regs (struct frame_info *frame)
-{
-  int i;
-
-  printf_filtered
-    ("PC=%s \n",
-     paddr (get_frame_register_unsigned (frame, PC_C_REGNUM)));
-
-  printf_filtered
-    ("GBR=%08lx MACH=%08lx MACL=%08lx PR=%08lx T=%08lx\n",
-     (long) get_frame_register_unsigned (frame, GBR_C_REGNUM),
-     (long) get_frame_register_unsigned (frame, MACH_C_REGNUM),
-     (long) get_frame_register_unsigned (frame, MACL_C_REGNUM),
-     (long) get_frame_register_unsigned (frame, PR_C_REGNUM),
-     (long) get_frame_register_unsigned (frame, T_C_REGNUM));
-  printf_filtered
-    ("FPSCR=%08lx FPUL=%08lx\n",
-     (long) get_frame_register_unsigned (frame, FPSCR_C_REGNUM),
-     (long) get_frame_register_unsigned (frame, FPUL_C_REGNUM));
-
-  for (i = 0; i < 16; i = i + 4)
-    printf_filtered
-      ("\nR%d-R%d  %08lx %08lx %08lx %08lx\n",
-       i, i + 3,
-       (long) get_frame_register_unsigned (frame, i + 0),
-       (long) get_frame_register_unsigned (frame, i + 1),
-       (long) get_frame_register_unsigned (frame, i + 2),
-       (long) get_frame_register_unsigned (frame, i + 3));
-
-  printf_filtered ("\n");
-  
-  for (i = 0; i < 16; i = i + 8)
-    printf_filtered
-      ("FR%d-FR%d  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
-       i, i + 7,
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 0),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 1),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 2),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 3),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 4),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 5),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 6),
-       (long) get_frame_register_unsigned
-               (frame, gdbarch_fp0_regnum (current_gdbarch) + i + 7));
-}
-
-/* FIXME!!! This only shows the registers for shmedia, excluding the
-   pseudo registers.  */
-void
-sh64_show_regs (struct frame_info *frame)
-{
-  if (pc_is_isa32 (get_frame_pc (frame)))
-    sh64_show_media_regs (frame);
-  else
-    sh64_show_compact_regs (frame);
-}
-

 /* *INDENT-OFF* */
 /*
     SH MEDIA MODE (ISA 32)
 /* *INDENT-OFF* */
 /*
     SH MEDIA MODE (ISA 32)


@@ -1512,12 +1408,10 @@ REGISTER_BYTE returns the register byte for the base register.
 */
 
 static struct type *
 */
 
 static struct type *

-sh64_build_float_register_type (int high)
+sh64_build_float_register_type (struct gdbarch *gdbarch, int high)

 {
 {

-  struct type *temp;
-
-  temp = create_range_type (NULL, builtin_type_int, 0, high);
-  return create_array_type (NULL, builtin_type_float, temp);
+  return lookup_array_range_type (builtin_type (gdbarch)->builtin_float,
+                                 0, high);

 }
 
 /* Return the GDB type object for the "standard" data type
 }
 
 /* Return the GDB type object for the "standard" data type


@@ -1525,41 +1419,41 @@ sh64_build_float_register_type (int high)
 static struct type *
 sh64_register_type (struct gdbarch *gdbarch, int reg_nr)
 {
 static struct type *
 sh64_register_type (struct gdbarch *gdbarch, int reg_nr)
 {

-  if ((reg_nr >= gdbarch_fp0_regnum (current_gdbarch)
+  if ((reg_nr >= gdbarch_fp0_regnum (gdbarch)

        && reg_nr <= FP_LAST_REGNUM)
       || (reg_nr >= FP0_C_REGNUM
          && reg_nr <= FP_LAST_C_REGNUM))
        && reg_nr <= FP_LAST_REGNUM)
       || (reg_nr >= FP0_C_REGNUM
          && reg_nr <= FP_LAST_C_REGNUM))

-    return builtin_type_float;
+    return builtin_type (gdbarch)->builtin_float;

   else if ((reg_nr >= DR0_REGNUM 
            && reg_nr <= DR_LAST_REGNUM)
           || (reg_nr >= DR0_C_REGNUM 
               && reg_nr <= DR_LAST_C_REGNUM))
   else if ((reg_nr >= DR0_REGNUM 
            && reg_nr <= DR_LAST_REGNUM)
           || (reg_nr >= DR0_C_REGNUM 
               && reg_nr <= DR_LAST_C_REGNUM))

-    return builtin_type_double;
+    return builtin_type (gdbarch)->builtin_double;

   else if  (reg_nr >= FPP0_REGNUM 
            && reg_nr <= FPP_LAST_REGNUM)
   else if  (reg_nr >= FPP0_REGNUM 
            && reg_nr <= FPP_LAST_REGNUM)

-    return sh64_build_float_register_type (1);
+    return sh64_build_float_register_type (gdbarch, 1);

   else if ((reg_nr >= FV0_REGNUM
            && reg_nr <= FV_LAST_REGNUM)
           ||(reg_nr >= FV0_C_REGNUM 
              && reg_nr <= FV_LAST_C_REGNUM))
   else if ((reg_nr >= FV0_REGNUM
            && reg_nr <= FV_LAST_REGNUM)
           ||(reg_nr >= FV0_C_REGNUM 
              && reg_nr <= FV_LAST_C_REGNUM))

-    return sh64_build_float_register_type (3);
+    return sh64_build_float_register_type (gdbarch, 3);

   else if (reg_nr == FPSCR_REGNUM)
   else if (reg_nr == FPSCR_REGNUM)

-    return builtin_type_int;
+    return builtin_type (gdbarch)->builtin_int;

   else if (reg_nr >= R0_C_REGNUM
           && reg_nr < FP0_C_REGNUM)
   else if (reg_nr >= R0_C_REGNUM
           && reg_nr < FP0_C_REGNUM)

-    return builtin_type_int;
+    return builtin_type (gdbarch)->builtin_int;

   else
   else

-    return builtin_type_long_long;
+    return builtin_type (gdbarch)->builtin_long_long;

 }
 
 static void
 }
 
 static void

-sh64_register_convert_to_virtual (int regnum, struct type *type,
-                                    char *from, char *to)
+sh64_register_convert_to_virtual (struct gdbarch *gdbarch, int regnum,
+                                 struct type *type, gdb_byte *from, gdb_byte *to)

 {
 {

-  if (gdbarch_byte_order (current_gdbarch) != BFD_ENDIAN_LITTLE)
+  if (gdbarch_byte_order (gdbarch) != BFD_ENDIAN_LITTLE)

     {
       /* It is a no-op.  */
     {
       /* It is a no-op.  */

-      memcpy (to, from, register_size (current_gdbarch, regnum));
+      memcpy (to, from, register_size (gdbarch, regnum));

       return;
     }
 
       return;
     }
 


@@ -1574,17 +1468,18 @@ sh64_register_convert_to_virtual (int regnum, struct type *type,
       store_typed_floating (to, type, val);
     }
   else
       store_typed_floating (to, type, val);
     }
   else

-    error ("sh64_register_convert_to_virtual called with non DR register number");
+    error (_("sh64_register_convert_to_virtual "
+            "called with non DR register number"));

 }
 
 static void
 }
 
 static void

-sh64_register_convert_to_raw (struct type *type, int regnum,
-                                const void *from, void *to)
+sh64_register_convert_to_raw (struct gdbarch *gdbarch, struct type *type,
+                             int regnum, const void *from, void *to)

 {
 {

-  if (gdbarch_byte_order (current_gdbarch) != BFD_ENDIAN_LITTLE)
+  if (gdbarch_byte_order (gdbarch) != BFD_ENDIAN_LITTLE)

     {
       /* It is a no-op.  */
     {
       /* It is a no-op.  */

-      memcpy (to, from, register_size (current_gdbarch, regnum));
+      memcpy (to, from, register_size (gdbarch, regnum));

       return;
     }
 
       return;
     }
 


@@ -1593,125 +1488,152 @@ sh64_register_convert_to_raw (struct type *type, int regnum,
       || (regnum >= DR0_C_REGNUM 
          && regnum <= DR_LAST_C_REGNUM))
     {
       || (regnum >= DR0_C_REGNUM 
          && regnum <= DR_LAST_C_REGNUM))
     {

-      DOUBLEST val = deprecated_extract_floating (from, TYPE_LENGTH(type));
+      DOUBLEST val = extract_typed_floating (from, type);

       floatformat_from_doublest (&floatformat_ieee_double_littlebyte_bigword, 
                                 &val, to);
     }
   else
       floatformat_from_doublest (&floatformat_ieee_double_littlebyte_bigword, 
                                 &val, to);
     }
   else

-    error ("sh64_register_convert_to_raw called with non DR register number");
+    error (_("sh64_register_convert_to_raw called "
+            "with non DR register number"));

 }
 
 }
 

-static void
+/* Concatenate PORTIONS contiguous raw registers starting at
+   BASE_REGNUM into BUFFER.  */
+
+static enum register_status
+pseudo_register_read_portions (struct gdbarch *gdbarch,
+                              struct regcache *regcache,
+                              int portions,
+                              int base_regnum, gdb_byte *buffer)
+{
+  int portion;
+
+  for (portion = 0; portion < portions; portion++)
+    {
+      enum register_status status;
+      gdb_byte *b;
+
+      b = buffer + register_size (gdbarch, base_regnum) * portion;
+      status = regcache_raw_read (regcache, base_regnum + portion, b);
+      if (status != REG_VALID)
+       return status;
+    }
+
+  return REG_VALID;
+}
+
+static enum register_status

 sh64_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache,
                           int reg_nr, gdb_byte *buffer)
 {
 sh64_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache,
                           int reg_nr, gdb_byte *buffer)
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);

   int base_regnum;
   int base_regnum;

-  int portion;

   int offset = 0;
   int offset = 0;

-  char temp_buffer[MAX_REGISTER_SIZE];
+  gdb_byte temp_buffer[MAX_REGISTER_SIZE];
+  enum register_status status;

 
   if (reg_nr >= DR0_REGNUM 
       && reg_nr <= DR_LAST_REGNUM)
     {
 
   if (reg_nr >= DR0_REGNUM 
       && reg_nr <= DR_LAST_REGNUM)
     {

-      base_regnum = sh64_dr_reg_base_num (reg_nr);
+      base_regnum = sh64_dr_reg_base_num (gdbarch, reg_nr);

 
       /* Build the value in the provided buffer.  */ 
       /* DR regs are double precision registers obtained by
         concatenating 2 single precision floating point registers.  */
 
       /* Build the value in the provided buffer.  */ 
       /* DR regs are double precision registers obtained by
         concatenating 2 single precision floating point registers.  */

-      for (portion = 0; portion < 2; portion++)
-       regcache_raw_read (regcache, base_regnum + portion, 
-                          (temp_buffer
-                           + register_size (gdbarch, base_regnum) * portion));
-
-      /* We must pay attention to the endianness.  */
-      sh64_register_convert_to_virtual (reg_nr, 
-                                       register_type (gdbarch, reg_nr),
-                                       temp_buffer, buffer);
+      status = pseudo_register_read_portions (gdbarch, regcache,
+                                             2, base_regnum, temp_buffer);
+      if (status == REG_VALID)
+       {
+         /* We must pay attention to the endianness.  */
+         sh64_register_convert_to_virtual (gdbarch, reg_nr,
+                                           register_type (gdbarch, reg_nr),
+                                           temp_buffer, buffer);
+       }

 
 

+      return status;

     }
 
     }
 

-  else if (reg_nr >= FPP0_REGNUM 
+  else if (reg_nr >= FPP0_REGNUM

           && reg_nr <= FPP_LAST_REGNUM)
     {
           && reg_nr <= FPP_LAST_REGNUM)
     {

-      base_regnum = sh64_fpp_reg_base_num (reg_nr);
+      base_regnum = sh64_fpp_reg_base_num (gdbarch, reg_nr);

 
       /* Build the value in the provided buffer.  */ 
       /* FPP regs are pairs of single precision registers obtained by
         concatenating 2 single precision floating point registers.  */
 
       /* Build the value in the provided buffer.  */ 
       /* FPP regs are pairs of single precision registers obtained by
         concatenating 2 single precision floating point registers.  */

-      for (portion = 0; portion < 2; portion++)
-       regcache_raw_read (regcache, base_regnum + portion, 
-                          ((char *) buffer
-                           + register_size (gdbarch, base_regnum) * portion));
+      return pseudo_register_read_portions (gdbarch, regcache,
+                                           2, base_regnum, buffer);

     }
 
   else if (reg_nr >= FV0_REGNUM 
           && reg_nr <= FV_LAST_REGNUM)
     {
     }
 
   else if (reg_nr >= FV0_REGNUM 
           && reg_nr <= FV_LAST_REGNUM)
     {

-      base_regnum = sh64_fv_reg_base_num (reg_nr);
+      base_regnum = sh64_fv_reg_base_num (gdbarch, reg_nr);

 
       /* Build the value in the provided buffer.  */ 
       /* FV regs are vectors of single precision registers obtained by
         concatenating 4 single precision floating point registers.  */
 
       /* Build the value in the provided buffer.  */ 
       /* FV regs are vectors of single precision registers obtained by
         concatenating 4 single precision floating point registers.  */

-      for (portion = 0; portion < 4; portion++)
-       regcache_raw_read (regcache, base_regnum + portion, 
-                          ((char *) buffer
-                           + register_size (gdbarch, base_regnum) * portion));
+      return pseudo_register_read_portions (gdbarch, regcache,
+                                           4, base_regnum, buffer);

     }
 
     }
 

-  /* sh compact pseudo registers. 1-to-1 with a shmedia register */
+  /* sh compact pseudo registers.  1-to-1 with a shmedia register.  */

   else if (reg_nr >= R0_C_REGNUM 
           && reg_nr <= T_C_REGNUM)
     {
   else if (reg_nr >= R0_C_REGNUM 
           && reg_nr <= T_C_REGNUM)
     {

-      base_regnum = sh64_compact_reg_base_num (reg_nr);
+      base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr);

 
       /* Build the value in the provided buffer.  */ 
 
       /* Build the value in the provided buffer.  */ 

-      regcache_raw_read (regcache, base_regnum, temp_buffer);
-      if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_BIG)
+      status = regcache_raw_read (regcache, base_regnum, temp_buffer);
+      if (status != REG_VALID)
+       return status;
+      if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)

        offset = 4;
        offset = 4;

-      memcpy (buffer, temp_buffer + offset, 4); /* get LOWER 32 bits only????*/
+      memcpy (buffer,
+             temp_buffer + offset, 4); /* get LOWER 32 bits only????  */
+      return REG_VALID;

     }
 
   else if (reg_nr >= FP0_C_REGNUM
           && reg_nr <= FP_LAST_C_REGNUM)
     {
     }
 
   else if (reg_nr >= FP0_C_REGNUM
           && reg_nr <= FP_LAST_C_REGNUM)
     {

-      base_regnum = sh64_compact_reg_base_num (reg_nr);
+      base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr);

 
       /* Build the value in the provided buffer.  */ 
       /* Floating point registers map 1-1 to the media fp regs,
         they have the same size and endianness.  */
 
       /* Build the value in the provided buffer.  */ 
       /* Floating point registers map 1-1 to the media fp regs,
         they have the same size and endianness.  */

-      regcache_raw_read (regcache, base_regnum, buffer);
+      return regcache_raw_read (regcache, base_regnum, buffer);

     }
 
   else if (reg_nr >= DR0_C_REGNUM 
           && reg_nr <= DR_LAST_C_REGNUM)
     {
     }
 
   else if (reg_nr >= DR0_C_REGNUM 
           && reg_nr <= DR_LAST_C_REGNUM)
     {

-      base_regnum = sh64_compact_reg_base_num (reg_nr);
+      base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr);

 
       /* DR_C regs are double precision registers obtained by
         concatenating 2 single precision floating point registers.  */
 
       /* DR_C regs are double precision registers obtained by
         concatenating 2 single precision floating point registers.  */

-      for (portion = 0; portion < 2; portion++)
-       regcache_raw_read (regcache, base_regnum + portion, 
-                          (temp_buffer
-                           + register_size (gdbarch, base_regnum) * portion));
-
-      /* We must pay attention to the endianness.  */
-      sh64_register_convert_to_virtual (reg_nr, 
-                                       register_type (gdbarch, reg_nr),
-                                       temp_buffer, buffer);
+      status = pseudo_register_read_portions (gdbarch, regcache,
+                                             2, base_regnum, temp_buffer);
+      if (status == REG_VALID)
+       {
+         /* We must pay attention to the endianness.  */
+         sh64_register_convert_to_virtual (gdbarch, reg_nr,
+                                           register_type (gdbarch, reg_nr),
+                                           temp_buffer, buffer);
+       }
+      return status;

     }
 
   else if (reg_nr >= FV0_C_REGNUM 
           && reg_nr <= FV_LAST_C_REGNUM)
     {
     }
 
   else if (reg_nr >= FV0_C_REGNUM 
           && reg_nr <= FV_LAST_C_REGNUM)
     {

-      base_regnum = sh64_compact_reg_base_num (reg_nr);
+      base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr);

 
       /* Build the value in the provided buffer.  */ 
       /* FV_C regs are vectors of single precision registers obtained by
         concatenating 4 single precision floating point registers.  */
 
       /* Build the value in the provided buffer.  */ 
       /* FV_C regs are vectors of single precision registers obtained by
         concatenating 4 single precision floating point registers.  */

-      for (portion = 0; portion < 4; portion++)
-       regcache_raw_read (regcache, base_regnum + portion, 
-                          ((char *) buffer
-                           + register_size (gdbarch, base_regnum) * portion));
+      return pseudo_register_read_portions (gdbarch, regcache,
+                                           4, base_regnum, buffer);

     }
 
   else if (reg_nr == FPSCR_C_REGNUM)
     }
 
   else if (reg_nr == FPSCR_C_REGNUM)


@@ -1741,47 +1663,56 @@ sh64_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache,
             21-31     reserved
        */
       /* *INDENT-ON* */
             21-31     reserved
        */
       /* *INDENT-ON* */

-      /* Get FPSCR into a local buffer */
-      regcache_raw_read (regcache, fpscr_base_regnum, temp_buffer);
+      /* Get FPSCR into a local buffer.  */
+      status = regcache_raw_read (regcache, fpscr_base_regnum, temp_buffer);
+      if (status != REG_VALID)
+       return status;

       /* Get value as an int.  */
       /* Get value as an int.  */

-      fpscr_value = extract_unsigned_integer (temp_buffer, 4);
+      fpscr_value = extract_unsigned_integer (temp_buffer, 4, byte_order);

       /* Get SR into a local buffer */
       /* Get SR into a local buffer */

-      regcache_raw_read (regcache, sr_base_regnum, temp_buffer);
+      status = regcache_raw_read (regcache, sr_base_regnum, temp_buffer);
+      if (status != REG_VALID)
+       return status;

       /* Get value as an int.  */
       /* Get value as an int.  */

-      sr_value = extract_unsigned_integer (temp_buffer, 4);
+      sr_value = extract_unsigned_integer (temp_buffer, 4, byte_order);

       /* Build the new value.  */
       fpscr_c_part1_value = fpscr_value & 0x3fffd;
       fpscr_c_part2_value = (sr_value & 0x7000) << 6;
       fpscr_c_value = fpscr_c_part1_value | fpscr_c_part2_value;
       /* Build the new value.  */
       fpscr_c_part1_value = fpscr_value & 0x3fffd;
       fpscr_c_part2_value = (sr_value & 0x7000) << 6;
       fpscr_c_value = fpscr_c_part1_value | fpscr_c_part2_value;

-      /* Store that in out buffer!!! */
-      store_unsigned_integer (buffer, 4, fpscr_c_value);
+      /* Store that in out buffer!!!  */
+      store_unsigned_integer (buffer, 4, byte_order, fpscr_c_value);

       /* FIXME There is surely an endianness gotcha here.  */
       /* FIXME There is surely an endianness gotcha here.  */

+
+      return REG_VALID;

     }
 
   else if (reg_nr == FPUL_C_REGNUM)
     {
     }
 
   else if (reg_nr == FPUL_C_REGNUM)
     {

-      base_regnum = sh64_compact_reg_base_num (reg_nr);
+      base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr);

 
       /* FPUL_C register is floating point register 32,
         same size, same endianness.  */
 
       /* FPUL_C register is floating point register 32,
         same size, same endianness.  */

-      regcache_raw_read (regcache, base_regnum, buffer);
+      return regcache_raw_read (regcache, base_regnum, buffer);

     }
     }

+  else
+    gdb_assert_not_reached ("invalid pseudo register number");

 }
 
 static void
 sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache,
                            int reg_nr, const gdb_byte *buffer)
 {
 }
 
 static void
 sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache,
                            int reg_nr, const gdb_byte *buffer)
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);

   int base_regnum, portion;
   int offset;
   int base_regnum, portion;
   int offset;

-  char temp_buffer[MAX_REGISTER_SIZE];
+  gdb_byte temp_buffer[MAX_REGISTER_SIZE];

 
   if (reg_nr >= DR0_REGNUM
       && reg_nr <= DR_LAST_REGNUM)
     {
 
   if (reg_nr >= DR0_REGNUM
       && reg_nr <= DR_LAST_REGNUM)
     {

-      base_regnum = sh64_dr_reg_base_num (reg_nr);
+      base_regnum = sh64_dr_reg_base_num (gdbarch, reg_nr);

       /* We must pay attention to the endianness.  */
       /* We must pay attention to the endianness.  */

-      sh64_register_convert_to_raw (register_type (gdbarch, reg_nr),
+      sh64_register_convert_to_raw (gdbarch, register_type (gdbarch, reg_nr),

                                    reg_nr,
                                    buffer, temp_buffer);
 
                                    reg_nr,
                                    buffer, temp_buffer);
 


@@ -1789,44 +1720,42 @@ sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache,
       for (portion = 0; portion < 2; portion++)
        regcache_raw_write (regcache, base_regnum + portion, 
                            (temp_buffer
       for (portion = 0; portion < 2; portion++)
        regcache_raw_write (regcache, base_regnum + portion, 
                            (temp_buffer

-                            + register_size (gdbarch, 
+                            + register_size (gdbarch,

                                              base_regnum) * portion));
     }
 
   else if (reg_nr >= FPP0_REGNUM 
           && reg_nr <= FPP_LAST_REGNUM)
     {
                                              base_regnum) * portion));
     }
 
   else if (reg_nr >= FPP0_REGNUM 
           && reg_nr <= FPP_LAST_REGNUM)
     {

-      base_regnum = sh64_fpp_reg_base_num (reg_nr);
+      base_regnum = sh64_fpp_reg_base_num (gdbarch, reg_nr);

 
       /* Write the real regs for which this one is an alias.  */
       for (portion = 0; portion < 2; portion++)
        regcache_raw_write (regcache, base_regnum + portion,
 
       /* Write the real regs for which this one is an alias.  */
       for (portion = 0; portion < 2; portion++)
        regcache_raw_write (regcache, base_regnum + portion,

-                           ((char *) buffer
-                            + register_size (gdbarch, 
-                                             base_regnum) * portion));
+                           (buffer + register_size (gdbarch,
+                                                    base_regnum) * portion));

     }
 
   else if (reg_nr >= FV0_REGNUM
           && reg_nr <= FV_LAST_REGNUM)
     {
     }
 
   else if (reg_nr >= FV0_REGNUM
           && reg_nr <= FV_LAST_REGNUM)
     {

-      base_regnum = sh64_fv_reg_base_num (reg_nr);
+      base_regnum = sh64_fv_reg_base_num (gdbarch, reg_nr);

 
       /* Write the real regs for which this one is an alias.  */
       for (portion = 0; portion < 4; portion++)
        regcache_raw_write (regcache, base_regnum + portion,
 
       /* Write the real regs for which this one is an alias.  */
       for (portion = 0; portion < 4; portion++)
        regcache_raw_write (regcache, base_regnum + portion,

-                           ((char *) buffer
-                            + register_size (gdbarch, 
-                                             base_regnum) * portion));
+                           (buffer + register_size (gdbarch,
+                                                    base_regnum) * portion));

     }
 
     }
 

-  /* sh compact general pseudo registers. 1-to-1 with a shmedia
+  /* sh compact general pseudo registers.  1-to-1 with a shmedia

      register but only 4 bytes of it.  */
   else if (reg_nr >= R0_C_REGNUM 
           && reg_nr <= T_C_REGNUM)
     {
      register but only 4 bytes of it.  */
   else if (reg_nr >= R0_C_REGNUM 
           && reg_nr <= T_C_REGNUM)
     {

-      base_regnum = sh64_compact_reg_base_num (reg_nr);
+      base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr);

       /* reg_nr is 32 bit here, and base_regnum is 64 bits.  */
       /* reg_nr is 32 bit here, and base_regnum is 64 bits.  */

-      if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_BIG)
+      if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)

        offset = 4;
       else 
        offset = 0;
        offset = 4;
       else 
        offset = 0;


@@ -1834,28 +1763,29 @@ sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache,
         buffer, so that overwriting the last four bytes with the new
         value of the pseudo will leave the upper 4 bytes unchanged.  */
       regcache_raw_read (regcache, base_regnum, temp_buffer);
         buffer, so that overwriting the last four bytes with the new
         value of the pseudo will leave the upper 4 bytes unchanged.  */
       regcache_raw_read (regcache, base_regnum, temp_buffer);

-      /* Write as an 8 byte quantity */
+      /* Write as an 8 byte quantity.  */

       memcpy (temp_buffer + offset, buffer, 4);
       regcache_raw_write (regcache, base_regnum, temp_buffer);
     }
 
       memcpy (temp_buffer + offset, buffer, 4);
       regcache_raw_write (regcache, base_regnum, temp_buffer);
     }
 

-  /* sh floating point compact pseudo registers. 1-to-1 with a shmedia
-     registers. Both are 4 bytes.  */
+  /* sh floating point compact pseudo registers.  1-to-1 with a shmedia
+     registers.  Both are 4 bytes.  */

   else if (reg_nr >= FP0_C_REGNUM
               && reg_nr <= FP_LAST_C_REGNUM)
     {
   else if (reg_nr >= FP0_C_REGNUM
               && reg_nr <= FP_LAST_C_REGNUM)
     {

-      base_regnum = sh64_compact_reg_base_num (reg_nr);
+      base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr);

       regcache_raw_write (regcache, base_regnum, buffer);
     }
 
   else if (reg_nr >= DR0_C_REGNUM 
           && reg_nr <= DR_LAST_C_REGNUM)
     {
       regcache_raw_write (regcache, base_regnum, buffer);
     }
 
   else if (reg_nr >= DR0_C_REGNUM 
           && reg_nr <= DR_LAST_C_REGNUM)
     {

-      base_regnum = sh64_compact_reg_base_num (reg_nr);
+      base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr);

       for (portion = 0; portion < 2; portion++)
        {
          /* We must pay attention to the endianness.  */
       for (portion = 0; portion < 2; portion++)
        {
          /* We must pay attention to the endianness.  */

-         sh64_register_convert_to_raw (register_type (gdbarch, reg_nr),
+         sh64_register_convert_to_raw (gdbarch,
+                                       register_type (gdbarch, reg_nr),

                                        reg_nr,
                                        buffer, temp_buffer);
 
                                        reg_nr,
                                        buffer, temp_buffer);
 


@@ -1869,12 +1799,12 @@ sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache,
   else if (reg_nr >= FV0_C_REGNUM 
           && reg_nr <= FV_LAST_C_REGNUM)
     {
   else if (reg_nr >= FV0_C_REGNUM 
           && reg_nr <= FV_LAST_C_REGNUM)
     {

-      base_regnum = sh64_compact_reg_base_num (reg_nr);
+      base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr);

      
       for (portion = 0; portion < 4; portion++)
        {
          regcache_raw_write (regcache, base_regnum + portion,
      
       for (portion = 0; portion < 4; portion++)
        {
          regcache_raw_write (regcache, base_regnum + portion,

-                             ((char *) buffer
+                             (buffer

                               + register_size (gdbarch, 
                                                base_regnum) * portion));
        }
                               + register_size (gdbarch, 
                                                base_regnum) * portion));
        }


@@ -1909,7 +1839,7 @@ sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache,
        */
       /* *INDENT-ON* */
       /* Get value as an int.  */
        */
       /* *INDENT-ON* */
       /* Get value as an int.  */

-      fpscr_c_value = extract_unsigned_integer (buffer, 4);
+      fpscr_c_value = extract_unsigned_integer (buffer, 4, byte_order);

 
       /* Build the new values.  */
       fpscr_mask = 0x0003fffd;
 
       /* Build the new values.  */
       fpscr_mask = 0x0003fffd;


@@ -1919,23 +1849,23 @@ sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache,
       sr_value = (fpscr_value & sr_mask) >> 6;
       
       regcache_raw_read (regcache, fpscr_base_regnum, temp_buffer);
       sr_value = (fpscr_value & sr_mask) >> 6;
       
       regcache_raw_read (regcache, fpscr_base_regnum, temp_buffer);

-      old_fpscr_value = extract_unsigned_integer (temp_buffer, 4);
+      old_fpscr_value = extract_unsigned_integer (temp_buffer, 4, byte_order);

       old_fpscr_value &= 0xfffc0002;
       fpscr_value |= old_fpscr_value;
       old_fpscr_value &= 0xfffc0002;
       fpscr_value |= old_fpscr_value;

-      store_unsigned_integer (temp_buffer, 4, fpscr_value);
+      store_unsigned_integer (temp_buffer, 4, byte_order, fpscr_value);

       regcache_raw_write (regcache, fpscr_base_regnum, temp_buffer);
       
       regcache_raw_read (regcache, sr_base_regnum, temp_buffer);
       regcache_raw_write (regcache, fpscr_base_regnum, temp_buffer);
       
       regcache_raw_read (regcache, sr_base_regnum, temp_buffer);

-      old_sr_value = extract_unsigned_integer (temp_buffer, 4);
+      old_sr_value = extract_unsigned_integer (temp_buffer, 4, byte_order);

       old_sr_value &= 0xffff8fff;
       sr_value |= old_sr_value;
       old_sr_value &= 0xffff8fff;
       sr_value |= old_sr_value;

-      store_unsigned_integer (temp_buffer, 4, sr_value);
+      store_unsigned_integer (temp_buffer, 4, byte_order, sr_value);

       regcache_raw_write (regcache, sr_base_regnum, temp_buffer);
     }
 
   else if (reg_nr == FPUL_C_REGNUM)
     {
       regcache_raw_write (regcache, sr_base_regnum, temp_buffer);
     }
 
   else if (reg_nr == FPUL_C_REGNUM)
     {

-      base_regnum = sh64_compact_reg_base_num (reg_nr);
+      base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr);

       regcache_raw_write (regcache, base_regnum, buffer);
     }
 }
       regcache_raw_write (regcache, base_regnum, buffer);
     }
 }


@@ -1987,30 +1917,29 @@ sh64_do_cr_c_register_info (struct ui_file *file, struct frame_info *frame,
 static void
 sh64_do_fp_register (struct gdbarch *gdbarch, struct ui_file *file,
                     struct frame_info *frame, int regnum)
 static void
 sh64_do_fp_register (struct gdbarch *gdbarch, struct ui_file *file,
                     struct frame_info *frame, int regnum)

-{                              /* do values for FP (float) regs */
+{                              /* Do values for FP (float) regs.  */

   unsigned char *raw_buffer;
   unsigned char *raw_buffer;

-  double flt;  /* double extracted from raw hex data */
+  double flt;  /* Double extracted from raw hex data.  */

   int inv;
   int j;
 
   /* Allocate space for the float.  */
   int inv;
   int j;
 
   /* Allocate space for the float.  */

-  raw_buffer = (unsigned char *) alloca
-                                (register_size (gdbarch,
-                                                gdbarch_fp0_regnum
-                                                (current_gdbarch)));
+  raw_buffer = (unsigned char *)
+    alloca (register_size (gdbarch, gdbarch_fp0_regnum (gdbarch)));

 
   /* Get the data in raw format.  */
 
   /* Get the data in raw format.  */

-  if (!frame_register_read (frame, regnum, raw_buffer))
-    error ("can't read register %d (%s)",
-          regnum, gdbarch_register_name (current_gdbarch, regnum));
+  if (!deprecated_frame_register_read (frame, regnum, raw_buffer))
+    error (_("can't read register %d (%s)"),
+          regnum, gdbarch_register_name (gdbarch, regnum));

 
 

-  /* Get the register as a number */ 
-  flt = unpack_double (builtin_type_float, raw_buffer, &inv);
+  /* Get the register as a number.  */ 
+  flt = unpack_double (builtin_type (gdbarch)->builtin_float,
+                      raw_buffer, &inv);

 
   /* Print the name and some spaces.  */
 
   /* Print the name and some spaces.  */

-  fputs_filtered (gdbarch_register_name (current_gdbarch, regnum), file);
+  fputs_filtered (gdbarch_register_name (gdbarch, regnum), file);

   print_spaces_filtered (15 - strlen (gdbarch_register_name
   print_spaces_filtered (15 - strlen (gdbarch_register_name

-                                       (current_gdbarch, regnum)), file);
+                                       (gdbarch, regnum)), file);

 
   /* Print the value.  */
   if (inv)
 
   /* Print the value.  */
   if (inv)


@@ -2019,14 +1948,10 @@ sh64_do_fp_register (struct gdbarch *gdbarch, struct ui_file *file,
     fprintf_filtered (file, "%-10.9g", flt);
 
   /* Print the fp register as hex.  */
     fprintf_filtered (file, "%-10.9g", flt);
 
   /* Print the fp register as hex.  */

-  fprintf_filtered (file, "\t(raw 0x");
-  for (j = 0; j < register_size (gdbarch, regnum); j++)
-    {
-      int idx = gdbarch_byte_order (current_gdbarch)
-               == BFD_ENDIAN_BIG ? j : register_size
-               (gdbarch, regnum) - 1 - j;
-      fprintf_filtered (file, "%02x", raw_buffer[idx]);
-    }
+  fprintf_filtered (file, "\t(raw ");
+  print_hex_chars (file, raw_buffer,
+                  register_size (gdbarch, regnum),
+                  gdbarch_byte_order (gdbarch));

   fprintf_filtered (file, ")");
   fprintf_filtered (file, "\n");
 }
   fprintf_filtered (file, ")");
   fprintf_filtered (file, "\n");
 }


@@ -2037,8 +1962,8 @@ sh64_do_pseudo_register (struct gdbarch *gdbarch, struct ui_file *file,
 {
   /* All the sh64-compact mode registers are pseudo registers.  */
 
 {
   /* All the sh64-compact mode registers are pseudo registers.  */
 

-  if (regnum < gdbarch_num_regs (current_gdbarch)
-      || regnum >= gdbarch_num_regs (current_gdbarch)
+  if (regnum < gdbarch_num_regs (gdbarch)
+      || regnum >= gdbarch_num_regs (gdbarch)

                   + NUM_PSEUDO_REGS_SH_MEDIA
                   + NUM_PSEUDO_REGS_SH_COMPACT)
     internal_error (__FILE__, __LINE__,
                   + NUM_PSEUDO_REGS_SH_MEDIA
                   + NUM_PSEUDO_REGS_SH_COMPACT)
     internal_error (__FILE__, __LINE__,


@@ -2046,7 +1971,7 @@ sh64_do_pseudo_register (struct gdbarch *gdbarch, struct ui_file *file,
 
   else if ((regnum >= DR0_REGNUM && regnum <= DR_LAST_REGNUM))
     {
 
   else if ((regnum >= DR0_REGNUM && regnum <= DR_LAST_REGNUM))
     {

-      int fp_regnum = sh64_dr_reg_base_num (regnum);
+      int fp_regnum = sh64_dr_reg_base_num (gdbarch, regnum);

       fprintf_filtered (file, "dr%d\t0x%08x%08x\n", regnum - DR0_REGNUM, 
          (unsigned) get_frame_register_unsigned (frame, fp_regnum),
          (unsigned) get_frame_register_unsigned (frame, fp_regnum + 1));
       fprintf_filtered (file, "dr%d\t0x%08x%08x\n", regnum - DR0_REGNUM, 
          (unsigned) get_frame_register_unsigned (frame, fp_regnum),
          (unsigned) get_frame_register_unsigned (frame, fp_regnum + 1));


@@ -2054,7 +1979,7 @@ sh64_do_pseudo_register (struct gdbarch *gdbarch, struct ui_file *file,
 
   else if ((regnum >= DR0_C_REGNUM && regnum <= DR_LAST_C_REGNUM))
     {
 
   else if ((regnum >= DR0_C_REGNUM && regnum <= DR_LAST_C_REGNUM))
     {

-      int fp_regnum = sh64_compact_reg_base_num (regnum);
+      int fp_regnum = sh64_compact_reg_base_num (gdbarch, regnum);

       fprintf_filtered (file, "dr%d_c\t0x%08x%08x\n", regnum - DR0_C_REGNUM,
          (unsigned) get_frame_register_unsigned (frame, fp_regnum),
          (unsigned) get_frame_register_unsigned (frame, fp_regnum + 1));
       fprintf_filtered (file, "dr%d_c\t0x%08x%08x\n", regnum - DR0_C_REGNUM,
          (unsigned) get_frame_register_unsigned (frame, fp_regnum),
          (unsigned) get_frame_register_unsigned (frame, fp_regnum + 1));


@@ -2062,7 +1987,7 @@ sh64_do_pseudo_register (struct gdbarch *gdbarch, struct ui_file *file,
 
   else if ((regnum >= FV0_REGNUM && regnum <= FV_LAST_REGNUM))
     {
 
   else if ((regnum >= FV0_REGNUM && regnum <= FV_LAST_REGNUM))
     {

-      int fp_regnum = sh64_fv_reg_base_num (regnum);
+      int fp_regnum = sh64_fv_reg_base_num (gdbarch, regnum);

       fprintf_filtered (file, "fv%d\t0x%08x\t0x%08x\t0x%08x\t0x%08x\n", 
           regnum - FV0_REGNUM, 
           (unsigned) get_frame_register_unsigned (frame, fp_regnum),
       fprintf_filtered (file, "fv%d\t0x%08x\t0x%08x\t0x%08x\t0x%08x\n", 
           regnum - FV0_REGNUM, 
           (unsigned) get_frame_register_unsigned (frame, fp_regnum),


@@ -2073,7 +1998,7 @@ sh64_do_pseudo_register (struct gdbarch *gdbarch, struct ui_file *file,
           
   else if ((regnum >= FV0_C_REGNUM && regnum <= FV_LAST_C_REGNUM))
     {
           
   else if ((regnum >= FV0_C_REGNUM && regnum <= FV_LAST_C_REGNUM))
     {

-      int fp_regnum = sh64_compact_reg_base_num (regnum);
+      int fp_regnum = sh64_compact_reg_base_num (gdbarch, regnum);

       fprintf_filtered (file, "fv%d_c\t0x%08x\t0x%08x\t0x%08x\t0x%08x\n", 
           regnum - FV0_C_REGNUM, 
           (unsigned) get_frame_register_unsigned (frame, fp_regnum),
       fprintf_filtered (file, "fv%d_c\t0x%08x\t0x%08x\t0x%08x\t0x%08x\n", 
           regnum - FV0_C_REGNUM, 
           (unsigned) get_frame_register_unsigned (frame, fp_regnum),


@@ -2084,7 +2009,7 @@ sh64_do_pseudo_register (struct gdbarch *gdbarch, struct ui_file *file,
 
   else if (regnum >= FPP0_REGNUM && regnum <= FPP_LAST_REGNUM)
     {
 
   else if (regnum >= FPP0_REGNUM && regnum <= FPP_LAST_REGNUM)
     {

-      int fp_regnum = sh64_fpp_reg_base_num (regnum);
+      int fp_regnum = sh64_fpp_reg_base_num (gdbarch, regnum);

       fprintf_filtered (file, "fpp%d\t0x%08x\t0x%08x\n", regnum - FPP0_REGNUM, 
          (unsigned) get_frame_register_unsigned (frame, fp_regnum),
          (unsigned) get_frame_register_unsigned (frame, fp_regnum + 1));
       fprintf_filtered (file, "fpp%d\t0x%08x\t0x%08x\n", regnum - FPP0_REGNUM, 
          (unsigned) get_frame_register_unsigned (frame, fp_regnum),
          (unsigned) get_frame_register_unsigned (frame, fp_regnum + 1));


@@ -2092,7 +2017,7 @@ sh64_do_pseudo_register (struct gdbarch *gdbarch, struct ui_file *file,
 
   else if (regnum >= R0_C_REGNUM && regnum <= R_LAST_C_REGNUM)
     {
 
   else if (regnum >= R0_C_REGNUM && regnum <= R_LAST_C_REGNUM)
     {

-      int c_regnum = sh64_compact_reg_base_num (regnum);
+      int c_regnum = sh64_compact_reg_base_num (gdbarch, regnum);

       fprintf_filtered (file, "r%d_c\t0x%08x\n", regnum - R0_C_REGNUM, 
           (unsigned) get_frame_register_unsigned (frame, c_regnum));
     }
       fprintf_filtered (file, "r%d_c\t0x%08x\n", regnum - R0_C_REGNUM, 
           (unsigned) get_frame_register_unsigned (frame, c_regnum));
     }


@@ -2108,20 +2033,28 @@ sh64_do_register (struct gdbarch *gdbarch, struct ui_file *file,
                  struct frame_info *frame, int regnum)
 {
   unsigned char raw_buffer[MAX_REGISTER_SIZE];
                  struct frame_info *frame, int regnum)
 {
   unsigned char raw_buffer[MAX_REGISTER_SIZE];

+  struct value_print_options opts;

 
 

-  fputs_filtered (gdbarch_register_name (current_gdbarch, regnum), file);
+  fputs_filtered (gdbarch_register_name (gdbarch, regnum), file);

   print_spaces_filtered (15 - strlen (gdbarch_register_name
   print_spaces_filtered (15 - strlen (gdbarch_register_name

-                                     (current_gdbarch, regnum)), file);
+                                     (gdbarch, regnum)), file);

 
   /* Get the data in raw format.  */
 
   /* Get the data in raw format.  */

-  if (!frame_register_read (frame, regnum, raw_buffer))
-    fprintf_filtered (file, "*value not available*\n");
-      
+  if (!deprecated_frame_register_read (frame, regnum, raw_buffer))
+    {
+      fprintf_filtered (file, "*value not available*\n");
+      return;
+    }
+
+  get_formatted_print_options (&opts, 'x');
+  opts.deref_ref = 1;

   val_print (register_type (gdbarch, regnum), raw_buffer, 0, 0,
   val_print (register_type (gdbarch, regnum), raw_buffer, 0, 0,

-            file, 'x', 1, 0, Val_pretty_default);
+            file, 0, NULL, &opts, current_language);

   fprintf_filtered (file, "\t");
   fprintf_filtered (file, "\t");

+  get_formatted_print_options (&opts, 0);
+  opts.deref_ref = 1;

   val_print (register_type (gdbarch, regnum), raw_buffer, 0, 0,
   val_print (register_type (gdbarch, regnum), raw_buffer, 0, 0,

-            file, 0, 1, 0, Val_pretty_default);
+            file, 0, NULL, &opts, current_language);

   fprintf_filtered (file, "\n");
 }
 
   fprintf_filtered (file, "\n");
 }
 


@@ -2129,12 +2062,12 @@ static void
 sh64_print_register (struct gdbarch *gdbarch, struct ui_file *file,
                     struct frame_info *frame, int regnum)
 {
 sh64_print_register (struct gdbarch *gdbarch, struct ui_file *file,
                     struct frame_info *frame, int regnum)
 {

-  if (regnum < 0 || regnum >= gdbarch_num_regs (current_gdbarch)
-                             + gdbarch_num_pseudo_regs (current_gdbarch))
+  if (regnum < 0 || regnum >= gdbarch_num_regs (gdbarch)
+                             + gdbarch_num_pseudo_regs (gdbarch))

     internal_error (__FILE__, __LINE__,
                    _("Invalid register number %d\n"), regnum);
 
     internal_error (__FILE__, __LINE__,
                    _("Invalid register number %d\n"), regnum);
 

-  else if (regnum >= 0 && regnum < gdbarch_num_regs (current_gdbarch))
+  else if (regnum >= 0 && regnum < gdbarch_num_regs (gdbarch))

     {
       if (TYPE_CODE (register_type (gdbarch, regnum)) == TYPE_CODE_FLT)
        sh64_do_fp_register (gdbarch, file, frame, regnum);     /* FP regs */
     {
       if (TYPE_CODE (register_type (gdbarch, regnum)) == TYPE_CODE_FLT)
        sh64_do_fp_register (gdbarch, file, frame, regnum);     /* FP regs */


@@ -2142,8 +2075,8 @@ sh64_print_register (struct gdbarch *gdbarch, struct ui_file *file,
        sh64_do_register (gdbarch, file, frame, regnum);
     }
 
        sh64_do_register (gdbarch, file, frame, regnum);
     }
 

-  else if (regnum < gdbarch_num_regs (current_gdbarch)
-                   + gdbarch_num_pseudo_regs (current_gdbarch))
+  else if (regnum < gdbarch_num_regs (gdbarch)
+                   + gdbarch_num_pseudo_regs (gdbarch))

     sh64_do_pseudo_register (gdbarch, file, frame, regnum);
 }
 
     sh64_do_pseudo_register (gdbarch, file, frame, regnum);
 }
 


@@ -2152,23 +2085,23 @@ sh64_media_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file,
                                 struct frame_info *frame, int regnum,
                                 int fpregs)
 {
                                 struct frame_info *frame, int regnum,
                                 int fpregs)
 {

-  if (regnum != -1)            /* do one specified register */
+  if (regnum != -1)            /* Do one specified register.  */

     {
     {

-      if (*(gdbarch_register_name (current_gdbarch, regnum)) == '\0')
-       error ("Not a valid register for the current processor type");
+      if (*(gdbarch_register_name (gdbarch, regnum)) == '\0')
+       error (_("Not a valid register for the current processor type"));

 
       sh64_print_register (gdbarch, file, frame, regnum);
     }
   else
 
       sh64_print_register (gdbarch, file, frame, regnum);
     }
   else

-    /* do all (or most) registers */
+    /* Do all (or most) registers.  */

     {
       regnum = 0;
     {
       regnum = 0;

-      while (regnum < gdbarch_num_regs (current_gdbarch))
+      while (regnum < gdbarch_num_regs (gdbarch))

        {
          /* If the register name is empty, it is undefined for this
             processor, so don't display anything.  */
        {
          /* If the register name is empty, it is undefined for this
             processor, so don't display anything.  */

-         if (gdbarch_register_name (current_gdbarch, regnum) == NULL
-             || *(gdbarch_register_name (current_gdbarch, regnum)) == '\0')
+         if (gdbarch_register_name (gdbarch, regnum) == NULL
+             || *(gdbarch_register_name (gdbarch, regnum)) == '\0')

            { 
              regnum++;
              continue;
            { 
              regnum++;
              continue;


@@ -2179,12 +2112,12 @@ sh64_media_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file,
            {
              if (fpregs)
                {
            {
              if (fpregs)
                {

-                 /* true for "INFO ALL-REGISTERS" command */
+                 /* true for "INFO ALL-REGISTERS" command.  */

                  sh64_do_fp_register (gdbarch, file, frame, regnum);
                  regnum ++;
                }
              else
                  sh64_do_fp_register (gdbarch, file, frame, regnum);
                  regnum ++;
                }
              else

-               regnum += FP_LAST_REGNUM - gdbarch_fp0_regnum (current_gdbarch);
+               regnum += FP_LAST_REGNUM - gdbarch_fp0_regnum (gdbarch);

                /* skip FP regs */
            }
          else
                /* skip FP regs */
            }
          else


@@ -2195,8 +2128,8 @@ sh64_media_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file,
        }
 
       if (fpregs)
        }
 
       if (fpregs)

-       while (regnum < gdbarch_num_regs (current_gdbarch)
-                       + gdbarch_num_pseudo_regs (current_gdbarch))
+       while (regnum < gdbarch_num_regs (gdbarch)
+                       + gdbarch_num_pseudo_regs (gdbarch))

          {
            sh64_do_pseudo_register (gdbarch, file, frame, regnum);
            regnum++;
          {
            sh64_do_pseudo_register (gdbarch, file, frame, regnum);
            regnum++;


@@ -2210,22 +2143,22 @@ sh64_compact_print_registers_info (struct gdbarch *gdbarch,
                                   struct frame_info *frame, int regnum,
                                   int fpregs)
 {
                                   struct frame_info *frame, int regnum,
                                   int fpregs)
 {

-  if (regnum != -1)            /* do one specified register */
+  if (regnum != -1)            /* Do one specified register.  */

     {
     {

-      if (*(gdbarch_register_name (current_gdbarch, regnum)) == '\0')
-       error ("Not a valid register for the current processor type");
+      if (*(gdbarch_register_name (gdbarch, regnum)) == '\0')
+       error (_("Not a valid register for the current processor type"));

 
       if (regnum >= 0 && regnum < R0_C_REGNUM)
 
       if (regnum >= 0 && regnum < R0_C_REGNUM)

-        error ("Not a valid register for the current processor mode.");
+        error (_("Not a valid register for the current processor mode."));

 
       sh64_print_register (gdbarch, file, frame, regnum);
     }
   else
 
       sh64_print_register (gdbarch, file, frame, regnum);
     }
   else

-    /* do all compact registers */
+    /* Do all compact registers.  */

     {
       regnum = R0_C_REGNUM;
     {
       regnum = R0_C_REGNUM;

-      while (regnum < gdbarch_num_regs (current_gdbarch)
-                     + gdbarch_num_pseudo_regs (current_gdbarch))
+      while (regnum < gdbarch_num_regs (gdbarch)
+                     + gdbarch_num_pseudo_regs (gdbarch))

         {
           sh64_do_pseudo_register (gdbarch, file, frame, regnum);
           regnum++;
         {
           sh64_do_pseudo_register (gdbarch, file, frame, regnum);
           regnum++;


@@ -2271,8 +2204,9 @@ sh64_alloc_frame_cache (void)
 }
 
 static struct sh64_frame_cache *
 }
 
 static struct sh64_frame_cache *

-sh64_frame_cache (struct frame_info *next_frame, void **this_cache)
+sh64_frame_cache (struct frame_info *this_frame, void **this_cache)

 {
 {

+  struct gdbarch *gdbarch;

   struct sh64_frame_cache *cache;
   CORE_ADDR current_pc;
   int i;
   struct sh64_frame_cache *cache;
   CORE_ADDR current_pc;
   int i;


@@ -2280,24 +2214,25 @@ sh64_frame_cache (struct frame_info *next_frame, void **this_cache)
   if (*this_cache)
     return *this_cache;
 
   if (*this_cache)
     return *this_cache;
 

+  gdbarch = get_frame_arch (this_frame);

   cache = sh64_alloc_frame_cache ();
   *this_cache = cache;
 
   cache = sh64_alloc_frame_cache ();
   *this_cache = cache;
 

-  current_pc = frame_pc_unwind (next_frame);
+  current_pc = get_frame_pc (this_frame);

   cache->media_mode = pc_is_isa32 (current_pc);
 
   /* In principle, for normal frames, fp holds the frame pointer,
      which holds the base address for the current stack frame.
      However, for functions that don't need it, the frame pointer is
      optional.  For these "frameless" functions the frame pointer is
   cache->media_mode = pc_is_isa32 (current_pc);
 
   /* In principle, for normal frames, fp holds the frame pointer,
      which holds the base address for the current stack frame.
      However, for functions that don't need it, the frame pointer is
      optional.  For these "frameless" functions the frame pointer is

-     actually the frame pointer of the calling frame. */
-  cache->base = frame_unwind_register_unsigned (next_frame, MEDIA_FP_REGNUM);
+     actually the frame pointer of the calling frame.  */
+  cache->base = get_frame_register_unsigned (this_frame, MEDIA_FP_REGNUM);

   if (cache->base == 0)
     return cache;
 
   if (cache->base == 0)
     return cache;
 

-  cache->pc = frame_func_unwind (next_frame, NORMAL_FRAME);
+  cache->pc = get_frame_func (this_frame);

   if (cache->pc != 0)
   if (cache->pc != 0)

-    sh64_analyze_prologue (current_gdbarch, cache, cache->pc, current_pc);
+    sh64_analyze_prologue (gdbarch, cache, cache->pc, current_pc);

 
   if (!cache->uses_fp)
     {
 
   if (!cache->uses_fp)
     {


@@ -2308,8 +2243,8 @@ sh64_frame_cache (struct frame_info *next_frame, void **this_cache)
          setup yet.  Try to reconstruct the base address for the stack
          frame by looking at the stack pointer.  For truly "frameless"
          functions this might work too.  */
          setup yet.  Try to reconstruct the base address for the stack
          frame by looking at the stack pointer.  For truly "frameless"
          functions this might work too.  */

-      cache->base = frame_unwind_register_unsigned
-                   (next_frame, gdbarch_sp_regnum (current_gdbarch));
+      cache->base = get_frame_register_unsigned
+                   (this_frame, gdbarch_sp_regnum (gdbarch));

     }
 
   /* Now that we have the base address for the stack frame we can
     }
 
   /* Now that we have the base address for the stack frame we can


@@ -2325,77 +2260,48 @@ sh64_frame_cache (struct frame_info *next_frame, void **this_cache)
   return cache;
 }
 
   return cache;
 }
 

-static void
-sh64_frame_prev_register (struct frame_info *next_frame, void **this_cache,
-                         int regnum, int *optimizedp,
-                         enum lval_type *lvalp, CORE_ADDR *addrp,
-                         int *realnump, gdb_byte *valuep)
+static struct value *
+sh64_frame_prev_register (struct frame_info *this_frame,
+                         void **this_cache, int regnum)

 {
 {

-  struct sh64_frame_cache *cache = sh64_frame_cache (next_frame, this_cache);
+  struct sh64_frame_cache *cache = sh64_frame_cache (this_frame, this_cache);
+  struct gdbarch *gdbarch = get_frame_arch (this_frame);
+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);

 
   gdb_assert (regnum >= 0);
 
 
   gdb_assert (regnum >= 0);
 

-  if (regnum == gdbarch_sp_regnum (current_gdbarch) && cache->saved_sp)
-    {
-      *optimizedp = 0;
-      *lvalp = not_lval;
-      *addrp = 0;
-      *realnump = -1;
-      if (valuep)
-        {
-          /* Store the value.  */
-          store_unsigned_integer (valuep,
-                                 register_size (current_gdbarch,
-                                 gdbarch_sp_regnum (current_gdbarch)),
-                                 cache->saved_sp);
-        }
-      return;
-    }
+  if (regnum == gdbarch_sp_regnum (gdbarch) && cache->saved_sp)
+    frame_unwind_got_constant (this_frame, regnum, cache->saved_sp);

 
   /* The PC of the previous frame is stored in the PR register of
      the current frame.  Frob regnum so that we pull the value from
      the correct place.  */
 
   /* The PC of the previous frame is stored in the PR register of
      the current frame.  Frob regnum so that we pull the value from
      the correct place.  */

-  if (regnum == gdbarch_pc_regnum (current_gdbarch))
+  if (regnum == gdbarch_pc_regnum (gdbarch))

     regnum = PR_REGNUM;
 
   if (regnum < SIM_SH64_NR_REGS && cache->saved_regs[regnum] != -1)
     {
     regnum = PR_REGNUM;
 
   if (regnum < SIM_SH64_NR_REGS && cache->saved_regs[regnum] != -1)
     {

-      int reg_size = register_size (current_gdbarch, regnum);
-      int size;
-
-      *optimizedp = 0;
-      *lvalp = lval_memory;
-      *addrp = cache->saved_regs[regnum];
-      *realnump = -1;
-      if (gdbarch_tdep (current_gdbarch)->sh_abi == SH_ABI_32
+      if (gdbarch_tdep (gdbarch)->sh_abi == SH_ABI_32

           && (regnum == MEDIA_FP_REGNUM || regnum == PR_REGNUM))
           && (regnum == MEDIA_FP_REGNUM || regnum == PR_REGNUM))

-       size = 4;
-      else
-        size = reg_size;
-      if (valuep)

         {
         {

-         memset (valuep, 0, reg_size);
-         if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_LITTLE)
-           read_memory (*addrp, valuep, size);
-         else
-           read_memory (*addrp, (char *) valuep + reg_size - size, size);
+         CORE_ADDR val;
+         val = read_memory_unsigned_integer (cache->saved_regs[regnum],
+                                             4, byte_order);
+         return frame_unwind_got_constant (this_frame, regnum, val);

         }
         }

-      return;
+
+      return frame_unwind_got_memory (this_frame, regnum,
+                                     cache->saved_regs[regnum]);

     }
 
     }
 

-  *optimizedp = 0;
-  *lvalp = lval_register;
-  *addrp = 0;
-  *realnump = regnum;
-  if (valuep)
-    frame_unwind_register (next_frame, (*realnump), valuep);
+  return frame_unwind_got_register (this_frame, regnum, regnum);

 }
 
 static void
 }
 
 static void

-sh64_frame_this_id (struct frame_info *next_frame, void **this_cache,
+sh64_frame_this_id (struct frame_info *this_frame, void **this_cache,

                    struct frame_id *this_id)
 {
                    struct frame_id *this_id)
 {

-  struct sh64_frame_cache *cache = sh64_frame_cache (next_frame, this_cache);
+  struct sh64_frame_cache *cache = sh64_frame_cache (this_frame, this_cache);

 
   /* This marks the outermost frame.  */
   if (cache->base == 0)
 
   /* This marks the outermost frame.  */
   if (cache->base == 0)


@@ -2406,41 +2312,39 @@ sh64_frame_this_id (struct frame_info *next_frame, void **this_cache,
 
 static const struct frame_unwind sh64_frame_unwind = {
   NORMAL_FRAME,
 
 static const struct frame_unwind sh64_frame_unwind = {
   NORMAL_FRAME,

+  default_frame_unwind_stop_reason,

   sh64_frame_this_id,
   sh64_frame_this_id,

-  sh64_frame_prev_register
+  sh64_frame_prev_register,
+  NULL,
+  default_frame_sniffer

 };
 
 };
 

-static const struct frame_unwind *
-sh64_frame_sniffer (struct frame_info *next_frame)
-{
-  return &sh64_frame_unwind;
-}
-

 static CORE_ADDR
 sh64_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame)
 {
   return frame_unwind_register_unsigned (next_frame,
 static CORE_ADDR
 sh64_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame)
 {
   return frame_unwind_register_unsigned (next_frame,

-                                        gdbarch_sp_regnum (current_gdbarch));
+                                        gdbarch_sp_regnum (gdbarch));

 }
 
 static CORE_ADDR
 sh64_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame)
 {
   return frame_unwind_register_unsigned (next_frame,
 }
 
 static CORE_ADDR
 sh64_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame)
 {
   return frame_unwind_register_unsigned (next_frame,

-                                        gdbarch_pc_regnum (current_gdbarch));
+                                        gdbarch_pc_regnum (gdbarch));

 }
 
 static struct frame_id
 }
 
 static struct frame_id

-sh64_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *next_frame)
+sh64_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame)

 {
 {

-  return frame_id_build (sh64_unwind_sp (gdbarch, next_frame),
-                         frame_pc_unwind (next_frame));
+  CORE_ADDR sp = get_frame_register_unsigned (this_frame,
+                                             gdbarch_sp_regnum (gdbarch));
+  return frame_id_build (sp, get_frame_pc (this_frame));

 }
 
 static CORE_ADDR
 }
 
 static CORE_ADDR

-sh64_frame_base_address (struct frame_info *next_frame, void **this_cache)
+sh64_frame_base_address (struct frame_info *this_frame, void **this_cache)

 {
 {

-  struct sh64_frame_cache *cache = sh64_frame_cache (next_frame, this_cache);
+  struct sh64_frame_cache *cache = sh64_frame_cache (this_frame, this_cache);

 
   return cache->base;
 }
 
   return cache->base;
 }


@@ -2466,7 +2370,7 @@ sh64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
   /* None found, create a new architecture from the information
      provided.  */
 
   /* None found, create a new architecture from the information
      provided.  */

-  tdep = XMALLOC (struct gdbarch_tdep);
+  tdep = XNEW (struct gdbarch_tdep);

   gdbarch = gdbarch_alloc (&info, tdep);
 
   /* Determine the ABI */
   gdbarch = gdbarch_alloc (&info, tdep);
 
   /* Determine the ABI */


@@ -2511,12 +2415,10 @@ sh64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
   set_gdbarch_breakpoint_from_pc (gdbarch, sh64_breakpoint_from_pc);
 
 
   set_gdbarch_breakpoint_from_pc (gdbarch, sh64_breakpoint_from_pc);
 

-  set_gdbarch_print_insn (gdbarch, gdb_print_insn_sh64);
+  set_gdbarch_print_insn (gdbarch, print_insn_sh);

   set_gdbarch_register_sim_regno (gdbarch, legacy_register_sim_regno);
 
   set_gdbarch_return_value (gdbarch, sh64_return_value);
   set_gdbarch_register_sim_regno (gdbarch, legacy_register_sim_regno);
 
   set_gdbarch_return_value (gdbarch, sh64_return_value);

-  set_gdbarch_deprecated_extract_struct_value_address (gdbarch,
-                                           sh64_extract_struct_value_address);

 
   set_gdbarch_skip_prologue (gdbarch, sh64_skip_prologue);
   set_gdbarch_inner_than (gdbarch, core_addr_lessthan);
 
   set_gdbarch_skip_prologue (gdbarch, sh64_skip_prologue);
   set_gdbarch_inner_than (gdbarch, core_addr_lessthan);


@@ -2528,7 +2430,7 @@ sh64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_frame_align (gdbarch, sh64_frame_align);
   set_gdbarch_unwind_sp (gdbarch, sh64_unwind_sp);
   set_gdbarch_unwind_pc (gdbarch, sh64_unwind_pc);
   set_gdbarch_frame_align (gdbarch, sh64_frame_align);
   set_gdbarch_unwind_sp (gdbarch, sh64_unwind_sp);
   set_gdbarch_unwind_pc (gdbarch, sh64_unwind_pc);

-  set_gdbarch_unwind_dummy_id (gdbarch, sh64_unwind_dummy_id);
+  set_gdbarch_dummy_id (gdbarch, sh64_dummy_id);

   frame_base_set_default (gdbarch, &sh64_frame_base);
 
   set_gdbarch_print_registers_info (gdbarch, sh64_print_registers_info);
   frame_base_set_default (gdbarch, &sh64_frame_base);
 
   set_gdbarch_print_registers_info (gdbarch, sh64_print_registers_info);


@@ -2539,8 +2441,8 @@ sh64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   /* Hook in ABI-specific overrides, if they have been registered.  */
   gdbarch_init_osabi (info, gdbarch);
 
   /* Hook in ABI-specific overrides, if they have been registered.  */
   gdbarch_init_osabi (info, gdbarch);
 

-  frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer);
-  frame_unwind_append_sniffer (gdbarch, sh64_frame_sniffer);
+  dwarf2_append_unwinders (gdbarch);
+  frame_unwind_append_unwinder (gdbarch, &sh64_frame_unwind);

 
   return gdbarch;
 }
 
   return gdbarch;
 }