From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 39416 invoked by alias); 3 Nov 2015 14:26:59 -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 39266 invoked by uid 89); 3 Nov 2015 14:26:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.4 required=5.0 tests=AWL,BAYES_00,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 X-HELO: usevmg21.ericsson.net Received: from usevmg21.ericsson.net (HELO usevmg21.ericsson.net) (198.24.6.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Tue, 03 Nov 2015 14:26:56 +0000 Received: from EUSAAHC005.ericsson.se (Unknown_Domain [147.117.188.87]) by usevmg21.ericsson.net (Symantec Mail Security) with SMTP id AF.D6.26730.8C658365; Tue, 3 Nov 2015 07:40:08 +0100 (CET) Received: from elxcz23q12-y4.dyn.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.87) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 3 Nov 2015 09:26:50 -0500 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH c++ 03/12] remote-sim.c: Add casts Date: Tue, 03 Nov 2015 14:26:00 -0000 Message-ID: <1446560804-18858-3-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1446560804-18858-1-git-send-email-simon.marchi@ericsson.com> References: <1446560804-18858-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2015-11/txt/msg00088.txt.bz2 From: Simon Marchi Mostly some casts from "generic arg" void* to the actual type. There are two (enum gdb_signal) casts. I tried to see if it would have been better to change the type of sigrc, but it has a double role, as an enum and as an integer, so I left it as is. gdb/ChangeLog: * remote-sim.c (check_for_duplicate_sim_descriptor): Add casts. (get_sim_inferior_data): Likewise. (sim_inferior_data_cleanup): Likewise. (gdbsim_close_inferior): Likewise. (gdbsim_resume_inferior): Likewise. (gdbsim_wait): Likewise. (simulator_command): Likewise. (sim_command_completer): Likewise. --- gdb/remote-sim.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 8bd1a65..5e27114 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -152,9 +152,10 @@ static int check_for_duplicate_sim_descriptor (struct inferior *inf, void *arg) { struct sim_inferior_data *sim_data; - SIM_DESC new_sim_desc = arg; + SIM_DESC new_sim_desc = (SIM_DESC) arg; - sim_data = inferior_data (inf, sim_inferior_data_key); + sim_data = ((struct sim_inferior_data *) + inferior_data (inf, sim_inferior_data_key)); return (sim_data != NULL && sim_data->gdbsim_desc == new_sim_desc); } @@ -172,7 +173,7 @@ get_sim_inferior_data (struct inferior *inf, int sim_instance_needed) { SIM_DESC sim_desc = NULL; struct sim_inferior_data *sim_data - = inferior_data (inf, sim_inferior_data_key); + = (struct sim_inferior_data *) inferior_data (inf, sim_inferior_data_key); /* Try to allocate a new sim instance, if needed. We do this ahead of a potential allocation of a sim_inferior_data struct in order to @@ -257,7 +258,7 @@ get_sim_inferior_data_by_ptid (ptid_t ptid, int sim_instance_needed) static void sim_inferior_data_cleanup (struct inferior *inf, void *data) { - struct sim_inferior_data *sim_data = data; + struct sim_inferior_data *sim_data = (struct sim_inferior_data *) data; if (sim_data != NULL) { @@ -766,8 +767,8 @@ gdbsim_open (const char *args, int from_tty) static int gdbsim_close_inferior (struct inferior *inf, void *arg) { - struct sim_inferior_data *sim_data = inferior_data (inf, - sim_inferior_data_key); + struct sim_inferior_data *sim_data + = (struct sim_inferior_data *) inferior_data (inf, sim_inferior_data_key); if (sim_data != NULL) { ptid_t ptid = sim_data->remote_sim_ptid; @@ -849,7 +850,7 @@ gdbsim_resume_inferior (struct inferior *inf, void *arg) { struct sim_inferior_data *sim_data = get_sim_inferior_data (inf, SIM_INSTANCE_NOT_NEEDED); - struct resume_data *rd = arg; + struct resume_data *rd = (struct resume_data *) arg; if (sim_data) { @@ -1034,13 +1035,13 @@ gdbsim_wait (struct target_ops *ops, case GDB_SIGNAL_TRAP: default: status->kind = TARGET_WAITKIND_STOPPED; - status->value.sig = sigrc; + status->value.sig = (enum gdb_signal) sigrc; break; } break; case sim_signalled: status->kind = TARGET_WAITKIND_SIGNALLED; - status->value.sig = sigrc; + status->value.sig = (enum gdb_signal) sigrc; break; case sim_running: case sim_polling: @@ -1198,7 +1199,8 @@ simulator_command (char *args, int from_tty) thus allocating memory that would not be garbage collected until the ultimate destruction of the associated inferior. */ - sim_data = inferior_data (current_inferior (), sim_inferior_data_key); + sim_data = ((struct sim_inferior_data *) + inferior_data (current_inferior (), sim_inferior_data_key)); if (sim_data == NULL || sim_data->gdbsim_desc == NULL) { @@ -1231,7 +1233,8 @@ sim_command_completer (struct cmd_list_element *ignore, const char *text, int i; VEC (char_ptr) *result = NULL; - sim_data = inferior_data (current_inferior (), sim_inferior_data_key); + sim_data = ((struct sim_inferior_data *) + inferior_data (current_inferior (), sim_inferior_data_key)); if (sim_data == NULL || sim_data->gdbsim_desc == NULL) return NULL; -- 2.5.1