Commit bf91ada56ab8ef6c6d80f401c879cc53a39a390b
1 parent
4c5e8c5c
CRIS: Remove unused pfn member from mmu translation results.
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6160 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
1 additions
and
6 deletions
target-cris/mmu.c
| @@ -285,7 +285,7 @@ static int cris_mmu_translate_page(struct cris_mmu_result_t *res, | @@ -285,7 +285,7 @@ static int cris_mmu_translate_page(struct cris_mmu_result_t *res, | ||
| 285 | env->sregs[SFR_RW_MM_TLB_SEL], | 285 | env->sregs[SFR_RW_MM_TLB_SEL], |
| 286 | env->regs[R_SP], env->pregs[PR_USP], env->ksp)); | 286 | env->regs[R_SP], env->pregs[PR_USP], env->ksp)); |
| 287 | 287 | ||
| 288 | - res->pfn = tlb_pfn; | 288 | + res->phy = tlb_pfn << TARGET_PAGE_BITS; |
| 289 | return !match; | 289 | return !match; |
| 290 | } | 290 | } |
| 291 | 291 | ||
| @@ -360,11 +360,7 @@ int cris_mmu_translate(struct cris_mmu_result_t *res, | @@ -360,11 +360,7 @@ int cris_mmu_translate(struct cris_mmu_result_t *res, | ||
| 360 | res->prot = PAGE_BITS; | 360 | res->prot = PAGE_BITS; |
| 361 | } | 361 | } |
| 362 | else | 362 | else |
| 363 | - { | ||
| 364 | miss = cris_mmu_translate_page(res, env, vaddr, rw, is_user); | 363 | miss = cris_mmu_translate_page(res, env, vaddr, rw, is_user); |
| 365 | - phy = (res->pfn << 13); | ||
| 366 | - res->phy = phy; | ||
| 367 | - } | ||
| 368 | done: | 364 | done: |
| 369 | env->pregs[PR_SRS] = old_srs; | 365 | env->pregs[PR_SRS] = old_srs; |
| 370 | return miss; | 366 | return miss; |