*** empty log message ***

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

diff --git a/gdb/memattr.c b/gdb/memattr.c
index e8eb56a458b17f91b70337b94b62b1cd19a3fd02..8c46d7eb168ec78a07239c7a320b7793adc0d83d 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)
     {
-      printf_unfiltered ("invalid memory region\n");
+      printf_unfiltered ("invalid memory region: low >= high\n");
       return NULL;
     }
 
@@ -55,8 +57,8 @@ 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) ||
+         (hi > n->lo && hi <= n->hi))
        {
          printf_unfiltered ("overlapping memory region\n");
          return NULL;
@@ -182,21 +184,21 @@ mem_command (char *args, int from_tty)
 
 #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
@@ -237,16 +239,16 @@ 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 = local_hex_string_custom ((unsigned long) m->lo, "08l");
       else
-       tmp = longest_local_hex_string_custom ((unsigned long) m->lo, "016l");
+       tmp = 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");
+       tmp = local_hex_string_custom ((unsigned long) m->hi, "08l");
       else
-       tmp = longest_local_hex_string_custom ((unsigned long) m->hi, "016l");
+       tmp = local_hex_string_custom ((unsigned long) m->hi, "016l");
       
       printf_filtered ("%s ", tmp);