From patchwork Tue Aug 18 15:53:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 8260 Received: (qmail 67310 invoked by alias); 18 Aug 2015 15:53:31 -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 67251 invoked by uid 89); 18 Aug 2015 15:53:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pa0-f42.google.com Received: from mail-pa0-f42.google.com (HELO mail-pa0-f42.google.com) (209.85.220.42) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 18 Aug 2015 15:53:27 +0000 Received: by pabyb7 with SMTP id yb7so135505347pab.0 for ; Tue, 18 Aug 2015 08:53:25 -0700 (PDT) X-Received: by 10.66.102.41 with SMTP id fl9mr14552498pab.93.1439913205882; Tue, 18 Aug 2015 08:53:25 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc1-power7.osuosl.org. [140.211.15.137]) by smtp.gmail.com with ESMTPSA id fn15sm18590925pdb.50.2015.08.18.08.53.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Aug 2015 08:53:25 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 02/13] Re-indent the code Date: Tue, 18 Aug 2015 16:53:08 +0100 Message-Id: <1439913199-22882-3-git-send-email-yao.qi@linaro.org> In-Reply-To: <1439913199-22882-1-git-send-email-yao.qi@linaro.org> References: <1439913199-22882-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes gdb/gdbserver: 2015-08-18 Yao Qi * linux-aarch64-low.c (debug_reg_change_callback): Re-indent the code. --- gdb/gdbserver/linux-aarch64-low.c | 66 +++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index d39a54f..8b59eab 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -272,39 +272,39 @@ debug_reg_change_callback (struct lwp_info *lwp, void *ptr) : &info->dr_changed_bp; dr_changed = *dr_changed_ptr; - gdb_assert (idx >= 0 - && (idx <= (is_watchpoint ? aarch64_num_wp_regs - : aarch64_num_bp_regs))); - - /* The following assertion is not right, as there can be changes - that have not been made to the hardware debug registers - before new changes overwrite the old ones. This can happen, - for instance, when the breakpoint/watchpoint hit one of the - threads and the user enters continue; then what happens is: - 1) all breakpoints/watchpoints are removed for all threads; - 2) a single step is carried out for the thread that was hit; - 3) all of the points are inserted again for all threads; - 4) all threads are resumed. - The 2nd step will only affect the one thread in which the - bp/wp was hit, which means only that one thread is resumed; - remember that the actual updating only happen in - aarch64_linux_prepare_to_resume, so other threads remain - stopped during the removal and insertion of bp/wp. Therefore - for those threads, the change of insertion of the bp/wp - overwrites that of the earlier removals. (The situation may - be different when bp/wp is steppable, or in the non-stop - mode.) */ - /* gdb_assert (DR_N_HAS_CHANGED (dr_changed, idx) == 0); */ - - /* The actual update is done later just before resuming the lwp, - we just mark that one register pair needs updating. */ - DR_MARK_N_CHANGED (dr_changed, idx); - *dr_changed_ptr = dr_changed; - - /* If the lwp isn't stopped, force it to momentarily pause, so - we can update its debug registers. */ - if (!lwp->stopped) - linux_stop_lwp (lwp); + gdb_assert (idx >= 0 + && (idx <= (is_watchpoint ? aarch64_num_wp_regs + : aarch64_num_bp_regs))); + + /* The following assertion is not right, as there can be changes + that have not been made to the hardware debug registers + before new changes overwrite the old ones. This can happen, + for instance, when the breakpoint/watchpoint hit one of the + threads and the user enters continue; then what happens is: + 1) all breakpoints/watchpoints are removed for all threads; + 2) a single step is carried out for the thread that was hit; + 3) all of the points are inserted again for all threads; + 4) all threads are resumed. + The 2nd step will only affect the one thread in which the + bp/wp was hit, which means only that one thread is resumed; + remember that the actual updating only happen in + aarch64_linux_prepare_to_resume, so other threads remain + stopped during the removal and insertion of bp/wp. Therefore + for those threads, the change of insertion of the bp/wp + overwrites that of the earlier removals. (The situation may + be different when bp/wp is steppable, or in the non-stop + mode.) */ + /* gdb_assert (DR_N_HAS_CHANGED (dr_changed, idx) == 0); */ + + /* The actual update is done later just before resuming the lwp, + we just mark that one register pair needs updating. */ + DR_MARK_N_CHANGED (dr_changed, idx); + *dr_changed_ptr = dr_changed; + + /* If the lwp isn't stopped, force it to momentarily pause, so + we can update its debug registers. */ + if (!lwp->stopped) + linux_stop_lwp (lwp); if (show_debug_regs) {