From patchwork Tue Oct 1 19:56:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Terekhov, Mikhail via Gdb-patches" X-Patchwork-Id: 34772 Received: (qmail 18598 invoked by alias); 1 Oct 2019 19:56:50 -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 18587 invoked by uid 89); 1 Oct 2019 19:56:49 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=H*MI:google X-HELO: mail-pg1-f202.google.com Received: from mail-pg1-f202.google.com (HELO mail-pg1-f202.google.com) (209.85.215.202) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 01 Oct 2019 19:56:47 +0000 Received: by mail-pg1-f202.google.com with SMTP id r24so9370464pgj.17 for ; Tue, 01 Oct 2019 12:56:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=uP1AXMgIn/Y/5j3v/DeKE7zrJnwvLayFMXzrxzAW6DU=; b=kj7LuIwaFz+fm9a0gH5JqvAdEN56UsZt0VhSbQnp3shTzvc5x8Qrp28iyE0amTRbhX FU72AimCb/cG11XdcwUw03qIYgrLGIdF3cNuR+PQsHrGmE+dZgEw2vAUFsYMHDNfQ0iU 6azoEzAx3+4hzH5ZvhrGd/Zmp63eflFHRJawKbjCs8axvJ0JglluYHSgVj1kqD6bBUrF C2jT1lYwmFxWfacze1cUvMXNEikUJic34HhAWo0Gz9iCuvgsTawIjpc/WjgSfmNReCfL 4a6sg1i8D/xQBdUzr82SO5NpbPS4GqcepAz4aRXc1saTz7zScHhrap33jeBa8Mp+na4T wiyw== Date: Tue, 1 Oct 2019 14:56:43 -0500 Message-Id: <20191001195643.256835-1-cbiesinger@google.com> Mime-Version: 1.0 Subject: [PATCH] Convert boolean globals in server.c to bool X-Patchwork-Original-From: "Christian Biesinger via gdb-patches" From: "Terekhov, Mikhail via Gdb-patches" Reply-To: Christian Biesinger To: gdb-patches@sourceware.org Cc: Christian Biesinger X-IsSubscribed: yes Converts the int globals to bool. Does not change startup_with_shell, which has a pending patch by tromey. gdb/gdbserver/ChangeLog: 2019-10-01 Christian Biesinger * server.c (server_waiting): Change to bool. (extended_protocol): Likewise. (response_needed): Likewise. (exit_requested): Likewise. (run_once): Likewise. (report_no_resumed): Likewise. (non_stop): Likewise. (disable_packet_vCont): Likewise. (disable_packet_Tthread): Likewise. (disable_packet_qC): Likewise. (disable_packet_qfThreadInfo): Likewise. (handle_general_set): Update. (handle_detach): Update. (handle_monitor_command): Update. (handle_query): Update. (captured_main): Update. (process_serial_event): Update. * server.h (server_waiting): Change to bool. (disable_packet_vCont): Likewise. (disable_packet_Tthread): Likewise. (disable_packet_qC): Likewise. (disable_packet_qfThreadInfo): Likewise. (run_once): Likewise. (non_stop): Likewise. * target.c (target_stop_and_wait): Update. --- gdb/gdbserver/server.c | 60 +++++++++++++++++++++--------------------- gdb/gdbserver/server.h | 14 +++++----- gdb/gdbserver/target.c | 4 +-- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 67e8e3e54d..deb089a572 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -73,19 +73,19 @@ static gdb_environ our_environ; int startup_with_shell = 1; -int server_waiting; +bool server_waiting; -static int extended_protocol; -static int response_needed; -static int exit_requested; +static bool extended_protocol; +static bool response_needed; +static bool exit_requested; /* --once: Exit after the first connection has closed. */ -int run_once; +bool run_once; /* Whether to report TARGET_WAITKING_NO_RESUMED events. */ -static int report_no_resumed; +static bool report_no_resumed; -int non_stop; +bool non_stop; static struct { /* Set the PROGRAM_PATH. Here we adjust the path of the provided @@ -129,10 +129,10 @@ unsigned long signal_pid; /* Set if you want to disable optional thread related packets support in gdbserver, for the sake of testing GDB against stubs that don't support them. */ -int disable_packet_vCont; -int disable_packet_Tthread; -int disable_packet_qC; -int disable_packet_qfThreadInfo; +bool disable_packet_vCont; +bool disable_packet_Tthread; +bool disable_packet_qC; +bool disable_packet_qfThreadInfo; static unsigned char *mem_buf; @@ -750,7 +750,7 @@ handle_general_set (char *own_buf) return; } - non_stop = req; + non_stop = (req != 0); if (remote_debug) debug_printf ("[%s mode enabled]\n", req_str); @@ -1237,7 +1237,7 @@ handle_detach (char *own_buf) if (debug_threads) debug_printf ("Forcing non-stop mode\n"); - non_stop = 1; + non_stop = true; start_non_stop (1); } @@ -1406,7 +1406,7 @@ handle_monitor_command (char *mon, char *own_buf) else if (strcmp (mon, "help") == 0) monitor_show_help (); else if (strcmp (mon, "exit") == 0) - exit_requested = 1; + exit_requested = true; else { monitor_output ("Unknown monitor command.\n\n"); @@ -2337,7 +2337,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) { /* GDB supports and wants TARGET_WAITKIND_NO_RESUMED events. */ - report_no_resumed = 1; + report_no_resumed = true; } else { @@ -3645,19 +3645,19 @@ captured_main (int argc, char *argv[]) tok = strtok (NULL, ",")) { if (strcmp ("vCont", tok) == 0) - disable_packet_vCont = 1; + disable_packet_vCont = true; else if (strcmp ("Tthread", tok) == 0) - disable_packet_Tthread = 1; + disable_packet_Tthread = true; else if (strcmp ("qC", tok) == 0) - disable_packet_qC = 1; + disable_packet_qC = true; else if (strcmp ("qfThreadInfo", tok) == 0) - disable_packet_qfThreadInfo = 1; + disable_packet_qfThreadInfo = true; else if (strcmp ("threads", tok) == 0) { - disable_packet_vCont = 1; - disable_packet_Tthread = 1; - disable_packet_qC = 1; - disable_packet_qfThreadInfo = 1; + disable_packet_vCont = true; + disable_packet_Tthread = true; + disable_packet_qC = true; + disable_packet_qfThreadInfo = true; } else { @@ -3685,7 +3685,7 @@ captured_main (int argc, char *argv[]) else if (strcmp (*next_arg, "--no-startup-with-shell") == 0) startup_with_shell = false; else if (strcmp (*next_arg, "--once") == 0) - run_once = 1; + run_once = true; else if (strcmp (*next_arg, "--selftest") == 0) selftest = true; else if (startswith (*next_arg, "--selftest=")) @@ -4016,7 +4016,7 @@ process_serial_event (void) disable_async_io (); - response_needed = 0; + response_needed = false; packet_len = getpkt (cs.own_buf); if (packet_len <= 0) { @@ -4024,7 +4024,7 @@ process_serial_event (void) /* Force an event loop break. */ return -1; } - response_needed = 1; + response_needed = true; char ch = cs.own_buf[0]; switch (ch) @@ -4039,7 +4039,7 @@ process_serial_event (void) handle_detach (cs.own_buf); break; case '!': - extended_protocol = 1; + extended_protocol = true; write_ok (cs.own_buf); break; case '?': @@ -4254,7 +4254,7 @@ process_serial_event (void) break; } case 'k': - response_needed = 0; + response_needed = false; if (!target_running ()) /* The packet we received doesn't make sense - but we can't reply to it, either. */ @@ -4293,7 +4293,7 @@ process_serial_event (void) } break; case 'R': - response_needed = 0; + response_needed = false; /* Restarting the inferior is only supported in the extended protocol. */ @@ -4354,7 +4354,7 @@ process_serial_event (void) else putpkt (cs.own_buf); - response_needed = 0; + response_needed = false; if (exit_requested) return -1; diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 520969453a..e01c4f146e 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -68,15 +68,15 @@ void initialize_low (); /* Public variables in server.c */ -extern int server_waiting; +extern bool server_waiting; -extern int disable_packet_vCont; -extern int disable_packet_Tthread; -extern int disable_packet_qC; -extern int disable_packet_qfThreadInfo; +extern bool disable_packet_vCont; +extern bool disable_packet_Tthread; +extern bool disable_packet_qC; +extern bool disable_packet_qfThreadInfo; -extern int run_once; -extern int non_stop; +extern bool run_once; +extern bool non_stop; #if USE_WIN32API #include diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c index 0b45b6c956..9018118a06 100644 --- a/gdb/gdbserver/target.c +++ b/gdb/gdbserver/target.c @@ -205,7 +205,7 @@ void target_stop_and_wait (ptid_t ptid) { struct target_waitstatus status; - int was_non_stop = non_stop; + bool was_non_stop = non_stop; struct thread_resume resume_info; resume_info.thread = ptid; @@ -213,7 +213,7 @@ target_stop_and_wait (ptid_t ptid) resume_info.sig = GDB_SIGNAL_0; (*the_target->resume) (&resume_info, 1); - non_stop = 1; + non_stop = true; mywait (ptid, &status, 0, 0); non_stop = was_non_stop; }