From nobody Tue Nov 11 03:22:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1561024157; cv=none; d=zoho.com; s=zohoarc; b=IMfRHXZEJdSdZmrv81rWMomT3XJk76bCYWldeTer0S34BSOgkz3Da1owX2MHx77UnXUeYHVXzPRAFIh0sm7PW9CkkJv8/5mhnT1fbAYadjLl9RQ3xUS7mYc0iHxAG5l9Tia6M03sO9xmcl03phT0egKndiXk9A0X8/r/uU3qC6o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561024157; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=EIo7Pu9DguIhFlR81FT+YVNfr6+2RNn6Vwt8H3jmpUY=; b=fhgqBVbL4n8xjydTqE/msxyetddeXvyEVkTCdynr9yzrGHOPUbOShxASmitLIuk+vpGU56odbu8kZlIkITVfmNlFND6Byhp18YpyTNIVOP4gwwwwkFbPeaqnFMy8MY1kooKr5HA1fWRSt06nSJmF+bO+q1NkWLXw56UwVzMglFU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1561024157318355.9057007410918; Thu, 20 Jun 2019 02:49:17 -0700 (PDT) Received: from localhost ([::1]:45568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtgy-0002p0-B7 for importer@patchew.org; Thu, 20 Jun 2019 05:49:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45722) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtEr-0004UR-My for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:20:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdtEp-0000st-Nv for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:20:13 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35389 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdtEo-0000o4-Pp for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:20:11 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 8A79A1A4657; Thu, 20 Jun 2019 11:20:08 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.13.43]) by mail.rt-rk.com (Postfix) with ESMTPSA id 588B81A23C4; Thu, 20 Jun 2019 11:20:08 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Thu, 20 Jun 2019 11:19:53 +0200 Message-Id: <1561022396-20649-2-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1561022396-20649-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1561022396-20649-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH 1/4] MAINTAINERS: Update file items for MIPS Malta board X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arikalo@wavecomp.com, amarkovic@wavecomp.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic hw/mips/gt64xxx_pci.c is used for Malta only, so it is logical to place this file in Malta board section of the MAINTAINERS file. Signed-off-by: Aleksandar Markovic Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index acbad13..869e87b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -930,6 +930,7 @@ M: Aurelien Jarno R: Aleksandar Rikalo S: Maintained F: hw/mips/mips_malta.c +F: hw/mips/gt64xxx_pci.c F: tests/acceptance/linux_ssh_mips_malta.py =20 Mipssim --=20 2.7.4 From nobody Tue Nov 11 03:22:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1561023926; cv=none; d=zoho.com; s=zohoarc; b=H0L7h70bF4L4QgQfEp4zKIihGkn8YezTm4xi7IcFQzrB96KQkSKaAonvChYICoSAiD8lGbAkPb1ibNXFDXN2s6Fn53Yjub+WJkkFPaDsMptYeJDmUqM/xE73YhDI+x+H4+kYsc7SJlo5sFVvWm3I4kCKTDr2nGBR+Yvx0ZZwmWc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561023926; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=HhZfZ///GUzMl6swoK9nVT6x1ULCtzxjUnekOrTDw1g=; b=YvvQIK5Fe/m9hdXysH4+7Xs7l7mmGQDULBXxc7xtvj5k9dRS5wk6SOtTCEfHurhcC+v/CYtnm8tPLpahpjNYkRvi5qYfHajJVD2diASoSa4fcJOYuw+5prxtvxCa2F10Zha6nvv5ysisge60sRAKdwe6DNuwsuuhE7rpZ9PcvqI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1561023926524577.583768405707; Thu, 20 Jun 2019 02:45:26 -0700 (PDT) Received: from localhost ([::1]:45448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtdF-0007Qc-E9 for importer@patchew.org; Thu, 20 Jun 2019 05:45:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45735) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtEt-0004W0-LQ for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:20:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdtEr-0000vy-V7 for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:20:15 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35424 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdtEr-0000sa-Ho for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:20:13 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 45D321A244B; Thu, 20 Jun 2019 11:20:10 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.13.43]) by mail.rt-rk.com (Postfix) with ESMTPSA id 146721A4674; Thu, 20 Jun 2019 11:20:10 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Thu, 20 Jun 2019 11:19:54 +0200 Message-Id: <1561022396-20649-3-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1561022396-20649-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1561022396-20649-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH 2/4] MAINTAINERS: Consolidate MIPS disassembler-related items X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arikalo@wavecomp.com, amarkovic@wavecomp.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Eliminate duplicate MIPS disassembler-related items in the MAINTAINERS file, and use wildcards to shorten the list of involved files. Signed-off-by: Aleksandar Markovic --- MAINTAINERS | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 869e87b..f9f66e5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -212,9 +212,7 @@ R: Aleksandar Rikalo S: Maintained F: target/mips/ F: default-configs/*mips* -F: disas/mips.c -F: disas/nanomips.cpp -F: disas/nanomips.h +F: disas/*mips* F: hw/intc/mips_gic.c F: hw/mips/ F: hw/misc/mips_* @@ -2321,7 +2319,6 @@ M: Aurelien Jarno R: Aleksandar Rikalo S: Maintained F: tcg/mips/ -F: disas/mips.c =20 PPC TCG target M: Richard Henderson --=20 2.7.4 From nobody Tue Nov 11 03:22:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1561023339; cv=none; d=zoho.com; s=zohoarc; b=O5Ip/RlObm8e2wRcBtmpig6ozcmozsio0miU9lpsbf3Hb7+omX8U0na9B6IDWoPqM+q0bR8lJg+YrfCUI3LPPJ3NSccmyNEER0+90xPpTasxOFbbEgAhz9nNzvLm1PVVhwR+bysAShxwiOpwkVZSJlSkH2AN30cGXWQJ60BQd98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561023339; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=tBgLYIfpvW48HA+I4P0cQtGztpiPs0cfi3vh2zCRSyM=; b=UoMpZYLRPZg4i8wClNGKzOqA40TrKL7fswCVZMKVvxHZmLx63JjLvds8UZmJXW6fl011gpLGAqo6Jeke2GLr5Uk4Z1xmpEyWoUUax9SEE1LzUa8b+ADMvBIq6uod1g9vNghn2KfpXhCQMUt+QZLMHYc9HoabAwdlT+c0ojr0gNU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1561023339604459.794055234456; Thu, 20 Jun 2019 02:35:39 -0700 (PDT) Received: from localhost ([::1]:45320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtTe-00008k-9R for importer@patchew.org; Thu, 20 Jun 2019 05:35:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45753) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtEx-0004Xe-BD for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:20:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdtEt-0000xc-Hy for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:20:18 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35439 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdtEr-0000ub-Tg for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:20:15 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 955EA1A4657; Thu, 20 Jun 2019 11:20:11 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.13.43]) by mail.rt-rk.com (Postfix) with ESMTPSA id 5786D1A4683; Thu, 20 Jun 2019 11:20:11 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Thu, 20 Jun 2019 11:19:55 +0200 Message-Id: <1561022396-20649-4-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1561022396-20649-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1561022396-20649-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH 3/4] target/mips: Fix some space checkpatch errors in translate.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arikalo@wavecomp.com, amarkovic@wavecomp.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Remove some space-related checkpatch warning. Signed-off-by: Aleksandar Markovic Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/translate.c | 126 +++++++++++++++++++++++++-------------------= ---- 1 file changed, 65 insertions(+), 61 deletions(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index a3cf976..324b32a 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -2617,7 +2617,7 @@ static const char * const mxuregnames[] =3D { } while (0) =20 /* General purpose registers moves. */ -static inline void gen_load_gpr (TCGv t, int reg) +static inline void gen_load_gpr(TCGv t, int reg) { if (reg =3D=3D 0) tcg_gen_movi_tl(t, 0); @@ -2625,14 +2625,14 @@ static inline void gen_load_gpr (TCGv t, int reg) tcg_gen_mov_tl(t, cpu_gpr[reg]); } =20 -static inline void gen_store_gpr (TCGv t, int reg) +static inline void gen_store_gpr(TCGv t, int reg) { if (reg !=3D 0) tcg_gen_mov_tl(cpu_gpr[reg], t); } =20 /* Moves to/from shadow registers. */ -static inline void gen_load_srsgpr (int from, int to) +static inline void gen_load_srsgpr(int from, int to) { TCGv t0 =3D tcg_temp_new(); =20 @@ -2839,7 +2839,7 @@ static void gen_store_fpr64(DisasContext *ctx, TCGv_i= 64 t, int reg) } } =20 -static inline int get_fp_bit (int cc) +static inline int get_fp_bit(int cc) { if (cc) return 24 + cc; @@ -2848,7 +2848,8 @@ static inline int get_fp_bit (int cc) } =20 /* Addresses computation */ -static inline void gen_op_addr_add (DisasContext *ctx, TCGv ret, TCGv arg0= , TCGv arg1) +static inline void gen_op_addr_add(DisasContext *ctx, TCGv ret, TCGv arg0, + TCGv arg1) { tcg_gen_add_tl(ret, arg0, arg1); =20 @@ -3328,8 +3329,8 @@ OP_LD_ATOMIC(lld,ld64); #endif #undef OP_LD_ATOMIC =20 -static void gen_base_offset_addr (DisasContext *ctx, TCGv addr, - int base, int offset) +static void gen_base_offset_addr(DisasContext *ctx, TCGv addr, + int base, int offset) { if (base =3D=3D 0) { tcg_gen_movi_tl(addr, offset); @@ -3341,7 +3342,7 @@ static void gen_base_offset_addr (DisasContext *ctx, = TCGv addr, } } =20 -static target_ulong pc_relative_pc (DisasContext *ctx) +static target_ulong pc_relative_pc(DisasContext *ctx) { target_ulong pc =3D ctx->base.pc_next; =20 @@ -3578,8 +3579,8 @@ static void gen_llwp(DisasContext *ctx, uint32_t base= , int16_t offset, } =20 /* Store */ -static void gen_st (DisasContext *ctx, uint32_t opc, int rt, - int base, int offset) +static void gen_st(DisasContext *ctx, uint32_t opc, int rt, + int base, int offset) { TCGv t0 =3D tcg_temp_new(); TCGv t1 =3D tcg_temp_new(); @@ -3717,8 +3718,8 @@ static void gen_scwp(DisasContext *ctx, uint32_t base= , int16_t offset, } =20 /* Load and store */ -static void gen_flt_ldst (DisasContext *ctx, uint32_t opc, int ft, - TCGv t0) +static void gen_flt_ldst(DisasContext *ctx, uint32_t opc, int ft, + TCGv t0) { /* Don't do NOP if destination is zero: we must perform the actual memory access. */ @@ -5132,8 +5133,8 @@ static void gen_mul_txx9(DisasContext *ctx, uint32_t = opc, tcg_temp_free(t1); } =20 -static void gen_mul_vr54xx (DisasContext *ctx, uint32_t opc, - int rd, int rs, int rt) +static void gen_mul_vr54xx(DisasContext *ctx, uint32_t opc, + int rd, int rs, int rt) { TCGv t0 =3D tcg_temp_new(); TCGv t1 =3D tcg_temp_new(); @@ -5196,8 +5197,8 @@ static void gen_mul_vr54xx (DisasContext *ctx, uint32= _t opc, tcg_temp_free(t1); } =20 -static void gen_cl (DisasContext *ctx, uint32_t opc, - int rd, int rs) +static void gen_cl(DisasContext *ctx, uint32_t opc, + int rd, int rs) { TCGv t0; =20 @@ -6188,8 +6189,8 @@ static void gen_compute_branch_nm(DisasContext *ctx, = uint32_t opc, =20 =20 /* special3 bitfield operations */ -static void gen_bitops (DisasContext *ctx, uint32_t opc, int rt, - int rs, int lsb, int msb) +static void gen_bitops(DisasContext *ctx, uint32_t opc, int rt, + int rs, int lsb, int msb) { TCGv t0 =3D tcg_temp_new(); TCGv t1 =3D tcg_temp_new(); @@ -6259,7 +6260,7 @@ fail: tcg_temp_free(t1); } =20 -static void gen_bshfl (DisasContext *ctx, uint32_t op2, int rt, int rd) +static void gen_bshfl(DisasContext *ctx, uint32_t op2, int rt, int rd) { TCGv t0; =20 @@ -6502,7 +6503,7 @@ static inline void gen_mfhc0_load64(TCGv arg, target_= ulong off, int shift) tcg_temp_free_i64(t0); } =20 -static inline void gen_mfc0_load32 (TCGv arg, target_ulong off) +static inline void gen_mfc0_load32(TCGv arg, target_ulong off) { TCGv_i32 t0 =3D tcg_temp_new_i32(); =20 @@ -6511,13 +6512,13 @@ static inline void gen_mfc0_load32 (TCGv arg, targe= t_ulong off) tcg_temp_free_i32(t0); } =20 -static inline void gen_mfc0_load64 (TCGv arg, target_ulong off) +static inline void gen_mfc0_load64(TCGv arg, target_ulong off) { tcg_gen_ld_tl(arg, cpu_env, off); tcg_gen_ext32s_tl(arg, arg); } =20 -static inline void gen_mtc0_store32 (TCGv arg, target_ulong off) +static inline void gen_mtc0_store32(TCGv arg, target_ulong off) { TCGv_i32 t0 =3D tcg_temp_new_i32(); =20 @@ -10077,7 +10078,8 @@ die: generate_exception_end(ctx, EXCP_RI); } =20 -static void gen_cp0 (CPUMIPSState *env, DisasContext *ctx, uint32_t opc, i= nt rt, int rd) +static void gen_cp0(CPUMIPSState *env, DisasContext *ctx, uint32_t opc, + int rt, int rd) { const char *opn =3D "ldst"; =20 @@ -10633,7 +10635,8 @@ enum r6_f_cmp_op { R6_OPC_CMP_SUNE_D =3D FOP(26, FMT_L), R6_OPC_CMP_SNE_D =3D FOP(27, FMT_L), }; -static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs) + +static void gen_cp1(DisasContext *ctx, uint32_t opc, int rt, int fs) { TCGv t0 =3D tcg_temp_new(); =20 @@ -10714,7 +10717,7 @@ static void gen_cp1 (DisasContext *ctx, uint32_t op= c, int rt, int fs) tcg_temp_free(t0); } =20 -static void gen_movci (DisasContext *ctx, int rd, int rs, int cc, int tf) +static void gen_movci(DisasContext *ctx, int rd, int rs, int cc, int tf) { TCGLabel *l1; TCGCond cond; @@ -10763,7 +10766,8 @@ static inline void gen_movcf_s(DisasContext *ctx, i= nt fs, int fd, int cc, tcg_temp_free_i32(t0); } =20 -static inline void gen_movcf_d (DisasContext *ctx, int fs, int fd, int cc,= int tf) +static inline void gen_movcf_d(DisasContext *ctx, int fs, int fd, int cc, + int tf) { int cond; TCGv_i32 t0 =3D tcg_temp_new_i32(); @@ -10886,8 +10890,8 @@ static void gen_sel_d(DisasContext *ctx, enum fopco= de op1, int fd, int ft, tcg_temp_free_i64(t1); } =20 -static void gen_farith (DisasContext *ctx, enum fopcode op1, - int ft, int fs, int fd, int cc) +static void gen_farith(DisasContext *ctx, enum fopcode op1, + int ft, int fs, int fd, int cc) { uint32_t func =3D ctx->opcode & 0x3f; switch (op1) { @@ -12314,8 +12318,8 @@ static void gen_farith (DisasContext *ctx, enum fop= code op1, } =20 /* Coprocessor 3 (FPU) */ -static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc, - int fd, int fs, int base, int index) +static void gen_flt3_ldst(DisasContext *ctx, uint32_t opc, + int fd, int fs, int base, int index) { TCGv t0 =3D tcg_temp_new(); =20 @@ -12394,8 +12398,8 @@ static void gen_flt3_ldst (DisasContext *ctx, uint3= 2_t opc, tcg_temp_free(t0); } =20 -static void gen_flt3_arith (DisasContext *ctx, uint32_t opc, - int fd, int fr, int fs, int ft) +static void gen_flt3_arith(DisasContext *ctx, uint32_t opc, + int fd, int fr, int fs, int ft) { switch (opc) { case OPC_ALNV_PS: @@ -13157,17 +13161,17 @@ enum { RR_RY_CNVT_SEW =3D 0x6, }; =20 -static int xlat (int r) +static int xlat(int r) { static int map[] =3D { 16, 17, 2, 3, 4, 5, 6, 7 }; =20 return map[r]; } =20 -static void gen_mips16_save (DisasContext *ctx, - int xsregs, int aregs, - int do_ra, int do_s0, int do_s1, - int framesize) +static void gen_mips16_save(DisasContext *ctx, + int xsregs, int aregs, + int do_ra, int do_s0, int do_s1, + int framesize) { TCGv t0 =3D tcg_temp_new(); TCGv t1 =3D tcg_temp_new(); @@ -13322,10 +13326,10 @@ static void gen_mips16_save (DisasContext *ctx, tcg_temp_free(t2); } =20 -static void gen_mips16_restore (DisasContext *ctx, - int xsregs, int aregs, - int do_ra, int do_s0, int do_s1, - int framesize) +static void gen_mips16_restore(DisasContext *ctx, + int xsregs, int aregs, + int do_ra, int do_s0, int do_s1, + int framesize) { int astatic; TCGv t0 =3D tcg_temp_new(); @@ -13428,8 +13432,8 @@ static void gen_mips16_restore (DisasContext *ctx, tcg_temp_free(t2); } =20 -static void gen_addiupc (DisasContext *ctx, int rx, int imm, - int is_64_bit, int extended) +static void gen_addiupc(DisasContext *ctx, int rx, int imm, + int is_64_bit, int extended) { TCGv t0; =20 @@ -13459,9 +13463,9 @@ static void gen_cache_operation(DisasContext *ctx, = uint32_t op, int base, } =20 #if defined(TARGET_MIPS64) -static void decode_i64_mips16 (DisasContext *ctx, - int ry, int funct, int16_t offset, - int extended) +static void decode_i64_mips16(DisasContext *ctx, + int ry, int funct, int16_t offset, + int extended) { switch (funct) { case I64_LDSP: @@ -13520,7 +13524,7 @@ static void decode_i64_mips16 (DisasContext *ctx, } #endif =20 -static int decode_extended_mips16_opc (CPUMIPSState *env, DisasContext *ct= x) +static int decode_extended_mips16_opc(CPUMIPSState *env, DisasContext *ctx) { int extend =3D cpu_lduw_code(env, ctx->base.pc_next + 2); int op, rx, ry, funct, sa; @@ -13734,7 +13738,7 @@ static inline void gen_helper_do_semihosting(void *= env) } #endif =20 -static int decode_mips16_opc (CPUMIPSState *env, DisasContext *ctx) +static int decode_mips16_opc(CPUMIPSState *env, DisasContext *ctx) { int rx, ry; int sa; @@ -13957,7 +13961,7 @@ static int decode_mips16_opc (CPUMIPSState *env, Di= sasContext *ctx) case M16_OPC_LWPC: gen_ld(ctx, OPC_LWPC, rx, 0, ((uint8_t)ctx->opcode) << 2); break; -#if defined (TARGET_MIPS64) +#if defined(TARGET_MIPS64) case M16_OPC_LWU: check_insn(ctx, ISA_MIPS3); check_mips_64(ctx); @@ -14061,7 +14065,7 @@ static int decode_mips16_opc (CPUMIPSState *env, Di= sasContext *ctx) case RR_SRAV: gen_shift(ctx, OPC_SRAV, ry, rx, ry); break; -#if defined (TARGET_MIPS64) +#if defined(TARGET_MIPS64) case RR_DSRL: check_insn(ctx, ISA_MIPS3); check_mips_64(ctx); @@ -14124,7 +14128,7 @@ static int decode_mips16_opc (CPUMIPSState *env, Di= sasContext *ctx) case RR_MFLO: gen_HILO(ctx, OPC_MFLO, 0, rx); break; -#if defined (TARGET_MIPS64) +#if defined(TARGET_MIPS64) case RR_DSRA: check_insn(ctx, ISA_MIPS3); check_mips_64(ctx); @@ -14158,7 +14162,7 @@ static int decode_mips16_opc (CPUMIPSState *env, Di= sasContext *ctx) case RR_DIVU: gen_muldiv(ctx, OPC_DIVU, 0, rx, ry); break; -#if defined (TARGET_MIPS64) +#if defined(TARGET_MIPS64) case RR_DMULT: check_insn(ctx, ISA_MIPS3); check_mips_64(ctx); @@ -14802,7 +14806,7 @@ enum { ADDIUR1SP =3D 0x1 }; =20 -static int mmreg (int r) +static int mmreg(int r) { static const int map[] =3D { 16, 17, 2, 3, 4, 5, 6, 7 }; =20 @@ -14810,7 +14814,7 @@ static int mmreg (int r) } =20 /* Used for 16-bit store instructions. */ -static int mmreg2 (int r) +static int mmreg2(int r) { static const int map[] =3D { 0, 17, 2, 3, 4, 5, 6, 7 }; =20 @@ -14885,8 +14889,8 @@ static void gen_andi16(DisasContext *ctx) gen_logic_imm(ctx, OPC_ANDI, rd, rs, decoded_imm[encoded]); } =20 -static void gen_ldst_multiple (DisasContext *ctx, uint32_t opc, int reglis= t, - int base, int16_t offset) +static void gen_ldst_multiple(DisasContext *ctx, uint32_t opc, int reglist, + int base, int16_t offset) { TCGv t0, t1; TCGv_i32 t2; @@ -15159,7 +15163,7 @@ static void gen_pool16c_r6_insn(DisasContext *ctx) } } =20 -static void gen_ldxs (DisasContext *ctx, int base, int index, int rd) +static void gen_ldxs(DisasContext *ctx, int base, int index, int rd) { TCGv t0 =3D tcg_temp_new(); TCGv t1 =3D tcg_temp_new(); @@ -15179,8 +15183,8 @@ static void gen_ldxs (DisasContext *ctx, int base, = int index, int rd) tcg_temp_free(t1); } =20 -static void gen_ldst_pair (DisasContext *ctx, uint32_t opc, int rd, - int base, int16_t offset) +static void gen_ldst_pair(DisasContext *ctx, uint32_t opc, int rd, + int base, int16_t offset) { TCGv t0, t1; =20 @@ -15270,7 +15274,7 @@ static void gen_sync(int stype) tcg_gen_mb(tcg_mo); } =20 -static void gen_pool32axf (CPUMIPSState *env, DisasContext *ctx, int rt, i= nt rs) +static void gen_pool32axf(CPUMIPSState *env, DisasContext *ctx, int rt, in= t rs) { int extension =3D (ctx->opcode >> 6) & 0x3f; int minor =3D (ctx->opcode >> 12) & 0xf; @@ -17234,7 +17238,7 @@ static void decode_micromips32_opc(CPUMIPSState *en= v, DisasContext *ctx) } } =20 -static int decode_micromips_opc (CPUMIPSState *env, DisasContext *ctx) +static int decode_micromips_opc(CPUMIPSState *env, DisasContext *ctx) { uint32_t op; =20 --=20 2.7.4 From nobody Tue Nov 11 03:22:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1561024046; cv=none; d=zoho.com; s=zohoarc; b=OSbPPgaO9zqQ/lBDyGr/4gHNN99JaT1Cn0nU2vyjjr/nt5DOsqK1ahIiTC95nbsOhCETkbHjjKh2Ju0KyOBzUcLz+XRzlF9OjytTWtPjnhTo8vdVNM0s/fAI7ClYGn9iHsM6dZy0IYF/AGFOjN3FjEaFYaPWJkgNIr12FCYWiDk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561024046; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=yoHaiMkRsomuHRC68pH2e1akFdwLjlL2suc0YxeDUbo=; b=W5rGKrirgr/awmhBbIFMLisxTopY+wH0HQ+hco1AX87WyY067P6J8Bo6yhn8QxUoGCq5I12cv7uFAml7bZ7uldgpfoivRtv3MohowuCt8f70xX7iZWqdwA+NU/6CxAJTXx9Kl6FwEtSuB1J2wa9MwwBL4mKNHA0rRfw7SmR62RQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1561024046209877.6491843715386; Thu, 20 Jun 2019 02:47:26 -0700 (PDT) Received: from localhost ([::1]:45478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtf9-000158-8T for importer@patchew.org; Thu, 20 Jun 2019 05:47:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45793) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtF0-0004Zt-I5 for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:20:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdtEw-00010Y-Ng for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:20:22 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35460 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdtEt-0000wC-KW for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:20:17 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id CCDF61A4663; Thu, 20 Jun 2019 11:20:12 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.13.43]) by mail.rt-rk.com (Postfix) with ESMTPSA id 95AA51A23C4; Thu, 20 Jun 2019 11:20:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Thu, 20 Jun 2019 11:19:56 +0200 Message-Id: <1561022396-20649-5-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1561022396-20649-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1561022396-20649-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH 4/4] target/mips: Fix if-else arms checkpatch errors in translate.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arikalo@wavecomp.com, amarkovic@wavecomp.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Remove if-else-arms-related checkpatch errors. Signed-off-by: Aleksandar Markovic Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/translate.c | 106 ++++++++++++++++++++++++++++++--------------= ---- 1 file changed, 66 insertions(+), 40 deletions(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index 324b32a..3558b2e 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -2619,16 +2619,18 @@ static const char * const mxuregnames[] =3D { /* General purpose registers moves. */ static inline void gen_load_gpr(TCGv t, int reg) { - if (reg =3D=3D 0) + if (reg =3D=3D 0) { tcg_gen_movi_tl(t, 0); - else + } else { tcg_gen_mov_tl(t, cpu_gpr[reg]); + } } =20 static inline void gen_store_gpr(TCGv t, int reg) { - if (reg !=3D 0) + if (reg !=3D 0) { tcg_gen_mov_tl(cpu_gpr[reg], t); + } } =20 /* Moves to/from shadow registers. */ @@ -2636,9 +2638,9 @@ static inline void gen_load_srsgpr(int from, int to) { TCGv t0 =3D tcg_temp_new(); =20 - if (from =3D=3D 0) + if (from =3D=3D 0) { tcg_gen_movi_tl(t0, 0); - else { + } else { TCGv_i32 t2 =3D tcg_temp_new_i32(); TCGv_ptr addr =3D tcg_temp_new_ptr(); =20 @@ -2841,10 +2843,11 @@ static void gen_store_fpr64(DisasContext *ctx, TCGv= _i64 t, int reg) =20 static inline int get_fp_bit(int cc) { - if (cc) + if (cc) { return 24 + cc; - else + } else { return 23; + } } =20 /* Addresses computation */ @@ -2908,14 +2911,16 @@ static inline void gen_move_high32(TCGv ret, TCGv_i= 64 arg) =20 static inline void check_cp0_enabled(DisasContext *ctx) { - if (unlikely(!(ctx->hflags & MIPS_HFLAG_CP0))) + if (unlikely(!(ctx->hflags & MIPS_HFLAG_CP0))) { generate_exception_err(ctx, EXCP_CpU, 0); + } } =20 static inline void check_cp1_enabled(DisasContext *ctx) { - if (unlikely(!(ctx->hflags & MIPS_HFLAG_FPU))) + if (unlikely(!(ctx->hflags & MIPS_HFLAG_FPU))) { generate_exception_err(ctx, EXCP_CpU, 1); + } } =20 /* Verify that the processor is running with COP1X instructions enabled. @@ -2924,8 +2929,9 @@ static inline void check_cp1_enabled(DisasContext *ct= x) =20 static inline void check_cop1x(DisasContext *ctx) { - if (unlikely(!(ctx->hflags & MIPS_HFLAG_COP1X))) + if (unlikely(!(ctx->hflags & MIPS_HFLAG_COP1X))) { generate_exception_end(ctx, EXCP_RI); + } } =20 /* Verify that the processor is running with 64-bit floating-point @@ -2933,8 +2939,9 @@ static inline void check_cop1x(DisasContext *ctx) =20 static inline void check_cp1_64bitmode(DisasContext *ctx) { - if (unlikely(~ctx->hflags & (MIPS_HFLAG_F64 | MIPS_HFLAG_COP1X))) + if (unlikely(~ctx->hflags & (MIPS_HFLAG_F64 | MIPS_HFLAG_COP1X))) { generate_exception_end(ctx, EXCP_RI); + } } =20 /* @@ -2950,8 +2957,9 @@ static inline void check_cp1_64bitmode(DisasContext *= ctx) */ static inline void check_cp1_registers(DisasContext *ctx, int regs) { - if (unlikely(!(ctx->hflags & MIPS_HFLAG_F64) && (regs & 1))) + if (unlikely(!(ctx->hflags & MIPS_HFLAG_F64) && (regs & 1))) { generate_exception_end(ctx, EXCP_RI); + } } =20 /* Verify that the processor is running with DSP instructions enabled. @@ -3040,8 +3048,9 @@ static inline void check_ps(DisasContext *ctx) instructions are not enabled. */ static inline void check_mips_64(DisasContext *ctx) { - if (unlikely(!(ctx->hflags & MIPS_HFLAG_64))) + if (unlikely(!(ctx->hflags & MIPS_HFLAG_64))) { generate_exception_end(ctx, EXCP_RI); + } } #endif =20 @@ -3131,8 +3140,7 @@ static inline void check_nms_dl_il_sl_tl_l2c(DisasCon= text *ctx) !(ctx->CP0_Config1 & (1 << CP0C1_IL)) && !(ctx->CP0_Config2 & (1 << CP0C2_SL)) && !(ctx->CP0_Config2 & (1 << CP0C2_TL)) && - !(ctx->CP0_Config5 & (1 << CP0C5_L2C))) - { + !(ctx->CP0_Config5 & (1 << CP0C5_L2C))) { generate_exception_end(ctx, EXCP_RI); } } @@ -3882,22 +3890,25 @@ static void gen_logic_imm(DisasContext *ctx, uint32= _t opc, uimm =3D (uint16_t)imm; switch (opc) { case OPC_ANDI: - if (likely(rs !=3D 0)) + if (likely(rs !=3D 0)) { tcg_gen_andi_tl(cpu_gpr[rt], cpu_gpr[rs], uimm); - else + } else { tcg_gen_movi_tl(cpu_gpr[rt], 0); + } break; case OPC_ORI: - if (rs !=3D 0) + if (rs !=3D 0) { tcg_gen_ori_tl(cpu_gpr[rt], cpu_gpr[rs], uimm); - else + } else { tcg_gen_movi_tl(cpu_gpr[rt], uimm); + } break; case OPC_XORI: - if (likely(rs !=3D 0)) + if (likely(rs !=3D 0)) { tcg_gen_xori_tl(cpu_gpr[rt], cpu_gpr[rs], uimm); - else + } else { tcg_gen_movi_tl(cpu_gpr[rt], uimm); + } break; case OPC_LUI: if (rs !=3D 0 && (ctx->insn_flags & ISA_MIPS32R6)) { @@ -6060,8 +6071,9 @@ static void gen_compute_branch (DisasContext *ctx, ui= nt32_t opc, } =20 out: - if (insn_bytes =3D=3D 2) + if (insn_bytes =3D=3D 2) { ctx->hflags |=3D MIPS_HFLAG_B16; + } tcg_temp_free(t0); tcg_temp_free(t1); } @@ -6708,8 +6720,9 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int= reg, int sel) { const char *register_name =3D "invalid"; =20 - if (sel !=3D 0) + if (sel !=3D 0) { check_insn(ctx, ISA_MIPS32); + } =20 switch (reg) { case CP0_REGISTER_00: @@ -7464,8 +7477,9 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int= reg, int sel) { const char *register_name =3D "invalid"; =20 - if (sel !=3D 0) + if (sel !=3D 0) { check_insn(ctx, ISA_MIPS32); + } =20 if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { gen_io_start(); @@ -8210,8 +8224,9 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) { const char *register_name =3D "invalid"; =20 - if (sel !=3D 0) + if (sel !=3D 0) { check_insn(ctx, ISA_MIPS64); + } =20 switch (reg) { case CP0_REGISTER_00: @@ -8920,8 +8935,9 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, in= t reg, int sel) { const char *register_name =3D "invalid"; =20 - if (sel !=3D 0) + if (sel !=3D 0) { check_insn(ctx, ISA_MIPS64); + } =20 if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { gen_io_start(); @@ -10162,8 +10178,9 @@ static void gen_cp0(CPUMIPSState *env, DisasContext= *ctx, uint32_t opc, break; case OPC_TLBWI: opn =3D "tlbwi"; - if (!env->tlb->helper_tlbwi) + if (!env->tlb->helper_tlbwi) { goto die; + } gen_helper_tlbwi(cpu_env); break; case OPC_TLBINV: @@ -10186,20 +10203,23 @@ static void gen_cp0(CPUMIPSState *env, DisasConte= xt *ctx, uint32_t opc, break; case OPC_TLBWR: opn =3D "tlbwr"; - if (!env->tlb->helper_tlbwr) + if (!env->tlb->helper_tlbwr) { goto die; + } gen_helper_tlbwr(cpu_env); break; case OPC_TLBP: opn =3D "tlbp"; - if (!env->tlb->helper_tlbp) + if (!env->tlb->helper_tlbp) { goto die; + } gen_helper_tlbp(cpu_env); break; case OPC_TLBR: opn =3D "tlbr"; - if (!env->tlb->helper_tlbr) + if (!env->tlb->helper_tlbr) { goto die; + } gen_helper_tlbr(cpu_env); break; case OPC_ERET: /* OPC_ERETNC */ @@ -10273,8 +10293,9 @@ static void gen_compute_branch1(DisasContext *ctx, = uint32_t op, goto out; } =20 - if (cc !=3D 0) + if (cc !=3D 0) { check_insn(ctx, ISA_MIPS4 | ISA_MIPS32); + } =20 btarget =3D ctx->base.pc_next + 4 + offset; =20 @@ -10728,10 +10749,11 @@ static void gen_movci(DisasContext *ctx, int rd, = int rs, int cc, int tf) return; } =20 - if (tf) + if (tf) { cond =3D TCG_COND_EQ; - else + } else { cond =3D TCG_COND_NE; + } =20 l1 =3D gen_new_label(); t0 =3D tcg_temp_new_i32(); @@ -10753,10 +10775,11 @@ static inline void gen_movcf_s(DisasContext *ctx,= int fs, int fd, int cc, TCGv_i32 t0 =3D tcg_temp_new_i32(); TCGLabel *l1 =3D gen_new_label(); =20 - if (tf) + if (tf) { cond =3D TCG_COND_EQ; - else + } else { cond =3D TCG_COND_NE; + } =20 tcg_gen_andi_i32(t0, fpu_fcr31, 1 << get_fp_bit(cc)); tcg_gen_brcondi_i32(cond, t0, 0, l1); @@ -10774,10 +10797,11 @@ static inline void gen_movcf_d(DisasContext *ctx,= int fs, int fd, int cc, TCGv_i64 fp0; TCGLabel *l1 =3D gen_new_label(); =20 - if (tf) + if (tf) { cond =3D TCG_COND_EQ; - else + } else { cond =3D TCG_COND_NE; + } =20 tcg_gen_andi_i32(t0, fpu_fcr31, 1 << get_fp_bit(cc)); tcg_gen_brcondi_i32(cond, t0, 0, l1); @@ -10797,10 +10821,11 @@ static inline void gen_movcf_ps(DisasContext *ctx= , int fs, int fd, TCGLabel *l1 =3D gen_new_label(); TCGLabel *l2 =3D gen_new_label(); =20 - if (tf) + if (tf) { cond =3D TCG_COND_EQ; - else + } else { cond =3D TCG_COND_NE; + } =20 tcg_gen_andi_i32(t0, fpu_fcr31, 1 << get_fp_bit(cc)); tcg_gen_brcondi_i32(cond, t0, 0, l1); @@ -12096,8 +12121,9 @@ static void gen_farith(DisasContext *ctx, enum fopc= ode op1, TCGLabel *l1 =3D gen_new_label(); TCGv_i64 fp0; =20 - if (ft !=3D 0) + if (ft !=3D 0) { tcg_gen_brcondi_tl(TCG_COND_NE, cpu_gpr[ft], 0, l1); + } fp0 =3D tcg_temp_new_i64(); gen_load_fpr64(ctx, fp0, fs); gen_store_fpr64(ctx, fp0, fd); --=20 2.7.4