2006-02-19 Randolph Chung <tausq@debian.org>

[deliverable/binutils-gdb.git] / gdb / memattr.c

diff --git a/gdb/memattr.c b/gdb/memattr.c
index 37a97ebc76c21140ac5fee840dffdc0e02a38dc7..3a5f7d09a2d786c7c64726e2bce1f5c8294fc88e 100644 (file)
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -1,6 +1,6 @@
 /* Memory attributes support, for GDB.
 
-   Copyright 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #include "defs.h"
 #include "command.h"
@@ -49,7 +49,7 @@ create_mem_region (CORE_ADDR lo, CORE_ADDR hi,
   /* lo == hi is a useless empty region */
   if (lo >= hi && hi != 0)
     {
-      printf_unfiltered ("invalid memory region: low >= high\n");
+      printf_unfiltered (_("invalid memory region: low >= high\n"));
       return NULL;
     }
 
@@ -61,7 +61,7 @@ create_mem_region (CORE_ADDR lo, CORE_ADDR hi,
          || (hi > n->lo && (hi <= n->hi || n->hi == 0))
          || (lo <= n->lo && (hi >= n->hi || hi == 0)))
        {
-         printf_unfiltered ("overlapping memory region\n");
+         printf_unfiltered (_("overlapping memory region\n"));
          return NULL;
        }
       n = n->next;
@@ -140,16 +140,16 @@ mem_command (char *args, int from_tty)
   struct mem_attrib attrib;
 
   if (!args)
-    error_no_arg ("No mem");
+    error_no_arg (_("No mem"));
 
   tok = strtok (args, " \t");
   if (!tok)
-    error ("no lo address");
+    error (_("no lo address"));
   lo = parse_and_eval_address (tok);
 
   tok = strtok (NULL, " \t");
   if (!tok)
-    error ("no hi address");
+    error (_("no hi address"));
   hi = parse_and_eval_address (tok);
 
   attrib = default_mem_attrib;
@@ -167,19 +167,19 @@ mem_command (char *args, int from_tty)
       else if (strcmp (tok, "16") == 0)
        {
          if ((lo % 2 != 0) || (hi % 2 != 0))
-           error ("region bounds not 16 bit aligned");
+           error (_("region bounds not 16 bit aligned"));
          attrib.width = MEM_WIDTH_16;
        }
       else if (strcmp (tok, "32") == 0)
        {
          if ((lo % 4 != 0) || (hi % 4 != 0))
-           error ("region bounds not 32 bit aligned");
+           error (_("region bounds not 32 bit aligned"));
          attrib.width = MEM_WIDTH_32;
        }
       else if (strcmp (tok, "64") == 0)
        {
          if ((lo % 8 != 0) || (hi % 8 != 0))
-           error ("region bounds not 64 bit aligned");
+           error (_("region bounds not 64 bit aligned"));
          attrib.width = MEM_WIDTH_64;
        }
 
@@ -203,7 +203,7 @@ mem_command (char *args, int from_tty)
 #endif
 
       else
-       error ("unknown attribute: %s", tok);
+       error (_("unknown attribute: %s"), tok);
     }
 
   create_mem_region (lo, hi, &attrib);
@@ -218,7 +218,7 @@ mem_info_command (char *args, int from_tty)
 
   if (!mem_region_chain)
     {
-      printf_unfiltered ("There are no memory regions defined.\n");
+      printf_unfiltered (_("There are no memory regions defined.\n"));
       return;
     }
 
@@ -235,24 +235,32 @@ mem_info_command (char *args, int from_tty)
 
   for (m = mem_region_chain; m; m = m->next)
     {
-      CORE_ADDR hi;
       char *tmp;
       printf_filtered ("%-3d %-3c\t",
                       m->number,
                       m->enabled_p ? 'y' : 'n');
       if (TARGET_ADDR_BIT <= 32)
-       tmp = local_hex_string_custom ((unsigned long) m->lo, "08l");
+       tmp = hex_string_custom ((unsigned long) m->lo, 8);
       else
-       tmp = local_hex_string_custom ((unsigned long) m->lo, "016l");
+       tmp = hex_string_custom ((unsigned long) m->lo, 16);
       
       printf_filtered ("%s ", tmp);
-      hi = (m->hi == 0 ? ~0 : m->hi);
 
       if (TARGET_ADDR_BIT <= 32)
-       tmp = local_hex_string_custom ((unsigned long) hi, "08l");
+       {
+       if (m->hi == 0)
+         tmp = "0x100000000";
+       else
+         tmp = hex_string_custom ((unsigned long) m->hi, 8);
+       }
       else
-       tmp = local_hex_string_custom ((unsigned long) hi, "016l");
-      
+       {
+       if (m->hi == 0)
+         tmp = "0x10000000000000000";
+       else
+         tmp = hex_string_custom ((unsigned long) m->hi, 16);
+       }
+
       printf_filtered ("%s ", tmp);
 
       /* Print a token for each attribute.
@@ -338,7 +346,7 @@ mem_enable (int num)
        m->enabled_p = 1;
        return;
       }
-  printf_unfiltered ("No memory region number %d.\n", num);
+  printf_unfiltered (_("No memory region number %d.\n"), num);
 }
 
 static void
@@ -363,7 +371,7 @@ mem_enable_command (char *args, int from_tty)
        while (*p1 >= '0' && *p1 <= '9')
          p1++;
        if (*p1 && *p1 != ' ' && *p1 != '\t')
-         error ("Arguments must be memory region numbers.");
+         error (_("Arguments must be memory region numbers."));
 
        num = atoi (p);
        mem_enable (num);
@@ -388,7 +396,7 @@ mem_disable (int num)
        m->enabled_p = 0;
        return;
       }
-  printf_unfiltered ("No memory region number %d.\n", num);
+  printf_unfiltered (_("No memory region number %d.\n"), num);
 }
 
 static void
@@ -413,7 +421,7 @@ mem_disable_command (char *args, int from_tty)
        while (*p1 >= '0' && *p1 <= '9')
          p1++;
        if (*p1 && *p1 != ' ' && *p1 != '\t')
-         error ("Arguments must be memory region numbers.");
+         error (_("Arguments must be memory region numbers."));
 
        num = atoi (p);
        mem_disable (num);
@@ -447,7 +455,7 @@ mem_delete (int num)
 
   if (!mem_region_chain)
     {
-      printf_unfiltered ("No memory region number %d.\n", num);
+      printf_unfiltered (_("No memory region number %d.\n"), num);
       return;
     }
 
@@ -493,7 +501,7 @@ mem_delete_command (char *args, int from_tty)
       while (*p1 >= '0' && *p1 <= '9')
        p1++;
       if (*p1 && *p1 != ' ' && *p1 != '\t')
-       error ("Arguments must be memory region numbers.");
+       error (_("Arguments must be memory region numbers."));
 
       num = atoi (p);
       mem_delete (num);
@@ -506,34 +514,36 @@ mem_delete_command (char *args, int from_tty)
   dont_repeat ();
 }
 \f
+extern initialize_file_ftype _initialize_mem; /* -Wmissing-prototype */
+
 void
-_initialize_mem ()
+_initialize_mem (void)
 {
-  add_com ("mem", class_vars, mem_command,
-          "Define attributes for memory region.\n\
+  add_com ("mem", class_vars, mem_command, _("\
+Define attributes for memory region.\n\
 Usage: mem <lo addr> <hi addr> [<mode> <width> <cache>], \n\
 where <mode>  may be rw (read/write), ro (read-only) or wo (write-only), \n\
       <width> may be 8, 16, 32, or 64, and \n\
-      <cache> may be cache or nocache");
+      <cache> may be cache or nocache"));
 
-  add_cmd ("mem", class_vars, mem_enable_command,
-          "Enable memory region.\n\
+  add_cmd ("mem", class_vars, mem_enable_command, _("\
+Enable memory region.\n\
 Arguments are the code numbers of the memory regions to enable.\n\
 Usage: enable mem <code number>\n\
-Do \"info mem\" to see current list of code numbers.", &enablelist);
+Do \"info mem\" to see current list of code numbers."), &enablelist);
 
-  add_cmd ("mem", class_vars, mem_disable_command,
-          "Disable memory region.\n\
+  add_cmd ("mem", class_vars, mem_disable_command, _("\
+Disable memory region.\n\
 Arguments are the code numbers of the memory regions to disable.\n\
 Usage: disable mem <code number>\n\
-Do \"info mem\" to see current list of code numbers.", &disablelist);
+Do \"info mem\" to see current list of code numbers."), &disablelist);
 
-  add_cmd ("mem", class_vars, mem_delete_command,
-          "Delete memory region.\n\
+  add_cmd ("mem", class_vars, mem_delete_command, _("\
+Delete memory region.\n\
 Arguments are the code numbers of the memory regions to delete.\n\
 Usage: delete mem <code number>\n\
-Do \"info mem\" to see current list of code numbers.", &deletelist);
+Do \"info mem\" to see current list of code numbers."), &deletelist);
 
   add_info ("mem", mem_info_command,
-           "Memory region attributes");
+           _("Memory region attributes"));
 }