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

target-arm: Fix brace style in reindented code

Browse source 
This patch fixes the brace style in the code reindented in the
previous commit.

Backports commit 87c3d486150917c8e286d29166c98a2035377b52 from qemu
This commit is contained in:
Peter Maydell 2018-02-12 11:56:20 -05:00 committed by Lioncash
parent 11c6c143d7
commit e3c3cccb7a
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4184,21 +4184,23 @@ static inline int check_ap(CPUARMState *env, ARMMMUIdx mmu_idx,
bool is_user = regime_is_user(env, mmu_idx); bool is_user = regime_is_user(env, mmu_idx);
if (domain_prot == 3) { if (domain_prot == 3) {
return PAGE_READ | PAGE_WRITE; return PAGE_READ | PAGE_WRITE;
} }
if (access_type == 1) if (access_type == 1) {
prot_ro = 0; prot_ro = 0;
else } else {
prot_ro = PAGE_READ; prot_ro = PAGE_READ;
}
switch (ap) { switch (ap) {
case 0: case 0:
if (arm_feature(env, ARM_FEATURE_V7)) { if (arm_feature(env, ARM_FEATURE_V7)) {
return 0; return 0;
} }
if (access_type == 1) if (access_type == 1) {
return 0; return 0;
}
switch (regime_sctlr(env, mmu_idx) & (SCTLR_S | SCTLR_R)) { switch (regime_sctlr(env, mmu_idx) & (SCTLR_S | SCTLR_R)) {
case SCTLR_S: case SCTLR_S:
return is_user ? 0 : PAGE_READ; return is_user ? 0 : PAGE_READ;
@ -4210,10 +4212,11 @@ static inline int check_ap(CPUARMState *env, ARMMMUIdx mmu_idx,
case 1: case 1:
return is_user ? 0 : PAGE_READ | PAGE_WRITE; return is_user ? 0 : PAGE_READ | PAGE_WRITE;
case 2: case 2:
if (is_user) if (is_user) {
return prot_ro; return prot_ro;
else } else {
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: /* Reserved. */ case 4: /* Reserved. */
@ -4223,8 +4226,9 @@ static inline int check_ap(CPUARMState *env, ARMMMUIdx mmu_idx,
case 6: case 6:
return prot_ro; return prot_ro;
case 7: case 7:
if (!arm_feature (env, ARM_FEATURE_V6K)) if (!arm_feature (env, ARM_FEATURE_V6K)) {
return 0; return 0;
}
return prot_ro; return prot_ro;
default: default:
abort(); abort();
@ -4735,17 +4739,20 @@ static int get_phys_addr_mpu(CPUARMState *env, uint32_t address,
*phys_ptr = address; *phys_ptr = address;
for (n = 7; n >= 0; n--) { for (n = 7; n >= 0; n--) {
base = env->cp15.c6_region[n]; base = env->cp15.c6_region[n];
if ((base & 1) == 0) if ((base & 1) == 0) {
continue; continue;
}
mask = 1 << ((base >> 1) & 0x1f); mask = 1 << ((base >> 1) & 0x1f);
/* Keep this shift separate from the above to avoid an /* Keep this shift separate from the above to avoid an
(undefined) << 32. */ (undefined) << 32. */
mask = (mask << 1) - 1; mask = (mask << 1) - 1;
if (((base ^ address) & ~mask) == 0) if (((base ^ address) & ~mask) == 0) {
break; break;
}
} }
if (n < 0) if (n < 0) {
return 2; return 2;
}
if (access_type == 2) { if (access_type == 2) {
mask = env->cp15.pmsav5_insn_ap; mask = env->cp15.pmsav5_insn_ap;
@ -4757,21 +4764,24 @@ static int get_phys_addr_mpu(CPUARMState *env, uint32_t address,
case 0: case 0:
return 1; return 1;
case 1: case 1:
if (is_user) if (is_user) {
return 1; return 1;
}
*prot = PAGE_READ | PAGE_WRITE; *prot = PAGE_READ | PAGE_WRITE;
break; break;
case 2: case 2:
*prot = PAGE_READ; *prot = PAGE_READ;
if (!is_user) if (!is_user) {
*prot |= PAGE_WRITE; *prot |= PAGE_WRITE;
}
break; break;
case 3: case 3:
*prot = PAGE_READ | PAGE_WRITE; *prot = PAGE_READ | PAGE_WRITE;
break; break;
case 5: case 5:
if (is_user) if (is_user) {
return 1; return 1;
}
*prot = PAGE_READ; *prot = PAGE_READ;
break; break;
case 6: case 6: