OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

cris: Dont clobber the MMU state across calls to cpu_get_phys_page_debug.

Browse Source 
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Edgar E. Iglesias 2010-07-05 10:24:56 +02:00
parent 253248a3be
commit 3c4fe427ed
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
target-cris/helper.c
View File

@ -248,9 +248,26 @@ 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. */
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); miss = cris_mmu_translate(&res, env, addr, 0, 0);
/* If D TLB misses, try I TLB. */
if (miss) {
miss = cris_mmu_translate(&res, env, addr, 2, 0);
}
/* 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));