qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
To: qemu-devel@nongnu.org
Cc: kbastian@mail.uni-paderborn.de, richard.henderson@linaro.org
Subject: [PATCH v4 8/8] target/tricore: Fix ICR.IE offset in RESTORE insn
Date: Wed, 21 Jun 2023 16:23:02 +0200	[thread overview]
Message-ID: <20230621142302.1648383-9-kbastian@mail.uni-paderborn.de> (raw)
In-Reply-To: <20230621142302.1648383-1-kbastian@mail.uni-paderborn.de>

from ISA v1.6.1 onwards the bit position of ICR.IE changed.
ctx->icr_ie_offset contains the correct value for the ISA version used
by the vCPU. We also need to exit this tb here, as we might have enabled
interrupts.

Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
---
v3 -> v4:
    - Exit tb for RESTORE

 target/tricore/translate.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/target/tricore/translate.c b/target/tricore/translate.c
index 71b6209af4..7feab20a7e 100644
--- a/target/tricore/translate.c
+++ b/target/tricore/translate.c
@@ -7956,7 +7956,9 @@ static void decode_sys_interrupts(DisasContext *ctx)
     case OPC2_32_SYS_RESTORE:
         if (has_feature(ctx, TRICORE_FEATURE_16)) {
             if (ctx->priv == TRICORE_PRIV_SM || ctx->priv == TRICORE_PRIV_UM1) {
-                tcg_gen_deposit_tl(cpu_ICR, cpu_ICR, cpu_gpr_d[r1], 8, 1);
+                tcg_gen_deposit_tl(cpu_ICR, cpu_ICR, cpu_gpr_d[r1],
+                        ctx->icr_ie_offset, 1);
+                ctx->base.is_jmp = DISAS_EXIT_UPDATE;
             } else {
                 generate_trap(ctx, TRAPC_PROT, TIN1_PRIV);
             }
-- 
2.40.1



  parent reply	other threads:[~2023-06-21 14:24 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-21 14:22 [PATCH v4 0/8] TriCore Privilege Levels Bastian Koppelmann
2023-06-21 14:22 ` [PATCH v4 1/8] target/tricore: Fix RR_JLI clobbering reg A[11] Bastian Koppelmann
2023-06-21 14:22 ` [PATCH v4 2/8] target/tricore: Introduce DISAS_TARGET_EXIT Bastian Koppelmann
2023-06-21 14:22 ` [PATCH v4 3/8] target/tricore: ENABLE exit to main-loop Bastian Koppelmann
2023-06-21 14:22 ` [PATCH v4 4/8] target/tricore: Indirect jump insns use tcg_gen_lookup_and_goto_ptr() Bastian Koppelmann
2023-06-21 14:22 ` [PATCH v4 5/8] target/tricore: Introduce priv tb flag Bastian Koppelmann
2023-06-21 14:23 ` [PATCH v4 6/8] target/tricore: Implement privilege level for all insns Bastian Koppelmann
2023-06-21 14:23 ` [PATCH v4 7/8] target/tricore: Honour privilege changes on PSW write Bastian Koppelmann
2023-06-21 14:23 ` Bastian Koppelmann [this message]
2023-06-21 14:39   ` [PATCH v4 8/8] target/tricore: Fix ICR.IE offset in RESTORE insn Richard Henderson

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=20230621142302.1648383-9-kbastian@mail.uni-paderborn.de \
    --to=kbastian@mail.uni-paderborn.de \
    --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).