diff options
| author | Richard Henderson | 2022-10-01 18:22:51 +0200 |
|---|---|---|
| committer | Peter Maydell | 2022-10-10 15:52:25 +0200 |
| commit | 72cef09caa2ce23324777676979c62bbdd02cb35 (patch) | |
| tree | 8ee3225cd29b52aedfcbb267ae507a0037aa3665 | |
| parent | target/arm: Hoist read of *is_secure in S1_ptw_translate (diff) | |
| download | qemu-72cef09caa2ce23324777676979c62bbdd02cb35.tar.gz qemu-72cef09caa2ce23324777676979c62bbdd02cb35.tar.xz qemu-72cef09caa2ce23324777676979c62bbdd02cb35.zip | |
target/arm: Remove env argument from combined_attrs_fwb
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>
| -rw-r--r-- | target/arm/ptw.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/arm/ptw.c b/target/arm/ptw.c index b40b4586f8..7d607c2e7b 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -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 * combined attributes in MAIR_EL1 format. */ -static uint8_t combined_attrs_fwb(CPUARMState *env, - ARMCacheAttrs s1, ARMCacheAttrs s2) +static uint8_t combined_attrs_fwb(ARMCacheAttrs s1, ARMCacheAttrs s2) { switch (s2.attrs) { case 7: @@ -2246,7 +2245,7 @@ static ARMCacheAttrs combine_cacheattrs(CPUARMState *env, /* Combine memory type and cacheability attributes */ if (arm_hcr_el2_eff(env) & HCR_FWB) { - ret.attrs = combined_attrs_fwb(env, s1, s2); + ret.attrs = combined_attrs_fwb(s1, s2); } else { ret.attrs = combined_attrs_nofwb(env, s1, s2); } |