motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/arm: Remove env argument from combined_attrs_fwb

Browse source 
This value is unused.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20221001162318.153420-16-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-10-01 09:22:51 -07:00 • committed by Peter Maydell
parent ab1f78859d
commit 72cef09caa
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
target/arm/ptw.c
View file

@ -2172,8 +2172,7 @@ static uint8_t force_cacheattr_nibble_wb(uint8_t attr)
* s1 and s2 for the HCR_EL2.FWB == 1 case, returning the * s1 and s2 for the HCR_EL2.FWB == 1 case, returning the
* combined attributes in MAIR_EL1 format. * combined attributes in MAIR_EL1 format.
*/ */
static uint8_t combined_attrs_fwb(CPUARMState *env, static uint8_t combined_attrs_fwb(ARMCacheAttrs s1, ARMCacheAttrs s2)
ARMCacheAttrs s1, ARMCacheAttrs s2)
{ {
switch (s2.attrs) { switch (s2.attrs) {
case 7: case 7:
@ -2246,7 +2245,7 @@ static ARMCacheAttrs combine_cacheattrs(CPUARMState *env,
/* Combine memory type and cacheability attributes */ /* Combine memory type and cacheability attributes */
if (arm_hcr_el2_eff(env) & HCR_FWB) { if (arm_hcr_el2_eff(env) & HCR_FWB) {
ret.attrs = combined_attrs_fwb(env, s1, s2); ret.attrs = combined_attrs_fwb(s1, s2);
} else { } else {
ret.attrs = combined_attrs_nofwb(env, s1, s2); ret.attrs = combined_attrs_nofwb(env, s1, s2);
} }