qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: Anthony Liguori <anthony@codemonkey.ws>
Cc: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 19/28] linux-user: Add cpu loop for AArch64
Date: Tue, 10 Sep 2013 19:52:13 +0100	[thread overview]
Message-ID: <1378839142-7726-20-git-send-email-peter.maydell@linaro.org> (raw)
In-Reply-To: <1378839142-7726-1-git-send-email-peter.maydell@linaro.org>

Add the main linux-user cpu loop for AArch64. Since AArch64
has a different system call interface, doesn't need to worry
about FPA emulation and may in the future keep the prefetch/data
abort information in different system registers, it's simplest
just to use a completely separate loop from the 32 bit ARM
target, rather than peppering it with ifdefs.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1378235544-22290-14-git-send-email-peter.maydell@linaro.org
---
 linux-user/main.c |   82 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/linux-user/main.c b/linux-user/main.c
index 5c2f7b2..b6e434a 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -449,6 +449,9 @@ void cpu_loop(CPUX86State *env)
         __r;                                            \
     })
 
+#ifdef TARGET_ABI32
+/* Commpage handling -- there is no commpage for AArch64 */
+
 /*
  * See the Linux kernel's Documentation/arm/kernel_user_helpers.txt
  * Input:
@@ -582,6 +585,7 @@ do_kernel_trap(CPUARMState *env)
 
     return 0;
 }
+#endif
 
 static int do_strex(CPUARMState *env)
 {
@@ -661,6 +665,7 @@ done:
     return segv;
 }
 
+#ifdef TARGET_ABI32
 void cpu_loop(CPUARMState *env)
 {
     CPUState *cs = CPU(arm_env_get_cpu(env));
@@ -873,6 +878,83 @@ void cpu_loop(CPUARMState *env)
     }
 }
 
+#else
+
+/* AArch64 main loop */
+void cpu_loop(CPUARMState *env)
+{
+    CPUState *cs = CPU(arm_env_get_cpu(env));
+    int trapnr, sig;
+    target_siginfo_t info;
+    uint32_t addr;
+
+    for (;;) {
+        cpu_exec_start(cs);
+        trapnr = cpu_arm_exec(env);
+        cpu_exec_end(cs);
+
+        switch (trapnr) {
+        case EXCP_SWI:
+            env->xregs[0] = do_syscall(env,
+                                       env->xregs[8],
+                                       env->xregs[0],
+                                       env->xregs[1],
+                                       env->xregs[2],
+                                       env->xregs[3],
+                                       env->xregs[4],
+                                       env->xregs[5],
+                                       0, 0);
+            break;
+        case EXCP_INTERRUPT:
+            /* just indicate that signals should be handled asap */
+            break;
+        case EXCP_UDEF:
+            info.si_signo = SIGILL;
+            info.si_errno = 0;
+            info.si_code = TARGET_ILL_ILLOPN;
+            info._sifields._sigfault._addr = env->pc;
+            queue_signal(env, info.si_signo, &info);
+            break;
+        case EXCP_PREFETCH_ABORT:
+            addr = env->cp15.c6_insn;
+            goto do_segv;
+        case EXCP_DATA_ABORT:
+            addr = env->cp15.c6_data;
+        do_segv:
+            info.si_signo = SIGSEGV;
+            info.si_errno = 0;
+            /* XXX: check env->error_code */
+            info.si_code = TARGET_SEGV_MAPERR;
+            info._sifields._sigfault._addr = addr;
+            queue_signal(env, info.si_signo, &info);
+            break;
+        case EXCP_DEBUG:
+        case EXCP_BKPT:
+            sig = gdb_handlesig(cs, TARGET_SIGTRAP);
+            if (sig) {
+                info.si_signo = sig;
+                info.si_errno = 0;
+                info.si_code = TARGET_TRAP_BRKPT;
+                queue_signal(env, info.si_signo, &info);
+            }
+            break;
+        case EXCP_STREX:
+            if (do_strex(env)) {
+                addr = env->cp15.c6_data;
+                goto do_segv;
+            }
+            break;
+        default:
+            fprintf(stderr, "qemu: unhandled CPU exception 0x%x - aborting\n",
+                    trapnr);
+            cpu_dump_state(cs, stderr, fprintf, 0);
+            abort();
+        }
+        process_pending_signals(env);
+    }
+}
+#endif /* ndef TARGET_ABI32 */
+
 #endif
 
 #ifdef TARGET_UNICORE32
-- 
1.7.9.5

  parent reply	other threads:[~2013-09-10 18:52 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-10 18:51 [Qemu-devel] [PULL 00/28] target-arm queue Peter Maydell
2013-09-10 18:51 ` [Qemu-devel] [PULL 01/28] target-arm: Make '-cpu any' available in linux-user mode only Peter Maydell
2013-09-10 18:51 ` [Qemu-devel] [PULL 02/28] target-arm: Use sextract32() in branch decode Peter Maydell
2013-09-10 18:51 ` [Qemu-devel] [PULL 03/28] target-arm: Avoid "1 << 31" undefined behaviour Peter Maydell
2013-09-10 18:51 ` [Qemu-devel] [PULL 04/28] target-arm: fix ARMv7M stack alignment on reset Peter Maydell
2013-09-10 18:51 ` [Qemu-devel] [PULL 05/28] target-arm: Implement qmp query-cpu-definitions Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 06/28] pl110: Clarify comment about PL110 ID on VersatilePB Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 07/28] abitypes.h: Remove incorrect ARM ABI_LLONG_ALIGNMENT Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 08/28] target-arm: Abstract out load/store from a vaddr in AArch32 Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 09/28] target-arm: Extract the disas struct to a header file Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 10/28] target-arm: Export cpu_env Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 11/28] target-arm: Fix target_ulong/uint32_t confusions Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 12/28] target-arm: Pass DisasContext* to gen_set_pc_im() Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 13/28] target-arm: Add new AArch64CPUInfo base class and subclasses Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 14/28] target-arm: Disable 32 bit CPUs in 64 bit linux-user builds Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 15/28] target-arm: Prepare translation for AArch64 code Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 16/28] target-arm: Add AArch64 translation stub Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 17/28] target-arm: Add AArch64 gdbstub support Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 18/28] linux-user: Don't treat AArch64 cpu names specially Peter Maydell
2013-09-10 18:52 ` Peter Maydell [this message]
2013-09-10 18:52 ` [Qemu-devel] [PULL 20/28] linux-user: Add syscall number definitions for AArch64 Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 21/28] linux-user: Fix up AArch64 syscall handlers Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 22/28] linux-user: Add signal handling for AArch64 Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 23/28] linux-user: Make sure NWFPE code is 32 bit ARM only Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 24/28] linux-user: Implement cpu_set_tls() and cpu_clone_regs() for AArch64 Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 25/28] linux-user: Add AArch64 termbits.h definitions Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 26/28] linux-user: Allow targets to specify a minimum uname release Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 27/28] linux-user: Add AArch64 support Peter Maydell
2013-09-10 18:52 ` [Qemu-devel] [PULL 28/28] configure: Add handling code for AArch64 targets 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=1378839142-7726-20-git-send-email-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.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).