2005-02-14 Andrew Cagney <cagney@gnu.org>

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

diff --git a/gdb/memattr.c b/gdb/memattr.c
index 9dd3dd5065c7758f393e0cf9a4b051b94a6b7122..7f4f0740b3e21681dbed11431bb6df2d7d25452a 100644 (file)
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -1,5 +1,6 @@
 /* Memory attributes support, for GDB.
-   Copyright 2001 Free Software Foundation, Inc.
+
+   Copyright 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -31,9 +32,9 @@ const struct mem_attrib default_mem_attrib =
 {
   MEM_RW,                      /* mode */
   MEM_WIDTH_UNSPECIFIED,
-  false,                       /* hwbreak */
-  false,                       /* cache */
-  false                                /* verify */
+  0,                           /* hwbreak */
+  0,                           /* cache */
+  0                            /* verify */
 };
 
 static struct mem_region *mem_region_chain = NULL;
@@ -45,9 +46,10 @@ create_mem_region (CORE_ADDR lo, CORE_ADDR hi,
 {
   struct mem_region *n, *new;
 
-  if (lo > hi)
+  /* lo == hi is a useless empty region */
+  if (lo >= hi && hi != 0)
     {
-      printf_unfiltered ("invalid memory region\n");
+      printf_unfiltered (_("invalid memory region: low >= high\n"));
       return NULL;
     }
 
@@ -55,10 +57,11 @@ create_mem_region (CORE_ADDR lo, CORE_ADDR hi,
   while (n)
     {
       /* overlapping node */
-      if ((lo >= n->lo && lo <= n->hi) ||
-         (hi >= n->lo && hi <= n->hi))
+      if ((lo >= n->lo && (lo < n->hi || n->hi == 0)) 
+         || (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;
@@ -109,7 +112,7 @@ lookup_mem_region (CORE_ADDR addr)
     {
       if (m->enabled_p == 1)
        {
-         if (addr >= m->lo && addr < m->hi)
+         if (addr >= m->lo && (addr < m->hi || m->hi == 0))
            return m;
 
          if (addr >= m->hi && lo < m->hi)
@@ -137,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;
@@ -164,43 +167,43 @@ 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;
        }
 
 #if 0
       else if (strcmp (tok, "hwbreak") == 0)
-       attrib.hwbreak = true;
+       attrib.hwbreak = 1;
       else if (strcmp (tok, "swbreak") == 0)
-       attrib.hwbreak = false;
+       attrib.hwbreak = 0;
 #endif
 
       else if (strcmp (tok, "cache") == 0)
-       attrib.cache = true;
+       attrib.cache = 1;
       else if (strcmp (tok, "nocache") == 0)
-       attrib.cache = false;
+       attrib.cache = 0;
 
 #if 0
       else if (strcmp (tok, "verify") == 0)
-       attrib.verify = true;
+       attrib.verify = 1;
       else if (strcmp (tok, "noverify") == 0)
-       attrib.verify = false;
+       attrib.verify = 0;
 #endif
 
       else
-       error ("unknown attribute: %s", tok);
+       error (_("unknown attribute: %s"), tok);
     }
 
   create_mem_region (lo, hi, &attrib);
@@ -215,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;
     }
 
@@ -237,17 +240,27 @@ mem_info_command (char *args, int from_tty)
                       m->number,
                       m->enabled_p ? 'y' : 'n');
       if (TARGET_ADDR_BIT <= 32)
-       tmp = longest_local_hex_string_custom ((unsigned long) m->lo, "08l");
+       tmp = hex_string_custom ((unsigned long) m->lo, 8);
       else
-       tmp = longest_local_hex_string_custom ((unsigned long) m->lo, "016l");
+       tmp = hex_string_custom ((unsigned long) m->lo, 16);
       
       printf_filtered ("%s ", tmp);
-      
+
       if (TARGET_ADDR_BIT <= 32)
-       tmp = longest_local_hex_string_custom ((unsigned long) m->hi, "08l");
+       {
+       if (m->hi == 0)
+         tmp = "0x100000000";
+       else
+         tmp = hex_string_custom ((unsigned long) m->hi, 8);
+       }
       else
-       tmp = longest_local_hex_string_custom ((unsigned long) m->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.
@@ -333,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
@@ -358,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);
@@ -383,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
@@ -408,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);
@@ -442,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;
     }
 
@@ -488,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);
@@ -501,12 +514,17 @@ 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\
-Usage: mem <lo addr> <hi addr> [<mode> <width> <cache>]");
+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");
 
   add_cmd ("mem", class_vars, mem_enable_command,
           "Enable memory region.\n\