From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613018; cv=none; d=zohomail.com; s=zohoarc; b=QQDK69x1sSRqlNO2KF076VfaEmhRTSObrX+8dIAs/b7erTGdoqQ2p3XRBWpBSWIsQ+j5fko7J3/iy8oOdlg8ysBZvk7B8bUUpz4td+t2IDs3YbqN2BTOhHpRQYc6hWYcU3YKD2wVdgo/Lw9BXlC7ao8ip090NAqFZOmIWZePzAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613018; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gz6y+LXm6Y2GsD6kiV72O4IHW4d4JM1W8BSMcONGr5Q=; b=VtzlNCXB7aw+QxCvPQWuycVB3oanDaWY8s5jcI4B8uRtCXHEdd+A6tRrzMJnR9/g22XvV/7CRCbiXoYJHRFXez+svPp3r1+ihNkMMujkFts59gdAkNpH/wKgBOcrp61Fnst8H7ncavJED0oDrSp2eonJ2iX8zgl9uJ3niWTNjKc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1624613018147461.63682333997235; Fri, 25 Jun 2021 02:23:38 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id g7so5197040wri.7 for ; Fri, 25 Jun 2021 02:23:37 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id f5sm6485034wrf.22.2021.06.25.02.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:23:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gz6y+LXm6Y2GsD6kiV72O4IHW4d4JM1W8BSMcONGr5Q=; b=uv8uReOB3tOqhZzwjDR3y8nku2uC3YNc5yO+z0H4W0qUsuHux1IAXgTMm7pTc8zXq1 YM92JY7FuVFyyzeis4B/7yVpvdKQ14ub+/bpX/9EtquQAJp66p7eJyhA3/06NE41TeX6 bV9nJLv8WKhm5bD6Y/8goQR3hD19BhvshoIi7k8Uj9v6rhUb79T+1zz60SLjNP6uvKWu wBe+snuDrpJKtWRRdpPAMOtterrIS0a+B9JniYVbIt0AUxm0hhsSc7K6BPkglKrTPdEj aPrnzy3go9Ntf1zzWFaohpUGC4tkMr8qRX4x5QAUf1qVyHCYW/JCFys3zSsPVwi8plOF tSbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gz6y+LXm6Y2GsD6kiV72O4IHW4d4JM1W8BSMcONGr5Q=; b=V6i77rO3iOG0BuGq8+nLpdy3wRFOmucM0ORieTR20K/6AKQx+C1+5z8F59Qr36MkRi HVhwb+tTgB4F6EOhkBfI2Wtu/EklY/APgkMn5ahuFdtgpQBZLEDpPzO9HIezFI1VOoyl GiSnWt/OF5DcgrOPbkfUSTHSWWx4cYWrxRAk+p4K1NHvK0Rx1ZTl5b9sEkQVxRHMQvWL GfRdxngmRplPzEFRJOyOmFBktfU3J4W0UAAJQgQdzk98Koix8dfrdKDh5DN152sMk31+ 1w8HnjfqqBGGQQ8uG6yFu+UTdZlEVefY9hZ9Q59dqBxtNoTe3HJNAWjpEx//ay5nWdI5 dL7w== X-Gm-Message-State: AOAM533Bgn40v18+pbTG2oN0p3SBT4Vt4X2R180Mbpf+sGrR2QTfLdKs pqgJ2PpGIoz3zhvyGbqwByc= X-Google-Smtp-Source: ABdhPJzpMEHTloVfP8WGQdc3KecRuNknXbcLZ4SU4YedJjvQNz2zQIQ7Zb1Epsh0qMShItAjnLREhw== X-Received: by 2002:a5d:6583:: with SMTP id q3mr9933130wru.360.1624613016406; Fri, 25 Jun 2021 02:23:36 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Richard Henderson Subject: [PULL 01/15] target/mips: Fix potential integer overflow (CID 1452921) Date: Fri, 25 Jun 2021 11:23:15 +0200 Message-Id: <20210625092329.1529100-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Use the BIT_ULL() macro to ensure we use 64-bit arithmetic. This fixes the following Coverity issue (OVERFLOW_BEFORE_WIDEN): CID 1452921: Integer handling issues: Potentially overflowing expression "1 << w" with type "int" (32 bits, signed) is evaluated using 32-bit arithmetic, and then used in a context that expects an expression of type "uint64_t" (64 bits, unsigned). Fixes: 074cfcb4dae ("target/mips: Implement hardware page table walker") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210505215119.1517465-1-f4bug@amsat.org> --- target/mips/tcg/sysemu/tlb_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/mips/tcg/sysemu/tlb_helper.c b/target/mips/tcg/sysemu/t= lb_helper.c index 259f780d19f..a150a014ec1 100644 --- a/target/mips/tcg/sysemu/tlb_helper.c +++ b/target/mips/tcg/sysemu/tlb_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ #include "qemu/osdep.h" +#include "qemu/bitops.h" =20 #include "cpu.h" #include "internal.h" @@ -659,7 +660,7 @@ static int walk_directory(CPUMIPSState *env, uint64_t *= vaddr, w =3D directory_index - 1; if (directory_index & 0x1) { /* Generate adjacent page from same PTE for odd TLB page */ - lsb =3D (1 << w) >> 6; + lsb =3D BIT_ULL(w) >> 6; *pw_entrylo0 =3D entry & ~lsb; /* even page */ *pw_entrylo1 =3D entry | lsb; /* odd page */ } else if (dph) { --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613023; cv=none; d=zohomail.com; s=zohoarc; b=Mev9yIyRSVw3o8YJerkTVe0H55wvF2kS2UrD5MBlB2xGkOZP8aKy0/dgxOWdWu1LWJoUYNzsw9m1LLJHDynsmovXawBJeDt+FAB0UHUQnHcUNPAtby2xU/lypkAyN0tRQcqoPGanZgRe8zxZw+jlvJZzbWye+nzuJvhjrpU66Vc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613023; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jnFRCnirhHN/LJxQWIK0doxtcYNiRzsabYEfVyfdjrg=; b=TpBwH3Bx7Lj+d/5IZPeT4SB18tYqh3npV92u6Fyf9s+mLbkm7nyV8h1FCf2Pue3mgpMjON30dIcolOekSV6h3R4GtEW7LbRZ1wjQ1czBLf/9v/Z+aziRIxFXupihYVYFp4foGouyruS3YPZ4tRFiz+dd4h5sKm5eUiQyOCfa6No= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1624613023283903.516904777164; Fri, 25 Jun 2021 02:23:43 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id j2so9791793wrs.12 for ; Fri, 25 Jun 2021 02:23:42 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id v5sm10766541wml.26.2021.06.25.02.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jnFRCnirhHN/LJxQWIK0doxtcYNiRzsabYEfVyfdjrg=; b=gg8TNXNipFAYxUUTBGWIz5pdroidBD+jZvTe+JfC9+S2FT4xS+AL6BkBUzl3axinL1 Pmh9F6ZNQGkp8vl9NSOMhkRuuFkkiwDeY9g1ahmTAjHwjZVZXxlhjhFs252WJNaGmgja vM2SV6nmQNhsb+HMthcR18y9FBW401a11SZSmzIyeJAHNQpLU9EXMvKyxTJbCJ6bGs0g Y3zmutD5X5yQV1cVFn4jDmwRL4TUdoOoTeIU4dOmzEkkuRMcag18cZVnlj4Xd4Sbz0yd mpwWVDLmwL4oaDV8CwiXDvaYQwS1UWzel96P19vXrZ98EKLjFYSK6cDqXgIf0FuSrkxR L5gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jnFRCnirhHN/LJxQWIK0doxtcYNiRzsabYEfVyfdjrg=; b=fn6D4aveWfeE5OR7sBo/+dMRuGXE74YhK4Kh3PnM6CI8rGSbobNOkZpEHiTeB+EI37 mZh+ITMG7lMqa+u+7wOLFe3gn55p/I5ECYSWyTCNwypfeEEhmGV2IZQZ3ofeR4NVIRvI mkrEij6dOHTaQTaqNBdmRK77Z09jvu6sG7/Kfat5HXdrfbG95JErDSawFv3bfMFJp5my oj/2KGByvhZuYSObNGBLusP6ym62UsDrN/+VWM+u+PX089bot5+gL1TYqBYnJcR+GU92 FNEMq5Gb7MbdgeaniM7COnaZF8wx6DtMzGQs3GD14f0GdW+TXm/De60FnmHoAGRlFvmS vXcg== X-Gm-Message-State: AOAM530eqHfZoTW5vUe/liks2WLFQL7oodBkLEVZJ8BgMndr52LyoPQt OMQ2dznNuPPc3S3jxOnMlc0= X-Google-Smtp-Source: ABdhPJxCdAOsUsc82M70D0SgcTyHgUv8sCWVi9huFtsT/AzdlssQqMqHbUjuWKHywoeECBSeNmbnGg== X-Received: by 2002:a5d:6c68:: with SMTP id r8mr6271220wrz.263.1624613021556; Fri, 25 Jun 2021 02:23:41 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Richard Henderson Subject: [PULL 02/15] target/mips: Fix TCG temporary leaks in gen_pool32a5_nanomips_insn() Date: Fri, 25 Jun 2021 11:23:16 +0200 Message-Id: <20210625092329.1529100-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Fix a pair of TCG temporary leak when translating nanoMIPS SHILO opcode. Fixes: 3285a3e4445 ("target/mips: Add emulation of DSP ASE for nanoMIPS") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210530094538.1275329-1-f4bug@amsat.org> --- target/mips/tcg/translate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 797eba44347..120484a6c06 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -20182,6 +20182,8 @@ static void gen_pool32a5_nanomips_insn(DisasContext= *ctx, int opc, tcg_gen_movi_tl(tv0, rd >> 3); tcg_gen_movi_tl(tv1, imm); gen_helper_shilo(tv0, tv1, cpu_env); + tcg_temp_free(tv1); + tcg_temp_free(tv0); } break; case NM_MULEQ_S_W_PHL: --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613028; cv=none; d=zohomail.com; s=zohoarc; b=K0VfhCTVD2rTgnFZXbeWkqTsnhjK/D8Nd+oa6NlXhx1BrMmt6Xs7mrenNjOu1pLTjuJX3Ctn2Eb2cl+ucZzd6GwkSWAMtqRm1N/+q2uszGVpJNZ0Gn5pPes9zmg95G7Vfocfrj9F6QQ9KTPWxCpuSwckW4KkQYVVhcN1GxQJI7w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613028; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=N0fTwLIOiJMjngQmCVcuvBFg6eFc/s2QuczGmyUTGrU=; b=S96sVDQtGMfngHQrQoxgX24S2JnuD/NUrXe5mMpu4Ww9Yde/RBsDq7rZYd8V5ydcuUg7rNtXWes8a0ZcvjXsAuK2Ow/p6Vn+bBOj7l/4HmlKt/szYZ2MxgbR2Y5gVoltl1NfceGFr/XWDOtVI+8R0cd3TaKEDo9I0DgOW/fDDC4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1624613028325979.6086457678695; Fri, 25 Jun 2021 02:23:48 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id a13so9798332wrf.10 for ; Fri, 25 Jun 2021 02:23:47 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id y13sm5401170wmj.18.2021.06.25.02.23.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:23:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N0fTwLIOiJMjngQmCVcuvBFg6eFc/s2QuczGmyUTGrU=; b=Qr7WdreUptyTS0yGSipx/KCrMtYTdYUJ+BWZEDwHoqeVAKSI/mljXuqjdCYBGs0Jkn hSzfz3+84o6BhrJPjhnjYtPqYluNc8j5UfiSLsM+pvnht/uIoMRCGcSIV4eGJMj1qIo7 a0swfCTHxUMM9kxk5PhnPd8nTi/UTKyz7oNDdpDKRvPFK/nzQBVpz/rMVSGbZLgYc6gh MBpKhNZibwm31+TaorEp54wqbcqgsZ8rGTnvbYwtOAtJSMH8fr/MJ/fytXzq8lio4bZs HJ7z+v8GxxxUgg/8oL2uh4GdnbFzdeA3EV74R4GHZXwRy/6quuBGptAzkzqpvwRN+Csn gB/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=N0fTwLIOiJMjngQmCVcuvBFg6eFc/s2QuczGmyUTGrU=; b=G3Kn0CgAYwptEnTq478wCUuTvHEwicT/jRr3oPANBg6APKe2xBJyiToANkr4t/SnA3 5nS/zxbgaV5CEHiKVQ1dTriO2oU8xPixg0jft3o6WOeeX2mcAUfwsXEU/7OUq+5Of7Rx SsZzu7nDaEL5WERylFBfOQ+2lbjmhlqTRRLoRvD/Yj+fV8FZC+kQzcBKmDoPVjUa+mbF 86wkcZebNNEBYIx7ngQq4/V2ALykFoSrszbwt2yYiHMw3lrFXmj2JmfLpcaHdikYY8Bf 9vL6pDCtHpM0J8kFu+Bg8azx6su0fQffXbJGmrT/i/YaRFkeaY1XffuboGbcKbjOnmVP IHwQ== X-Gm-Message-State: AOAM532oene3eJ8tM8iAr0t/F735miXB6YoQ4AhkfqPjYsiRl8GL7Qbw 84qLJbH96J7W7f7ieuOIxd0= X-Google-Smtp-Source: ABdhPJy1+6RzYmmYwKp8bMNB3IRMGxy5hxNM3Se98BQ3g+cwyGSnJGCjPsS/qyn3dOIMd6+BDi09pQ== X-Received: by 2002:adf:d22b:: with SMTP id k11mr9891613wrh.57.1624613026449; Fri, 25 Jun 2021 02:23:46 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Richard Henderson Subject: [PULL 03/15] target/mips: Fix more TCG temporary leaks in gen_pool32a5_nanomips_insn Date: Fri, 25 Jun 2021 11:23:17 +0200 Message-Id: <20210625092329.1529100-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Fix multiple TCG temporary leaks in gen_pool32a5_nanomips_insn(). Fixes: 3285a3e4445 ("target/mips: Add emulation of DSP ASE for nanoMIPS - p= art 1") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210617174323.2900831-3-f4bug@amsat.org> --- target/mips/tcg/translate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 120484a6c06..09b19262c8c 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -20298,6 +20298,10 @@ static void gen_pool32a5_nanomips_insn(DisasContex= t *ctx, int opc, gen_reserved_instruction(ctx); break; } + + tcg_temp_free(v2_t); + tcg_temp_free(v1_t); + tcg_temp_free(t0); } =20 static int decode_nanomips_32_48_opc(CPUMIPSState *env, DisasContext *ctx) --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613032; cv=none; d=zohomail.com; s=zohoarc; b=BZrDh7+nzkVI98C5rZIw2tKiPYODBkljHYkTrIpasBhJ9Ytk56VtNdluIArbzphvyXQwQppHH5Ikz/nTaJwIPR2nCuk3arWDGwayGsKsoT1R/u4Nt9AiBqu03Sg2GxErkC7Syg/8ShBg4r0FJK9ANPsiZ/a6r2E8+ejxoY2htL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613032; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vux3pRxRjKycdWHxcdq6t2Uw4/zpg6Clkow+InjP29Q=; b=mNvR0M5FVDO3Ity8ELOVqEwC7yZkB2N6PfSzxUJzhEiLL23fgo6aPD2iIIz/ucoSUOP21fNUpJ13+xWTaw4YU3k/Rl4u5FFet/SHy4giCUSQa5Iai/ABHpWlfZdq/yFAxPMm2NcPbOE/y1fybO5ZowFtwHWsic7r28mW/FKBiCQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1624613032927823.2871771787486; Fri, 25 Jun 2021 02:23:52 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id f15so9814914wro.8 for ; Fri, 25 Jun 2021 02:23:52 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id n7sm10503951wmq.37.2021.06.25.02.23.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:23:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vux3pRxRjKycdWHxcdq6t2Uw4/zpg6Clkow+InjP29Q=; b=mFJBwGdydAYfpQyoRXJrQCUfQ/BHdeVZs/1l+VVgftCQRSSjK/8gEQQ2HLql1z3Qrn yuUiW05o9AcH1UQ0tk0sszsoGDU2k0RGzi5CFcgtV34lewr1l50DHbCz+HjU20GomztN WLadwpdgKNeutQabIjjnh57mhjaKv6sUZkdOnLRKiIvYcsL2Gw8rcJPYOxGZF5e6cS6K +M5opfO44GJ+hI1O6DAqF2AKI+s98FuRL+MyY/rStgBTDQa0IUB2jFOX0FQo3urSEYq+ n4QhM9BgLDIUuQEqj8mLJRwDgasdhXmHSr4SuQ7g5Cgz/zD42UMDs9GoXNNhwWZEALcB uokA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vux3pRxRjKycdWHxcdq6t2Uw4/zpg6Clkow+InjP29Q=; b=CtP+0S/HREbj2+wSmtyeULWThthxhjtqzl32qLO6q/pvTy3zEnkMdrQssb9N9p7a9j JDb8maeuoyKQ4EDmpymWodwOGC9wiIcLXMetpF/1bcF9WvjqDP3diwAkGovU6GOnX6uA awHsLWc0WeTTNRvWM1Olkd9DGeXw4pwfSvQXUJujfUDeWtmTfixQFeOh6xTyiOVMiFaj lapeJzPZfOzHVzHErS+aZQjaZFkO0PYhM+GsY7EzeFj/UuIVTpMCVEqEOEg3EZBc+k7B YYrUiyZkhL3gdhqjsPcUMKXLCDIkAEp9DCRJXsNCMk0/mIh9puYEbSm6eIK+K+DtBKXJ Hw1Q== X-Gm-Message-State: AOAM531W+eInUJFfWxiWnhBVDx0PwbZ6g1H2DgyzRA38fc/l8S8C0VUn mb3XEuZeKqnYicAdCyKJ9MU= X-Google-Smtp-Source: ABdhPJyACY5tC87R5tPnFolNYvIu7yaY7tTMWDt+fiNi6JxP/2yIKKpUhV1zoQg9sJUFAkLvTdpb+A== X-Received: by 2002:a05:6000:1245:: with SMTP id j5mr9677750wrx.371.1624613031263; Fri, 25 Jun 2021 02:23:51 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Jia Liu , Richard Henderson Subject: [PULL 04/15] target/mips: Raise exception when DINSV opcode used with DSP disabled Date: Fri, 25 Jun 2021 11:23:18 +0200 Message-Id: <20210625092329.1529100-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Per the "MIPS=C2=AE DSP Module for MIPS64 Architecture" manual, rev. 3.02, Table 5.3 "SPECIAL3 Encoding of Function Field for DSP Module": If the Module/ASE is not implemented, executing such an instruction must cause a Reserved Instruction Exception. The DINSV instruction lists the following exceptions: - Reserved Instruction - DSP Disabled If the MIPS core doesn't support the DSP module, or the DSP is disabled, do not handle the '$rt =3D $0' case as a no-op but raise the proper exception instead. Cc: Jia Liu Fixes: 1cb6686cf92 ("target-mips: Add ASE DSP bit/manipulation instructions= ") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210529165443.1114402-1-f4bug@amsat.org> --- target/mips/tcg/translate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 09b19262c8c..3fd0c48d772 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -24379,10 +24379,11 @@ static void decode_opc_special3_legacy(CPUMIPSSta= te *env, DisasContext *ctx) { TCGv t0, t1; =20 + check_dsp(ctx); + if (rt =3D=3D 0) { break; } - check_dsp(ctx); =20 t0 =3D tcg_temp_new(); t1 =3D tcg_temp_new(); --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613037; cv=none; d=zohomail.com; s=zohoarc; b=mRoCrRAAI0yVXKK2ZZ27hjbRtircLtzsPeJMbHwTlKSm20jiUsL/tpln047F8K7GT4tpYOfzHF4SXEtra4wMfIJPFNfV4gIIXV5EJ8cW3EIaRsoRkDwynM1/NwKSmAxuRi7GGSalYby0wBc7YpkBBVEwhZliO6Iqn0UO9vrj3q4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613037; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WwdNN5kZV6nSH6AN6jmAvVVXJTDQlT1EEV5IustrciY=; b=DY5gEHi6N6wYKQ2+BIAUfAfK4YpvVCE793/sN7ntYAAs6R69ZLdU8OuVFr8lrIr3e8R8Y3IThDP8SwCkxrpNfQlWYNFJ3+2jV9YZpIX9eL63JdZChIowd30Do61mIXx+GzlupVgHTAktz26Mmky3VRrDWXfRfft7nFOGvOgkAlU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1624613037912607.9925347105518; Fri, 25 Jun 2021 02:23:57 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id c84so5796343wme.5 for ; Fri, 25 Jun 2021 02:23:57 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id l20sm5193943wmq.3.2021.06.25.02.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:23:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WwdNN5kZV6nSH6AN6jmAvVVXJTDQlT1EEV5IustrciY=; b=Z4nJYjhuwtboGaNEHTYeeVwyneAGl4JaXan5YccRBwcmRZy3EhHdw/oVuTYcjZ0eM9 NOzRMeOys5XZD70MnQH404fdY5x5rnBdtmQzUzjTLQiUEjO3SAt+J3fLcxXkzlODkUsw XF9BLLNDrfhgzShSmGoLdc8YSnvswXdEzOV8uBRMvfYoED3+BpviDTrm4JNaTdr4vDN3 XhG05hsevSI7qGlF6yMI+fviQzduf3emOp8csqV6JvGiRXJ1cEYxGLJZjKCv25Hr2TxV e6jbcJEwwksL6KORCHGMam82ftXZGkAQoBdRyhhTuj8GF2jIvGOxT0EqBXad/FkjSTp6 knlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=WwdNN5kZV6nSH6AN6jmAvVVXJTDQlT1EEV5IustrciY=; b=JUqMbwx7SSy/SDqPxgYHB5MaDRSQrhSvSql5/0G9/XBvi8hR2PRoza8XtW14+rksAc St5FUmC8bqmyJ50UeoiQh9syC55k+uySOlKZhM/ht1a2RROKQ6sdI3NQZYzROmjPiNL2 cpPPPcjR5vd9ssB8EwOX914uZbg0qTgS5XljuhhdmNI+4SP6RdPrkks/Wb5uorRD4plU PaKOYU8glHwwwu6uAa1F0JzPmNvJM4Bk4oL7OtX5M43+Uo/3GQYpKtfcHFfg57tOktOX FUGqqkJAJKBl/iDDAb45cMfBeOII0tU3ymkKrNGuN8TDSFtItVj+FsXtODZb4Mx3ZSaw +zLQ== X-Gm-Message-State: AOAM533/UvYB/opMw+vuuT8/knqJ56E/aYehBEGg/+vbFPuE8Cb05HEX H4Q7Axh/Cs8Htn5v5BUBZUo= X-Google-Smtp-Source: ABdhPJyrWsp/NIkdhZK5ZdI4acH0v61Ub743RzxxNuwgrdIJ7mQC6EpEwe6H5ELUwWuD50LJ2GpwxA== X-Received: by 2002:a1c:1f54:: with SMTP id f81mr9250063wmf.121.1624613036258; Fri, 25 Jun 2021 02:23:56 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Richard Henderson Subject: [PULL 05/15] target/mips: Do not abort on invalid instruction Date: Fri, 25 Jun 2021 11:23:19 +0200 Message-Id: <20210625092329.1529100-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) On real hardware an invalid instruction doesn't halt the world, but usually triggers a RESERVED INSTRUCTION exception. TCG guest code shouldn't abort QEMU anyway. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210617174323.2900831-2-f4bug@amsat.org> --- target/mips/tcg/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 3fd0c48d772..4b7229a868a 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -12151,8 +12151,8 @@ static void gen_branch(DisasContext *ctx, int insn_= bytes) tcg_gen_lookup_and_goto_ptr(); break; default: - fprintf(stderr, "unknown branch 0x%x\n", proc_hflags); - abort(); + LOG_DISAS("unknown branch 0x%x\n", proc_hflags); + gen_reserved_instruction(ctx); } } } --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613042; cv=none; d=zohomail.com; s=zohoarc; b=Mh1viq4G2fZlC1C6AZokKyPeYxKtj8AQPngV3mmScoEg/ul6bnow6cKHboNBOP9Gl8AhnXFo8DV+9o98Yf67hbUvTUtaTd+IllXS/KfrYYEbZtSzlblfDwmCOIDy5bajSSeXwdcYqhMu/NwhKNdx1bvXbjFmXP4VflGS1KTAazI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613042; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n82fAnsfNr3VVPFp6ddOKhLvaXiXpM82IkFTfD/mycg=; b=b2X8yKyffdBsT/QOB9DuWV9B72qqqRde01vxZ3gLxkQ7GwDj1peFTNhCXhnRM01PsAiRGI2JOg3sZ/kMQHxI+NVSbL/5ucKwhxUXh/7BSU/TGtTBYEnOdUtv89sD3mcQM9KBSyOdPimyZ/w9/SREcsTmS9G1L0KXhJlaZLp02QM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 162461304283954.103389030608014; Fri, 25 Jun 2021 02:24:02 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id a5-20020a7bc1c50000b02901e3bbe0939bso5414646wmj.0 for ; Fri, 25 Jun 2021 02:24:02 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id e12sm5595440wrw.34.2021.06.25.02.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:24:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n82fAnsfNr3VVPFp6ddOKhLvaXiXpM82IkFTfD/mycg=; b=ktc/ouPj74Bn1eGoCjam2EgCUs++p0NV+C5Ve/5kQ8Nbp9t9+bTmKauOctJp50JycY tIh+fVc2lhj83Hmn8C2Fo22IJeLzQZkG5RrFF8h8d7yPmsE7E2/6p/bF1BMgo9eDSetQ 8IIyjKTOkXxnebQ4Ud+55WvBq9B0oxXEVWYPAaaVEg+6AxtUipvsEDOIF7gfQvicNlqq 8bqzn8Tuerl9YvLNKiheECmGGiANwHI4/rghbQQnIE3NwmIbVF2cnJMX0W2P7TM7Yicq Nc1ngVOJbvwWgxIctGyAGPl+62uAXtCsv0pc/rXQv009XXKv3tQdXC6z9UBaw3m2x19R Qjig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=n82fAnsfNr3VVPFp6ddOKhLvaXiXpM82IkFTfD/mycg=; b=Jg3yRgV27taIH0nes2sipNrqNGfMF5WJVvoVOecrYKA0aEdg7nZRPxZHBB1QO7TxjQ PVPXzyfnj8Z6Vjo9xeMKOTmSzDwUHhOfKj+0ieOVJeCYtOtB8EVrWgiHkJEyzySBvh/m dHOAopkY0ioJtXr+JKVbYC+qG6zcojnxCM5MsdjEUk9T0Tey2YOT/YGFBbbYtFUPDf3D slQZ9yWxcYT9kqa4mwv01bEuosBpV0gmIzcNsm7kV+rRw0THTh/VIGtw+N3qiJP2SOPH A9nI1FjYn1xsmtvv452bMunno/30ydF9AO0rU18udxLCSdYU00HdMkelotvv82nNOtI+ 1efg== X-Gm-Message-State: AOAM530R5xjUnAa2NnTCtj0XyosE5n28qCHqcR4al3izTrBjB0ZgwlKD 469qNXzAAK1Hg+n8nr9UiNg= X-Google-Smtp-Source: ABdhPJxa5ZpMqqshjsYj6nsHZ9j6MofibKvky/6IRCRArfS48PNgsoX0OW+cK22s4FOw+rh54yqz8g== X-Received: by 2002:a05:600c:198f:: with SMTP id t15mr9568639wmq.27.1624613041120; Fri, 25 Jun 2021 02:24:01 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Richard Henderson Subject: [PULL 06/15] target/mips: Move TCG trace events to tcg/ sub directory Date: Fri, 25 Jun 2021 11:23:20 +0200 Message-Id: <20210625092329.1529100-7-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Commit a2b0a27d33e ("target/mips: Move TCG source files under tcg/ sub directory") forgot to move the trace-event file. As it only contains TCG events, move it for consistency. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210617174323.2900831-4-f4bug@amsat.org> --- meson.build | 2 +- target/mips/tcg/trace.h | 1 + target/mips/trace.h | 1 - target/mips/tcg/translate.c | 2 +- target/mips/{ =3D> tcg}/trace-events | 0 5 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 target/mips/tcg/trace.h delete mode 100644 target/mips/trace.h rename target/mips/{ =3D> tcg}/trace-events (100%) diff --git a/meson.build b/meson.build index d8a92666fbc..a91b39465c7 100644 --- a/meson.build +++ b/meson.build @@ -1882,7 +1882,7 @@ 'target/hppa', 'target/i386', 'target/i386/kvm', - 'target/mips', + 'target/mips/tcg', 'target/ppc', 'target/riscv', 'target/s390x', diff --git a/target/mips/tcg/trace.h b/target/mips/tcg/trace.h new file mode 100644 index 00000000000..b8c6c4568ec --- /dev/null +++ b/target/mips/tcg/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_mips_tcg.h" diff --git a/target/mips/trace.h b/target/mips/trace.h deleted file mode 100644 index f25b88ca6f9..00000000000 --- a/target/mips/trace.h +++ /dev/null @@ -1 +0,0 @@ -#include "trace/trace-target_mips.h" diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 4b7229a868a..0a4257db2a9 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -31,7 +31,7 @@ #include "exec/helper-gen.h" #include "semihosting/semihost.h" =20 -#include "target/mips/trace.h" +#include "trace.h" #include "trace-tcg.h" #include "exec/translator.h" #include "exec/log.h" diff --git a/target/mips/trace-events b/target/mips/tcg/trace-events similarity index 100% rename from target/mips/trace-events rename to target/mips/tcg/trace-events --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613047; cv=none; d=zohomail.com; s=zohoarc; b=Xfzr3wmwQf9hLTg81lZ9I47TH1L7unCE8dK3NtxcYdRb2MCYLXZosFYTEyaFdY5OI8PKOUjSlRX5/lKKY5UZ4HRzfugOs0Lg1GyOGMI7pTkCwB0V7dMXnHZzRZ0tsK1+8mv7/UboVhKPXIqV5dNKInYM4qeSxUNjxvxRQA528OM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613047; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ogN8LU6jvlKXrmDdhXY50C3EJp0l5oxhM+0LviCV4xo=; b=lT54u9QNGf5wDQ/95eKI5lBDkTxyBRSJmtZFymsLI73XfB8W/NVcghjgmcsfP4ut5qulhzOiKn7LoTSsIiSdCGa0Tto3LL/4svUq+SF82a0ozFY8vr4+uJK4LDNauY/ZzNDoEn2rptbbGRRK4TuLha5+4jLubMkVj4kmtEH1ZLM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1624613047967927.7751781046811; Fri, 25 Jun 2021 02:24:07 -0700 (PDT) Received: by mail-wr1-f48.google.com with SMTP id d11so9877299wrm.0 for ; Fri, 25 Jun 2021 02:24:07 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id e12sm5595668wrw.34.2021.06.25.02.24.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ogN8LU6jvlKXrmDdhXY50C3EJp0l5oxhM+0LviCV4xo=; b=tkXRTQpMLKbHpHkiFrN4EK6heOQI2VTZbm+hK6gapbFMxuWyUZLdE/yq1TrBdqdnOE tjVVOJN+ZYNf8Ki3pk8cMpSrmLP7g1GU+Nv/UgYI06KCHB+0/yarKzHDa5VzDhRPKxsc NRheyXPPD3U5mt8Vht6XcWRC15/yLy7zHTb7Ei5Np0VAwP0o0ahqpUHUFaOOwFT0ETvZ CoYpzdAVGYNfh0EiJ7v/WAzHErse8YeyI/cVKy6kpmiqdXyrkLUBiA8/c6YsQAp4hMf5 9jmSZSaGadXwD2YqADdWanblxCp4hrsVa2T9VhO9Qyf8M7MVsUSF5K00jWaqkzJUYjLg tVqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ogN8LU6jvlKXrmDdhXY50C3EJp0l5oxhM+0LviCV4xo=; b=o2mibZTB4nvfB9S9b6j3p2seeDqrhs0JaBCUdarL5Uv54PJO8vmrA49GzqiDeJxXAF dFfHrnzFi4IeOM6FJe7R3ypiB0/xz6O7WYn2kOndoN5vJrK2c+sQNGHTf+srJlO8qSyZ 7qzEJHLXznGBpS15C5damrDBWN2kng4kFCCqJE3qHj55mkmIX/d2ApP50Afvyb9uVexH XYabbiUCJihsFywQJYYV7Xj8vb64fWZzVNX3lA+YjpFzOhm68jaTF3xFK6b62D62ov35 hsny4akw5kywsPLty37WjT9Fv4gjlKifNo3UKsvy5eH5vqOQqurVUswxQ2dkBKtWYoH/ jA0g== X-Gm-Message-State: AOAM531ritf9UoRkSrLB6r9JCLhfe6ejyl0gQQu9a7zyvB9UE1KfcXOu oRbdyilFY5VHpHERlzuPdvo= X-Google-Smtp-Source: ABdhPJxgIJPkux/OCx7zevRoyoYoAdZ0JkzfafKvHgETVe3hy1Nau6zcQ0wofUmLiH4/Mt+liCQfuw== X-Received: by 2002:a05:6000:1788:: with SMTP id e8mr9950834wrg.218.1624613046344; Fri, 25 Jun 2021 02:24:06 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Richard Henderson Subject: [PULL 07/15] target/mips: Move translate.h to tcg/ sub directory Date: Fri, 25 Jun 2021 11:23:21 +0200 Message-Id: <20210625092329.1529100-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We moved various TCG source files in commit a2b0a27d33e ("target/mips: Move TCG source files under tcg/ sub directory") but forgot to move the header declaring their prototypes. Do it now, since all it declares is TCG specific. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210617174323.2900831-5-f4bug@amsat.org> --- target/mips/{ =3D> tcg}/translate.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename target/mips/{ =3D> tcg}/translate.h (100%) diff --git a/target/mips/translate.h b/target/mips/tcg/translate.h similarity index 100% rename from target/mips/translate.h rename to target/mips/tcg/translate.h --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613052; cv=none; d=zohomail.com; s=zohoarc; b=TRZDcEKz+hEeqsygL0Zkp7bOMv4RTmXxsaD7S/xTLXTjlWO93KrlM4Ed6hxTUaBa+TI9fVJIMGIyxTJRcRirXrVQW2CzQXZuWYm05yARxPBNM/WlgvzR3SwMcxllWXCGrB4cBQFlrZIJ8R+mqbe+6jlrpcKBBhgJUqqwylcm6Vs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613052; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ehB0qAlihF7k4LAF1LEURlWlaeE5Zj9aqJsWbLM6/nM=; b=Z6phze5/TDNGox8lEw1n9vjvm4ZfQHmr8oHtyPhtLCZEwXzECej1LXmfFhxGBMSJ92VOPBHuS3a/UF4d5imUcwqYIhiG+zFEHwEmcXXVB+RXmXlHEo9J6+2OQC+pP2Qwuv0s6ffNq4FBRLJkVsf/5ibprupA7rz4YUQ4XZZrnCA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1624613052896519.4506557195917; Fri, 25 Jun 2021 02:24:12 -0700 (PDT) Received: by mail-wm1-f53.google.com with SMTP id u20so630206wmq.4 for ; Fri, 25 Jun 2021 02:24:12 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id m18sm5450062wmq.45.2021.06.25.02.24.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:24:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ehB0qAlihF7k4LAF1LEURlWlaeE5Zj9aqJsWbLM6/nM=; b=ns3tbLZTFCaF9gWaI03iDv/PVe6/5NCRli4xXhMc7lOYevRj5WaY7CtWsjU/ZXAH1A lN2bUwMGqeXYTfh+8+/l5vRL7oAuIqd556k7jolMbJsyPHxnc7ijvP9DXnihQ4WryQSH QGR9OuvPkld1hui64SckdP+yljYRa6RISv09cQldWfDqfdzu7nSOpyRE6Ps3/OsanSia bxBxiqGO5TLwAugALsT/2h8SqkcKd7nW3nhQ1mmf/o5oDjGuFHmDXqm8llvxc7pmnk14 mcRvRCFM1Jvfz1ZZDkL4WtfPoZVqLpIgGGpopWdeNFn+g7Nfzse/62+sleVMOgwhX5q/ Pszg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ehB0qAlihF7k4LAF1LEURlWlaeE5Zj9aqJsWbLM6/nM=; b=WTrUwb6TGfg9ZOuInyCIJyvSDb3BTXOekKYsNMCdyxdgFZRggFQEQnZcbzWF8khBLh HoBp1nTYdCIIuC7J2sBO1mWQi3i0XA+YvCpRrz5iFNwQzH4yZhVDhgVi4FfDEhEtcMJc 98HNUf9Hq2U5dzyCG5Hn/dL5+5ZPBj5YnwCFol3A5i3aPy+GMxjRTP+6R1h/Di5ShFTE L47rJ9ZXFkNUZqM61AdLf22QLyINY/K3Nj9+jvDzFF/zHz4AxYAdSrcx1u7SCxPwmtUm A+g3p2vwYhqMejBWZI/4pB3+BwZXg7HFm6DyTYwD4U+7bvKhMiVeWxaaVNfy3lsiNFCT lvDw== X-Gm-Message-State: AOAM5317rhD/mwZ9P0Fw+EBiKOngwAAB0xzhbPyKa1A7Z2ijPaUqkLG5 nYYKGtXVKhXUqO039qkVAxI= X-Google-Smtp-Source: ABdhPJzB2W3Uyr2eL2r7hWMVCVhMoQrkt+kdKsVB+j/lkMA4/Fi+Zl3WKOBUP0QFMk7QEZvePhCFsQ== X-Received: by 2002:a05:600c:4111:: with SMTP id j17mr9360772wmi.86.1624613051120; Fri, 25 Jun 2021 02:24:11 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Richard Henderson Subject: [PULL 08/15] target/mips: Restrict some system specific declarations to sysemu Date: Fri, 25 Jun 2021 11:23:22 +0200 Message-Id: <20210625092329.1529100-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Commit 043715d1e0f ("target/mips: Update ITU to utilize SAARI and SAAR CP0 registers") declared itc_reconfigure() in public namespace, while it is restricted to system emulation. Similarly commit 5679479b9a1 ("target/mips: Move CP0 helpers to sysemu/cp0.c") restricted cpu_mips_soft_irq() definition to system emulation, but forgot to restrict its declaration. To avoid polluting user-mode emulation with these declarations, restrict them to sysemu. Also restrict the sysemu ITU/ITC/IRQ fields from CPUMIPSState. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210617174323.2900831-6-f4bug@amsat.org> --- target/mips/cpu.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 075c24abdad..1dfe69c6c0c 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1152,13 +1152,13 @@ struct CPUMIPSState { CPUMIPSMVPContext *mvp; #if !defined(CONFIG_USER_ONLY) CPUMIPSTLBContext *tlb; + void *irq[8]; + struct MIPSITUState *itu; + MemoryRegion *itc_tag; /* ITC Configuration Tags */ #endif =20 const mips_def_t *cpu_model; - void *irq[8]; QEMUTimer *timer; /* Internal timer */ - struct MIPSITUState *itu; - MemoryRegion *itc_tag; /* ITC Configuration Tags */ target_ulong exception_base; /* ExceptionBase input to the core */ uint64_t cp0_count_ns; /* CP0_Count clock period (in nanoseconds) */ }; @@ -1316,12 +1316,16 @@ uint64_t cpu_mips_phys_to_kseg1(void *opaque, uint6= 4_t addr); bool mips_um_ksegs_enabled(void); void mips_um_ksegs_enable(void); =20 +#if !defined(CONFIG_USER_ONLY) + /* mips_int.c */ void cpu_mips_soft_irq(CPUMIPSState *env, int irq, int level); =20 /* mips_itu.c */ void itc_reconfigure(struct MIPSITUState *tag); =20 +#endif /* !CONFIG_USER_ONLY */ + /* helper.c */ target_ulong exception_resume_pc(CPUMIPSState *env); =20 --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613057; cv=none; d=zohomail.com; s=zohoarc; b=iw4V39wWbXCTLbGjgclA/ZWa2sE6Fw5xVW0nnH846yu59Tg0YqPrZ5nf8D/WD2jC9oQjEF1SIPbg5XkRrg7T5lYRewPz4RLbtiZpU8q/nPIFY8YTPaQj4+v21gZpG9GHXsPo9JY79F5UfhJ2K5ANcrp5Qwl6wQBNtSZF0VxWt/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613057; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SeSEcRIPGoSv9nIgUL5/majnlvtkMwRXIAnFMpntYY8=; b=lEVABRgbQdInxiw0xWjoCpj/oKGQjF/XAFhMY6I1v1T/dJd8MBc6DDiZwp0pBtPBZbFBP4DqkoO4/1eTkBBKF4JE2hzx+hz6JGm5es/53YieJlu+VHWQC3PXm819JM5da8r4xYVqTlFV8cie2Lp0nR+qdF1WbHPCSIZbHbkltIg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1624613057786188.81637307889548; Fri, 25 Jun 2021 02:24:17 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id j2so9793530wrs.12 for ; Fri, 25 Jun 2021 02:24:17 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id g17sm6734642wrh.72.2021.06.25.02.24.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:24:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SeSEcRIPGoSv9nIgUL5/majnlvtkMwRXIAnFMpntYY8=; b=i8AcMrjs9iY3jRdNo1ntGr+neGC6pImAv1mHuAEwvSPIAB8lwQGEqQKTL0ewidYBzQ DTGRUJdSwUjmK8VSt4fYaVCbAGLqAHZ9QDj9PPiCEHsEKUCKbXo5yM1Fa1C1HxJtkae8 QoLoUMNR+O2Ex9EF/x7zJ/S8wO+X+JuJB6M95swke9EpjtyvyUjTnrR3XGZO8bzYzxio ACodGH9//kXb2Z1YlM3MOCGYg+eBeOkwwsryFsecpmNNGLeXiVg0ZGq0wGvRxK41HR18 CquCoegMQQ8xHoCcNVPMo7Yev15wHgGktR34zDl1vjT3XUT0IUyXX/Bwu3keH/WRFfLk ZH1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SeSEcRIPGoSv9nIgUL5/majnlvtkMwRXIAnFMpntYY8=; b=rU1gF2E6y9IM3FM04sSt3LdefE9e0q/DarhgsDmn/JsS82pOekMNuLHFJQx/jUJFVI NFUfDYVlRuRT+e/beosV1hchBCbRh/vTzHVqI7Db1z1Tg+ExozbSHUFrW+9BcHMladxZ bEL5JOlRebrnmLNpn0XNw3IYr5RMeEMdOgPJfgSEoxn/7j5iJZtj0v0xFVgozYgVvQ6z IwkL5kI4zrKeXvVWQVIsHghOJjQAAPOSkMqNQG/h7YwIcCDrHe2I9v4HDqDTD7L6Jly6 ty72s0KyT6e8PfYGn9+fwwkKgi38IOV2Sn1YPKf6L6D4FiLKFJjxGFsiu7HevvCjg5UN CBjQ== X-Gm-Message-State: AOAM533msfPdQeV/JuEWJA1XbMaAwahIpKBieRQfjsxInucPILPtJ4Ey mb/aQNTyi8svx0sPEj0soPA= X-Google-Smtp-Source: ABdhPJwBaGwUmxT8qSbfLwxIZbqU66wGQMpcYCWYXwXIYjn4bijRuffh4i2fK188CFzhutnFTOyWhg== X-Received: by 2002:a5d:648a:: with SMTP id o10mr8392212wri.304.1624613056125; Fri, 25 Jun 2021 02:24:16 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Richard Henderson Subject: [PULL 09/15] target/mips: Remove SmartMIPS / MDMX unuseful comments Date: Fri, 25 Jun 2021 11:23:23 +0200 Message-Id: <20210625092329.1529100-10-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) These placeholder comments for SmartMIPS and MDMX extensions have been added commit 3c824109da0 ("target-mips: microMIPS ASE support"). More than 11 years later it is safe to assume there won't be added soon, so remove these unuseful comments. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210617174323.2900831-7-f4bug@amsat.org> --- target/mips/tcg/translate.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 0a4257db2a9..8b251183209 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -21578,14 +21578,6 @@ static int decode_nanomips_opc(CPUMIPSState *env, = DisasContext *ctx) } =20 =20 -/* SmartMIPS extension to MIPS32 */ - -#if defined(TARGET_MIPS64) - -/* MDMX extension to MIPS64 */ - -#endif - /* MIPSDSP functions. */ static void gen_mipsdsp_ld(DisasContext *ctx, uint32_t opc, int rd, int base, int offset) --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613062; cv=none; d=zohomail.com; s=zohoarc; b=J5aEwUv8Hu0bpmZIUnS08u9fmpFNSZjY+EA2aZQF9ZXFSyX2m8yE8qWF+c8Vx25kkAb/3Y65Xne0719IbKH34gjXWZFdP/O2yYb1j7vuoJtF9MUO5fslqAjI3ZhbQg4O++niYZvvTeVHCnMWYL2hsvkmK37G55MelARXNW+4+W4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613062; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EUNHNUxYdr2ImjOQsqKJN23H1ATXEvXXcSq4igsm0wc=; b=NTJM4qBeQJi6FgiUNtG3ZtA2Smty+qLGOmiUyri64y2hgnf+0YTw4V9xhPTDiOt/GniKjyBL7RwyJ0wk8KvX+ocTyOLqGIlhS87L/IfNwewfo0pV7JjmAPVZVhntolm63Nh9Zyg6MAxPSyzdgRks9mMkUs314aC4PNp+CBwMgww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1624613062759946.6384163908472; Fri, 25 Jun 2021 02:24:22 -0700 (PDT) Received: by mail-wm1-f53.google.com with SMTP id o33-20020a05600c5121b02901e360c98c08so6269790wms.5 for ; Fri, 25 Jun 2021 02:24:22 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id w2sm5584777wrp.14.2021.06.25.02.24.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:24:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EUNHNUxYdr2ImjOQsqKJN23H1ATXEvXXcSq4igsm0wc=; b=I6uV1D5LQEBA+m+Iq0GUAZExfWcoOa2DIxvZHj19WlOxZSTBltHKHbTyuIMTWy1Mnm IMX72FTAXGIMHJS9tM7jd5I6Vj09Ew+JlvhxmlVN2yG0ONIlC0I4tnnn6icm/q6sGxNd Lg56hDLghoTvRE2lqp0vrdbTu5QB85tYdRJhCIkQp6qkEbKIYQiDtTHg4zaaZZV3i3Dd 3A1JhSg11ZOg656u+8nLjUSE/HbInY5u34/fphN58yEcBKEFTSvwtyh+MmD/oenHQj6Y +wNqW+n/HYmatGBHxVFM0kQh7qNAnA+upn0hHY5je3VcKax2FxG+XgvcnH94eruiryDM ONgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=EUNHNUxYdr2ImjOQsqKJN23H1ATXEvXXcSq4igsm0wc=; b=GNw45ZQ7VRxmrlXaRCby53SnZNkWZeI6dUlvCsR9ZFAnDr9rIpfC+NfJ8cp2hjAjFw qKuZme2ikA20+hlFUkcnszLxzIaBYOqYZm4OjMBJ/sseE7VUXW0v+XkF433XHEr9g4rH EAx/6cDMYczgiu0QDCQdw+tnX26kogpVlh62cPp5abUtNoFeiRnHl1xxpEOZPXS9ILjZ izQmbp6p03x08bmqn29noCkCA8i10dAqPy4PfxhbtotUIQj1V6Izq7ZtV/d1J0/agyRP k8RkX+eyF+UPTEtfX4Y02rYLuHHzpxDWWdjGKwC0oR8SAmQvwZcp5oMN9r7lSG0GZ+GZ /BXA== X-Gm-Message-State: AOAM531XUK19X10VgD5GnmDX+dRzkzwi9/PUEmcMK/xZAs0XSi4FHGin I5md8ibGY6QoJ3ZH+3cDF5Y= X-Google-Smtp-Source: ABdhPJwKuXKOWo9eJ2Xbv6hIQO2PPcofq2IXntvClXf/2F5vGWZQg9CJHLr5I3l5twgXHv8Sylf+9Q== X-Received: by 2002:a7b:c0d6:: with SMTP id s22mr9428610wmh.52.1624613060941; Fri, 25 Jun 2021 02:24:20 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Richard Henderson Subject: [PULL 10/15] target/mips: Remove microMIPS BPOSGE32 / BPOSGE64 unuseful cases Date: Fri, 25 Jun 2021 11:23:24 +0200 Message-Id: <20210625092329.1529100-11-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) These switch cases for the microMIPS BPOSGE32 / BPOSGE64 opcodes have been added commit 3c824109da0 ("target-mips: microMIPS ASE support"). More than 11 years later it is safe to assume there won't be added soon. The cases fall back to the default which generates a RESERVED INSTRUCTION, so it is safe to remove them. Functionally speaking, the patch is a no-op. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210617174323.2900831-8-f4bug@amsat.org> --- target/mips/tcg/translate.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 8b251183209..1ff0b098bca 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -14076,8 +14076,6 @@ enum { BGEZALS =3D 0x13, BC2F =3D 0x14, BC2T =3D 0x15, - BPOSGE64 =3D 0x1a, - BPOSGE32 =3D 0x1b, /* These overlap and are distinguished by bit16 of the instruction */ BC1F =3D 0x1c, BC1T =3D 0x1d, @@ -16121,10 +16119,6 @@ static void decode_micromips32_opc(CPUMIPSState *e= nv, DisasContext *ctx) generate_exception_err(ctx, EXCP_CpU, 1); } break; - case BPOSGE64: - case BPOSGE32: - /* MIPS DSP: not implemented */ - /* Fall through */ default: MIPS_INVAL("pool32i"); gen_reserved_instruction(ctx); --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613068; cv=none; d=zohomail.com; s=zohoarc; b=NjbwAvgCcMq6Wrzl4P47Zbm/gX48CzIVOKlHdyXDx8gxAr3JYAl+HITyotVCsjk8o1bnzsWjdxeo+oGtKjdQ2RbU2ZtbZ/x2czBdvbyK1LydvJBoheBVRB2CuV4LDBsNAHZs7hZNqy9py8tyMdMZqD8caEaTcNLWifQ8Pq7bwEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613068; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GB1t1SzgUrQ6wryHeMC6aCDk5PBhagijh5OIfYjZw6g=; b=Qs0dBdMT+NuPVErpWG/crJoHvKgeY4ci0qleeFbWlIOKacAJw1koEDLvM5gC/IwrNDzne0NCJBPZXaOjJqWLsJE80qB5tDmXwXUADPi8M6h9Nqi5XU+picsLjTc5kvv4uwjPIVtgS1SBtp+nikOXp1Rj3KCyjCAXTWKfbgV0ANA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1624613068197873.2500941289302; Fri, 25 Jun 2021 02:24:28 -0700 (PDT) Received: by mail-wm1-f44.google.com with SMTP id c84so5797326wme.5 for ; Fri, 25 Jun 2021 02:24:26 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id o20sm11013917wms.3.2021.06.25.02.24.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:24:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GB1t1SzgUrQ6wryHeMC6aCDk5PBhagijh5OIfYjZw6g=; b=KIxdmLjiZGf83Q6VIez29DM1KUbUTWULlB+zZuxUNz8Caf6y22gfN/g8icUoeg4YWF A+AUFkPlgr/EulzR/2SByjpzm0H8KhGLzz2W4QiMbCteycux834R213qCEJsjn3Hi4r0 tgQKvJfNhJr+4BJlgTv+BU0CYf/INVMjPFuo1RznaxKsP3sSy0vTTSGT7FoRocumQ/TN 0crjVIvdehkPDekdF/2RdwQdWVT3sEkAETsHcKIM8hnsdOuRQKLUBUgEa7I2WApPZSw9 lMoxFZpPNscb2O8clzdWgL1WUItN1SuAIVZrT3qhRvSWG2HXNbZtz9ojdYcHNhc58wBs x9dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GB1t1SzgUrQ6wryHeMC6aCDk5PBhagijh5OIfYjZw6g=; b=it/mjGGgswCoHEiYoGEerY68Z7Zal8vgbOP06bfCKxpLz3bo5nVIt/+Ye0qcRPHNLT CdhYtNRnCg0uR7SlJfAMdGselUTmTxtbn0RrOlO/mlUMXSj6ktxu7imX49NIE/0xfJOh WGcqkqFyvYHB1YtG+D/BxFbzynIAN0gYHpOCVfu1Fg1AAb6OO3FTjkxcx/7j8VbmdDCq wsBg2vl2mZrtZftZuHe+o/a7DPf2TakLcgu5jQx9VzJOV8nwSYQ/iUibFYsL9qBYNnd2 mO6+7nTTgf+G6saG9XoWgT5nMWgCU+Y61ntknhBIkWz+baQJGAA+pHjBKvTmZhEE5X1d MVhA== X-Gm-Message-State: AOAM5315p27F41u63Xg948AgZJt6bnmezQBLib6FQiIlMjFKgjRlyokj kssKW34ibycSPzh9RnWdw3s= X-Google-Smtp-Source: ABdhPJxdsG9HylINq+TFz/O4GyK3za1sDOycPdHtNCZiAgpmQsYF8AnacnD8nhGtJmERIq6NKiBPog== X-Received: by 2002:a7b:c041:: with SMTP id u1mr9171640wmc.95.1624613065546; Fri, 25 Jun 2021 02:24:25 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , Filip Vidojevic Subject: [PULL 11/15] target/mips: fix emulation of nanoMIPS BPOSGE32 instruction Date: Fri, 25 Jun 2021 11:23:25 +0200 Message-Id: <20210625092329.1529100-12-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Aleksandar Rikalo Per the "MIPS=C2=AE Architecture Extension: nanoMIPS32 DSP Technical Reference Manual =E2=80=94 Revision 0.04" p. 88 "BPOSGE32C", offset argumen= t (imm) should be left-shifted first. This change was tested against test_dsp_r1_bposge32.c DSP test. Reported-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Rikalo Signed-off-by: Filip Vidojevic Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/tcg/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 1ff0b098bca..d248b5e5d21 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -21137,7 +21137,7 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *= env, DisasContext *ctx) extract32(ctx->opcode, 0, 1) << 13; =20 gen_compute_branch_nm(ctx, OPC_BPOSGE32, 4, -1, -2, - imm); + imm << 1); } break; default: --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613072; cv=none; d=zohomail.com; s=zohoarc; b=I1yShqQpeIHvZRqtzUwhHvhybi5vmL6H8AgfsP0faq4VYGW67DcVf+YXs084hYmsV1aJxM+2ZJX2ajkAmmhVXwwCKUJ0NY6qVDYfTdL71DqWr5RijuNNi8bUa8KVpkmNZMAFEMTqi801R8QN9Avc04JuS4TZymZprG9/4GBcVH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613072; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XnVMC6KQbRUPT2iCc62lO26HFbbEhTwhTfNAPgbW2dw=; b=X8FbgQsVl04SxEXdnV+QDQQRzxQpwXfz/nHNtx0w6omhKO+1QHAyzmKN1cKmeqn+sEEqIbxI9j6Ti0f73K7nK7VAZucsCZxLc9QDi3dnpPmCip9IhSLarHBCTf88rFRDgDEQ5kAV3E5p6G1xKr6CD9JkQvLpoa1iAk07RgmpedQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1624613072129484.48349191197167; Fri, 25 Jun 2021 02:24:32 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id a13so9800533wrf.10 for ; Fri, 25 Jun 2021 02:24:31 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id s18sm5661045wrw.33.2021.06.25.02.24.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XnVMC6KQbRUPT2iCc62lO26HFbbEhTwhTfNAPgbW2dw=; b=qgAELLmh8rIKRaExqIOpOuLzMt+0hK+PHh/WAUp/sjLHBS/auZ487mBbCsp91k9emT QWPJ2YXwfrXDQhg2LFP9KOKcMpLaqGUNqFeShyNFnCdJuFN1SYrGG7Ugl0X1zEDR9Z6/ QBzYPpZtY8AhJ8g1kIlCOlT9J5R+I3SmjvHI7YJZiZiweiYfbg9URg4vujK3FouS+Lxl DCANJNpzM6XC6OCnIkUxkO8GAtvwBpTf5LcuakCE1Ow0424bUCDXa9SGT/BzXMlX2S23 iva13/BORetnVJKs8Mwb1xzoDtfreB6unBzYGKNZYUKzdiv8LcXvHsKwrrvb7v1zU9WM CS1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XnVMC6KQbRUPT2iCc62lO26HFbbEhTwhTfNAPgbW2dw=; b=TorrIlEizJHeQYNMN4O1WCd/AeYxafzEtehPNMgXsLE2zLQLC7qMERD3s6LNtJhkE0 eBR+awPRJ2KSXnYDrWR6MjBE5bCPUDhT+QoIp9Pnw4vp2N2rzVnhrvDkUKzwUy3MqYoc nQQnQfHSIvKe5GxFuZeG1n4h3RoEdSkswtH5FLLTdX9tZqJYnWOOLL3ELPwofe6dEP6N IE3JCVeIhD8+hxKoeZ1374s5vhzMcolr/d8ZyO0lMagTBSAfPnqzCng7iHg9FGIAmXl2 yPgiNUwfee/6P9FlUb92m3hbOHowrGr3jc0ZoFXkuaRD/nHVCCJKocXCKdDLMl3QeFSY ybRw== X-Gm-Message-State: AOAM531GZJLr3J2i92trq0sNuO5BQAqyLtHwMI+A1q5aYko8sIFfo2mB DxZcPqpnuEccFWQ+oZuowfc= X-Google-Smtp-Source: ABdhPJysOrfmHQoZ8ydqj7nOsyXiN8qjPg+jEcHkFu+Yt/d+WLnYvlQ9jZ/Ef421XUmnj0Hm0svraA== X-Received: by 2002:a5d:648e:: with SMTP id o14mr9930651wri.5.1624613070467; Fri, 25 Jun 2021 02:24:30 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Richard Henderson Subject: [PULL 12/15] target/mips: Constify host_to_mips_errno[] Date: Fri, 25 Jun 2021 11:23:26 +0200 Message-Id: <20210625092329.1529100-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Keep host_to_mips_errno[] in .rodata by marking the array const. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210617174323.2900831-9-f4bug@amsat.org> --- target/mips/tcg/sysemu/mips-semi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/mips/tcg/sysemu/mips-semi.c b/target/mips/tcg/sysemu/mi= ps-semi.c index 6de60fa6dd7..77108b0b1a9 100644 --- a/target/mips/tcg/sysemu/mips-semi.c +++ b/target/mips/tcg/sysemu/mips-semi.c @@ -75,7 +75,7 @@ enum UHIOpenFlags { }; =20 /* Errno values taken from asm-mips/errno.h */ -static uint16_t host_to_mips_errno[] =3D { +static const uint16_t host_to_mips_errno[] =3D { [ENAMETOOLONG] =3D 78, #ifdef EOVERFLOW [EOVERFLOW] =3D 79, --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613076; cv=none; d=zohomail.com; s=zohoarc; b=Kf1Z9rOQleiz+4Y6InYDVag4IVy7Evtn4MVM3Hy8MUMg1nh/WLAnjMl5QJHBnvDo5bwpBlSXMblYaogOqEx1HHNjCFQ+rmVVBNd+i4KYyBCVR275wCbkxHzfaCu2eANrlty8kXK1ITHfd8mcJy296ewaji6rHTuCvDuFWRIwuLA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613076; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z3wZSKfgpDL8vaWMLSuWVaLYUZ6Ms90loGBbtNoC/Qo=; b=EsGsbVMOGVPjVV+0G7duX1gmWYLrmm/i2tLL/frUVSc3VbI/Ifd23m4YMeb6fjllnOmBtieGtnguKka0RmXSH8eIAJEY97pvAhM1gYaYtZ0xmUUzjkSpR05JcM9ahxHfuXWuO4hNdWHCtpPyrXryMAFuLyQ2FOQSz42oQ4jg+CU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1624613076844896.5630009406995; Fri, 25 Jun 2021 02:24:36 -0700 (PDT) Received: by mail-wm1-f48.google.com with SMTP id o35-20020a05600c5123b02901e6a7a3266cso2992310wms.1 for ; Fri, 25 Jun 2021 02:24:36 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id m184sm5089542wmm.26.2021.06.25.02.24.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:24:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z3wZSKfgpDL8vaWMLSuWVaLYUZ6Ms90loGBbtNoC/Qo=; b=HYud0adKfSUKhdOcGbaVOejHqV/EpokTAihJYx7ygtcuiyydWn8EsxU6xbRuJGH7nb 25UZYMY318In3mhelHB2ejZdNmLLPCYhNm/MUYksf0avYEZPJZ9rm/36ZxCXzWHZhN83 3mtiqH/0t06qYsE4lo8jCyxvWjsbCY81/wUkCITXJgtDO+usN5OZKV6vKzwtKV2qo8PN 2TqIRqmRlBB+GaQLCY6EjjqFWsUgvaqKZPL845YbgbHknL1TXm5DG736D6AdrKc/HzGj pmi8yCB8TivuhnjWuoRPyUNCIhmXUty+Y1a5oZ5mo6ivuov1c9W+wSZr18agiBMNw7hi A9kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Z3wZSKfgpDL8vaWMLSuWVaLYUZ6Ms90loGBbtNoC/Qo=; b=hDSwwB+XS0Yno1UaiVOyHF3zx751uiDKOaGEIC1EjrXooF5cubifF4j0aAHniowM8l wcV9bxqtI6E3eqoTM8I3/23MMbetgWCKnbK3Pc7FKL7KZpwh2mw7+Lf/BhxDts2TcR4h 6YPFOjCw/n82NPn8UiNZrR+os2QKLeusn49AAPsJ4XulE0tfnnkOTkWEwm+9gHhBsOay mP0f/o3pEqJxgkbGl5ocq7tti503Wt4oS8QA2PcUUj/z+vi4ePHO5sCrCYKTD8+zfuOW xvlN+i/ksDbZON+ZzTBcMAyXBpDUeMpPnk1Sl62bDWP4fzifxA2pwF9olGbhoPZ4YSMP ELUg== X-Gm-Message-State: AOAM533jzEI9K6v5eX1SoC5OvBO3w35+96pTyWXuf15r7AjnD00BLJ8v VzFksxt5MpgqNBNlltrAdx8= X-Google-Smtp-Source: ABdhPJxN1oDBJukEZnOLIgmAv+1Q8e/pB8PqhRzPuPHmD2UyC8Yd+UrQqE5kpSR1lsUql2EnvEb7xg== X-Received: by 2002:a7b:c7c7:: with SMTP id z7mr9570043wmk.21.1624613075135; Fri, 25 Jun 2021 02:24:35 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Richard Henderson Subject: [PULL 13/15] target/mips: Optimize regnames[] arrays Date: Fri, 25 Jun 2021 11:23:27 +0200 Message-Id: <20210625092329.1529100-14-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Since all entries are no more than 3/4/6 bytes (including nul terminator), can save space and pie runtime relocations by declaring regnames[] as array of 3/4/6 const char. Inspired-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210617174323.2900831-10-f4bug@amsat.org> --- target/mips/internal.h | 2 +- target/mips/cpu.c | 2 +- target/mips/tcg/msa_translate.c | 2 +- target/mips/tcg/mxu_translate.c | 4 ++-- target/mips/tcg/translate.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 18d5da64a57..eecdd101169 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -74,7 +74,7 @@ struct mips_def_t { int32_t SAARP; }; =20 -extern const char regnames[32][4]; +extern const char regnames[32][3]; extern const char fregnames[32][4]; =20 extern const struct mips_def_t mips_defs[]; diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 96236abc006..d426918291a 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -35,7 +35,7 @@ #include "qapi/qapi-commands-machine-target.h" #include "fpu_helper.h" =20 -const char regnames[32][4] =3D { +const char regnames[32][3] =3D { "r0", "at", "v0", "v1", "a0", "a1", "a2", "a3", "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7", diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index ae6587edf69..b0df4f85dfe 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -255,7 +255,7 @@ enum { OPC_BINSRI_df =3D (0x7 << 23) | OPC_MSA_BIT_09, }; =20 -static const char * const msaregnames[] =3D { +static const char msaregnames[][6] =3D { "w0.d0", "w0.d1", "w1.d0", "w1.d1", "w2.d0", "w2.d1", "w3.d0", "w3.d1", "w4.d0", "w4.d1", "w5.d0", "w5.d1", diff --git a/target/mips/tcg/mxu_translate.c b/target/mips/tcg/mxu_translat= e.c index fb0a811af6c..963d4ba8b13 100644 --- a/target/mips/tcg/mxu_translate.c +++ b/target/mips/tcg/mxu_translate.c @@ -447,9 +447,9 @@ enum { static TCGv mxu_gpr[NUMBER_OF_MXU_REGISTERS - 1]; static TCGv mxu_CR; =20 -static const char * const mxuregnames[] =3D { +static const char mxuregnames[][4] =3D { "XR1", "XR2", "XR3", "XR4", "XR5", "XR6", "XR7", "XR8", - "XR9", "XR10", "XR11", "XR12", "XR13", "XR14", "XR15", "MXU_CR", + "XR9", "XR10", "XR11", "XR12", "XR13", "XR14", "XR15", "XCR", }; =20 void mxu_translate_init(void) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index d248b5e5d21..b4a454ec09b 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -1280,11 +1280,11 @@ TCGv_i64 fpu_f64[32]; #define DISAS_STOP DISAS_TARGET_0 #define DISAS_EXIT DISAS_TARGET_1 =20 -static const char * const regnames_HI[] =3D { +static const char regnames_HI[][4] =3D { "HI0", "HI1", "HI2", "HI3", }; =20 -static const char * const regnames_LO[] =3D { +static const char regnames_LO[][4] =3D { "LO0", "LO1", "LO2", "LO3", }; =20 --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613081; cv=none; d=zohomail.com; s=zohoarc; b=jEYaDl5+F8bwRYoPlOzI13tA3Hz2KSj6vbt9Y+Go/0fn7URKiH+9hqqVyfaR/UvAiygdBy4r2W8wzPwhBe9xU2hSN8U9qgnwYUzz4C4wRU/sbMPvvj2yV1kayxp2hqH+s3Wpy/iLYt7vrK6i/e8kfTLkVza045T3TPcRqRCMcw0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613081; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=g6g9WN+eC+yVfOp2XuA0nXSJN4HI3/lxTp05miFPo38=; b=STcJerAPutuQDXf4RrfkI38VrXmTbpd5z1bZr9bBoJgmNLAOSZut1dr0cek5UO4x5DzGOJbmhHO/dHvac0MqmN7UxT+YwvLi2zYaYOV65+3auCpQeTP2xZE+KY0gF0ikUF1quDkCd/pUZjOhxvoLiDOQJd9AwDRqpka8iHkSw4E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1624613081621773.9147191331223; Fri, 25 Jun 2021 02:24:41 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id r3so1282260wmq.1 for ; Fri, 25 Jun 2021 02:24:40 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id e3sm5600587wro.26.2021.06.25.02.24.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:24:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g6g9WN+eC+yVfOp2XuA0nXSJN4HI3/lxTp05miFPo38=; b=RJ1i1pTd+Y9T1+cvaBJ2YIZeaHyyy9BMGJ3sTAxfT6G7Kh4b2530dqoz8Sp+tbLK4E eqZvHONr98ynmF8bh/m0i7kFxnooptyzEoJ2otC5dmyTzER9OjTdOS0wao7XldAQL6bS Xn8iozDENDR4la5PDUY+kMDbdKJOYkvFRS+UNH916glFtJ4O2JOJTCYrF+utwCfeZWlq w9058GFXw8WzJe1Jv8sUArv+UM3Kn6BlZ1gQLsQ7kSDvRcpEYmclwKiUKDXPvw6yevWE z2+t7HeygN1TYcdjGNzYjDLIS1G0idIKMe/GfvaeiiMeEqjYmAUa/WIQojkrGmdqbpj/ cKwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=g6g9WN+eC+yVfOp2XuA0nXSJN4HI3/lxTp05miFPo38=; b=KIXp4Mccbw6z5jboD/xuKZukp4GSfPoefolzbqKGJnuiKj3NzAkY6jgD7WWATmvOkZ icnxK/5U+mC2kPFwoM9pXD3DTyOyrADw8i8fPfcO77oy6Q03eMWNUpA9crgQ5cke5zIv hzBuYqynxHbOQJamnUZT7JxgrbFneDoB0xyqyjsI1eb9F0VqjfzS39fLmhw7tZSi0mHl z9Hl8Rv+GcmjcE34tG0z09+836CRV4Yke8JMT8fuhNirSGSCUbtQ63+e1y7Wnl7GstCU bIInLj+jhK0/TncfmXROCWhGUCdCKDaqt7XY5tCT6ALptyhbtUDYomd77VBRiGPM3Xd9 duyA== X-Gm-Message-State: AOAM531p1Xu3jdxHDfGxz0wK1dCN2qMOb1dstWBBvZMF3Ax6jefSB76/ ZIDPARXxRtj4d4mTxLtTid4= X-Google-Smtp-Source: ABdhPJxWNbnnAfRkqnxPsNDQENJFjLPuTyXG/hfe9fpMnPMjpNcYxW2WKzJYYX74/ZwA6uIZOGHLJg== X-Received: by 2002:a7b:c446:: with SMTP id l6mr9676847wmi.171.1624613079851; Fri, 25 Jun 2021 02:24:39 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Richard Henderson Subject: [PULL 14/15] target/mips: Remove pointless gen_msa() Date: Fri, 25 Jun 2021 11:23:28 +0200 Message-Id: <20210625092329.1529100-15-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Only trans_MSA() calls gen_msa(), inline it to simplify. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210617174636.2902654-2-f4bug@amsat.org> --- target/mips/tcg/msa_translate.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index b0df4f85dfe..9df4497c886 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -2162,7 +2162,7 @@ static void gen_msa_vec(DisasContext *ctx) } } =20 -static void gen_msa(DisasContext *ctx) +static bool trans_MSA(DisasContext *ctx, arg_MSA *a) { uint32_t opcode =3D ctx->opcode; =20 @@ -2258,11 +2258,6 @@ static void gen_msa(DisasContext *ctx) gen_reserved_instruction(ctx); break; } -} - -static bool trans_MSA(DisasContext *ctx, arg_MSA *a) -{ - gen_msa(ctx); =20 return true; } --=20 2.31.1 From nobody Mon Feb 9 10:42:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624613086; cv=none; d=zohomail.com; s=zohoarc; b=O04ZR941dwlYs4IspuoXkKd3w/mrI7x9tJgVpnX+8Rsfq4yoY/LO5YEVwWSzLN0R760QwDJl2925GU3L1/xTHJw9cNavls2wcPNicLuiV5LaiQ3RFJrXnBtOXMLbPml04IP60o6qF30Rffdah/lXVLcgkdL+hR0tnF09Vbo2cS8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624613086; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=f5DPlzA8O4zttmU/S05Ji9+z4p90zXOhep4QV0U8i+Q=; b=BxGBF72NkCBoxvIzFxnFDm2CsViFLOsjuSgRSHquvHFTYRD03Kbdz3AHy1VXaYfeWBvdgYYeLipfNL5O3zaw1cf8r9adYrI6uZo1WtitF6+s8F1OiNEGxCX7t0YvUO3ZaT26733OGN29dv0I/asT1FWM7L/xh7ToBsgN/u5er84= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1624613086335962.1394362875644; Fri, 25 Jun 2021 02:24:46 -0700 (PDT) Received: by mail-wm1-f48.google.com with SMTP id o22so4861696wms.0 for ; Fri, 25 Jun 2021 02:24:45 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id p13sm4081429wrx.30.2021.06.25.02.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 02:24:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f5DPlzA8O4zttmU/S05Ji9+z4p90zXOhep4QV0U8i+Q=; b=Tk0z3vBNKbY1MUy7pIMEXRCKarGDPyJWHXMc6Reit1hMI4oyHCKyVu8410IVfREQKm 2WPq6gMMsBH8BKPn5Wqsnw92SqWOW5GYxVw3RVzZa7McL0QlKL6bqtgJw3eANDho1stR MQ9klNh26wRlkNPUd0QpnLVtfMGsAYvjEVVom2fs4QUeQJl0PEkjD3xUD3xjbCgziBrc 9jUy27A2eDieuFjbNG2TEkKhSTibawnSv7WUoZnAUbhXYjSfNj0EmL4n07rvrf+rik2x vf4AK224MBKJzsWO//Mn+Dx/k9geYi+lq/zRY6DyRzrhp07e4eStTQuMrnI9MD388lFw UC8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=f5DPlzA8O4zttmU/S05Ji9+z4p90zXOhep4QV0U8i+Q=; b=qkBg71L5l30CDG5N6ug9di2+dAwZlPnSy1YD4QhcjLqr7kHS3rY/Em9vI9v1Z4Sq+Y YksFdyJqeNmxkb9QEA53jE30VbLZCI1m80oiAdyoc9kkbEqbyH05mzYoaL0eybPq65ju deKtgwu5FocBRPlKxOUTZX25nqO0sE/wAmfHvBv30a/ceek4wmoXKeQzauZiFl0We22r Ap7JCjtwFVeYwh18nrI7CCmXiLlIlK28L6eUhEH3+4X/WWoa1l7iXjF1VzFK596qH15I ryRUJl8VM6svmBZu5vWtTr3ML21DqjAhRHucjt5+3j5ThmUVVAuLXoQ2uYZD+lzbYMTA 5mCA== X-Gm-Message-State: AOAM530riBpr0Kg6GyrD7aUlOu9YiFjpSv+hDcycQ4unasimwxc15dwf WTkzHBiCWNn02sDMuyRoZGqKRuHj9m2qAQ== X-Google-Smtp-Source: ABdhPJy4K3gWHKlDU0BzLDvtBe1wxiVdqepUw1QIaqk51e2jEQILPmw6WHU/KWTZipqGkTEEVr5DGw== X-Received: by 2002:a1c:9a8b:: with SMTP id c133mr9650720wme.65.1624613084630; Fri, 25 Jun 2021 02:24:44 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Aurelien Jarno , Richard Henderson Subject: [PULL 15/15] target/mips: Merge msa32/msa64 decodetree definitions Date: Fri, 25 Jun 2021 11:23:29 +0200 Message-Id: <20210625092329.1529100-16-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625092329.1529100-1-f4bug@amsat.org> References: <20210625092329.1529100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We don't need to maintain 2 sets of decodetree definitions. Merge them into a single file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210617174636.2902654-3-f4bug@amsat.org> --- target/mips/tcg/{msa32.decode =3D> msa.decode} | 8 +++++--- target/mips/tcg/msa64.decode | 17 ----------------- target/mips/tcg/msa_translate.c | 14 ++++---------- target/mips/tcg/meson.build | 3 +-- 4 files changed, 10 insertions(+), 32 deletions(-) rename target/mips/tcg/{msa32.decode =3D> msa.decode} (74%) delete mode 100644 target/mips/tcg/msa64.decode diff --git a/target/mips/tcg/msa32.decode b/target/mips/tcg/msa.decode similarity index 74% rename from target/mips/tcg/msa32.decode rename to target/mips/tcg/msa.decode index ca200e373b1..bf132e36b9b 100644 --- a/target/mips/tcg/msa32.decode +++ b/target/mips/tcg/msa.decode @@ -6,9 +6,10 @@ # # Reference: # MIPS Architecture for Programmers Volume IV-j -# The MIPS32 SIMD Architecture Module, Revision 1.12 -# (Document Number: MD00866-2B-MSA32-AFP-01.12) -# +# - The MIPS32 SIMD Architecture Module, Revision 1.12 +# (Document Number: MD00866-2B-MSA32-AFP-01.12) +# - The MIPS64 SIMD Architecture Module, Revision 1.12 +# (Document Number: MD00868-1D-MSA64-AFP-01.12) =20 &rtype rs rt rd sa =20 @@ -19,6 +20,7 @@ @bz_df ...... ... df:2 wt:5 s16:16 &msa_bz =20 LSA 000000 ..... ..... ..... 000 .. 000101 @lsa +DLSA 000000 ..... ..... ..... 000 .. 010101 @lsa =20 BZ_V 010001 01011 ..... ................ @bz BNZ_V 010001 01111 ..... ................ @bz diff --git a/target/mips/tcg/msa64.decode b/target/mips/tcg/msa64.decode deleted file mode 100644 index d2442474d0b..00000000000 --- a/target/mips/tcg/msa64.decode +++ /dev/null @@ -1,17 +0,0 @@ -# MIPS SIMD Architecture Module instruction set -# -# Copyright (C) 2020 Philippe Mathieu-Daud=C3=A9 -# -# SPDX-License-Identifier: LGPL-2.1-or-later -# -# Reference: -# MIPS Architecture for Programmers Volume IV-j -# The MIPS64 SIMD Architecture Module, Revision 1.12 -# (Document Number: MD00868-1D-MSA64-AFP-01.12) -# - -&rtype rs rt rd sa !extern - -@lsa ...... rs:5 rt:5 rd:5 ... sa:2 ...... &rtype - -DLSA 000000 ..... ..... ..... 000 .. 010101 @lsa diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index 9df4497c886..eed2eca6c92 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -18,8 +18,7 @@ #include "internal.h" =20 /* Include the auto-generated decoder. */ -#include "decode-msa32.c.inc" -#include "decode-msa64.c.inc" +#include "decode-msa.c.inc" =20 #define OPC_MSA (0x1E << 26) =20 @@ -2269,13 +2268,8 @@ static bool trans_LSA(DisasContext *ctx, arg_rtype *= a) =20 static bool trans_DLSA(DisasContext *ctx, arg_rtype *a) { + if (TARGET_LONG_BITS !=3D 64) { + return false; + } return gen_dlsa(ctx, a->rd, a->rt, a->rs, a->sa); } - -bool decode_ase_msa(DisasContext *ctx, uint32_t insn) -{ - if (TARGET_LONG_BITS =3D=3D 64 && decode_msa64(ctx, insn)) { - return true; - } - return decode_msa32(ctx, insn); -} diff --git a/target/mips/tcg/meson.build b/target/mips/tcg/meson.build index 5d8acbaf0d3..bf4001e5741 100644 --- a/target/mips/tcg/meson.build +++ b/target/mips/tcg/meson.build @@ -1,8 +1,7 @@ gen =3D [ decodetree.process('mips32r6.decode', extra_args: '--static-decode=3Ddec= ode_mips32r6'), decodetree.process('mips64r6.decode', extra_args: '--static-decode=3Ddec= ode_mips64r6'), - decodetree.process('msa32.decode', extra_args: '--static-decode=3Ddecode= _msa32'), - decodetree.process('msa64.decode', extra_args: '--static-decode=3Ddecode= _msa64'), + decodetree.process('msa.decode', extra_args: '--decode=3Ddecode_ase_msa'= ), decodetree.process('tx79.decode', extra_args: '--static-decode=3Ddecode_= tx79'), ] =20 --=20 2.31.1