From nobody Mon Feb 9 17:59:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635358190; cv=none; d=zohomail.com; s=zohoarc; b=a4M5Vi66svJfna6392MfCq1AZVaT4JAa36b4mTynKV0RPmP2BBMp/fyWfEJ0OB5IxTORp6k008a6RpnHTJU2Fwc7zCYxCj05lb9/+L4+OiGbahVKM3B7QMyifP72OwMoO7gUGFl6c/DBBAKloYPdTp5W+iCVlePCwaBH2eypIZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635358190; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Aw01qurvZgVJm3hzFcpb7GCT541369XMRKPF+7337Yg=; b=l8810cZjdCGXWOtdcyu2Y5zoXMpknJvJ+j2HlD5o4ZeDxuqfw98oxYZ3PSPY4iP+NHx6CQxF/M+IZv8JC76yTnrqP9YRnZVmqBOWcKPvPCHA0RPtLcl9QXltu8RwXdK/rqAL+SKMzxJHpIhQPjqzZm5sexNWPa1TECyRLRBR7/w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1635358190130649.3457467112623; Wed, 27 Oct 2021 11:09:50 -0700 (PDT) Received: by mail-wm1-f48.google.com with SMTP id a20-20020a1c7f14000000b003231d13ee3cso7031509wmd.3 for ; Wed, 27 Oct 2021 11:09:49 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id e17sm702280wrx.18.2021.10.27.11.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 11:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Aw01qurvZgVJm3hzFcpb7GCT541369XMRKPF+7337Yg=; b=Mxkm09txG8ll7mFi9bmRcKWa3cvAFQkq/S3mB5WdmIMnRRDNvPbWEU1TEzLXpqkJqa zA48dp9vpZMgv5720n/JQ/jMyU1p1vzPcGtzjRLBw7avnTNl3VUWePuWDRQJoTO/msbK XIEs+lXAtyVXeiETPEbyqfuQIOqp2aKvjo/QqLmTWSAWM+YIRY3EwIKPpsGGlopFJ30g Y5rqAcvKqeCmX5sLEMwADBNlbOk2TvE5Y89m9diIwtXIEO6VqiIspqLp2QRBF8rOxOZ4 A3xNeXsHKI+4Zo0gziANkVrM65xZWSV1hdq88ET0mJdBJx7OBedMgLxLwo8UhXkPyxgw h6tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Aw01qurvZgVJm3hzFcpb7GCT541369XMRKPF+7337Yg=; b=eds1U7Z1+CA0DHyHV2XGqX00Vln3/qbGm0MVAzWLwQtcNdsrlk7gPO/DJh45M2g7JY n6mzryxlDFozRUyHHY5ZS2KhPLjw7SCXcestzT23wqcY/E3hm3A9vl2VYZCloDM3PlK+ 5wlHS7tm7q2RiomtQs7lxOk5+Vqe5XbcfZsMYBz0B6Ovq+xcWAkuJ5v/WW9B1gDD+g4u 4hGNTqai21o7EvAVTUzJLxgqY4Y/g+vTEUs3BCX18k/GtLcQyUtTaW771K2rCS5iF/0G nW0x2uDW6r27kfV5qXwfJGCmE03S/TtMd+J8GFq+4eTJYBpIsekKOl5YK5dPvnz8WfuH O2Kw== X-Gm-Message-State: AOAM5315umCzd524ZMQoy9SE/7EsrdkJ6xMfsgW8/oEsBKTHdrLeFJOW S9X70Mw6rhfaIiU5j3YUBntoTZ83gY0= X-Google-Smtp-Source: ABdhPJyqyL11aqZ+2V3J3jsjv4Fo2ADMTbSU9fx6yhyBGR+dSfAQn2s97pKoJqx9EIwPA3blQjiEDw== X-Received: by 2002:a05:600c:2205:: with SMTP id z5mr7546142wml.133.1635358188325; Wed, 27 Oct 2021 11:09:48 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Aleksandar Rikalo , Jiaxun Yang , Richard Henderson Subject: [PATCH v2 29/32] target/mips: Convert CTCMSA opcode to decodetree Date: Wed, 27 Oct 2021 20:07:27 +0200 Message-Id: <20211027180730.1551932-30-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211027180730.1551932-1-f4bug@amsat.org> References: <20211027180730.1551932-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1635358190611100001 Convert the CTCMSA (Copy To Control MSA register) opcode to decodetree. Since it overlaps with the SLDI opcode, use a decodetree overlap group. Reviewed-by: Jiaxun Yang Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/tcg/msa.decode | 5 ++- target/mips/tcg/msa_translate.c | 69 ++++++--------------------------- 2 files changed, 16 insertions(+), 58 deletions(-) diff --git a/target/mips/tcg/msa.decode b/target/mips/tcg/msa.decode index 12358e7a6ba..f3ec195bac0 100644 --- a/target/mips/tcg/msa.decode +++ b/target/mips/tcg/msa.decode @@ -165,7 +165,10 @@ BNZ 010001 111 .. ..... ..............= .. @bz HSUB_S 011110 110.. ..... ..... ..... 010101 @3r HSUB_U 011110 111.. ..... ..... ..... 010101 @3r =20 - SLDI 011110 0000 ...... ..... ..... 011001 @elm_df + { + CTCMSA 011110 0000111110 ..... ..... 011001 @elm + SLDI 011110 0000 ...... ..... ..... 011001 @elm_df + } { CFCMSA 011110 0001111110 ..... ..... 011001 @elm SPLATI 011110 0001 ...... ..... ..... 011001 @elm_df diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index 56db02f73e7..4a2a02bd6d2 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -25,18 +25,6 @@ static int msa_bit_df(DisasContext *ctx, int x); /* Include the auto-generated decoder. */ #include "decode-msa.c.inc" =20 -#define OPC_MSA (0x1E << 26) - -#define MASK_MSA_MINOR(op) (MASK_OP_MAJOR(op) | (op & 0x3F)) -enum { - OPC_MSA_ELM =3D 0x19 | OPC_MSA, -}; - -enum { - /* ELM instructions df(bits 21..16) =3D _b, _h, _w, _d */ - OPC_CTCMSA =3D (0x0 << 22) | (0x3E << 16) | OPC_MSA_ELM, -}; - static const char msaregnames[][6] =3D { "w0.d0", "w0.d1", "w1.d0", "w1.d1", "w2.d0", "w2.d1", "w3.d0", "w3.d1", @@ -521,27 +509,22 @@ static bool trans_MOVE_V(DisasContext *ctx, arg_msa_e= lm *a) return true; } =20 -static void gen_msa_elm_3e(DisasContext *ctx) +static bool trans_CTCMSA(DisasContext *ctx, arg_msa_elm *a) { -#define MASK_MSA_ELM_DF3E(op) (MASK_MSA_MINOR(op) | (op & (0x3FF << 16))) - uint8_t source =3D (ctx->opcode >> 11) & 0x1f; - uint8_t dest =3D (ctx->opcode >> 6) & 0x1f; - TCGv telm =3D tcg_temp_new(); - TCGv_i32 tdt =3D tcg_const_i32(dest); + TCGv telm; =20 - switch (MASK_MSA_ELM_DF3E(ctx->opcode)) { - case OPC_CTCMSA: - gen_load_gpr(telm, source); - gen_helper_msa_ctcmsa(cpu_env, telm, tdt); - break; - default: - MIPS_INVAL("MSA instruction"); - gen_reserved_instruction(ctx); - break; + if (!check_msa_enabled(ctx)) { + return true; } =20 + telm =3D tcg_temp_new(); + + gen_load_gpr(telm, a->ws); + gen_helper_msa_ctcmsa(cpu_env, telm, tcg_constant_i32(a->wd)); + tcg_temp_free(telm); - tcg_temp_free_i32(tdt); + + return true; } =20 static bool trans_CFCMSA(DisasContext *ctx, arg_msa_elm *a) @@ -642,20 +625,6 @@ static bool trans_INSERT(DisasContext *ctx, arg_msa_el= m_df *a) return trans_msa_elm_d64(ctx, a, gen_msa_insert); } =20 -static void gen_msa_elm(DisasContext *ctx) -{ - uint8_t dfn =3D (ctx->opcode >> 16) & 0x3f; - - if (dfn =3D=3D 0x3E) { - /* CTCMSA */ - gen_msa_elm_3e(ctx); - return; - } else { - gen_reserved_instruction(ctx); - return; - } -} - static bool trans_msa_3rf(DisasContext *ctx, arg_msa_r *a, enum CPUMIPSMSADataFormat df_base, gen_helper_piiii *gen_msa_3rf) @@ -798,21 +767,7 @@ TRANS_MSA(BSEL_V, trans_msa_vec, gen_helper_msa_bsel= _v); =20 static bool trans_MSA(DisasContext *ctx, arg_MSA *a) { - uint32_t opcode =3D ctx->opcode; - - if (!check_msa_enabled(ctx)) { - return true; - } - - switch (MASK_MSA_MINOR(opcode)) { - case OPC_MSA_ELM: - gen_msa_elm(ctx); - break; - default: - MIPS_INVAL("MSA instruction"); - gen_reserved_instruction(ctx); - break; - } + gen_reserved_instruction(ctx); =20 return true; } --=20 2.31.1