mirror of https://gitee.com/openkylin/qemu.git
Implement ARMv7 MMU access permissions.
Signed-off-by: Paul Brook <paul@codesourcery.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6099 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
564e571add
commit
d4934d18f3
|
@ -900,12 +900,16 @@ static inline int check_ap(CPUState *env, int ap, int domain, int access_type,
|
||||||
return PAGE_READ | PAGE_WRITE;
|
return PAGE_READ | PAGE_WRITE;
|
||||||
case 3:
|
case 3:
|
||||||
return PAGE_READ | PAGE_WRITE;
|
return PAGE_READ | PAGE_WRITE;
|
||||||
case 4: case 7: /* Reserved. */
|
case 4: /* Reserved. */
|
||||||
return 0;
|
return 0;
|
||||||
case 5:
|
case 5:
|
||||||
return is_user ? 0 : prot_ro;
|
return is_user ? 0 : prot_ro;
|
||||||
case 6:
|
case 6:
|
||||||
return prot_ro;
|
return prot_ro;
|
||||||
|
case 7:
|
||||||
|
if (!arm_feature (env, ARM_FEATURE_V7))
|
||||||
|
return 0;
|
||||||
|
return prot_ro;
|
||||||
default:
|
default:
|
||||||
abort();
|
abort();
|
||||||
}
|
}
|
||||||
|
@ -1085,6 +1089,12 @@ static int get_phys_addr_v6(CPUState *env, uint32_t address, int access_type,
|
||||||
if (xn && access_type == 2)
|
if (xn && access_type == 2)
|
||||||
goto do_fault;
|
goto do_fault;
|
||||||
|
|
||||||
|
/* The simplified model uses AP[0] as an access control bit. */
|
||||||
|
if ((env->cp15.c1_sys & (1 << 29)) && (ap & 1) == 0) {
|
||||||
|
/* Access flag fault. */
|
||||||
|
code = (code == 15) ? 6 : 3;
|
||||||
|
goto do_fault;
|
||||||
|
}
|
||||||
*prot = check_ap(env, ap, domain, access_type, is_user);
|
*prot = check_ap(env, ap, domain, access_type, is_user);
|
||||||
if (!*prot) {
|
if (!*prot) {
|
||||||
/* Access permission fault. */
|
/* Access permission fault. */
|
||||||
|
|
Loading…
Reference in New Issue