2001-07-26 Elena Zannoni <ezannoni@redhat.com>

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

diff --git a/gdb/memattr.c b/gdb/memattr.c
index ba642912926723221f1651499f0eb40e059aa61d..10637fc60763ac74138bce6690140ad4cb2e5f95 100644 (file)
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -1,4 +1,23 @@
-/* memattr.c */
+/* Memory attributes support, for GDB.
+   Copyright 2001 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   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.  */
+
 #include "defs.h"
 #include "command.h"
 #include "gdbcmd.h"
@@ -34,7 +53,7 @@ static struct mem_region *
 create_mem_region (CORE_ADDR lo, CORE_ADDR hi,
                   const struct mem_attrib *attrib)
 {
-  struct mem_region *n, *p, *new;
+  struct mem_region *n, *new;
 
   if (lo > hi)
     {
@@ -52,6 +71,7 @@ create_mem_region (CORE_ADDR lo, CORE_ADDR hi,
          printf_unfiltered ("overlapping memory region\n");
          return NULL;
        }
+      n = n->next;
     }
 
   new = xmalloc (sizeof (struct mem_region));
@@ -209,16 +229,36 @@ mem_info_command (char *args, int from_tty)
       return;
     }
 
-  printf_filtered ("Memory regions now in effect:\n");
+  printf_filtered ("Num ");
+  printf_filtered ("Enb ");
+  printf_filtered ("Low Addr   ");
+  if (TARGET_ADDR_BIT > 32)
+    printf_filtered ("        ");
+  printf_filtered ("High Addr  ");
+  if (TARGET_ADDR_BIT > 32)
+    printf_filtered ("        ");
+  printf_filtered ("Attrs ");
+  printf_filtered ("\n");
+
   for (m = mem_region_chain; m; m = m->next)
     {
-      printf_filtered ("%d: %c\t",
+      char *tmp;
+      printf_filtered ("%-3d %-3c\t",
                       m->number,
                       m->status ? 'y' : 'n');
-      printf_filtered ("%s - ",
-                   local_hex_string_custom ((unsigned long) m->lo, "08l"));
-      printf_filtered ("%s\t",
-                   local_hex_string_custom ((unsigned long) m->hi, "08l"));
+      if (TARGET_ADDR_BIT <= 32)
+       tmp = longest_local_hex_string_custom ((unsigned long) m->lo, "08l");
+      else
+       tmp = longest_local_hex_string_custom ((unsigned long) m->lo, "016l");
+      
+      printf_filtered ("%s ", tmp);
+      
+      if (TARGET_ADDR_BIT <= 32)
+       tmp = longest_local_hex_string_custom ((unsigned long) m->hi, "08l");
+      else
+       tmp = longest_local_hex_string_custom ((unsigned long) m->hi, "016l");
+      
+      printf_filtered ("%s ", tmp);
 
       /* Print a token for each attribute.
 
@@ -475,21 +515,25 @@ void
 _initialize_mem ()
 {
   add_com ("mem", class_vars, mem_command,
-          "Define attributes for memory region.");
+          "Define attributes for memory region.\n\
+Usage: mem <lo addr> <hi addr> [<mode> <width> <cache>]");
 
   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);
 
   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);
 
   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);
 
   add_info ("mem", mem_info_command,