cris: Avoid debug clobbering for both I & D MMU state.
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@axis.com>
diff --git a/target-cris/mmu.c b/target-cris/mmu.c
index 07967dd..773438e 100644
--- a/target-cris/mmu.c
+++ b/target-cris/mmu.c
@@ -135,7 +135,7 @@
/* rw 0 = read, 1 = write, 2 = exec. */
static int cris_mmu_translate_page(struct cris_mmu_result *res,
CPUState *env, uint32_t vaddr,
- int rw, int usermode)
+ int rw, int usermode, int debug)
{
unsigned int vpage;
unsigned int idx;
@@ -261,7 +261,7 @@
set = env->mmu_rand_lfsr & 3;
}
- if (!match) {
+ if (!match && !debug) {
cris_mmu_update_rand_lfsr(env);
/* Compute index. */
@@ -330,7 +330,7 @@
int cris_mmu_translate(struct cris_mmu_result *res,
CPUState *env, uint32_t vaddr,
- int rw, int mmu_idx)
+ int rw, int mmu_idx, int debug)
{
int seg;
int miss = 0;
@@ -357,9 +357,10 @@
base = cris_mmu_translate_seg(env, seg);
res->phy = base | (0x0fffffff & vaddr);
res->prot = PAGE_BITS;
+ } else {
+ miss = cris_mmu_translate_page(res, env, vaddr, rw,
+ is_user, debug);
}
- else
- miss = cris_mmu_translate_page(res, env, vaddr, rw, is_user);
done:
env->pregs[PR_SRS] = old_srs;
return miss;
