2003-06-18 Corinna Vinschen <vinschen@redhat.com>

        * h8300-tdep.c (h8300s_register_name): Enable MACH and MACL
        registers for H8/300S.
        (h8300_print_registers_info): Ditto.
        (h8300_gdbarch_init): Accommodate register count for H8/300S.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d86c33ac144dc0b1c28ef1807962b93e9a9784df..47d256678a7babb66ebff83053ab3079815f6b8e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-18  Corinna Vinschen  <vinschen@redhat.com>
+
+       * h8300-tdep.c (h8300s_register_name): Enable MACH and MACL
+       registers for H8/300S.
+       (h8300_print_registers_info): Ditto.
+       (h8300_gdbarch_init): Accommodate register count for H8/300S. 
+
 2003-06-18  Daniel Jacobowitz  <drow@mvista.com>
 
        * config/nm-linux.h (linux_record_stopped_pid): New prototype.

diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index 24dca63fdb2b0a08a8a2b07f4db4c41cea08ea65..1253b4d6ca15f0da935c04fb82fb8840f5f29b29 100644 (file)
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -895,7 +895,7 @@ h8300s_register_name (int regno)
   static char *register_names[] = {
     "er0", "er1", "er2", "er3", "er4", "er5", "er6",
     "sp", "", "pc", "cycles", "", "tick", "inst",
-    /* "mach", "macl", */
+    "mach", "macl",
     "ccr", "exr" /* pseudo registers */
   };
   if (regno < 0
@@ -1015,9 +1015,9 @@ h8300_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file,
            {
              h8300_print_register (gdbarch, file, frame, E_SBR_REGNUM);
              h8300_print_register (gdbarch, file, frame, E_VBR_REGNUM);
-             h8300_print_register (gdbarch, file, frame, E_MACH_REGNUM);
-             h8300_print_register (gdbarch, file, frame, E_MACL_REGNUM);
            }
+         h8300_print_register (gdbarch, file, frame, E_MACH_REGNUM);
+         h8300_print_register (gdbarch, file, frame, E_MACL_REGNUM);
          h8300_print_register (gdbarch, file, frame, E_CYCLES_REGNUM);
          h8300_print_register (gdbarch, file, frame, E_TICKS_REGNUM);
          h8300_print_register (gdbarch, file, frame, E_INSTS_REGNUM);
@@ -1220,7 +1220,7 @@ h8300_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
       h8300sxmode = 0;
       h8300smode = 1;
       h8300hmode = 1;
-      set_gdbarch_num_regs (gdbarch, 14);
+      set_gdbarch_num_regs (gdbarch, 16);
       set_gdbarch_num_pseudo_regs (gdbarch, 2);
       set_gdbarch_ecoff_reg_to_regnum (gdbarch, h8300s_dbg_reg_to_regnum);
       set_gdbarch_dwarf_reg_to_regnum (gdbarch, h8300s_dbg_reg_to_regnum);