2001-07-26 Elena Zannoni <ezannoni@redhat.com>

	* sh-tdep.c (sh_gdbarch_init): Use SH_DEFAULT_NUM_REGS instead of
	NUM_REGS.
	(SH_DEFAULT_NUM_REGS): Define.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 57ad4912b55061fe8299245c970a98e9e6c29ceb..f5e6a8d5afd53827bc7c97b6b65f568f354f0108 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-26  Elena Zannoni  <ezannoni@redhat.com>
+
+       * sh-tdep.c (sh_gdbarch_init): Use SH_DEFAULT_NUM_REGS instead of
+       NUM_REGS.
+       (SH_DEFAULT_NUM_REGS): Define.
+
 2001-07-26  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * go32-nat.c (read_memory_region): Make sure the segment limit was

diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 8e15c7e4274791d8d3f7151c2cbd9d313132763f..52ec8e8969a41f77e40265ab5d5ecbb13101d79a 100644 (file)
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -50,6 +50,8 @@ int (*print_sh_insn) (bfd_vma, disassemble_info*);
 CORE_ADDR (*skip_prologue_hard_way) (CORE_ADDR);
 void (*do_pseudo_register) (int);
 
+#define SH_DEFAULT_NUM_REGS 59
+
 /* Define other aspects of the stack frame.
    we keep a copy of the worked out return pc lying around, since it
    is a useful bit of info */
@@ -1906,12 +1908,12 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_max_register_raw_size (gdbarch, 4);
   set_gdbarch_max_register_virtual_size (gdbarch, 4);
   set_gdbarch_ptr_bit (gdbarch, 4 * TARGET_CHAR_BIT);
-  set_gdbarch_num_regs (gdbarch, 59);
+  set_gdbarch_num_regs (gdbarch, SH_DEFAULT_NUM_REGS);
   set_gdbarch_sp_regnum (gdbarch, 15);
   set_gdbarch_fp_regnum (gdbarch, 14);
   set_gdbarch_pc_regnum (gdbarch, 16);
   set_gdbarch_register_size (gdbarch, 4);
-  set_gdbarch_register_bytes (gdbarch, NUM_REGS * 4);
+  set_gdbarch_register_bytes (gdbarch, SH_DEFAULT_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);