This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [PATCH] Fix memory-region overlapping checking
Hi,
Here are the fix with test cases.
2012-08-08 Wei-cheng Wang <cole945@gmail.com>
* memattr.c: Fix memory region overlapping checking
---
diff --git a/gdb/memattr.c b/gdb/memattr.c
index ec7deb5..5396138 100644
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -207,7 +207,7 @@ create_mem_region (CORE_ADDR lo, CORE_ADDR 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)))
+ || (lo <= n->lo && ((hi >= n->hi && n->hi != 0)|| hi == 0)))
{
printf_unfiltered (_("overlapping memory region\n"));
return;
--
2012-08-08 Wei-cheng Wang <cole945@gmail.com>
* gdb.base/memattr.exp: Add cases for overlapping checking.
---
diff --git a/gdb/testsuite/gdb.base/memattr.exp
b/gdb/testsuite/gdb.base/memattr.exp
index 4065808..f491b60 100644
--- a/gdb/testsuite/gdb.base/memattr.exp
+++ b/gdb/testsuite/gdb.base/memattr.exp
@@ -448,3 +448,46 @@ gdb_test_multiple "info mem" "mem 2-4 were deleted" {
gdb_test "delete mem 8" "No memory region number 8." \
"delete non-existant region"
+
+#
+# Test overlapping checking
+#
+# lo' hi'
+# |---------|
+# 10 20 30 40 50 60 70 80
+# |----| FAIL
+# |---| FAIL
+# |----| FAIL
+# |-------------| FAIL
+# |----| PASS
+# |----| PASS
+
+proc delete_memory {} {
+ global gdb_prompt
+
+ send_gdb "delete mem\n"
+ gdb_expect 100 {
+ -re "Delete all memory regions.*y or n.*$" {
+ send_gdb "y\n";
+ exp_continue
+ }
+ -re "$gdb_prompt $" { }
+ }
+}
+
+# Test normal case (upper != 0)
+delete_memory
+send_gdb "mem 0x30 0x60 ro\n"; gdb_expect -re "$gdb_prompt $"
+gdb_test "mem 0x20 0x40 ro" "overlapping memory region"
+gdb_test "mem 0x40 0x50 ro" "overlapping memory region"
+gdb_test "mem 0x50 0x70 ro" "overlapping memory region"
+gdb_test_no_output "mem 0x10 0x30 ro"
+gdb_test_no_output "mem 0x60 0x80 ro"
+
+# Test sepcial case (upper == 0)
+delete_memory
+send_gdb "mem 0x30 0x0 ro\n"; gdb_expect -re "$gdb_prompt $"
+gdb_test "mem 0x20 0x40 ro" "overlapping memory region"
+gdb_test "mem 0x40 0x50 ro" "overlapping memory region"
+gdb_test "mem 0x50 0x70 ro" "overlapping memory region"
+gdb_test_no_output "mem 0x10 0x30 ro"
--