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: peter.maydell@linaro.org, rth@twiddle.net
Subject: [Qemu-devel] [PATCH v4 03/15] target-tricore: Add softmmu support
Date: Thu,  7 Aug 2014 15:34:29 +0100	[thread overview]
Message-ID: <1407422081-9468-4-git-send-email-kbastian@mail.uni-paderborn.de> (raw)
In-Reply-To: <1407422081-9468-1-git-send-email-kbastian@mail.uni-paderborn.de>

Add basic softmmu support for TriCore

Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
---
 target-tricore/helper.c    | 54 +++++++++++++++++++++++++++++++++++++++++++++-
 target-tricore/op_helper.c | 33 +++++++++++++++++++++++++++-
 2 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/target-tricore/helper.c b/target-tricore/helper.c
index 0794672..22acb83 100644
--- a/target-tricore/helper.c
+++ b/target-tricore/helper.c
@@ -24,10 +24,62 @@
 
 #include "cpu.h"
 
+enum {
+    TLBRET_DIRTY = -4,
+    TLBRET_INVALID = -3,
+    TLBRET_NOMATCH = -2,
+    TLBRET_BADADDR = -1,
+    TLBRET_MATCH = 0
+};
+
+#if defined(CONFIG_SOFTMMU)
+static int get_physical_address(CPUTRICOREState *env, hwaddr *physical,
+                                int *prot, target_ulong address,
+                                int rw, int access_type)
+{
+    int ret = TLBRET_MATCH;
+
+    *physical = address & 0xFFFFFFFF;
+    *prot = PAGE_READ | PAGE_WRITE;
+
+    return ret;
+}
+#endif
+
+/* TODO: Add exeption support*/
+static void raise_mmu_exception(CPUTRICOREState *env, target_ulong address,
+                                int rw, int tlb_error)
+{
+}
+
 int cpu_tricore_handle_mmu_fault(CPUState *cs, target_ulong address,
                                  int rw, int mmu_idx)
 {
-    return 0;
+    TRICORECPU *cpu = TRICORE_CPU(cs);
+    CPUTRICOREState *env = &cpu->env;
+    hwaddr physical;
+    int prot;
+    int access_type;
+    int ret = 0;
+
+    rw &= 1;
+    access_type = ACCESS_INT;
+    ret = get_physical_address(env, &physical, &prot,
+                               address, rw, access_type);
+    qemu_log("%s address=" TARGET_FMT_lx " ret %d physical " TARGET_FMT_plx
+             " prot %d\n", __func__, address, ret, physical, prot);
+
+    if (ret == TLBRET_MATCH) {
+        tlb_set_page(cs, address & TARGET_PAGE_MASK,
+                     physical & TARGET_PAGE_MASK, prot | PAGE_EXEC,
+                     mmu_idx, TARGET_PAGE_SIZE);
+        ret = 0;
+    } else if (ret < 0) {
+        raise_mmu_exception(env, address, rw, ret);
+        ret = 1;
+    }
+
+    return ret;
 }
 
 void tricore_cpu_do_interrupt(CPUState *cs)
diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c
index 275790b..2e5981f 100644
--- a/target-tricore/op_helper.c
+++ b/target-tricore/op_helper.c
@@ -20,8 +20,39 @@
 #include "exec/helper-proto.h"
 #include "exec/cpu_ldst.h"
 
+static inline void QEMU_NORETURN do_raise_exception_err(CPUTRICOREState *env,
+                                                        uint32_t exception,
+                                                        int error_code,
+                                                        uintptr_t pc)
+{
+    CPUState *cs = CPU(tricore_env_get_cpu(env));
+    cs->exception_index = exception;
+    env->error_code = error_code;
+
+    if (pc) {
+        /* now we have a real cpu fault */
+        cpu_restore_state(cs, pc);
+    }
+
+    cpu_loop_exit(cs);
+}
+
+static inline void QEMU_NORETURN do_raise_exception(CPUTRICOREState *env,
+                                                    uint32_t exception,
+                                                    uintptr_t pc)
+{
+    do_raise_exception_err(env, exception, 0, pc);
+}
+
 void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
               uintptr_t retaddr)
 {
+    int ret;
+    ret = cpu_tricore_handle_mmu_fault(cs, addr, is_write, mmu_idx);
+    if (ret) {
+        TRICORECPU *cpu = TRICORE_CPU(cs);
+        CPUTRICOREState *env = &cpu->env;
+        do_raise_exception_err(env, cs->exception_index,
+                               env->error_code, retaddr);
+    }
 }
-
-- 
2.0.4

  parent reply	other threads:[~2014-08-07 13:31 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-07 14:34 [Qemu-devel] [PATCH v4 00/15] TriCore architecture guest implementation Bastian Koppelmann
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 01/15] target-tricore: Add target stubs and qom-cpu Bastian Koppelmann
2014-08-08  2:28   ` Richard Henderson
2014-08-08 10:40     ` Bastian Koppelmann
2014-08-08 11:35       ` Bastian Koppelmann
2014-08-11 16:06     ` Bastian Koppelmann
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 02/15] target-tricore: Add board for systemmode Bastian Koppelmann
2014-08-07 14:34 ` Bastian Koppelmann [this message]
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 04/15] target-tricore: Add initialization for translation and activate target Bastian Koppelmann
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 05/15] target-tricore: Add masks and opcodes for decoding Bastian Koppelmann
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 06/15] target-tricore: Add instructions of SRC opcode format Bastian Koppelmann
2014-08-08  2:58   ` Richard Henderson
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 07/15] target-tricore: Add instructions of SRR " Bastian Koppelmann
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 08/15] target-tricore: Add instructions of SSR " Bastian Koppelmann
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 09/15] target-tricore: Add instructions of SRRS and SLRO " Bastian Koppelmann
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 10/15] target-tricore: Add instructions of SB " Bastian Koppelmann
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 11/15] target-tricore: Add instructions of SBC and SBRN " Bastian Koppelmann
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 12/15] target-tricore: Add instructions of SBR " Bastian Koppelmann
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 13/15] target-tricore: Add instructions of SC " Bastian Koppelmann
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 14/15] target-tricore: Add instructions of SLR, SSRO and SRO " Bastian Koppelmann
2014-08-07 14:34 ` [Qemu-devel] [PATCH v4 15/15] target-tricore: Add instructions of SR " Bastian Koppelmann

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=1407422081-9468-4-git-send-email-kbastian@mail.uni-paderborn.de \
    --to=kbastian@mail.uni-paderborn.de \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    /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).