Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Wei-cheng Wang <cole945@gmail.com>
To: Yao Qi <yao@codesourcery.com>
Cc: gdb-patches@sourceware.org
Subject: Re: [PATCH] Fix memory-region overlapping checking
Date: Tue, 07 Aug 2012 06:02:00 -0000	[thread overview]
Message-ID: <CAPmZyH65a8B0=9wwMVHhDC-eTxOQ1==MRhhcFP=bDuZCJa9tBQ@mail.gmail.com> (raw)
In-Reply-To: <1591920.sFon8Oz8ME@qiyao.dyndns.org>

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"
--


  reply	other threads:[~2012-08-07  6:02 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-02  6:11 Wei-cheng Wang
2012-08-02  8:10 ` Yao Qi
2012-08-02 10:00   ` Wei-cheng Wang
2012-08-03 10:54 ` Yao Qi
2012-08-07  2:35   ` Wei-cheng Wang
2012-08-07  2:48     ` Yao Qi
2012-08-07  6:02       ` Wei-cheng Wang [this message]
2012-08-08 10:31         ` Yao Qi
2012-08-16 10:03           ` Wei-cheng Wang
2012-08-24 11:18             ` Pedro Alves
2012-08-24 11:47               ` Wei-cheng Wang
2012-08-24 15:12                 ` Pedro Alves
2012-08-27  2:22                   ` Wei-cheng Wang
2012-08-27  8:58                     ` Pedro Alves

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAPmZyH65a8B0=9wwMVHhDC-eTxOQ1==MRhhcFP=bDuZCJa9tBQ@mail.gmail.com' \
    --to=cole945@gmail.com \
    --cc=gdb-patches@sourceware.org \
    --cc=yao@codesourcery.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox