From nobody Mon Feb 9 11:06:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.67 as permitted sender) client-ip=209.85.218.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1608073087; cv=none; d=zohomail.com; s=zohoarc; b=ZKnBpzpJKm0qzM49iWtQoiAB9pwz4OqidjoEzqKU1OHTIEBc29D0jE4173z0hrlXX+BGH3Be0l6oD91JIzQEnZwWoupiVxGnHCmllDFPIJrdDnM1R9wFvwDNPe9Q96lbQLp0qAFsTDoM2p8i28SkaOCrqdCNHPXtapYpbaMQm04= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608073087; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eBR/KP1XMbhrcgssotJd4G/2avIMrBZMV7G4WmoiWo8=; b=Pv2AMvKg7WdF058QEZ4Im+DRjiljTJ7mR3DITCmck6rn1RrXK5CIVIjH26mVMQqfFu9UrBcZlHV58+CYA7AkU75a2DBgjm6lHnqu2qGXBlQYU6MAehSE8Lyac9nm1U6BloeaLTQj2jydHqgc5eRCH1usrVbEzUx1BIrRrBqlFTU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by mx.zohomail.com with SMTPS id 1608073087705546.3412160715542; Tue, 15 Dec 2020 14:58:07 -0800 (PST) Received: by mail-ej1-f67.google.com with SMTP id d17so30055914ejy.9 for ; Tue, 15 Dec 2020 14:58:07 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id o33sm19828818edd.50.2020.12.15.14.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Dec 2020 14:58:05 -0800 (PST) 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=eBR/KP1XMbhrcgssotJd4G/2avIMrBZMV7G4WmoiWo8=; b=YrR0Z5DqkFBEJMEr1NVzef+bcwtTkoahx68HU/I9evKCqeSbblFgtzi4VwkRteuGlB alrA8YVrKnFX+Qmh04SBwbi4UktTCu8JTa5GIZoLuSqedrTqamgZjvge9k/ZMuj6RZv9 0RmgIsSUZFdr60RFQPWxo20uMyRah+OAv4Hg0lBOEJrNCJXPTkVex4JsV7Td9l1UrgH8 18sLjhIGG44a2+kwmIh29I3kxxH6eUDWLFp+NT3KAxoazrkdaDiEpHpw4+vvcikbRRB9 Hpab1AIgsyW6ZGURc5Qrd31/2aT5JgQyU4ESaIVP0R1q+at+GxzUWO0g1NhFgG7SS0xd o/Zg== 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=eBR/KP1XMbhrcgssotJd4G/2avIMrBZMV7G4WmoiWo8=; b=qEHCrmx/SUMyQZtIPC7KBoGSRelflOIcBrEtuBYsntDrkt0j8J/qkC4+LtDT2aBaLN scvxf+/typoMcPVyJsvtA44856gZiSwoCfUVKOeqfnvNUPQtO8S2dcX8JtI5WNLLfTXN +eB/aL2pp1MTGN+SLuL+Z0fUgkC/deDdDcoBHLyg1dvhfzZJyKrztaqxqAo30P8zLZd+ AgX0r49oWA+q2lSQpJr5g5JhkoaNQYwWuwXMyx3u+pmxs721nn1Gb1OQCoU3hi5nnyRP dWXDslGZwIzGt7JFi1faI2WzrSKhHz0kBBHypikUtCIzqBEBmSu3G+/6XC13CI5H2myC kU1g== X-Gm-Message-State: AOAM53009giVokosxRbLPPOZR5bKS3gcg1wW5Za9ZKZT0sUnI0Mc8uAT f1+z/7ORWTbpXvYNYFYps9Y= X-Google-Smtp-Source: ABdhPJw8ylReeQsh/8yN74nzFbXTfd16F9/1BaCqotQgh4xKhIEOL+x+fifCJ+4D13ea5/hOaaDSYg== X-Received: by 2002:a17:906:4a4f:: with SMTP id a15mr29198657ejv.541.1608073085939; Tue, 15 Dec 2020 14:58:05 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, Aleksandar Rikalo , Paolo Bonzini , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen Subject: [PATCH v2 01/24] target/mips/translate: Extract decode_opc_legacy() from decode_opc() Date: Tue, 15 Dec 2020 23:57:34 +0100 Message-Id: <20201215225757.764263-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201215225757.764263-1-f4bug@amsat.org> References: <20201215225757.764263-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) As we will slowly move to decodetree generated decoders, extract the legacy decoding from decode_opc(), so new decoders are added in decode_opc() while old code is removed from decode_opc_legacy(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/translate.c | 45 ++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index cc876019bf7..5c62b32c6ae 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -30518,30 +30518,13 @@ static void gen_msa(CPUMIPSState *env, DisasConte= xt *ctx) =20 } =20 -static void decode_opc(CPUMIPSState *env, DisasContext *ctx) +static bool decode_opc_legacy(CPUMIPSState *env, DisasContext *ctx) { int32_t offset; int rs, rt, rd, sa; uint32_t op, op1; int16_t imm; =20 - /* make sure instructions are on a word boundary */ - if (ctx->base.pc_next & 0x3) { - env->CP0_BadVAddr =3D ctx->base.pc_next; - generate_exception_err(ctx, EXCP_AdEL, EXCP_INST_NOTAVAIL); - return; - } - - /* Handle blikely not taken case */ - if ((ctx->hflags & MIPS_HFLAG_BMASK_BASE) =3D=3D MIPS_HFLAG_BL) { - TCGLabel *l1 =3D gen_new_label(); - - tcg_gen_brcondi_tl(TCG_COND_NE, bcond, 0, l1); - tcg_gen_movi_i32(hflags, ctx->hflags & ~MIPS_HFLAG_BMASK); - gen_goto_tb(ctx, 1, ctx->base.pc_next + 4); - gen_set_label(l1); - } - op =3D MASK_OP_MAJOR(ctx->opcode); rs =3D (ctx->opcode >> 21) & 0x1f; rt =3D (ctx->opcode >> 16) & 0x1f; @@ -31269,8 +31252,32 @@ static void decode_opc(CPUMIPSState *env, DisasCon= text *ctx) break; default: /* Invalid */ MIPS_INVAL("major opcode"); + return false; + } + return true; +} + +static void decode_opc(CPUMIPSState *env, DisasContext *ctx) +{ + /* make sure instructions are on a word boundary */ + if (ctx->base.pc_next & 0x3) { + env->CP0_BadVAddr =3D ctx->base.pc_next; + generate_exception_err(ctx, EXCP_AdEL, EXCP_INST_NOTAVAIL); + return; + } + + /* Handle blikely not taken case */ + if ((ctx->hflags & MIPS_HFLAG_BMASK_BASE) =3D=3D MIPS_HFLAG_BL) { + TCGLabel *l1 =3D gen_new_label(); + + tcg_gen_brcondi_tl(TCG_COND_NE, bcond, 0, l1); + tcg_gen_movi_i32(hflags, ctx->hflags & ~MIPS_HFLAG_BMASK); + gen_goto_tb(ctx, 1, ctx->base.pc_next + 4); + gen_set_label(l1); + } + + if (!decode_opc_legacy(env, ctx)) { gen_reserved_instruction(ctx); - break; } } =20 --=20 2.26.2