[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 32/66] target/arm: Remove env argument from combined_attrs
From: |
Peter Maydell |
Subject: |
Re: [PATCH v2 32/66] target/arm: Remove env argument from combined_attrs_fwb |
Date: |
Tue, 20 Sep 2022 17:05:58 +0100 |
On Mon, 22 Aug 2022 at 17:41, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> This value is unused.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> target/arm/ptw.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/target/arm/ptw.c b/target/arm/ptw.c
> index 680139b478..5c6e5eea88 100644
> --- a/target/arm/ptw.c
> +++ b/target/arm/ptw.c
> @@ -2171,8 +2171,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:
> @@ -2245,7 +2244,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);
> }
There's nothing in the git log, but I'm fairly sure I put the 'env'
argument into this function to make it parallel with the
combined_attrs_nofwb() one.
If you really want to get rid of it,
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
thanks
-- PMM
-- PMM
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [PATCH v2 32/66] target/arm: Remove env argument from combined_attrs_fwb,
Peter Maydell <=