qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
	"Huacai Chen" <chenhuacai@kernel.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PULL 02/36] target/mips: Fix CACHEE opcode (CACHE using EVA addressing)
Date: Sun,  2 May 2021 18:15:04 +0200	[thread overview]
Message-ID: <20210502161538.534038-3-f4bug@amsat.org> (raw)
In-Reply-To: <20210502161538.534038-1-f4bug@amsat.org>

The CACHEE opcode "requires CP0 privilege".

The pseudocode checks in the ISA manual is:

    if is_eva and not C0.Config5.EVA:
      raise exception('RI')

    if not IsCoprocessor0Enabled():
      raise coprocessor_exception(0)

Add the missing checks.

Inspired-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210420175426.1875746-1-f4bug@amsat.org>
---
 target/mips/translate.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/target/mips/translate.c b/target/mips/translate.c
index 71fa5ec1973..5dad75cdf37 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -20957,6 +20957,8 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *env, DisasContext *ctx)
                     gen_ld(ctx, OPC_LHUE, rt, rs, s);
                     break;
                 case NM_CACHEE:
+                    check_eva(ctx);
+                    check_cp0_enabled(ctx);
                     check_nms_dl_il_sl_tl_l2c(ctx);
                     gen_cache_operation(ctx, rt, rs, s);
                     break;
@@ -24530,11 +24532,11 @@ static void decode_opc_special3(CPUMIPSState *env, DisasContext *ctx)
             gen_st_cond(ctx, rt, rs, imm, MO_TESL, true);
             return;
         case OPC_CACHEE:
+            check_eva(ctx);
             check_cp0_enabled(ctx);
             if (ctx->hflags & MIPS_HFLAG_ITC_CACHE) {
                 gen_cache_operation(ctx, rt, rs, imm);
             }
-            /* Treat as NOP. */
             return;
         case OPC_PREFE:
             check_cp0_enabled(ctx);
-- 
2.26.3



  parent reply	other threads:[~2021-05-02 16:20 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-02 16:15 [PULL 00/36] MIPS patches for 2021-05-02 Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 01/36] hw/isa/piix4: Use qdev_get_gpio_in_named() to get ISA IRQ Philippe Mathieu-Daudé
2021-05-02 16:15 ` Philippe Mathieu-Daudé [this message]
2021-05-02 16:15 ` [PULL 03/36] target/mips: Add missing CP0 check to nanoMIPS RDPGPR / WRPGPR opcodes Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 04/36] target/mips: Remove spurious LOG_UNIMP of MTHC0 opcode Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 05/36] target/mips: Migrate missing CPU fields Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 06/36] target/mips: Make check_cp0_enabled() return a boolean Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 07/36] target/mips: Simplify meson TCG rules Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 08/36] target/mips: Move IEEE rounding mode array to new source file Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 09/36] target/mips: Move msa_reset() " Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 10/36] target/mips: Make CPU/FPU regnames[] arrays global Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 11/36] target/mips: Optimize CPU/FPU regnames[] arrays Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 12/36] target/mips: Restrict mips_cpu_dump_state() to cpu.c Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 13/36] target/mips: Turn printfpr() macro into a proper function Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 14/36] target/mips: Declare mips_env_set_pc() inlined in "internal.h" Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 15/36] target/mips: Merge do_translate_address into cpu_mips_translate_address Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 16/36] target/mips: Extract load/store helpers to ldst_helper.c Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 17/36] meson: Introduce meson_user_arch source set for arch-specific user-mode Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 18/36] target/mips: Introduce tcg-internal.h for TCG specific declarations Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 19/36] target/mips: Add simple user-mode mips_cpu_do_interrupt() Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 20/36] target/mips: Add simple user-mode mips_cpu_tlb_fill() Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 21/36] target/mips: Move cpu_signal_handler definition around Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 22/36] target/mips: Move sysemu specific files under sysemu/ subfolder Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 23/36] target/mips: Move physical addressing code to sysemu/physaddr.c Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 24/36] target/mips: Restrict cpu_mips_get_random() / update_pagemask() to TCG Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 25/36] target/mips: Move sysemu TCG-specific code to tcg/sysemu/ subfolder Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 26/36] target/mips: Restrict mmu_init() to TCG Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 27/36] target/mips: Move tlb_helper.c to tcg/sysemu/ Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 28/36] target/mips: Restrict CPUMIPSTLBContext::map_address() handlers scope Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 29/36] target/mips: Move Special opcodes to tcg/sysemu/special_helper.c Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 30/36] target/mips: Move helper_cache() " Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 31/36] target/mips: Move TLB management helpers to tcg/sysemu/tlb_helper.c Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 32/36] target/mips: Move exception management code to exception.c Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 33/36] target/mips: Move CP0 helpers to sysemu/cp0.c Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 34/36] target/mips: Move TCG source files under tcg/ sub directory Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 35/36] hw/mips: Restrict non-virtualized machines to TCG Philippe Mathieu-Daudé
2021-05-02 16:15 ` [PULL 36/36] gitlab-ci: Add KVM mips64el cross-build jobs Philippe Mathieu-Daudé
2021-05-02 16:24 ` [PULL 00/36] MIPS patches for 2021-05-02 no-reply
2021-05-04  9:09 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210502161538.534038-3-f4bug@amsat.org \
    --to=f4bug@amsat.org \
    --cc=aleksandar.rikalo@syrmia.com \
    --cc=aurelien@aurel32.net \
    --cc=chenhuacai@kernel.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).