mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cris: Avoid debug clobbering for both I & D MMU state.

Browse Source 
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@axis.com>
This commit is contained in:
Edgar E. Iglesias 2010-07-05 11:39:04 +02:00
parent 3c4fe427ed
commit 9f5a1fae7e
3 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
target-cris/helper.c
View File

@ -78,7 +78,7 @@ int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
D(printf ("%s addr=%x pc=%x rw=%x\n", __func__, address, env->pc, rw)); D(printf ("%s addr=%x pc=%x rw=%x\n", __func__, address, env->pc, rw));
miss = cris_mmu_translate(&res, env, address & TARGET_PAGE_MASK, miss = cris_mmu_translate(&res, env, address & TARGET_PAGE_MASK,
rw, mmu_idx); rw, mmu_idx, 0);
if (miss) if (miss)
{ {
if (env->exception_index == EXCP_BUSFAULT) if (env->exception_index == EXCP_BUSFAULT)
@ -248,26 +248,15 @@ void do_interrupt(CPUState *env)
target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
{ {
uint32_t phy = addr; uint32_t phy = addr;
uint32_t r_cause, r_tlb_sel, rand_lfsr;
struct cris_mmu_result res; struct cris_mmu_result res;
int miss; int miss;
/* Save MMU state. */ miss = cris_mmu_translate(&res, env, addr, 0, 0, 1);
r_tlb_sel = env->sregs[SFR_RW_MM_TLB_SEL];
r_cause = env->sregs[SFR_R_MM_CAUSE];
rand_lfsr = env->mmu_rand_lfsr;
miss = cris_mmu_translate(&res, env, addr, 0, 0);
/* If D TLB misses, try I TLB. */ /* If D TLB misses, try I TLB. */
if (miss) { if (miss) {
miss = cris_mmu_translate(&res, env, addr, 2, 0); miss = cris_mmu_translate(&res, env, addr, 2, 0, 1);
} }
/* Restore MMU state. */
env->sregs[SFR_RW_MM_TLB_SEL] = r_tlb_sel;
env->sregs[SFR_R_MM_CAUSE] = r_cause;
env->mmu_rand_lfsr = rand_lfsr;
if (!miss) if (!miss)
phy = res.phy; phy = res.phy;
D(fprintf(stderr, "%s %x -> %x\n", __func__, addr, phy)); D(fprintf(stderr, "%s %x -> %x\n", __func__, addr, phy));

11
target-cris/mmu.c
View File

@ -135,7 +135,7 @@ static void dump_tlb(CPUState *env, int mmu)
/* rw 0 = read, 1 = write, 2 = exec. */ /* rw 0 = read, 1 = write, 2 = exec. */
static int cris_mmu_translate_page(struct cris_mmu_result *res, static int cris_mmu_translate_page(struct cris_mmu_result *res,
CPUState *env, uint32_t vaddr, CPUState *env, uint32_t vaddr,
int rw, int usermode) int rw, int usermode, int debug)
{ {
unsigned int vpage; unsigned int vpage;
unsigned int idx; unsigned int idx;
@ -261,7 +261,7 @@ static int cris_mmu_translate_page(struct cris_mmu_result *res,
set = env->mmu_rand_lfsr & 3; set = env->mmu_rand_lfsr & 3;
} }
if (!match) { if (!match && !debug) {
cris_mmu_update_rand_lfsr(env); cris_mmu_update_rand_lfsr(env);
/* Compute index. */ /* Compute index. */
@ -330,7 +330,7 @@ void cris_mmu_flush_pid(CPUState *env, uint32_t pid)
int cris_mmu_translate(struct cris_mmu_result *res, int cris_mmu_translate(struct cris_mmu_result *res,
CPUState *env, uint32_t vaddr, CPUState *env, uint32_t vaddr,
int rw, int mmu_idx) int rw, int mmu_idx, int debug)
{ {
int seg; int seg;
int miss = 0; int miss = 0;
@ -357,9 +357,10 @@ int cris_mmu_translate(struct cris_mmu_result *res,
base = cris_mmu_translate_seg(env, seg); base = cris_mmu_translate_seg(env, seg);
res->phy = base | (0x0fffffff & vaddr); res->phy = base | (0x0fffffff & vaddr);
res->prot = PAGE_BITS; 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: done:
env->pregs[PR_SRS] = old_srs; env->pregs[PR_SRS] = old_srs;
return miss; return miss;

2
target-cris/mmu.h
View File

@ -14,4 +14,4 @@ void cris_mmu_init(CPUState *env);
void cris_mmu_flush_pid(CPUState *env, uint32_t pid); void cris_mmu_flush_pid(CPUState *env, uint32_t pid);
int cris_mmu_translate(struct cris_mmu_result *res, int cris_mmu_translate(struct cris_mmu_result *res,
CPUState *env, uint32_t vaddr, CPUState *env, uint32_t vaddr,
int rw, int mmu_idx); int rw, int mmu_idx, int debug);