2000-12-17 Elena Zannoni <ezannoni@kwikemart.cygnus.com>

        * sh-tdep.c (sh_gdbarch_init): Initialize do_registers_info.

        * config/sh/tm-sh.h (DO_REGISTERS_INFO): Remove macro. Use
        multiarch version instead.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2450e04..363d15a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,9 @@
 2000-12-17  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
 
+        * sh-tdep.c (sh_gdbarch_init): Initialize do_registers_info.
+
        * config/sh/tm-sh.h: Don't remove SR_REGNUM from enum.
+       (DO_REGISTERS_INFO): Remove macro. Use multiarch version instead.
 
 Fri Dec 15 23:12:15 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 

diff --git a/gdb/config/sh/tm-sh.h b/gdb/config/sh/tm-sh.h
index 23c75ce..b0c13ea 100644 (file)
--- a/gdb/config/sh/tm-sh.h
+++ b/gdb/config/sh/tm-sh.h
@@ -66,12 +66,6 @@ enum
     SR_REGNUM = 22
   };
 
-/* Define DO_REGISTERS_INFO() to do machine-specific formatting
-   of register dumps. */
-extern void sh_do_registers_info (int regnum, int fpregs);
-#undef  DO_REGISTERS_INFO
-#define DO_REGISTERS_INFO(REGNUM, FP) sh_do_registers_info(REGNUM, FP)
-
 #define NUM_REALREGS 59 /* used in remote-e7000.c which is not multiarched. */
 
 #define REGISTER_TYPE  long /* used in standalone.c */

diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 5e89dd9..be93f21 100644 (file)
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -104,6 +104,7 @@ static gdbarch_fetch_pseudo_register_ftype sh_fetch_pseudo_register;
 static gdbarch_store_pseudo_register_ftype sh_store_pseudo_register;
 static int fv_reg_base_num (int);
 static int dr_reg_base_num (int);
+static gdbarch_do_registers_info_ftype sh_do_registers_info;
 static void do_fv_register_info (int fv_regnum);
 static void do_dr_register_info (int dr_regnum);
 static void sh_do_pseudo_register (int regnum);
@@ -1917,6 +1918,7 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_register_bytes (gdbarch, NUM_REGS * 4);
   set_gdbarch_fetch_pseudo_register (gdbarch, sh_fetch_pseudo_register);
   set_gdbarch_store_pseudo_register (gdbarch, sh_store_pseudo_register);
+  set_gdbarch_do_registers_info (gdbarch, sh_do_registers_info);
   print_sh_insn = gdb_print_insn_sh;
 
   switch (info.bfd_arch_info->mach)