From nobody Sun Feb 8 23:57:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1608126227; cv=none; d=zohomail.com; s=zohoarc; b=PuehNdOS14qHbyjcag6h8pUDPcGtFGWASyWXVP7ciKmAc+zh5EXtyfDtBu3XPDHRzZRrhELL/rGsAyefk0AmenF0yOy5DuM1NuugPKhFVaflExA8YlV6EuC4t072F9UcesDnrZoYjqO0fWd77gUdgOkyIFDHZDEUweyfimmi398= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608126227; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+qkEnDMdHWRU31cSJg9p2IUmb01k7KNSi4LqckJbiYc=; b=eWW9vWc48mWs6qyZ3ek0Xl8Y9f+h5qsaAt6DHDZqs5wrPbAtUSbKH4wjJB0AyNsFHqgNpXM+7njbJxw34wDgGzRQbyCFhUdlnWgJbFuWd1ijSgem4i3OZYLSVDSDbsZugNyZhKq/Kpo0V0ZN1USV9gmExCvyv9Qca+RWHcnq8XM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1608126227784875.4921641010503; Wed, 16 Dec 2020 05:43:47 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id 91so23217539wrj.7 for ; Wed, 16 Dec 2020 05:43:46 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id h13sm3163733wrm.28.2020.12.16.05.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 05:43:45 -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=+qkEnDMdHWRU31cSJg9p2IUmb01k7KNSi4LqckJbiYc=; b=KMsq2FYO+4z+v/DnwOmTSLJu07PtTm7D8g6PEVlcA7WxzDRAw93IeeN+AUqDOJmqcA MXMfSj1VtkYvxPNOqBGJmoaAQe9BZe2gi6WFz93ARLxoV9lIXskAQ0F09r1MVj14zwps SRXGSE1sXGhfyd5RpWgn0DQJU7kp4cgm8PIhWYgIRVECh47cUuUj1vkLYf6RCTnRmv5U TGWzHRuSSwxnUI2HJ7n5fl+S636c//373wSzfDicz38T+HOZ5iqI13MKo3YdR8RZMdxK ArA4lARro+f9qWqbIA/H7I2Dosd+1I+AVBm33IT/YeyKxHqKBx+RZ+Q82rGLgl2e6e0D +xTg== 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=+qkEnDMdHWRU31cSJg9p2IUmb01k7KNSi4LqckJbiYc=; b=Yvg8nKK9m6t3PFGav8yxtIzzjSwwMikPokG3xmxR4ecqyQoeQJ5FXrJzqZcetCYRup Jw8jYR+MpS16l01+shNP6Y1q0HpQqxqCR9/Y2nKJAphga6F0g51WD0yzyVjGZ3xuR+d4 p0aIzO3uZUfWAelKXwHCvitW40rrxdwozZFk9ZQ7OR29rFOnxqEJvnSrEkY/1784GgGD 8DA+5fcVt/72RFO4bgMb3TXwx8XIPYT+qK6P62NTwo+A/PUYqiPykb3QB/7uvIcJu3BF e1yzjRrI5oC3aZ5D5YpKh1tGH3zT2861QTWUL5YPvk5NY8Lx1E+2cspseH9yxKpt9FYk ZMRg== X-Gm-Message-State: AOAM533S3FNN/Rq8fV5dfydlUUV9BeM80YowMupqOABUbWZ+kmOsKN7V dUR1TmPdvjhoLO91ggh+1Ka806uO+3I= X-Google-Smtp-Source: ABdhPJxcBJU9P/OhWpbSiiegkLCRBGV8w1zn5WCmA94jBL0JJyrp/jiJhXILv1ZqIymtjw7n9lc1zA== X-Received: by 2002:adf:fd05:: with SMTP id e5mr38919269wrr.225.1608126225781; Wed, 16 Dec 2020 05:43:45 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Aleksandar Rikalo , Jiaxun Yang , Paul Burton , Richard Henderson , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 03/11] target/mips/mips-defs: Use ISA_MIPS32R2 definition to check Release 2 Date: Wed, 16 Dec 2020 14:43:20 +0100 Message-Id: <20201216134328.851840-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201216134328.851840-1-f4bug@amsat.org> References: <20201216134328.851840-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Use the single ISA_MIPS32R2 definition to check if the Release 2 ISA is supported, whether the CPU support 32/64-bit. For now we keep '32' in the definition name, we will rename it as ISA_MIPS_R2 in few commits. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/mips-defs.h | 3 +-- linux-user/mips/cpu_loop.c | 1 - target/mips/translate.c | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/target/mips/mips-defs.h b/target/mips/mips-defs.h index 2756e72a9d6..9cfa4c346bf 100644 --- a/target/mips/mips-defs.h +++ b/target/mips/mips-defs.h @@ -24,7 +24,6 @@ #define ISA_MIPS5 0x0000000000000010ULL #define ISA_MIPS32 0x0000000000000020ULL #define ISA_MIPS32R2 0x0000000000000040ULL -#define ISA_MIPS64R2 0x0000000000000100ULL #define ISA_MIPS32R3 0x0000000000000200ULL #define ISA_MIPS64R3 0x0000000000000400ULL #define ISA_MIPS32R5 0x0000000000000800ULL @@ -81,7 +80,7 @@ =20 /* MIPS Technologies "Release 2" */ #define CPU_MIPS32R2 (CPU_MIPS32 | ISA_MIPS32R2) -#define CPU_MIPS64R2 (CPU_MIPS64 | CPU_MIPS32R2 | ISA_MIPS64R2) +#define CPU_MIPS64R2 (CPU_MIPS64 | ISA_MIPS32R2) =20 /* MIPS Technologies "Release 3" */ #define CPU_MIPS32R3 (CPU_MIPS32R2 | ISA_MIPS32R3) diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c index b58dbeb83d1..a2aa8167210 100644 --- a/linux-user/mips/cpu_loop.c +++ b/linux-user/mips/cpu_loop.c @@ -386,7 +386,6 @@ void target_cpu_copy_regs(CPUArchState *env, struct tar= get_pt_regs *regs) prog_req.fre &=3D interp_req.fre; =20 bool cpu_has_mips_r2_r6 =3D env->insn_flags & ISA_MIPS32R2 || - env->insn_flags & ISA_MIPS64R2 || env->insn_flags & ISA_MIPS32R6 || env->insn_flags & ISA_MIPS64R6; =20 diff --git a/target/mips/translate.c b/target/mips/translate.c index 8c0ecfa17e1..0923dfdf451 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28212,7 +28212,7 @@ static void decode_opc_special3(CPUMIPSState *env, = DisasContext *ctx) case OPC_DINSM: case OPC_DINSU: case OPC_DINS: - check_insn(ctx, ISA_MIPS64R2); + check_insn(ctx, ISA_MIPS32R2); check_mips_64(ctx); gen_bitops(ctx, op1, rt, rs, sa, rd); break; @@ -28232,7 +28232,7 @@ static void decode_opc_special3(CPUMIPSState *env, = DisasContext *ctx) decode_opc_special3_r6(env, ctx); break; default: - check_insn(ctx, ISA_MIPS64R2); + check_insn(ctx, ISA_MIPS32R2); check_mips_64(ctx); op2 =3D MASK_DBSHFL(ctx->opcode); gen_bshfl(ctx, op2, rt, rd); --=20 2.26.2