From patchwork Thu Feb 7 09:40:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 31342 Received: (qmail 74898 invoked by alias); 7 Feb 2019 09:40:34 -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 74761 invoked by uid 89); 7 Feb 2019 09:40:33 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=5847, 584, 7, from_tty, bank X-HELO: gateway21.websitewelcome.com Received: from gateway21.websitewelcome.com (HELO gateway21.websitewelcome.com) (192.185.45.212) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 07 Feb 2019 09:40:31 +0000 Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway21.websitewelcome.com (Postfix) with ESMTP id AD218400DA49D for ; Thu, 7 Feb 2019 03:40:30 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id rgAYgxx9KiQerrgAYgETgc; Thu, 07 Feb 2019 03:40:30 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mGlbWLLRsInKa6xFW1wu2qsD53liZ7rCGtvWwujyCNk=; b=dEV25aZLW0B0DWHBBT6UPHhxCg m1SR4QuI1HHEkP+drSJg6orNhMzWqKbdgzjUOX9K1TwXRha2+fKWTze4idQPWIU8uBDS3tRE9KeMk hvWTrCg25E2aKJLEiQao+pOeZ; Received: from dhcp-guest.act-europe.fr ([194.98.77.127]:61727 helo=bapiya.act-europe.fr) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1grgAY-003W3S-5Y; Thu, 07 Feb 2019 03:40:30 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 5/8] Minor C++-ification in ravenscar-thread.c Date: Thu, 7 Feb 2019 02:40:13 -0700 Message-Id: <20190207094016.368-6-tom@tromey.com> In-Reply-To: <20190207094016.368-1-tom@tromey.com> References: <20190207094016.368-1-tom@tromey.com> From: Tom Tromey This changes some functions in ravenscar-thread.c to return "bool" rather than int, where appropriate, and also changes "(void)" to "()". gdb/ChangeLog 2019-02-07 Tom Tromey * ravenscar-thread.c (is_ravenscar_task) (ravenscar_task_is_currently_active): Return bool. (ravenscar_update_inferior_ptid, get_running_thread_msymbol) (_initialize_ravenscar): Remove "(void)". (has_ravenscar_runtime, ravenscar_runtime_initialized): Likewise. Return bool. --- gdb/ChangeLog | 9 +++++++++ gdb/ravenscar-thread.c | 30 +++++++++++++----------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/gdb/ravenscar-thread.c b/gdb/ravenscar-thread.c index 37b799540f7..b0de509ad0c 100644 --- a/gdb/ravenscar-thread.c +++ b/gdb/ravenscar-thread.c @@ -121,15 +121,11 @@ struct ravenscar_thread_target final : public target_ops static ravenscar_thread_target ravenscar_ops; static ptid_t ravenscar_active_task (int cpu); -static void ravenscar_update_inferior_ptid (void); -static int has_ravenscar_runtime (void); -static int ravenscar_runtime_initialized (void); -static void ravenscar_inferior_created (struct target_ops *target, - int from_tty); +static bool ravenscar_runtime_initialized (); -/* Return nonzero iff PTID corresponds to a ravenscar task. */ +/* Return true iff PTID corresponds to a ravenscar task. */ -static int +static bool is_ravenscar_task (ptid_t ptid) { /* By construction, ravenscar tasks have their LWP set to zero. @@ -169,7 +165,7 @@ ravenscar_get_thread_base_cpu (ptid_t ptid) return base_cpu; } -/* Given a ravenscar task (identified by its ptid_t PTID), return nonzero +/* Given a ravenscar task (identified by its ptid_t PTID), return true if this task is the currently active task on the cpu that task is running on. @@ -179,7 +175,7 @@ ravenscar_get_thread_base_cpu (ptid_t ptid) that task's registers are in the CPU bank. Otherwise, the task is currently suspended, and its registers have been saved in memory. */ -static int +static bool ravenscar_task_is_currently_active (ptid_t ptid) { ptid_t active_task_ptid @@ -210,7 +206,7 @@ get_base_thread_from_ravenscar_task (ptid_t ptid) update inferior_ptid accordingly. */ static void -ravenscar_update_inferior_ptid (void) +ravenscar_update_inferior_ptid () { int base_cpu; @@ -242,7 +238,7 @@ ravenscar_update_inferior_ptid (void) Return NULL if not found. */ static struct bound_minimal_symbol -get_running_thread_msymbol (void) +get_running_thread_msymbol () { struct bound_minimal_symbol msym; @@ -260,8 +256,8 @@ get_running_thread_msymbol (void) /* Return True if the Ada Ravenscar run-time can be found in the application. */ -static int -has_ravenscar_runtime (void) +static bool +has_ravenscar_runtime () { struct bound_minimal_symbol msym_ravenscar_runtime_initializer = lookup_minimal_symbol (ravenscar_runtime_initializer, NULL, NULL); @@ -280,10 +276,10 @@ has_ravenscar_runtime (void) /* Return True if the Ada Ravenscar run-time can be found in the application, and if it has been initialized on target. */ -static int -ravenscar_runtime_initialized (void) +static bool +ravenscar_runtime_initialized () { - return (!(ravenscar_active_task (1) == null_ptid)); + return ravenscar_active_task (1) != null_ptid; } /* Return the ID of the thread that is currently running. @@ -588,7 +584,7 @@ Support for Ravenscar task/thread switching is disabled\n")); init.c. */ void -_initialize_ravenscar (void) +_initialize_ravenscar () { base_ptid = null_ptid;