sparc32 mmu register fixes
PATCH 1/1 sparc32 mmu register fixes
This patch gets openboot prom mmu register self tests passing for lx, ss4, ss5 and ss10 prom images.
Index: target-sparc/cpu.h
===================================================================
RCS file: /sources/qemu/qemu/target-sparc/cpu.h,v
retrieving revision 1.61
cpu.h +4 -0
@@ -198,6 +198,10 @@ typedef struct CPUSPARCState {int interrupt_request;int halted;uint32_t mmu_bm; +uint32_t mmu_ctpr_mask; +uint32_t mmu_cxr_mask; +uint32_t mmu_sfsr_mask; +uint32_t mmu_trcr_mask;/* NOTE: we allow 8 more registers to handle wrapping */ target_ulong regbase[NWINDOWS *16 +8 ];
Index: target-sparc/helper.c
===================================================================
RCS file: /sources/qemu/qemu/target-sparc/helper.c,v retrieving revision 1.33
helper.c +1 -1
@@ -129,7 +129,7 @@ int get_physical_address (CPUState *env,/* SPARC reference MMU table walk: Context table->L1->L2->PTE */ /* Context base + context number */ - pde_ptr = ((env->mmuregs[1 ] & ~63 )<<4 ) + (env->mmuregs[2 ] <<2 ); + pde_ptr = (env->mmuregs[1 ] <<4 ) + (env->mmuregs[2 ] <<2 ); pde =ldl_phys (pde_ptr);/* Ctx pde */
Index: target-sparc/op_helper.c
===================================================================
RCS file: /sources/qemu/qemu/target-sparc/op_helper.c,v retrieving revision 1.65
op_helper.c +14 -8
@@ -591,7 +591,7 @@ void helper_st_asi(int asi, int size) oldreg = env->mmuregs[reg];switch (reg) { -case 0 : +case 0 :// Control Register env->mmuregs[reg] = (env->mmuregs[reg] &0xff000000 ) | (T1 &0x00ffffff );// Mappings generated during no-fault mode or MMU
@@ -600,21 +600,27 @@ void helper_st_asi(int asi, int size) (env->mmuregs[reg] & (MMU_E | MMU_NF | env->mmu_bm)))tlb_flush (env,1 );break ; -case 2 : - env->mmuregs[reg] =T1 ; +case 1 :// Context Table Pointer Register + env->mmuregs[reg] =T1 & env->mmu_ctpr_mask; +break ; +case 2 :// Context Register + env->mmuregs[reg] =T1 & env->mmu_cxr_mask;if (oldreg != env->mmuregs[reg]) {/* we flush when the MMU context changes because QEMU has no MMU context support */ tlb_flush (env,1 ); }break ; -case 3 : -case 4 : +case 3 :// Synchronous Fault Status Register with Clear +case 4 :// Synchronous Fault Address Register +break ; +case 0x10 :// TLB Replacement Control Register + env->mmuregs[reg] =T1 & env->mmu_trcr_mask;break ; -case 0x13 : - env->mmuregs[3 ] =T1 ; +case 0x13 :// Synchronous Fault Status Register with Read and Clear + env->mmuregs[3 ] =T1 & env->mmu_sfsr_mask;break ; -case 0x14 : +case 0x14 :// Synchronous Fault Address Register env->mmuregs[4 ] =T1 ;break ;default :
Index: target-sparc/translate.c
===================================================================
RCS file: /sources/qemu/qemu/target-sparc/translate.c,v retrieving revision 1.86
translate.c +84 -0
210 lines not on this page · raw message