2004-06-07 Randolph Chung <tausq@debian.org>

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

diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index 5003ea069eb67c4776a9d6ea25e94ffd8a5a372a..ed32a5c6145ab9c07b477cb0b041cda8209673a6 100644 (file)
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -72,7 +72,7 @@ nto_map_arch_to_cputype (const char *arch)
 {
   if (!strcmp (arch, "i386") || !strcmp (arch, "x86"))
     return CPUTYPE_X86;
-  if (!strcmp (arch, "rs6000") || !strcmp (arch, "ppc"))
+  if (!strcmp (arch, "rs6000") || !strcmp (arch, "powerpc"))
     return CPUTYPE_PPC;
   if (!strcmp (arch, "mips"))
     return CPUTYPE_MIPS;
@@ -97,7 +97,8 @@ nto_find_and_open_solib (char *solib, unsigned o_flags, char **temp_pathname)
       arch = "x86";
       endian = "";
     }
-  else if (strcmp (TARGET_ARCHITECTURE->arch_name, "rs6000") == 0)
+  else if (strcmp (TARGET_ARCHITECTURE->arch_name, "rs6000") == 0
+          || strcmp (TARGET_ARCHITECTURE->arch_name, "powerpc") == 0)
     {
       arch = "ppc";
       endian = "be";
@@ -130,7 +131,8 @@ nto_init_solib_absolute_prefix (void)
       arch = "x86";
       endian = "";
     }
-  else if (strcmp (TARGET_ARCHITECTURE->arch_name, "rs6000") == 0)
+  else if (strcmp (TARGET_ARCHITECTURE->arch_name, "rs6000") == 0
+          || strcmp (TARGET_ARCHITECTURE->arch_name, "powerpc") == 0)
     {
       arch = "ppc";
       endian = "be";
@@ -270,26 +272,19 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
 {
   nto_regset_t regset;
 
-  nto_init_solib_absolute_prefix ();
-
-  if (which == NTO_REG_GENERAL)
+/* See corelow.c:get_core_registers for values of WHICH.  */
+  if (which == 0)
     {
       memcpy ((char *) &regset, core_reg_sect,
              min (core_reg_size, sizeof (regset)));
       nto_supply_gregset ((char *) &regset);
     }
-  else if (which == NTO_REG_FLOAT)
+  else if (which == 2)
     {
       memcpy ((char *) &regset, core_reg_sect,
              min (core_reg_size, sizeof (regset)));
       nto_supply_fpregset ((char *) &regset);
     }
-  else if (which == NTO_REG_ALT)
-    {
-      memcpy ((char *) &regset, core_reg_sect,
-             min (core_reg_size, sizeof (regset)));
-      nto_supply_altregset ((char *) &regset);
-    }
 }
 
 void
@@ -312,11 +307,11 @@ void
 _initialize_nto_tdep (void)
 {
   add_setshow_cmd ("nto-debug", class_maintenance, var_zinteger,
-                 &nto_internal_debugging, "Set QNX NTO internal debugging.\n\
+                  &nto_internal_debugging, "Set QNX NTO internal debugging.\n\
 When non-zero, nto specific debug info is\n\
 displayed. Different information is displayed\n\
-for different positive values.",  "Show QNX NTO internal debugging.\n",
-                 NULL, NULL, &setdebuglist, &showdebuglist);
+for different positive values.", "Show QNX NTO internal debugging.\n",
+                  NULL, NULL, &setdebuglist, &showdebuglist);
 
   /* We use SIG45 for pulses, or something, so nostop, noprint
      and pass them.  */
@@ -338,5 +333,5 @@ for different positive values.",  "Show QNX NTO internal debugging.\n",
 #endif
 
   /* Register core file support.  */
-  add_core_fns (&regset_core_fns);
+  deprecated_add_core_fns (&regset_core_fns);
 }