yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-11 08:15:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-arm: Add support for S2 page-table protection bits

Browse source 
Backports commit 6ab1a5ee1c9d328cacf78805439ed4d3d132decd from qemu
This commit is contained in:
Edgar E. Iglesias 2018-02-17 13:25:57 -05:00 committed by Lioncash
parent bf0313353e
commit 9f5af4cb22
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
qemu/target-arm/helper.c
View file

@ -5430,6 +5430,28 @@ simple_ap_to_rw_prot(CPUARMState *env, ARMMMUIdx mmu_idx, int ap)
return simple_ap_to_rw_prot_is_user(ap, regime_is_user(env, mmu_idx)); return simple_ap_to_rw_prot_is_user(ap, regime_is_user(env, mmu_idx));
} }
/* Translate S2 section/page access permissions to protection flags
*
* @env: CPUARMState
* @s2ap: The 2-bit stage2 access permissions (S2AP)
* @xn: XN (execute-never) bit
*/
static int get_S2prot(CPUARMState *env, int s2ap, int xn)
{
int prot = 0;
if (s2ap & 1) {
prot |= PAGE_READ;
}
if (s2ap & 2) {
prot |= PAGE_WRITE;
}
if (!xn) {
prot |= PAGE_EXEC;
}
return prot;
}
/* Translate section/page access permissions to protection flags /* Translate section/page access permissions to protection flags
* *
* @env: CPUARMState * @env: CPUARMState
@ -6133,11 +6155,17 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
*/ */
page_size = (1ULL << ((stride * (4 - level)) + 3)); page_size = (1ULL << ((stride * (4 - level)) + 3));
descaddr |= (address & (page_size - 1)); descaddr |= (address & (page_size - 1));
/* Extract attributes from the descriptor and merge with table attrs */ /* Extract attributes from the descriptor */
attrs = extract64(descriptor, 2, 10) attrs = extract64(descriptor, 2, 10)
| (extract64(descriptor, 52, 12) << 10); | (extract64(descriptor, 52, 12) << 10);
attrs |= extract32(tableattrs, 0, 2) << 11; /* XN, PXN */ attrs |= extract32(tableattrs, 0, 2) << 11; /* XN, PXN */
attrs |= extract32(tableattrs, 3, 1) << 5; /* APTable[1] => AP[2] */ attrs |= extract32(tableattrs, 3, 1) << 5; /* APTable[1] => AP[2] */
if (mmu_idx == ARMMMUIdx_S2NS) {
/* Stage 2 table descriptors do not include any attribute fields */
break;
}
/* Merge in attributes from table descriptors */
/* The sense of AP[1] vs APTable[0] is reversed, as APTable[0] == 1 /* The sense of AP[1] vs APTable[0] is reversed, as APTable[0] == 1
* means "force PL1 access only", which means forcing AP[1] to 0. * means "force PL1 access only", which means forcing AP[1] to 0.
*/ */
@ -6157,11 +6185,16 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
} }
ap = extract32(attrs, 4, 2); ap = extract32(attrs, 4, 2);
ns = extract32(attrs, 3, 1);
xn = extract32(attrs, 12, 1); xn = extract32(attrs, 12, 1);
pxn = extract32(attrs, 11, 1);
*prot = get_S1prot(env, mmu_idx, va_size == 64, ap, ns, xn, pxn); if (mmu_idx == ARMMMUIdx_S2NS) {
ns = true;
*prot = get_S2prot(env, ap, xn);
} else {
ns = extract32(attrs, 3, 1);
pxn = extract32(attrs, 11, 1);
*prot = get_S1prot(env, mmu_idx, va_size == 64, ap, ns, xn, pxn);
}
fault_type = permission_fault; fault_type = permission_fault;
if (!(*prot & (1 << access_type))) { if (!(*prot & (1 << access_type))) {