2000-03-22 Mark Kettenis <kettenis@gnu.org>

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

diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 72c6cbd2b9dc4f931a2969f91921726f2dd08d8f..1c98cafcee7b6eb719516fd434c63b538443461b 100644 (file)
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -88,9 +88,11 @@ static char *sh3e_reg_names[] = {
 };
 /* *INDENT-ON* */
 
-
-
+#ifdef _WIN32_WCE
+char **sh_register_names = sh3_reg_names;
+#else
 char **sh_register_names = sh_generic_reg_names;
+#endif
 
 struct
   {
@@ -104,15 +106,15 @@ sh_processor_type_table[] =
   }
   ,
   {
-    sh3_reg_names, bfd_mach_sh3
+    sh_reg_names, bfd_mach_sh2
   }
   ,
   {
-    sh3e_reg_names, bfd_mach_sh3e
+    sh3_reg_names, bfd_mach_sh3
   }
   ,
   {
-    sh3e_reg_names, bfd_mach_sh4
+    sh3e_reg_names, bfd_mach_sh3e
   }
   ,
   {
@@ -620,7 +622,7 @@ sh_target_architecture_hook (ap)
        }
     }
 
-  fatal ("Architecture `%s' unreconized", ap->printable_name);
+  internal_error ("Architecture `%s' unreconized", ap->printable_name);
 }
 
 /* Print the registers in a form similar to the E7000 */
@@ -636,71 +638,67 @@ sh_show_regs (args, from_tty)
   else
     cpu = 0;
 
-  /* FIXME: sh4 has more registers */
-  if (cpu == bfd_mach_sh4)
-    cpu = bfd_mach_sh3;
-
-  printf_filtered ("PC=%08x SR=%08x PR=%08x MACH=%08x MACHL=%08x\n",
-                  read_register (PC_REGNUM),
-                  read_register (SR_REGNUM),
-                  read_register (PR_REGNUM),
-                  read_register (MACH_REGNUM),
-                  read_register (MACL_REGNUM));
+  printf_filtered ("PC=%s SR=%08lx PR=%08lx MACH=%08lx MACHL=%08lx\n",
+                  paddr (read_register (PC_REGNUM)),
+                  (long) read_register (SR_REGNUM),
+                  (long) read_register (PR_REGNUM),
+                  (long) read_register (MACH_REGNUM),
+                  (long) read_register (MACL_REGNUM));
 
-  printf_filtered ("GBR=%08x VBR=%08x",
-                  read_register (GBR_REGNUM),
-                  read_register (VBR_REGNUM));
+  printf_filtered ("GBR=%08lx VBR=%08lx",
+                  (long) read_register (GBR_REGNUM),
+                  (long) read_register (VBR_REGNUM));
   if (cpu == bfd_mach_sh3 || cpu == bfd_mach_sh3e)
     {
-      printf_filtered (" SSR=%08x SPC=%08x",
-                      read_register (SSR_REGNUM),
-                      read_register (SPC_REGNUM));
+      printf_filtered (" SSR=%08lx SPC=%08lx",
+                      (long) read_register (SSR_REGNUM),
+                      (long) read_register (SPC_REGNUM));
       if (cpu == bfd_mach_sh3e)
        {
-         printf_filtered (" FPUL=%08x FPSCR=%08x",
-                          read_register (FPUL_REGNUM),
-                          read_register (FPSCR_REGNUM));
+         printf_filtered (" FPUL=%08lx FPSCR=%08lx",
+                          (long) read_register (FPUL_REGNUM),
+                          (long) read_register (FPSCR_REGNUM));
        }
     }
 
-  printf_filtered ("\nR0-R7  %08x %08x %08x %08x %08x %08x %08x %08x\n",
-                  read_register (0),
-                  read_register (1),
-                  read_register (2),
-                  read_register (3),
-                  read_register (4),
-                  read_register (5),
-                  read_register (6),
-                  read_register (7));
-  printf_filtered ("R8-R15 %08x %08x %08x %08x %08x %08x %08x %08x\n",
-                  read_register (8),
-                  read_register (9),
-                  read_register (10),
-                  read_register (11),
-                  read_register (12),
-                  read_register (13),
-                  read_register (14),
-                  read_register (15));
+  printf_filtered ("\nR0-R7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+                  (long) read_register (0),
+                  (long) read_register (1),
+                  (long) read_register (2),
+                  (long) read_register (3),
+                  (long) read_register (4),
+                  (long) read_register (5),
+                  (long) read_register (6),
+                  (long) read_register (7));
+  printf_filtered ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+                  (long) read_register (8),
+                  (long) read_register (9),
+                  (long) read_register (10),
+                  (long) read_register (11),
+                  (long) read_register (12),
+                  (long) read_register (13),
+                  (long) read_register (14),
+                  (long) read_register (15));
   if (cpu == bfd_mach_sh3e)
     {
-      printf_filtered ("FP0-FP7  %08x %08x %08x %08x %08x %08x %08x %08x\n",
-                      read_register (FP0_REGNUM + 0),
-                      read_register (FP0_REGNUM + 1),
-                      read_register (FP0_REGNUM + 2),
-                      read_register (FP0_REGNUM + 3),
-                      read_register (FP0_REGNUM + 4),
-                      read_register (FP0_REGNUM + 5),
-                      read_register (FP0_REGNUM + 6),
-                      read_register (FP0_REGNUM + 7));
-      printf_filtered ("FP8-FP15 %08x %08x %08x %08x %08x %08x %08x %08x\n",
-                      read_register (FP0_REGNUM + 8),
-                      read_register (FP0_REGNUM + 9),
-                      read_register (FP0_REGNUM + 10),
-                      read_register (FP0_REGNUM + 11),
-                      read_register (FP0_REGNUM + 12),
-                      read_register (FP0_REGNUM + 13),
-                      read_register (FP0_REGNUM + 14),
-                      read_register (FP0_REGNUM + 15));
+      printf_filtered ("FP0-FP7  %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+                      (long) read_register (FP0_REGNUM + 0),
+                      (long) read_register (FP0_REGNUM + 1),
+                      (long) read_register (FP0_REGNUM + 2),
+                      (long) read_register (FP0_REGNUM + 3),
+                      (long) read_register (FP0_REGNUM + 4),
+                      (long) read_register (FP0_REGNUM + 5),
+                      (long) read_register (FP0_REGNUM + 6),
+                      (long) read_register (FP0_REGNUM + 7));
+      printf_filtered ("FP8-FP15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
+                      (long) read_register (FP0_REGNUM + 8),
+                      (long) read_register (FP0_REGNUM + 9),
+                      (long) read_register (FP0_REGNUM + 10),
+                      (long) read_register (FP0_REGNUM + 11),
+                      (long) read_register (FP0_REGNUM + 12),
+                      (long) read_register (FP0_REGNUM + 13),
+                      (long) read_register (FP0_REGNUM + 14),
+                      (long) read_register (FP0_REGNUM + 15));
     }
 }