From patchwork Sun Dec 24 08:45:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82813 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 71638385840E for ; Sun, 24 Dec 2023 08:47:22 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id AA01A3858D3C for ; Sun, 24 Dec 2023 08:45:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AA01A3858D3C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AA01A3858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703407562; cv=none; b=XqAL9yAOkysxkol6CffjCLM46Ozg38vG8hS85dsDTyyAy5jKmZtEbM6nxAC+DETGy9g+YpG/IkSjIXkT791eDIgdL5ZyClaRb3MX4I7oe/DcZLoDX5e8gWtuOS0APKEEqkcj/5641+Orhnrnx27G9n4EftLS3UJD6UpHajLyO8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703407562; c=relaxed/simple; bh=1GqH0/U2jDUZQdbp5JiRctFUK0hZ2AhgjkR9Udxohu8=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=efZJTcQRm7ryP8LYrT9VEU3TkTfyofnMN3su8VVBeqVFtAd+xXKpgTpb3M+ot3O7MzMj/IPgSx8uA8SEeuosagzlmykbz9jhLmKSin5YTdfmuRx3rbNKCB5t9YL4eJO32qBdAL67yu4k+t96R3O9IABQ2SsW1L8cmuRmnuwAvuY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 374CB33D9AD; Sun, 24 Dec 2023 08:45:53 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: frv: fix -Wincompatible-function-pointer-types warnings [PR sim/29752] Date: Sun, 24 Dec 2023 03:45:51 -0500 Message-ID: <20231224084551.21178-1-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Some compilers warn in the frv code: sem.c:24343:41: error: incompatible function pointer types passing 'void (SIM_CPU *, UINT, UDI)' (aka 'void (struct _sim_cpu *, unsigned int, unsigned long)') to parameter of type 'void (*)(SIM_CPU *, UINT, DI)' (aka 'void (*)(struct _sim_cpu *, unsigned int, long)') [-Wincompatible-function-pointer-types] This is due to frvbf_h_acc40U_set using UDI for setting the new value, but using the common sim_queue_fn_di_write API which uses DI. The same size, but different sign. We can change frvbf_h_acc40U_set to take a DI without changing behavior in practice: the UDI is already passed via the queue function which accepts a DI, and frvbf_h_acc40U_set already casts the input to UDI before running any operations on it. Bug: https://sourceware.org/PR29752 --- sim/frv/cpu.c | 2 +- sim/frv/cpu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sim/frv/cpu.c b/sim/frv/cpu.c index 195c8a12e17f..21b0e38ae178 100644 --- a/sim/frv/cpu.c +++ b/sim/frv/cpu.c @@ -631,7 +631,7 @@ frvbf_h_acc40U_get (SIM_CPU *current_cpu, UINT regno) /* Set a value for h-acc40U. */ void -frvbf_h_acc40U_set (SIM_CPU *current_cpu, UINT regno, UDI newval) +frvbf_h_acc40U_set (SIM_CPU *current_cpu, UINT regno, DI newval) { SET_H_ACC40U (regno, newval); } diff --git a/sim/frv/cpu.h b/sim/frv/cpu.h index fbb6c571c33c..1f1b00f01bdf 100644 --- a/sim/frv/cpu.h +++ b/sim/frv/cpu.h @@ -352,7 +352,7 @@ void frvbf_h_accg_set (SIM_CPU *, UINT, USI); DI frvbf_h_acc40S_get (SIM_CPU *, UINT); void frvbf_h_acc40S_set (SIM_CPU *, UINT, DI); UDI frvbf_h_acc40U_get (SIM_CPU *, UINT); -void frvbf_h_acc40U_set (SIM_CPU *, UINT, UDI); +void frvbf_h_acc40U_set (SIM_CPU *, UINT, DI); DI frvbf_h_iacc0_get (SIM_CPU *, UINT); void frvbf_h_iacc0_set (SIM_CPU *, UINT, DI); UQI frvbf_h_iccr_get (SIM_CPU *, UINT);