[PATCH] memattr bounds

[Don Howard <dhoward@redhat.com>]

The following addresses edge conditions in the mem command by making a
special case for upper bound == 0.  When the upper bound is zero, it is
assumed that the user wants an upper bound of max CORE_ADDR+1. Currently,
it's not possible to define a memory region with zero as it's upper bound, 
so this should not conflict with any current usage.

The patch also corrects a bug that allowes the definition of overlapping
memory regions, where the new region starts below an existing region and
extends above it. (Or does someone think that is a feature?)


2002-06-21  Don Howard  <dhoward@redhat.com>

	* memattr.c (create_mem_region): Treat hi == 0 as a special case
	that means max CORE_ADDR+1.
	(lookup_mem_region): Ditto.
	(mem_info_command): Ditto.


Index: memattr.c
===================================================================
RCS file: /cvs/src/src/gdb/memattr.c,v
retrieving revision 1.11
diff -p -u -w -r1.11 memattr.c
--- memattr.c	12 May 2002 04:20:05 -0000	1.11
+++ memattr.c	21 Jun 2002 20:47:15 -0000
@@ -47,7 +47,7 @@ create_mem_region (CORE_ADDR lo, CORE_AD
   struct mem_region *n, *new;
 
   /* lo == hi is a useless empty region */
-  if (lo >= hi)
+  if (lo >= hi && hi != 0)
     {
       printf_unfiltered ("invalid memory region: low >= high\n");
       return NULL;
@@ -57,8 +57,9 @@ create_mem_region (CORE_ADDR lo, CORE_AD
   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");
 	  return NULL;
@@ -111,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)
@@ -246,9 +247,9 @@ mem_info_command (char *args, int from_t
       printf_filtered ("%s ", tmp);
       
       if (TARGET_ADDR_BIT <= 32)
-	tmp = local_hex_string_custom ((unsigned long) m->hi, "08l");
+	tmp = local_hex_string_custom ((unsigned long) (m->hi ? m->hi : ~0), "08l");
       else
-	tmp = local_hex_string_custom ((unsigned long) m->hi, "016l");
+	tmp = local_hex_string_custom ((unsigned long) (m->hi ? m->hi : ~0), "016l");
       
       printf_filtered ("%s ", tmp);
 


-- 
dhoward@redhat.com
gdb engineering