diff options
| author | Don Howard <dhoward@redhat.com> | 2002-06-24 22:08:30 +0000 |
|---|---|---|
| committer | Don Howard <dhoward@redhat.com> | 2002-06-24 22:08:30 +0000 |
| commit | 2e0b1caba8c37fdc375e4d9c88d107375b95b9a3 (patch) | |
| tree | 6e60c7e57f8c492dfcdcad26bdeda42b99974b18 /gdb | |
| parent | a9559c1b07a006e9ed471beb0527898496cd4c30 (diff) | |
| download | gdb-2e0b1caba8c37fdc375e4d9c88d107375b95b9a3.tar.gz | |
2002-06-24 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.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/memattr.c | 17 |
2 files changed, 17 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e60cd4244c6..8840ec5ac64 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2002-06-24 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. + 2002-06-24 Grace Sainsbury <graces@redhat.com> * config/m68k/tm-m68k.h (DECR_PC_AFTER_BREAK): Remove. diff --git a/gdb/memattr.c b/gdb/memattr.c index 8c46d7eb168..37a97ebc76c 100644 --- a/gdb/memattr.c +++ b/gdb/memattr.c @@ -47,7 +47,7 @@ create_mem_region (CORE_ADDR lo, CORE_ADDR hi, 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_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"); 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) @@ -234,6 +235,7 @@ 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, @@ -244,11 +246,12 @@ mem_info_command (char *args, int from_tty) tmp = local_hex_string_custom ((unsigned long) m->lo, "016l"); printf_filtered ("%s ", tmp); - + hi = (m->hi == 0 ? ~0 : m->hi); + if (TARGET_ADDR_BIT <= 32) - tmp = local_hex_string_custom ((unsigned long) m->hi, "08l"); + tmp = local_hex_string_custom ((unsigned long) hi, "08l"); else - tmp = local_hex_string_custom ((unsigned long) m->hi, "016l"); + tmp = local_hex_string_custom ((unsigned long) hi, "016l"); printf_filtered ("%s ", tmp); |