From nobody Tue Feb 10 19:10:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619972153; cv=none; d=zohomail.com; s=zohoarc; b=fLwV84csie2aJpa3M3PHYzRubkRVUU/mXt08NkBS6Myd8HHxH5aQq8UeOnN1oXL/VPExbMbc4iz3E3ccI3zl3CGArENqedsTZ2xP2Quzq+OSm5HcNF4lesD6AxFfLkkC/2k8mei/PnTLo//p7mp2KF8D1Ewc5HS8MiC1f2gdZXI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619972153; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P4j2gbE04oS0h94Kjd7cj3338C2131+7etp/nt6YQrQ=; b=ahfepJ/jQsY780QjJe/6ztvOsjYszD5Ew1QjR5hJ2Eu1CToe9Rp2u6ufIWe9wMiagSR/3d6V1evR7kiEF7KGfyvQSofzRmrWZoplP+6IJMOesvoU6ZSlaLWoaLxtnWCWkuUipvS8RHx4Sa2ZYcnVDOwdsUBFO/tpDQqPTwzdKcw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1619972153545372.79229332777857; Sun, 2 May 2021 09:15:53 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id s5-20020a7bc0c50000b0290147d0c21c51so2114519wmh.4 for ; Sun, 02 May 2021 09:15:52 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id l5sm8959057wmh.0.2021.05.02.09.15.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 09:15:51 -0700 (PDT) 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=P4j2gbE04oS0h94Kjd7cj3338C2131+7etp/nt6YQrQ=; b=c6reylfW4gomBRCjmTwnA8+dxcYEh/M6L+TJ40aIa9SWwhdhRchsBqGARcfKfPGvP1 kyFks3kUm4AKrnJxqJua8LcmeyNsEnnfQJH5xNIPgbNObx0iDZbmzr1lfwg+ly8Bnqar sGBoo9ts5fSv4KMzReRhQFDVesU9nnC+sYcUnqC0y9tnsz6Bs4SbXlSKHS1YXm0zMNcX 2Q8gpJpcm0u12rUV2T15/dJaQIdTnuwO8mNI4vyT4hB8KJjX7y4FyQdXaiaeXnwjy0Ef m2h8Ig6mPohoTnzcX1WZHdKYD5uQlzzAVdaKqFFBBq7/pYsPXDw/n/rNU88md660LtSz r22A== 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=P4j2gbE04oS0h94Kjd7cj3338C2131+7etp/nt6YQrQ=; b=h5oRzCVPm0XtVxR+bWkmHCJr0rUSS9OBPtib3zCUh87mcqKa5Sghb1FrPhROD89hqd QVyyTgKjI3R1buo18yO9C884He215HxroXXmfEJk7KtLlXbNHI31iMgPZiXJ3Imf/wx0 jUwJEg5bc3etT7msTUhsOJyfxmu97/6gh/fwB3Se/f1iPD0GutqxEng2HTqUH5Q1KVZe J897a7eNnzcmeIPRY9pkI2TsOdoY0ZCSkNyzEnqY6rVnL3ywXapsz2aKxmy+y/PO/4tC OAPQm2vZbPOwDYgQ0OdP9kpGT7TrYKcqu115e6Rbr70GeZQtokncMx0C5pcinaCgVqrI XkuQ== X-Gm-Message-State: AOAM530wWB/FzcgzbJaDOHgSSRL3zGLOa/rI73YcUgCxdjR2IuV0SHl9 b4ZBZ6jRCV7NTn3gB0EM4c2pCpKoihDPL+ur X-Google-Smtp-Source: ABdhPJwiNs9jXlEaXqfMC4+nvvay3Oi/sGUmkTriPiraFqLBkq7Cg+UKielvdRa81zHVtL6JM0omYw== X-Received: by 2002:a1c:7419:: with SMTP id p25mr8923380wmc.79.1619972151830; Sun, 02 May 2021 09:15:51 -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: Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 02/36] target/mips: Fix CACHEE opcode (CACHE using EVA addressing) Date: Sun, 2 May 2021 18:15:04 +0200 Message-Id: <20210502161538.534038-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210502161538.534038-1-f4bug@amsat.org> References: <20210502161538.534038-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) 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson 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); --=20 2.26.3