From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 82280 invoked by alias); 2 Jun 2016 09:31:07 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 82220 invoked by uid 89); 2 Jun 2016 09:31:06 -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=TYPE X-HELO: mail-pa0-f66.google.com Received: from mail-pa0-f66.google.com (HELO mail-pa0-f66.google.com) (209.85.220.66) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 02 Jun 2016 09:31:02 +0000 Received: by mail-pa0-f66.google.com with SMTP id x1so2851331pav.1 for ; Thu, 02 Jun 2016 02:31:02 -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=bxE3zgL9qm5wv5JwGhL/d6Np3ibvPFNi5Ocyw4eEsWc=; b=BRGSzxoav6EFqCmcxb5e2MjhQxj7zUF5RkGsGU1KNwG+z116sNkbiAZop5zpbIdEPB XN0NcRUKiejDJSkmJWpAuUT31FRasYWV0PbEZnD0XxNCCFRcK1L5dQilP2F4gpWBmOwi nf5xtFbF/dqKOn+vBNvbDqr9ypuY/9vfCmaaeJARbABB/rRYwoxn/t7tnQQK1pe7Sf5r nxxjBe+wddSZfKPHj5vYNEQ+LC6iNAQJxc4FELonFNyhUf84LfHq/s+SIt/AcjZufzgg Scvf0oK5tISDbH1Yi6uWoY9pH9PsOrKjkXif6QxPCQkTUTWQoRfNDwR3VtgTcn9a5hKF yxjQ== X-Gm-Message-State: ALyK8tJo0XvV3l50MP05yES8LRePqrZENFc9fL60MIPiTZWFkTSnozBiNyDaIUxjbgXk5A== X-Received: by 10.66.248.169 with SMTP id yn9mr4070158pac.13.1464859860938; Thu, 02 Jun 2016 02:31:00 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc113.osuosl.org. [140.211.9.71]) by smtp.gmail.com with ESMTPSA id hw10sm68656218pac.15.2016.06.02.02.30.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Jun 2016 02:31:00 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 06/12] Pass breakpoint type in set_breakpoint_at Date: Thu, 02 Jun 2016 09:31:00 -0000 Message-Id: <1464859846-15619-7-git-send-email-yao.qi@linaro.org> In-Reply-To: <1464859846-15619-1-git-send-email-yao.qi@linaro.org> References: <1464859846-15619-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes X-SW-Source: 2016-06/txt/msg00026.txt.bz2 V2: rename set_breakpoint_at_1 to set_breakpoint_type_at 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-05-31 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/mem-break.c | 20 ++++++++++++++------ gdb/gdbserver/mem-break.h | 3 ++- 2 files changed, 16 insertions(+), 7 deletions(-) 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)); -- 1.9.1