Re: [PATCH 03/13] target/mips: Remove access_type arg from get_segctl_physical_address()

[Jiaxun Yang]

在 2021/1/28 下午10:41, Philippe Mathieu-Daudé 写道:
> get_segctl_physical_address() doesn't use the 'access_type' argument,
> remove it to simplify.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> ---
>   target/mips/tlb_helper.c | 20 ++++++++++----------
>   1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c
> index 9906292440c..d89ad87cb9d 100644
> --- a/target/mips/tlb_helper.c
> +++ b/target/mips/tlb_helper.c
> @@ -245,7 +245,7 @@ static int get_seg_physical_address(CPUMIPSState *env, 
> hwaddr *physical,
>   
>   static int get_segctl_physical_address(CPUMIPSState *env, hwaddr *physical,
>                                          int *prot, target_ulong real_address,
> -                                       int rw, int access_type, int mmu_idx,
> +                                       int rw, int mmu_idx,
>                                          uint16_t segctl, target_ulong segmask)
>   {
>       unsigned int am = (segctl & CP0SC_AM_MASK) >> CP0SC_AM;
> @@ -306,7 +306,7 @@ static int get_physical_address(CPUMIPSState *env, hwaddr 
> *physical,
>               segctl = env->CP0_SegCtl2 >> 16;
>           }
>           ret = get_segctl_physical_address(env, physical, prot,
> -                                          real_address, rw, access_type,
> +                                          real_address, rw,
>                                             mmu_idx, segctl, 0x3FFFFFFF);
>   #if defined(TARGET_MIPS64)
>       } else if (address < 0x4000000000000000ULL) {
> @@ -370,26 +370,26 @@ static int get_physical_address(CPUMIPSState *env, hwaddr 
> *physical,
>   #endif
>       } else if (address < KSEG1_BASE) {
>           /* kseg0 */
> -        ret = get_segctl_physical_address(env, physical, prot, real_address, 
> rw,
> -                                          access_type, mmu_idx,
> +        ret = get_segctl_physical_address(env, physical, prot, real_address,
> +                                          rw, mmu_idx,
>                                             env->CP0_SegCtl1 >> 16, 0x1FFFFFFF);
>       } else if (address < KSEG2_BASE) {
>           /* kseg1 */
> -        ret = get_segctl_physical_address(env, physical, prot, real_address, 
> rw,
> -                                          access_type, mmu_idx,
> +        ret = get_segctl_physical_address(env, physical, prot, real_address,
> +                                          rw, mmu_idx,
>                                             env->CP0_SegCtl1, 0x1FFFFFFF);
>       } else if (address < KSEG3_BASE) {
>           /* sseg (kseg2) */
> -        ret = get_segctl_physical_address(env, physical, prot, real_address, 
> rw,
> -                                          access_type, mmu_idx,
> +        ret = get_segctl_physical_address(env, physical, prot, real_address,
> +                                          rw, mmu_idx,
>                                             env->CP0_SegCtl0 >> 16, 0x1FFFFFFF);
>       } else {
>           /*
>            * kseg3
>            * XXX: debug segment is not emulated
>            */
> -        ret = get_segctl_physical_address(env, physical, prot, real_address, 
> rw,
> -                                          access_type, mmu_idx,
> +        ret = get_segctl_physical_address(env, physical, prot, real_address,
> +                                          rw, mmu_idx,
>                                             env->CP0_SegCtl0, 0x1FFFFFFF);
>       }
>       return ret;