From nobody Tue Nov 18 07:26:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1608136109; cv=none; d=zohomail.com; s=zohoarc; b=Hp8OZIXVj8snshH3pUBvB00u0fnOA/6ZfvxAJa4SGtRB9fDrg9/p0qfPm1Yb1CF47UtT9STD6+0SOmmLoy7t+6s6iv8SirB3vy8ss5XSCrwBnT0FxXNOuRkgowom3cRwzNA6jz6wF1Xqj0I+MjRInflOHNQ21nRH04sNQCI/SVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608136109; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nnfnPGeSTecm92WN/NMVfeabAYZsekuzz7oGOoZfca0=; b=Nun+/lkQNv8ttAD46LWU0T6JG6NqXQzf0Qj9fJJ7clnxesf+Ba6thJH73a50PA/YEpTOOGNu99IE73DBrinmKQ1GRA6cFiDix9JE+qmuBMkdMkxc9enyPZ4ODDVLe48z62m+98CWaoi/Ek/x967ApGlgyMRacNzwltE2xxinQJE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 160813610976431.42154625443186; Wed, 16 Dec 2020 08:28:29 -0800 (PST) Received: by mail-wm1-f41.google.com with SMTP id n16so2271492wmc.0 for ; Wed, 16 Dec 2020 08:28:25 -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 u66sm3660173wmg.2.2020.12.16.08.28.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 08:28:21 -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=nnfnPGeSTecm92WN/NMVfeabAYZsekuzz7oGOoZfca0=; b=MdBF0PV/G+JX3bs2j8zQ5YG4Fm8/Y4WvLFKGsyvZdLsIhqc5zWP7MX5Qxc6g/Qw+rq k5XwejhgdDWwK2JCMYVnbKk6KcOmKtyNoEZJ1RJoi5qYUyxvot6Dhw2MZMarnbNqarua MVzxu9LkB/iygz1pUDr1t6CXFGDz6TkL7r3APlXGkE9OuPIhJkLkb1X8g4j6rd/FBlnE j6tGM5PJV3Tq10N9gBglC2ebx0eFNQs9ROkFr/mdqaO4CFsyvffhVf1XwHrVjjN0me9A IJA4LiRASkxS9ycLyQumR1ZDJW4DY1xzpHJjKEC/ztKmY0HuA1K5hD5aXJ5btWeSVqQX Sypg== 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=nnfnPGeSTecm92WN/NMVfeabAYZsekuzz7oGOoZfca0=; b=mwHOD3BJG2oNEm7bCod9eIBqEGjSw6bxOIhsdGqZHBlq+YPYivVJELvBCagtavOn+A HAPQuglqbnnpH7frm+T11WYsVqnz9YXfvX8+bRmydLOSbx/A2A7DbNR+1NIDImLz0dTf eTHrrfijil54UXOlp5bsjwFwVkfxYPgIOQRLrGf+gadF/PHg0Z+WmQ9wW3aHE6mC0AKT DAdzXZEmMBUZoQTrVfppHmyq19m2Ye/VpWZ8JrCxtn3aFGZoI/EHWEpGaErmwCl+YxTT KTB+0vmSwGvOwz0V/1TmxEZ0iHbUrfOycIYYk/mapyT6eM8agweudLmyQmBnmvolx8mq nSCQ== X-Gm-Message-State: AOAM530wlOYjMC7xIEN0MckbzUhsDlzRfYXhWhjrhprBUlVaJCTRTOyZ TV5bpcaDsz/+QkpYKIcnT54= X-Google-Smtp-Source: ABdhPJzP4NYJT5XeWd1Dc4SQyH0MvRfshFo/f6yobW8EX9dj5KXLQY9/jHQ4lNwj0/av9YGkYZCymQ== X-Received: by 2002:a1c:2605:: with SMTP id m5mr4166103wmm.111.1608136102128; Wed, 16 Dec 2020 08:28:22 -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: Richard Henderson , Aleksandar Rikalo , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paul Burton , Jiaxun Yang , Aurelien Jarno Subject: [PATCH v2 07/12] target/mips/mips-defs: Use ISA_MIPS32R6 definition to check Release 6 Date: Wed, 16 Dec 2020 17:27:39 +0100 Message-Id: <20201216162744.895920-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201216162744.895920-1-f4bug@amsat.org> References: <20201216162744.895920-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_MIPS32R6 definition to check if the Release 6 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_R6 in few commits. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/internal.h | 2 +- target/mips/mips-defs.h | 3 +-- linux-user/elfload.c | 2 +- linux-user/mips/cpu_loop.c | 3 +-- target/mips/tlb_helper.c | 6 +++--- target/mips/translate.c | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 76269cfc7bb..97899dbd3c8 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -308,7 +308,7 @@ static inline void compute_hflags(CPUMIPSState *env) } else if (((env->hflags & MIPS_HFLAG_KSU) =3D=3D MIPS_HFLAG_UM) && !(env->CP0_Status & (1 << CP0St_UX))) { env->hflags |=3D MIPS_HFLAG_AWRAP; - } else if (env->insn_flags & ISA_MIPS64R6) { + } else if (env->insn_flags & ISA_MIPS32R6) { /* Address wrapping for Supervisor and Kernel is specified in R6 */ if ((((env->hflags & MIPS_HFLAG_KSU) =3D=3D MIPS_HFLAG_SM) && !(env->CP0_Status & (1 << CP0St_SX))) || diff --git a/target/mips/mips-defs.h b/target/mips/mips-defs.h index ea9dcc7c98e..df2ffae5718 100644 --- a/target/mips/mips-defs.h +++ b/target/mips/mips-defs.h @@ -27,7 +27,6 @@ #define ISA_MIPS32R3 0x0000000000000200ULL #define ISA_MIPS32R5 0x0000000000000800ULL #define ISA_MIPS32R6 0x0000000000002000ULL -#define ISA_MIPS64R6 0x0000000000004000ULL #define ISA_NANOMIPS32 0x0000000000008000ULL /* * bits 24-39: MIPS ASEs @@ -90,7 +89,7 @@ =20 /* MIPS Technologies "Release 6" */ #define CPU_MIPS32R6 (CPU_MIPS32R5 | ISA_MIPS32R6) -#define CPU_MIPS64R6 (CPU_MIPS64R5 | CPU_MIPS32R6 | ISA_MIPS64R6) +#define CPU_MIPS64R6 (CPU_MIPS64R5 | CPU_MIPS32R6) =20 /* Wave Computing: "nanoMIPS" */ #define CPU_NANOMIPS32 (CPU_MIPS32R6 | ISA_NANOMIPS32) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 0b02a926025..e875a5387cc 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -997,7 +997,7 @@ static uint32_t get_elf_hwcap(void) #define GET_FEATURE(flag, hwcap) \ do { if (cpu->env.insn_flags & (flag)) { hwcaps |=3D hwcap; } } while = (0) =20 - GET_FEATURE(ISA_MIPS32R6 | ISA_MIPS64R6, HWCAP_MIPS_R6); + GET_FEATURE(ISA_MIPS32R6, HWCAP_MIPS_R6); GET_FEATURE(ASE_MSA, HWCAP_MIPS_MSA); =20 #undef GET_FEATURE diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c index a2aa8167210..1e4acf3d6e3 100644 --- a/linux-user/mips/cpu_loop.c +++ b/linux-user/mips/cpu_loop.c @@ -386,8 +386,7 @@ 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_MIPS32R6 || - env->insn_flags & ISA_MIPS64R6; + env->insn_flags & ISA_MIPS32R6; =20 if (prog_req.fre && !prog_req.frdefault && !prog_req.fr1) { env->CP0_Config5 |=3D (1 << CP0C5_FRE); diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index 94a482e3dbe..68d766f90a3 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -1025,7 +1025,7 @@ void mips_cpu_do_interrupt(CPUState *cs) enter_debug_mode: if (env->insn_flags & ISA_MIPS3) { env->hflags |=3D MIPS_HFLAG_64; - if (!(env->insn_flags & ISA_MIPS64R6) || + if (!(env->insn_flags & ISA_MIPS32R6) || env->CP0_Status & (1 << CP0St_KX)) { env->hflags &=3D ~MIPS_HFLAG_AWRAP; } @@ -1054,7 +1054,7 @@ void mips_cpu_do_interrupt(CPUState *cs) env->CP0_Status |=3D (1 << CP0St_ERL) | (1 << CP0St_BEV); if (env->insn_flags & ISA_MIPS3) { env->hflags |=3D MIPS_HFLAG_64; - if (!(env->insn_flags & ISA_MIPS64R6) || + if (!(env->insn_flags & ISA_MIPS32R6) || env->CP0_Status & (1 << CP0St_KX)) { env->hflags &=3D ~MIPS_HFLAG_AWRAP; } @@ -1240,7 +1240,7 @@ void mips_cpu_do_interrupt(CPUState *cs) env->CP0_Status |=3D (1 << CP0St_EXL); if (env->insn_flags & ISA_MIPS3) { env->hflags |=3D MIPS_HFLAG_64; - if (!(env->insn_flags & ISA_MIPS64R6) || + if (!(env->insn_flags & ISA_MIPS32R6) || env->CP0_Status & (1 << CP0St_KX)) { env->hflags &=3D ~MIPS_HFLAG_AWRAP; } diff --git a/target/mips/translate.c b/target/mips/translate.c index de3a6b5ed65..f32b5ebdd7e 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -29078,7 +29078,7 @@ static void mips_tr_init_disas_context(DisasContext= Base *dcbase, CPUState *cs) #else ctx->mem_idx =3D hflags_mmu_index(ctx->hflags); #endif - ctx->default_tcg_memop_mask =3D (ctx->insn_flags & (ISA_MIPS32R6 | ISA= _MIPS64R6 | + ctx->default_tcg_memop_mask =3D (ctx->insn_flags & (ISA_MIPS32R6 | INSN_LOONGSON3A)) ? MO_UNALN : MO_ALIGN; =20 LOG_DISAS("\ntb %p idx %d hflags %04x\n", ctx->base.tb, ctx->mem_idx, --=20 2.26.2