qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
	"open list:ARM TCG CPUs" <qemu-arm@nongnu.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Peter Maydell" <peter.maydell@linaro.org>
Subject: [Qemu-devel] [PATCH v1 3/9] target/arm: handle A-profile A32 semihosting at translate time
Date: Wed, 28 Aug 2019 17:53:01 +0100	[thread overview]
Message-ID: <20190828165307.18321-4-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190828165307.18321-1-alex.bennee@linaro.org>

As for the other semihosting calls we can resolve this at translate
time.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/arm/translate.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/target/arm/translate.c b/target/arm/translate.c
index 6157e9f52fc..9dc7ec78061 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -7657,6 +7657,22 @@ static void arm_skip_unless(DisasContext *s, uint32_t cond)
     arm_gen_test_cc(cond ^ 1, s->condlabel);
 }
 
+static inline void gen_arm_swi(DisasContext *s, int imm24)
+{
+    if (semihosting_enabled() &&
+#ifndef CONFIG_USER_ONLY
+        s->current_el != 0 &&
+#endif
+        (imm24 == 0x123456)) {
+        gen_exception_internal_insn(s, 0, EXCP_SEMIHOST);
+        return;
+    }
+
+    gen_set_pc_im(s, s->base.pc_next);
+    s->svc_imm = imm24;
+    s->base.is_jmp = DISAS_SWI;
+}
+
 static void disas_arm_insn(DisasContext *s, unsigned int insn)
 {
     unsigned int cond, val, op1, i, shift, rm, rs, rn, rd, sh;
@@ -9195,9 +9211,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn)
             break;
         case 0xf:
             /* swi */
-            gen_set_pc_im(s, s->base.pc_next);
-            s->svc_imm = extract32(insn, 0, 24);
-            s->base.is_jmp = DISAS_SWI;
+            gen_arm_swi(s, extract32(insn, 0, 24));
             break;
         default:
         illegal_op:
-- 
2.20.1



  parent reply	other threads:[~2019-08-28 17:10 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-28 16:52 [Qemu-devel] [PATCH v1 0/9] arm semih-hosting cleanups and other misc cleanups Alex Bennée
2019-08-28 16:52 ` [Qemu-devel] [PATCH v1 1/9] target/arm: handle M-profile semihosting at translate time Alex Bennée
2019-08-28 16:53 ` [Qemu-devel] [PATCH v1 2/9] target/arm: handle A-profile T32 " Alex Bennée
2019-08-28 16:53 ` Alex Bennée [this message]
2019-08-28 16:53 ` [Qemu-devel] [PATCH v1 4/9] target/arm: remove run time semihosting checks Alex Bennée
2019-08-28 21:12   ` Richard Henderson
2019-08-28 16:53 ` [Qemu-devel] [PATCH v1 5/9] includes: remove stale [smp|max]_cpus externs Alex Bennée
2019-08-28 21:12   ` Richard Henderson
2019-08-28 16:53 ` [Qemu-devel] [PATCH v1 6/9] tcg/README: fix typo s/afterwise/afterwards/ Alex Bennée
2019-08-28 16:53 ` [Qemu-devel] [PATCH v1 7/9] atomic_template: fix indentation in GEN_ATOMIC_HELPER Alex Bennée
2019-08-28 16:53 ` [Qemu-devel] [PATCH v1 8/9] accel/stubs: reduce headers from tcg-stub Alex Bennée
2019-08-29  9:31   ` Alex Bennée
2019-08-28 16:53 ` [Qemu-devel] [PATCH v1 9/9] include/exec/cpu-defs.h: fix typo Alex Bennée
2019-08-29 16:57 ` [Qemu-devel] [PATCH v1 0/9] arm semih-hosting cleanups and other misc cleanups Philippe Mathieu-Daudé
2019-09-03 10:22 ` Peter Maydell
2019-09-03 10:37 ` Peter Maydell
2019-09-03 10:45   ` Alex Bennée

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=20190828165307.18321-4-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.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).