From patchwork Fri Jun 25 09:23:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344695 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F758C2B9F4 for ; Fri, 25 Jun 2021 09:56:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5265661429 for ; Fri, 25 Jun 2021 09:56:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5265661429 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwiZz-0003RX-Bm for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 05:56:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi3n-0003rD-Ji for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:23:39 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:34416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi3l-0001XS-Uw for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:23:39 -0400 Received: by mail-wr1-x434.google.com with SMTP id e22so9837434wrc.1 for ; Fri, 25 Jun 2021 02:23:37 -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=irBOFPBxCcjuSCIVaZv25djnNdEgF5wNkX17oFy6cl8fXEEQJAem6RYC2+9HH1SpZo jzp9FcsKurLpqm23sMy63Q3sxf2+4resY5h7EuF/E04dVkZYnzOYQy3nGVSW+bZoopRz kKXuoUoQ3nfolZl5sI1/CZ4X1jHHVy4Fhgtjs3zTaxehhv+edzjquhmcJt3wETwvK7bX phMlStNx0kvIYAFSCpJ6V3//E4Kr136fewp0tLZf3YHmfwq29Hgtv9mHvt3nQ6W7srh+ stMl4hcMp+NNzQ1J4Afi1VRFAyYNgDErFsAsFB7tJxYVnJSFW8mpMrAQoesT5LKpRGQj QZIg== X-Gm-Message-State: AOAM530z8hF9J91wUGmGC3H6ZOKPFPyLuRwTYaJ5F7Mucrum6OF1ocTH ikVvgfClfVrjSzUMI1UsD41r39f43E7HiA== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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/tlb_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" #include "cpu.h" #include "internal.h" @@ -659,7 +660,7 @@ static int walk_directory(CPUMIPSState *env, uint64_t *vaddr, w = directory_index - 1; if (directory_index & 0x1) { /* Generate adjacent page from same PTE for odd TLB page */ - lsb = (1 << w) >> 6; + lsb = BIT_ULL(w) >> 6; *pw_entrylo0 = entry & ~lsb; /* even page */ *pw_entrylo1 = entry | lsb; /* odd page */ } else if (dph) { From patchwork Fri Jun 25 09:23:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344655 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8054BC2B9F4 for ; Fri, 25 Jun 2021 09:49:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 310936142B for ; Fri, 25 Jun 2021 09:49:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 310936142B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwiSZ-0008Vt-9E for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 05:49:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi3w-0004Ab-1H for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:23:48 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:40861) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi3r-0001cn-F8 for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:23:44 -0400 Received: by mail-wr1-x436.google.com with SMTP id g7so5197326wri.7 for ; Fri, 25 Jun 2021 02:23:43 -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=RxgAtbmJYdJiBvoSOa2Fnr/wkmdepFqfQfbmO27bKVWMxYnRPpgkkWrx8cdNrb9L5a Nj90A/YAXouM0K/8VCA6cSq88ltS6boFamQdL2bqxNC9ED9JCDktb0tsF5C+ddzdvWYJ W+VDI+tWMk1yMX/sVssI5D2AhKSGbIRCfDpuPW/Ud0ui0NgVeORIRk4oosxJw4OLrcKj THxg8X+gCf6Xo+MSB+kevd4DpmwR1OZwtt45SGuAnQDMULuruJzpUWcVL+sB+gmongF6 fjldlA4m9pMxH+QGVg8MkZR/sMy9+FaNTGfNC06EVUtBpkZiRuHPjdNH3KBUF1QsOgO/ ov5w== X-Gm-Message-State: AOAM530um2oHwPBwrO/28tUpViCu1uwO/Uykrr9r9Lp8RdYS6GThztnc oDgkjiIK4EKZLsTMYCu3txrWFr0NpfRLfQ== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x436.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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: From patchwork Fri Jun 25 09:23:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344701 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D2CAC2B9F4 for ; Fri, 25 Jun 2021 09:58:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C14E26142B for ; Fri, 25 Jun 2021 09:58:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C14E26142B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwibu-0008TY-Up for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 05:58:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi3x-0004GV-GP for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:23:49 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:34419) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi3v-0001eg-TE for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:23:49 -0400 Received: by mail-wr1-x435.google.com with SMTP id e22so9837951wrc.1 for ; Fri, 25 Jun 2021 02:23:47 -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=ak8cOocBJdftnX4ttzAeG40fq9hIMPtK1XFueuUoAXkjnl6SWYhWABAtqfOHFbI7m9 IcL1L//Q8Wkj9Wfs95Z4LIQyXFM2r4ejqeS0oQ9gIKwce9d40l8/U6n313XGargU3uNb D2WxC0fOobs2rRMVRuNKMVA1mwHTuuOjB535gdD/+3Hg/XY/IIJ05XSGiS6TVYymz7y6 UYj3E+icCKFaf9MXDqaQbzG5fjTzn/Nc8pvsRoLDC4eEOfOjQHEjsgnKDqPbayJj9HPB cI87l2asqQ07iOt8oniR9ZgrzHGxFtWmAx2nB6J8GzqhZZsEAWI71D6OLyniGQT/fldT GffA== X-Gm-Message-State: AOAM531km6ANpOoRkWuRqVWHWtO6rAjP2XBPKzripc2KGuDgcatcoE81 kRqsRyFtX/ZSr/Xm3D/S990wtYfv/B94QQ== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Fix multiple TCG temporary leaks in gen_pool32a5_nanomips_insn(). Fixes: 3285a3e4445 ("target/mips: Add emulation of DSP ASE for nanoMIPS - part 1") Signed-off-by: Philippe Mathieu-Daudé 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(DisasContext *ctx, int opc, gen_reserved_instruction(ctx); break; } + + tcg_temp_free(v2_t); + tcg_temp_free(v1_t); + tcg_temp_free(t0); } static int decode_nanomips_32_48_opc(CPUMIPSState *env, DisasContext *ctx) From patchwork Fri Jun 25 09:23:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344663 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A3D7C2B9F4 for ; Fri, 25 Jun 2021 09:51:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 39DAD613EF for ; Fri, 25 Jun 2021 09:51:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 39DAD613EF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwiV8-0005vr-DG for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 05:51:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi42-0004Zw-Bu for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:23:54 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:33730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi40-0001hn-NP for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:23:54 -0400 Received: by mail-wr1-x42a.google.com with SMTP id d11so9876590wrm.0 for ; Fri, 25 Jun 2021 02:23:52 -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=mZcolQIpzQC+5qz/MGgt5zL0gpoSsVqvGwleKxXu5qBZUnwevz3dRq/VNDtfkSvf7R uEZ5vswCV15/3SOjTdZzy7T1clRSH98peKmzjqzOpaeXcduGbVdsTAL2ogd9PtkpPHEO O1d2YWtuQxKmZj/zGUGjtEXgvN0UuKihbkknbOS3qT9m/oWv2dPdlmHymAn2X7m0rdqF 8ArqZ6zwYgTxU48Hr0Cdbsx3REYskz2y7X5y2eCj11ntgq8ma3OgBMp7PO7jbjX9FVVw Bu/6ZV3+1lqbhSf04SOSbPNIRHBVzW4uCoaOLDW8i5ZlbT3X2KD0hPGkX0opVK8IIj6I zwZw== X-Gm-Message-State: AOAM533Xxg4MaQcR2hT59VDgYjj9iP2G5rXZ0bgCJCDYKsc6VagrLV2y W/EPTeLJfIlHnduq5nJlzkkTCyxq9UF5jw== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aleksandar Rikalo , Jia Liu , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Per the "MIPS® 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 = $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é 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(CPUMIPSState *env, DisasContext *ctx) { TCGv t0, t1; + check_dsp(ctx); + if (rt == 0) { break; } - check_dsp(ctx); t0 = tcg_temp_new(); t1 = tcg_temp_new(); From patchwork Fri Jun 25 09:23:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344719 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F961C2B9F4 for ; Fri, 25 Jun 2021 10:09:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0789461428 for ; Fri, 25 Jun 2021 10:09:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0789461428 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwimX-00015x-4g for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 06:09:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi49-0004jM-Ls for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:01 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:55145) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi45-0001lS-Oj for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:23:58 -0400 Received: by mail-wm1-x32c.google.com with SMTP id u20so629737wmq.4 for ; Fri, 25 Jun 2021 02:23:57 -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=Cqbh2pThM4UGK518n3pfON8d84NF9jWTKgQPtSKYBTVo6mWe4ZtPhjVR9upRUcprtF rJkFQ5n26BNph/q6Hi35oBe7zawerdghnwJidBZzpzXd9FlrrR7dDrCbzqXAx7Q1fDav tCmwv5krMAW1JU/+WA3Ble8GmHOEmPwFYiGD+nHHQvNfLZxpc/9+IT9DULdjxHj3ZRur 61pZu/qsaxEkCcbiorF6AizWXp3MNNkTBMj0mIsv7PHTcQCDBs386Ss5XyMNAWOxCGIU kjbkQ+ByLUxmAxCjVtrrSAY4g5vrrMaT4xfo9BB6/t5sngVyJkKCOCl76JGBJqRPiCB2 lKAQ== X-Gm-Message-State: AOAM533TN3fM/53rSf4CgOIH180TvcylinP6d9aXbLi+j94oMlm+2r6R XR1nt2VCmTHo1EoA0oiTCRsu0CO8EXj2/A== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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); } } } From patchwork Fri Jun 25 09:23:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344705 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C5F6C49EA7 for ; Fri, 25 Jun 2021 10:01:25 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3891B6142D for ; Fri, 25 Jun 2021 10:01:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3891B6142D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwieK-0004Ue-A0 for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 06:01:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi4C-0004m8-QS for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:04 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:43571) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi4B-0001n5-6K for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:04 -0400 Received: by mail-wm1-x329.google.com with SMTP id p8-20020a7bcc880000b02901dbb595a9f1so5386516wma.2 for ; Fri, 25 Jun 2021 02:24:02 -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=X4we0tFnSrB5xs7WOpRO+u0qYkXkJwfU/HXFgmX+kcDab09S5GJj3/SxBuutV3fxys 7+zhtf94UsEWoHkH0DS6Dl0UvUkBdp6fWzu2LHw55c7y2loUiw93vwM7DG4zg9zGvM56 RTZqjqNMpc0+ADDFzhqt8HKiPQK/bgthmLxc60f56W7MHsxXtASUaiAHvlvu8ue5xAyL +9QaE53jM69r2NgC8ClqIeztguWMiQ5bIBOaG2tuU1/Yj4NdV+pXOHHqmsOplkpaCMnA JPqT4Pf0yMH9JtMZ40agA/g58Wt45huNxmWhaRI0pmvoKTr7dGx798uY9tBQsHtiy/36 wJXg== X-Gm-Message-State: AOAM532umFv5eYU9rShvYLOeCO6duBcSlP+tktRCDwDPE4F0JNCe+LVz n6rPXGNs3C7NaRR2lehm2fITVnBKzvnA7Q== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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/{ => 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/{ => 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" -#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 From patchwork Fri Jun 25 09:23:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344657 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7321C2B9F4 for ; Fri, 25 Jun 2021 09:49:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 964F26141A for ; Fri, 25 Jun 2021 09:49:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 964F26141A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwiTE-0001R2-PE for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 05:49:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi4H-0004s0-Bb for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:10 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:46905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi4F-0001re-Mz for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:09 -0400 Received: by mail-wr1-x42d.google.com with SMTP id l8so1054098wry.13 for ; Fri, 25 Jun 2021 02:24:07 -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=rh7DYDwUTyPNepNLf6+OAXsKrVeG2IloPrqD1hFkS6hQi13nXoLhoKcTME0XP1MF9T g2ozQeyGsk99sqiZ0J6PeOPE4r5YcQN1QIgxBOQMDq8uVvA4ezhdTAZ/zc7RwoKQ9z05 QDA1hAnT2kUH1/J03MlNniSUvkanjTSKijnBBWcb/rxUQ1JecmfHp5dxzE1qeaDPWRix bF0dDSvNkASHqglDX5CzHm03/fVe1QoGIin5Vc69gpy1sVmvynBoDiAyYjWXPfKlerwu 2APJph3iHWculzMhDU13fxsAgLSpsJccAuK2G37lrMJpXQVneocXGPH08XhalJTp5kgg flqA== X-Gm-Message-State: AOAM530WEavWpJuk11AxlHgHfecBg89FjkMVvxLtGkADqyiSgZjSThn/ urd8+JJYlOdffjfPk3z1CrPL/iGnQcfXjA== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é Reviewed-by: Richard Henderson Message-Id: <20210617174323.2900831-5-f4bug@amsat.org> --- target/mips/{ => tcg}/translate.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename target/mips/{ => 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 From patchwork Fri Jun 25 09:23:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344711 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 408B4C2B9F4 for ; Fri, 25 Jun 2021 10:03:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 06AAC6142D for ; Fri, 25 Jun 2021 10:03:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 06AAC6142D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwigE-0000LA-J8 for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 06:03:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi4M-000555-3l for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:14 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:47088) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi4K-0001vC-Gi for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:13 -0400 Received: by mail-wm1-x329.google.com with SMTP id v20-20020a05600c2154b02901dcefb16af0so5379492wml.5 for ; Fri, 25 Jun 2021 02:24:12 -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=mRVYuNORMVn7GHbuQ6zQ+pLi325jFb0x4eXYUzZQMmzITSb717I2eDFA3mRv8gf/LN ZZ0sIQHalLO2kjJB6XRhNSMnDz6q0L7NtJFL9ex5yOhIjN+L7XQmIVKMBVyrLHUhtZRp paPBvJ6C4a4GZTbUQsdy3OYfdZm3+h7xuCTzNU8pU4l2KnO0MVD84i4RmPBlje/bjI/y eUs5QAXuFCHBuKbvFwXxyWEGjDcQIzGmqUnRg//TguVVAHeCtEJljMCDjnH2MAOimPCl kSQV17ifTRInQBiX3ZQ9IzZGw0C5ynInifGSV4IMXb722VPP3z0ddhETqwlMtQtkxErf n0Pg== X-Gm-Message-State: AOAM533gi5fvPVOBpOTAdDDvp1yI07Zc43JanVmeM9oL30qT3Qkz5Udn DlfAlTF/Uf3dKQGs805LKL1gSVve6mK8xw== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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 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, uint64_t addr); bool mips_um_ksegs_enabled(void); void mips_um_ksegs_enable(void); +#if !defined(CONFIG_USER_ONLY) + /* mips_int.c */ void cpu_mips_soft_irq(CPUMIPSState *env, int irq, int level); /* mips_itu.c */ void itc_reconfigure(struct MIPSITUState *tag); +#endif /* !CONFIG_USER_ONLY */ + /* helper.c */ target_ulong exception_resume_pc(CPUMIPSState *env); From patchwork Fri Jun 25 09:23:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344721 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7EB6C2B9F4 for ; Fri, 25 Jun 2021 10:11:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 62A9B61436 for ; Fri, 25 Jun 2021 10:11:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 62A9B61436 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwinx-0002eK-FR for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 06:11:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi4R-0005Pi-2T for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:19 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:44011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi4P-0001yy-J2 for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:18 -0400 Received: by mail-wr1-x42e.google.com with SMTP id a13so9799846wrf.10 for ; Fri, 25 Jun 2021 02:24:17 -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=Ryx5vxT3U92ILiS0rBGNp0mOWUlTO0RDCuU8r8Fqx2/sfLR/LLPzXVm03XnsOmdoGD WMAuRnA1s2DiPpPLcoaYn/A39DePfgPf0ZrCggGXVB6AXvOYums3RR9TwSUU2Pdxy0ET kSne/pmMGaSvRMYQWUU74s/Ztsc6FOlJxv9CGbM8E49OZnRFzOsorm88fI/DQrd494cC UZ6BLSS1Hq5MEWVa/SUtxjU9pT6IqJJ/kj30v/jct3vuYf3/wSJfj5I0i4JD/m+aXhwa cr9cXhtn9BJaLRlaMAGS5JMAoWGKbkz4j+kyUpqEPwRh1HPGuZXLbPhnA28xvhHN28xV H/Kw== X-Gm-Message-State: AOAM531ZkhwPsCHBnwgKwYlIrm/VD4g9s0VEAbn7ZvSUasSktQft7WJB fo/b8vDMhThD5k5MModAsINR5o92RJvLDw== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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) } -/* 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) From patchwork Fri Jun 25 09:23:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344723 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9D69C2B9F4 for ; Fri, 25 Jun 2021 10:12:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A2D5761438 for ; Fri, 25 Jun 2021 10:12:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A2D5761438 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwip3-00045o-QM for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 06:12:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi4W-0005is-6m for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:24 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:35533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi4U-00022N-Lu for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:23 -0400 Received: by mail-wm1-x331.google.com with SMTP id j11-20020a05600c1c0bb02901e23d4c0977so7387512wms.0 for ; Fri, 25 Jun 2021 02:24:22 -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=NoA+ZsYYLAcub+zEhYdYWAgPaWClFCFZOo//OVaHpXNeMhU1lK73uSEn84WLmtNvVt CuNiP3giF/5ITV6BOLrQdkIRB72YvgNXaJDyKVjHe1tJebXFnr7Jy40aaM33/JoNiac9 ZxH4x5tAbeG66qdJfwp1c9K0nxvlLpFhZ8cT+Ewyir7HvoLbmmpHx4Sje/v8fS7GQhF/ mSN7aYY8mAURVDf8J3djXW7+5YZaZdFfEa2uUYzGiy38+ma44k0faNXcxssHQCV1NKhv B7UTxvOZkjVF4ZJ3+Tr5ULRFS0kh4UArHDDzbm+2nSHMuqvC2woFeCIkLzp5jKsgqmAg lMrg== X-Gm-Message-State: AOAM530BSYm3zBkd6OQSmo9qw0a8fgUt/rFLw6N6FGn6OB0+Ce01Vhjl ANTbmTaKVjGnFj3cV+7w4X7/jdL/wzKyZQ== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x331.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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 = 0x13, BC2F = 0x14, BC2T = 0x15, - BPOSGE64 = 0x1a, - BPOSGE32 = 0x1b, /* These overlap and are distinguished by bit16 of the instruction */ BC1F = 0x1c, BC1T = 0x1d, @@ -16121,10 +16119,6 @@ static void decode_micromips32_opc(CPUMIPSState *env, 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); From patchwork Fri Jun 25 09:23:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344665 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41DB2C2B9F4 for ; Fri, 25 Jun 2021 09:52:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E4205613EF for ; Fri, 25 Jun 2021 09:52:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E4205613EF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwiVf-0007K4-Tv for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 05:52:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi4b-0005zp-Cw for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:29 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:51728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi4Z-00025Q-Hl for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:29 -0400 Received: by mail-wm1-x330.google.com with SMTP id r3so1281822wmq.1 for ; Fri, 25 Jun 2021 02:24:26 -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=OjMBCe1P23tFy9wqFr0F2VScMHuRZ6F444azrDzeE5UxGXpHAjpFPR1X7r3W9XDg5B XHOWqFpomtinXssgJBPTTzFxgUCgAMzKLI6F8LoNhYS+EsVsqzbtV/0Q0iNROS+pXaEZ UrBq2KYFyjcN+Tkurb2nTt7xZJC5Yn1AchOaap/sTJhcJmHqBH/dNtzr/VBQfhKtMLvx XUvrzCD5IR7YVKBrwh3AtBOGsYLZ8Pk9uoMkzLZMGHFv83hjFUhvhsVtaBS9xLMLCfEV 2qkR7LApCndnI8HoL2YF03qJ5dALiyKzpiAgeo9/4RD8Aewtj1lX9HlOz8KFWrMmzRzI g2KA== X-Gm-Message-State: AOAM533Aae4VDYLDAVqksC9oLn4wxV+zVmaTysr2YPtl+V71CyvVnNTU 0B08iM5/qHsYVjVqOrYnCBpAYF3GpxKzRw== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x330.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Filip Vidojevic Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Aleksandar Rikalo Per the "MIPS® Architecture Extension: nanoMIPS32 DSP Technical Reference Manual — Revision 0.04" p. 88 "BPOSGE32C", offset argument (imm) should be left-shifted first. This change was tested against test_dsp_r1_bposge32.c DSP test. Reported-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Rikalo Signed-off-by: Filip Vidojevic Reviewed-by: Philippe Mathieu-Daudé Message-Id: Signed-off-by: Philippe Mathieu-Daudé --- 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; gen_compute_branch_nm(ctx, OPC_BPOSGE32, 4, -1, -2, - imm); + imm << 1); } break; default: From patchwork Fri Jun 25 09:23:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344685 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 077DAC2B9F4 for ; Fri, 25 Jun 2021 09:54:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A8B8161419 for ; Fri, 25 Jun 2021 09:54:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A8B8161419 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwiXw-0004Ze-MJ for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 05:54:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi4f-0006Gw-Ks for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:33 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:39883) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi4e-00029A-25 for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:33 -0400 Received: by mail-wr1-x432.google.com with SMTP id b3so9815568wrm.6 for ; Fri, 25 Jun 2021 02:24:31 -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=OD12A/0Qyh1Plj/2EJBS5T6c9racVM0mdDYqQLaJuIyKGVKy2Qz+SrFY8Sil8QMiwE QVzykPRgxL6A7IIsojtyEJAXJ3i09bk/anWh2no5P7ifQ2anqRU3pBiOoLM8yrIkeE48 araWc92K/BeYWVgIUotCdHBwBDrb6BMekPgT20UrZOrj6iMHsfmPyJXFYgQcgbtt1XWw mu7nY6ihJr3HJh6r64xPKI7kwn0NrxYKVXZrWGxg5CRpkhBhgF+Y7hdQQhju068IZQbk LHRHUNzdsDOUH8KnO0LJhm8OHPxXpH7KQwLkb7oYmiiF7YSstznWhjPKKaUWhPmAqEnl 8wUg== X-Gm-Message-State: AOAM532eUVXUlxlR6xk1QTtUnMs6K3YHvsCYVxPFJnK6TZPbW3y8WZ7J vOn7U9YarDgU+wRigRqDjoptnSzaKepKbA== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x432.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Keep host_to_mips_errno[] in .rodata by marking the array const. Signed-off-by: Philippe Mathieu-Daudé 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/mips-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 { }; /* Errno values taken from asm-mips/errno.h */ -static uint16_t host_to_mips_errno[] = { +static const uint16_t host_to_mips_errno[] = { [ENAMETOOLONG] = 78, #ifdef EOVERFLOW [EOVERFLOW] = 79, From patchwork Fri Jun 25 09:23:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344683 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A93AC2B9F4 for ; Fri, 25 Jun 2021 09:54:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B471B613EF for ; Fri, 25 Jun 2021 09:54:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B471B613EF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwiXK-0003Ev-QD for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 05:54:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi4k-0006bC-IA for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:38 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:55153) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi4i-0002D1-R8 for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:38 -0400 Received: by mail-wm1-x330.google.com with SMTP id u20so630920wmq.4 for ; Fri, 25 Jun 2021 02:24: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=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=fn3nRLNaJ9XLbUIDclP4U60oKvWqZSTcoNRDUvD79LybkSieKbNd6n63k7GJelrHZB YRgzhvMqruaZfYiVa+HQDnvT3M7G4NfqqvAx1uqjRdZnxXWHqYy7a3RnwLdPabDAcDPv Vps2yfG2EE8eLKNr7jeNTMYQspFBXk2/2cU7znO6UNCvZb+2Znn1oK8vCDnFftQNBAYK M3y06mW7zt/UkLe9QfB/uNR5U/yYSYLLFw3njOsiysp9r8gu2xWiJjYMvSU2X9gVFQvh 9XLFg3uBlMWMF8DagU3WBxZM5vA4qOU8f3dxDRLTBGtb2j37TMUabgyRtFlqdI6pjLVL cTKw== X-Gm-Message-State: AOAM5320yggyJ0aabUUzanNkayD3cNxWmuknD/ts8OXvyIhjMviYwOYJ yqRTG0YdgYrdfGpQgpsaRRlAHd0PKtm2Iw== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x330.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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; }; -extern const char regnames[32][4]; +extern const char regnames[32][3]; extern const char fregnames[32][4]; 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" -const char regnames[32][4] = { +const char regnames[32][3] = { "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_translate.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 = (0x7 << 23) | OPC_MSA_BIT_09, }; -static const char * const msaregnames[] = { +static const char msaregnames[][6] = { "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_translate.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; -static const char * const mxuregnames[] = { +static const char mxuregnames[][4] = { "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", }; 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 -static const char * const regnames_HI[] = { +static const char regnames_HI[][4] = { "HI0", "HI1", "HI2", "HI3", }; -static const char * const regnames_LO[] = { +static const char regnames_LO[][4] = { "LO0", "LO1", "LO2", "LO3", }; From patchwork Fri Jun 25 09:23:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344691 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55958C2B9F4 for ; Fri, 25 Jun 2021 09:56:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 21A2C613EF for ; Fri, 25 Jun 2021 09:56:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 21A2C613EF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwiZH-0000aN-8G for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 05:56:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi4o-0006rR-UO for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:42 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:44950) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi4n-0002Hd-BX for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:42 -0400 Received: by mail-wm1-x335.google.com with SMTP id h21-20020a1ccc150000b02901d4d33c5ca0so5389379wmb.3 for ; Fri, 25 Jun 2021 02:24:40 -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=RuF1F391+FCC0i/pozbgQ+qrY8I1bONIbJJzdCOY6CLBRyJgCqQIjB/eQtQ5IZgVDj lxw52mDh0r1NGo6GpVB9ZxkSERMlLxgSHojhJ+4v3lv72JnXIJtXLNmMaLz0fGkFC8sJ RHfVxv3fmPsrxcGv5IjQjRwQTm8ExitGHIdz6VPbdW4qz9rBv/S2xhHjTTTaXH13QgbW VJ3nJwuXjqd2QTqcfo4+tUA0lmh1LMeb8RZ3iGauD67xIwdaAfnlxqp0q/5F01B3SR5f A8R549x2AJmd0IU5/7l1ZSyQnBKrO1IdbjaG/YYIjRZPM4Khgjh8b2qYhRzuAfvQiWNQ g0hg== X-Gm-Message-State: AOAM531+mJar0qyLURetRJ5Aq93PvEROcK7/mUDhCsgYw29iNtkFblIt eYfjzjJNa0kWJtQ5f+fVlllJXletuS7HfA== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x335.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Only trans_MSA() calls gen_msa(), inline it to simplify. Signed-off-by: Philippe Mathieu-Daudé 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_translate.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) } } -static void gen_msa(DisasContext *ctx) +static bool trans_MSA(DisasContext *ctx, arg_MSA *a) { uint32_t opcode = ctx->opcode; @@ -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); return true; } From patchwork Fri Jun 25 09:23:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12344693 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BA63C2B9F4 for ; Fri, 25 Jun 2021 09:56:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D0A216142B for ; Fri, 25 Jun 2021 09:56:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0A216142B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwiZb-0001yA-Vv for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 05:56:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwi4v-00074H-Op for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:51 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:35533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwi4s-0002Le-4B for qemu-devel@nongnu.org; Fri, 25 Jun 2021 05:24:48 -0400 Received: by mail-wm1-x32e.google.com with SMTP id j11-20020a05600c1c0bb02901e23d4c0977so7388245wms.0 for ; Fri, 25 Jun 2021 02:24: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=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=NpZZP2GjnOABcafJMiRbOXMF2YUeqrPYiXyGBOJjJmceCPT+dwChsdDhSYaTBRCSI8 asQFV/EiQ6tVLAhc1Rghvp4jtUTT8+8HQkCIV6Id1UejnqKBwiyDFQC3sRzryyik/kEK KGZ7nrgdKAgEMQ3Q3C2pgFIsTiHF7yMawhXc0ZRurrWixq1DL3pPD0c/khJxlF4PDpaJ W4JTNk6Lf+NGWFcdn/St3aP/JQSK7CexSM6LdA8Q/z7c3zSnALPdstL+COZ8v8f4WXLq lusws43QMrTNG4ow93A1Y+04jtwBc6f4+ghfh6g7eLqUWarIZ0gfoM/s9kvdFLTQeOWi al2Q== X-Gm-Message-State: AOAM533r2UL664JJFMOj3djdusEVLqJ60Pk39jTTdXB4A/EiULCndSZE k8r/mcR3q9DUrCB0+GYpJqA66/uiFuhqNQ== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aurelien Jarno , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We don't need to maintain 2 sets of decodetree definitions. Merge them into a single file. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20210617174636.2902654-3-f4bug@amsat.org> --- target/mips/tcg/{msa32.decode => 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 => 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) &rtype rs rt rd sa @@ -19,6 +20,7 @@ @bz_df ...... ... df:2 wt:5 s16:16 &msa_bz LSA 000000 ..... ..... ..... 000 .. 000101 @lsa +DLSA 000000 ..... ..... ..... 000 .. 010101 @lsa 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é -# -# 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_translate.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" /* Include the auto-generated decoder. */ -#include "decode-msa32.c.inc" -#include "decode-msa64.c.inc" +#include "decode-msa.c.inc" #define OPC_MSA (0x1E << 26) @@ -2269,13 +2268,8 @@ static bool trans_LSA(DisasContext *ctx, arg_rtype *a) static bool trans_DLSA(DisasContext *ctx, arg_rtype *a) { + if (TARGET_LONG_BITS != 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 == 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 = [ decodetree.process('mips32r6.decode', extra_args: '--static-decode=decode_mips32r6'), decodetree.process('mips64r6.decode', extra_args: '--static-decode=decode_mips64r6'), - decodetree.process('msa32.decode', extra_args: '--static-decode=decode_msa32'), - decodetree.process('msa64.decode', extra_args: '--static-decode=decode_msa64'), + decodetree.process('msa.decode', extra_args: '--decode=decode_ase_msa'), decodetree.process('tx79.decode', extra_args: '--static-decode=decode_tx79'), ]