motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 09:43:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target-mips: distinguish between data load and instruction fetch

Browse source 
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
Reviewed-by: Yongbok Kim <yongbok.kim@imgtec.com>
This commit is contained in:
Leon Alrae 2014-07-07 11:23:57 +01:00
parent 55e9409366
commit 9f6bcedba6
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
target-mips/helper.c
View file

@ -87,7 +87,7 @@ int r4k_map_address (CPUMIPSState *env, hwaddr *physical, int *prot,
/* Check access rights */ /* Check access rights */
if (!(n ? tlb->V1 : tlb->V0)) if (!(n ? tlb->V1 : tlb->V0))
return TLBRET_INVALID; return TLBRET_INVALID;
if (rw == 0 || (n ? tlb->D1 : tlb->D0)) { if (rw != MMU_DATA_STORE || (n ? tlb->D1 : tlb->D0)) {
*physical = tlb->PFN[n] | (address & (mask >> 1)); *physical = tlb->PFN[n] | (address & (mask >> 1));
*prot = PAGE_READ; *prot = PAGE_READ;
if (n ? tlb->D1 : tlb->D0) if (n ? tlb->D1 : tlb->D0)
@ -237,25 +237,28 @@ static void raise_mmu_exception(CPUMIPSState *env, target_ulong address,
case TLBRET_BADADDR: case TLBRET_BADADDR:
/* Reference to kernel address from user mode or supervisor mode */ /* Reference to kernel address from user mode or supervisor mode */
/* Reference to supervisor address from user mode */ /* Reference to supervisor address from user mode */
if (rw) if (rw == MMU_DATA_STORE) {
exception = EXCP_AdES; exception = EXCP_AdES;
else } else {
exception = EXCP_AdEL; exception = EXCP_AdEL;
}
break; break;
case TLBRET_NOMATCH: case TLBRET_NOMATCH:
/* No TLB match for a mapped address */ /* No TLB match for a mapped address */
if (rw) if (rw == MMU_DATA_STORE) {
exception = EXCP_TLBS; exception = EXCP_TLBS;
else } else {
exception = EXCP_TLBL; exception = EXCP_TLBL;
}
error_code = 1; error_code = 1;
break; break;
case TLBRET_INVALID: case TLBRET_INVALID:
/* TLB match with no valid bit */ /* TLB match with no valid bit */
if (rw) if (rw == MMU_DATA_STORE) {
exception = EXCP_TLBS; exception = EXCP_TLBS;
else } else {
exception = EXCP_TLBL; exception = EXCP_TLBL;
}
break; break;
case TLBRET_DIRTY: case TLBRET_DIRTY:
/* TLB match but 'D' bit is cleared */ /* TLB match but 'D' bit is cleared */
@ -312,8 +315,6 @@ int mips_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw,
qemu_log("%s pc " TARGET_FMT_lx " ad %" VADDR_PRIx " rw %d mmu_idx %d\n", qemu_log("%s pc " TARGET_FMT_lx " ad %" VADDR_PRIx " rw %d mmu_idx %d\n",
__func__, env->active_tc.PC, address, rw, mmu_idx); __func__, env->active_tc.PC, address, rw, mmu_idx);
rw &= 1;
/* data access */ /* data access */
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
/* XXX: put correct access by using cpu_restore_state() /* XXX: put correct access by using cpu_restore_state()
@ -347,8 +348,6 @@ hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address, int r
int access_type; int access_type;
int ret = 0; int ret = 0;
rw &= 1;
/* data access */ /* data access */
access_type = ACCESS_INT; access_type = ACCESS_INT;
ret = get_physical_address(env, &physical, &prot, ret = get_physical_address(env, &physical, &prot,