SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/arm: Use bool consistently for get_phys_addr subroutines

Browse Source 
The return type of the functions is already bool, but in a few
instances we used an integer type with the return statement.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20221011031911.2408754-13-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-10-10 20:18:59 -07:00 committed by Peter Maydell
parent 3f5a74c543
commit 6b72c5424a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/arm/ptw.c
View File

@ -2432,7 +2432,7 @@ static bool get_phys_addr_disabled(CPUARMState *env, target_ulong address,
result->f.lg_page_size = TARGET_PAGE_BITS; result->f.lg_page_size = TARGET_PAGE_BITS;
result->cacheattrs.shareability = shareability; result->cacheattrs.shareability = shareability;
result->cacheattrs.attrs = memattr; result->cacheattrs.attrs = memattr;
return 0; return false;
} }
static bool get_phys_addr_twostage(CPUARMState *env, S1Translate *ptw, static bool get_phys_addr_twostage(CPUARMState *env, S1Translate *ptw,
@ -2443,9 +2443,8 @@ static bool get_phys_addr_twostage(CPUARMState *env, S1Translate *ptw,
{ {
hwaddr ipa; hwaddr ipa;
int s1_prot; int s1_prot;
int ret;
bool is_secure = ptw->in_secure; bool is_secure = ptw->in_secure;
bool ipa_secure, s2walk_secure; bool ret, ipa_secure, s2walk_secure;
ARMCacheAttrs cacheattrs1; ARMCacheAttrs cacheattrs1;
bool is_el0; bool is_el0;
uint64_t hcr; uint64_t hcr;
@ -2520,7 +2519,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, S1Translate *ptw,
&& (ipa_secure && (ipa_secure
|| !(env->cp15.vtcr_el2 & (VTCR_NSA | VTCR_NSW)))); || !(env->cp15.vtcr_el2 & (VTCR_NSA | VTCR_NSW))));
return 0; return false;
} }
static bool get_phys_addr_with_struct(CPUARMState *env, S1Translate *ptw, static bool get_phys_addr_with_struct(CPUARMState *env, S1Translate *ptw,