yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-23 06:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

armv7m: Implement M profile default memory map

Browse source 
Add support for the M profile default memory map which is used
if the MPU is not present or disabled.

The main differences in behaviour from implementing this
correctly are that we set the PAGE_EXEC attribute on
the right regions of memory, such that device regions
are not executable.

Backports commit 3a00d560bcfca7ad04327062c1986a016c104b1f from qemu
This commit is contained in:
Michael Davidsaver 2018-03-02 19:24:59 -05:00 committed by Lioncash
parent 7c845dabe8
commit 4d8ae4a2b2
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
qemu/target/arm/helper.c
View file

@ -7279,18 +7279,36 @@ static inline void get_phys_addr_pmsav7_default(CPUARMState *env,
ARMMMUIdx mmu_idx,
int32_t address, int *prot)
{
*prot = PAGE_READ | PAGE_WRITE;
switch (address) {
case 0xF0000000 ... 0xFFFFFFFF:
if (regime_sctlr(env, mmu_idx) & SCTLR_V) { /* hivecs execing is ok */
if (!arm_feature(env, ARM_FEATURE_M)) {
*prot = PAGE_READ | PAGE_WRITE;
if (address >= 0xF0000000 && address <= 0xFFFFFFFF) {
if (regime_sctlr(env, mmu_idx) & SCTLR_V) {
/* hivecs execing is ok */
*prot |= PAGE_EXEC;
}
} else if (address >= 0x00000000 && address <= 0x7FFFFFFF) {
*prot |= PAGE_EXEC;
}
break;
case 0x00000000 ... 0x7FFFFFFF:
*prot |= PAGE_EXEC;
break;
} else {
/* Default system address map for M profile cores.
* The architecture specifies which regions are execute-never;
* at the MPU level no other checks are defined.
*/
if ((address >= 0x00000000 && address <= 0x1FFFFFFF) || /* ROM */
(address >= 0x20000000 && address <= 0x3FFFFFFF) || /* SRAM */
(address >= 0x60000000 && address <= 0x7FFFFFFF) || /* RAM */
(address >= 0x80000000 && address <= 0x9FFFFFFF)) { /* RAM */
*prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
} else if ((address >= 0x40000000 && address <= 0x5FFFFFFF) || /* Peripheral */
(address >= 0xA0000000 && address <= 0xBFFFFFFF) || /* Device */
(address >= 0xC0000000 && address <= 0xDFFFFFFF) || /* Device */
(address >= 0xE0000000 && address <= 0xFFFFFFFF)) { /* System */
*prot = PAGE_READ | PAGE_WRITE;
} else {
g_assert_not_reached();
}
}
}
static bool get_phys_addr_pmsav7(CPUARMState *env, uint32_t address,