Merge remote-tracking branch 'mst/tags/for_anthony' into staging

[qemu.git] / target-cris / mmu.c

diff --git a/target-cris/mmu.c b/target-cris/mmu.c
index 773438e9f457a11a388710c128fc720d6e48249a..512e28b4813f4e4940d19e890ea4c158c38fc92d 100644 (file)
--- a/target-cris/mmu.c
+++ b/target-cris/mmu.c
@@ -20,24 +20,18 @@
 
 #ifndef CONFIG_USER_ONLY
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "config.h"
 #include "cpu.h"
 #include "mmu.h"
-#include "exec-all.h"
 
 #ifdef DEBUG
 #define D(x) x
 #define D_LOG(...) qemu_log(__VA_ARGS__)
 #else
-#define D(x)
+#define D(x) do { } while (0)
 #define D_LOG(...) do { } while (0)
 #endif
 
-void cris_mmu_init(CPUState *env)
+void cris_mmu_init(CPUCRISState *env)
 {
        env->mmu_rand_lfsr = 0xcccc;
 }
@@ -55,7 +49,7 @@ static inline unsigned int compute_polynom(unsigned int sr)
        return f;
 }
 
-static void cris_mmu_update_rand_lfsr(CPUState *env)
+static void cris_mmu_update_rand_lfsr(CPUCRISState *env)
 {
        unsigned int f;
 
@@ -76,7 +70,7 @@ static inline int cris_mmu_segmented_addr(int seg, uint32_t rw_mm_cfg)
        return (1 << seg) & rw_mm_cfg;
 }
 
-static uint32_t cris_mmu_translate_seg(CPUState *env, int seg)
+static uint32_t cris_mmu_translate_seg(CPUCRISState *env, int seg)
 {
        uint32_t base;
        int i;
@@ -112,7 +106,7 @@ static inline void set_field(uint32_t *dst, unsigned int val,
 }
 
 #ifdef DEBUG
-static void dump_tlb(CPUState *env, int mmu)
+static void dump_tlb(CPUCRISState *env, int mmu)
 {
        int set;
        int idx;
@@ -134,7 +128,7 @@ static void dump_tlb(CPUState *env, int mmu)
 
 /* rw 0 = read, 1 = write, 2 = exec.  */
 static int cris_mmu_translate_page(struct cris_mmu_result *res,
-                                  CPUState *env, uint32_t vaddr,
+                                  CPUCRISState *env, uint32_t vaddr,
                                   int rw, int usermode, int debug)
 {
        unsigned int vpage;
@@ -251,7 +245,7 @@ static int cris_mmu_translate_page(struct cris_mmu_result *res,
                        res->prot |= PAGE_READ;
                        if (tlb_w)
                                res->prot |= PAGE_WRITE;
-                       if (tlb_x)
+                       if (mmu == 0 && (cfg_x || tlb_x))
                                res->prot |= PAGE_EXEC;
                }
                else
@@ -294,7 +288,7 @@ static int cris_mmu_translate_page(struct cris_mmu_result *res,
        return !match;
 }
 
-void cris_mmu_flush_pid(CPUState *env, uint32_t pid)
+void cris_mmu_flush_pid(CPUCRISState *env, uint32_t pid)
 {
        target_ulong vaddr;
        unsigned int idx;
@@ -329,7 +323,7 @@ void cris_mmu_flush_pid(CPUState *env, uint32_t pid)
 }
 
 int cris_mmu_translate(struct cris_mmu_result *res,
-                      CPUState *env, uint32_t vaddr,
+                      CPUCRISState *env, uint32_t vaddr,
                       int rw, int mmu_idx, int debug)
 {
        int seg;