From patchwork Thu Jun 30 14:09:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 13512 Received: (qmail 58612 invoked by alias); 30 Jun 2016 14:09:44 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 58515 invoked by uid 89); 30 Jun 2016 14:09:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=sk:delete_ X-HELO: mail-pf0-f195.google.com Received: from mail-pf0-f195.google.com (HELO mail-pf0-f195.google.com) (209.85.192.195) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 30 Jun 2016 14:09:33 +0000 Received: by mail-pf0-f195.google.com with SMTP id 66so7504553pfy.1 for ; Thu, 30 Jun 2016 07:09:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Zk62O3HKBCdn8ODh+VwqvQrquUX+Tr0NHcEIl+Z6eEg=; b=Aj3HkbMIbyc9vEqdNKvXk5O/u6KQgIia4eG9SA7TWXH5bzN33YS6pKTBI7MVfrf31j G/yNoIRNNjHkTId3nyYh/i7agGWmgxqbtHjFQ6qtQPZ9wooPG39PUyx8nJ/I14WlQgyw nt6flcOzFEtCy8EnezEInmzTuNJpt7O6T3z+L+uPlrYwNpPlCGcq3RXZIRTFXG2eKBGt NcrKuKfcZIZDHgOotAfYd5AvzGtF8pSTPk7i5srEvc95/0Eo5nTA9I3Rp+1gZjpFMgUC DhMSGr7bj0+uHOhCFAvfdR4CKB4oFtHVywPAXlDigo7lSrlm2PhlLI7KMgg6qfSydMwi 2uhA== X-Gm-Message-State: ALyK8tJ7JLwAZgkglu4qc6pGWs4HXqIQUkaeiCfrF2bmHcWJ4zryq0DBp3AaSSEkUFNkLg== X-Received: by 10.98.41.198 with SMTP id p189mr21711296pfp.18.1467295771709; Thu, 30 Jun 2016 07:09:31 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc1-power7.osuosl.org. [140.211.15.137]) by smtp.gmail.com with ESMTPSA id s3sm6263184pfb.87.2016.06.30.07.09.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Jun 2016 07:09:31 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 1/9] Pass breakpoint type in set_breakpoint_at Date: Thu, 30 Jun 2016 15:09:17 +0100 Message-Id: <1467295765-3457-2-git-send-email-yao.qi@linaro.org> In-Reply-To: <1467295765-3457-1-git-send-email-yao.qi@linaro.org> References: <1467295765-3457-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes Nowadays, set_breakpoint_at creates breakpoint of type other_breakpoint, but we also use set_breakpoint_at in set_reinsert_breakpoint to create breakpoint, so that we have to overwrite the breakpoint type like this, bp = set_breakpoint_at (stop_at, NULL); bp->type = reinsert_breakpoint; which looks not very good. This patch changes set_breakpoint_at to receive breakpoint type. Since set_breakpoint_at is used in many places, I rename it to set_breakpoint_type_at, and wrap it with set_breakpoint_at, and pass other_breakpoint. In this way, we can call set_breakpoint_type_at with reinsert_breakpoint in set_reinsert_breakpoint too, and code looks cleaner. gdb/gdbserver: 2016-06-17 Yao Qi * mem-break.c (set_breakpoint_at): Rename it to ... (set_breakpoint_type_at): ... it. (set_breakpoint_at): Call set_breakpoint_type_at. (set_reinsert_breakpoint): Call set_breakpoint_type_at. * mem-break.h (set_breakpoint_at): Update comments. --- gdb/gdbserver/ChangeLog | 8 ++++++++ gdb/gdbserver/mem-break.c | 20 ++++++++++++++------ gdb/gdbserver/mem-break.h | 3 ++- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 30d0498..7c24260 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -47,6 +47,14 @@ 2016-06-17 Yao Qi + * mem-break.c (set_breakpoint_at): Rename it to ... + (set_breakpoint_type_at): ... it. + (set_breakpoint_at): Call set_breakpoint_type_at. + (set_reinsert_breakpoint): Call set_breakpoint_type_at. + * mem-break.h (set_breakpoint_at): Update comments. + +2016-06-17 Yao Qi + * linux-low.c (handle_extended_wait): Call uninsert_reinsert_breakpoints for the parent process. Remove reinsert breakpoints from the child process. Reinsert them to diff --git a/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c index 5c73326..f0b77f9 100644 --- a/gdb/gdbserver/mem-break.c +++ b/gdb/gdbserver/mem-break.c @@ -785,20 +785,29 @@ set_breakpoint (enum bkpt_type type, enum raw_bkpt_type raw_type, return bp; } -/* See mem-break.h */ +/* Set breakpoint of TYPE on address WHERE with handler HANDLER. */ -struct breakpoint * -set_breakpoint_at (CORE_ADDR where, int (*handler) (CORE_ADDR)) +static struct breakpoint * +set_breakpoint_type_at (enum bkpt_type type, CORE_ADDR where, + int (*handler) (CORE_ADDR)) { int err_ignored; CORE_ADDR placed_address = where; int breakpoint_kind = target_breakpoint_kind_from_pc (&placed_address); - return set_breakpoint (other_breakpoint, raw_bkpt_type_sw, + return set_breakpoint (type, raw_bkpt_type_sw, placed_address, breakpoint_kind, handler, &err_ignored); } +/* See mem-break.h */ + +struct breakpoint * +set_breakpoint_at (CORE_ADDR where, int (*handler) (CORE_ADDR)) +{ + return set_breakpoint_type_at (other_breakpoint, where, handler); +} + static int delete_raw_breakpoint (struct process_info *proc, struct raw_breakpoint *todel) @@ -1411,8 +1420,7 @@ set_reinsert_breakpoint (CORE_ADDR stop_at) { struct breakpoint *bp; - bp = set_breakpoint_at (stop_at, NULL); - bp->type = reinsert_breakpoint; + bp = set_breakpoint_type_at (reinsert_breakpoint, stop_at, NULL); } void diff --git a/gdb/gdbserver/mem-break.h b/gdb/gdbserver/mem-break.h index 6a06c0c..dd5a750 100644 --- a/gdb/gdbserver/mem-break.h +++ b/gdb/gdbserver/mem-break.h @@ -141,7 +141,8 @@ int gdb_breakpoint_here (CORE_ADDR where); /* Create a new breakpoint at WHERE, and call HANDLER when it is hit. HANDLER should return 1 if the breakpoint - should be deleted, 0 otherwise. */ + should be deleted, 0 otherwise. The type of the created + breakpoint is other_breakpoint. */ struct breakpoint *set_breakpoint_at (CORE_ADDR where, int (*handler) (CORE_ADDR));