From nobody Tue Feb 10 20:07:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918121; cv=none; d=zohomail.com; s=zohoarc; b=he8EeoUWSG82z1il2PkZUwEbA/vu7EVTueuwbXK76vEKXDCGbvCvEO6mz3bJF7wO0w2f7E403OUjUZkYLbF9r41JMNX0dYCvLxyVp1ZbOq4Ufq14uwZJgPPfKlWCKFE+DC4/zS/iymLZ2jHI41mSg3QzEhRQrBNuqDkaM0LaInY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918121; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GYl+8CWL6PT+OOiW+f+gON8b+09cumwTEA/5uUAsIxU=; b=H3YUOBuQ9x59EyA4+GYUAtUtBu/RGKV4+04ahE4GRqoe8kAK7/RPPcoN+ECbDsEcy4kePq4DygessjMNCvUYuxqZyVPMqiEgXRhYTWjpe0ckh0Aaj/YHacMBRD4hd5guDjGe+6Xt7BQ0+gLizVSScXX/WEv9y3PHW3qcu8kpF0k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1613918121091669.054340434506; Sun, 21 Feb 2021 06:35:21 -0800 (PST) Received: by mail-wr1-f50.google.com with SMTP id a4so14113170wro.8 for ; Sun, 21 Feb 2021 06:35:20 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id r12sm14570843wrt.69.2021.02.21.06.35.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GYl+8CWL6PT+OOiW+f+gON8b+09cumwTEA/5uUAsIxU=; b=WdFyiHnzJxqOVp4rUZfnxgMCUmW/T+ySyNeJrMCvta6p9P0D+4QeQEJKCg4J1febIM qE6tauzmbPIlCD6drJ5DbLyUN+ueqLKmqwtWNBGVmHWWvhWgvU/r+yEbNd5dIwxTsxNW NLjN5A+SGnPY305k4Np4xGlOGZRw4EZ47bQ06qnTwUVTzK5s26N8sP3Pt0uFjUnL87eH ng11Up23ttbetBsB2qJGsu7Q4IIu5ac7WMbwHBEA4TNX410CWo5X2DTJiHzi6Iug/qgG swVr4EFCLLPNh9RoIos3/aIm08t6u3dCr0CCbPnOtBED9W8NU0m+5t7AmBA4CfzG83L9 aCKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GYl+8CWL6PT+OOiW+f+gON8b+09cumwTEA/5uUAsIxU=; b=c/7cNo42WOCa3ukmLykHHfu1A7ue6K3sSzxnms9/0ycTI64EmC1hPSnljuUO3vllm1 PXAFhtRAE+ialcxqFqU/JnZF/OzA+5sV6UuAsuvhHmozrb3Y91usOmDwMYesz0kReHKB EPVX+CTl33+oRIDHzFGPp6F+g4FOJ/k5KYWANlmFLH8PSdlZnrBCvSPIIUtpN4NIoME0 Nkhu6Aso8DzDPPCV+z/y7Zfg3RweqPVfcUIxqoJv2o5TcKigwJ42ucz8prW52BmHHK2j 4OpoqDw1jpZUBsRjoPvPAa1X+I7RYnKM5Fdj5ThwAehb0ygvRmF5VzseG7oSKOZ/NJLF Tivg== X-Gm-Message-State: AOAM533F0QXQUgCsdUwTBdrkp4CBlortll50zyPaaAUQmm4IJJ28b/Ta 5iYn8NaKSdWPRkk+xVYccPc= X-Google-Smtp-Source: ABdhPJy3hPOH9dJOsWTGepvFnIijzQYnbXIhmH/W3fsRxUGsTlPsgeZ1ybXJzE3WJhKpLU/7IMjqew== X-Received: by 2002:adf:f6c3:: with SMTP id y3mr17723834wrp.24.1613918119427; Sun, 21 Feb 2021 06:35:19 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 09/43] target/mips: Remove access_type argument from map_address() handler Date: Sun, 21 Feb 2021 15:33:58 +0100 Message-Id: <20210221143432.2468220-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) TLB map_address() handlers don't use the 'access_type' argument, remove it to simplify. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20210128144125.3696119-2-f4bug@amsat.org> --- target/mips/internal.h | 8 ++++---- target/mips/tlb_helper.c | 15 +++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 5dd17ff7333..d09afded5ea 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -111,7 +111,7 @@ struct CPUMIPSTLBContext { uint32_t nb_tlb; uint32_t tlb_in_use; int (*map_address)(struct CPUMIPSState *env, hwaddr *physical, int *pr= ot, - target_ulong address, int rw, int access_type); + target_ulong address, int rw); void (*helper_tlbwi)(struct CPUMIPSState *env); void (*helper_tlbwr)(struct CPUMIPSState *env); void (*helper_tlbp)(struct CPUMIPSState *env); @@ -126,11 +126,11 @@ struct CPUMIPSTLBContext { }; =20 int no_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type); + target_ulong address, int rw); int fixed_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type); + target_ulong address, int rw); int r4k_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type); + target_ulong address, int rw); void r4k_helper_tlbwi(CPUMIPSState *env); void r4k_helper_tlbwr(CPUMIPSState *env); void r4k_helper_tlbp(CPUMIPSState *env); diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index 082c17928d3..1af2dc969d6 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -39,7 +39,7 @@ enum { =20 /* no MMU emulation */ int no_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type) + target_ulong address, int rw) { *physical =3D address; *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; @@ -48,7 +48,7 @@ int no_mmu_map_address(CPUMIPSState *env, hwaddr *physica= l, int *prot, =20 /* fixed mapping MMU emulation */ int fixed_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type) + target_ulong address, int rw) { if (address <=3D (int32_t)0x7FFFFFFFUL) { if (!(env->CP0_Status & (1 << CP0St_ERL))) { @@ -68,7 +68,7 @@ int fixed_mmu_map_address(CPUMIPSState *env, hwaddr *phys= ical, int *prot, =20 /* MIPS32/MIPS64 R4000-style MMU emulation */ int r4k_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type) + target_ulong address, int rw) { uint16_t ASID =3D env->CP0_EntryHi & env->CP0_EntryHi_ASID_mask; uint32_t MMID =3D env->CP0_MemoryMapID; @@ -234,8 +234,7 @@ static int get_seg_physical_address(CPUMIPSState *env, = hwaddr *physical, return mapped; } else if (mapped) { /* The segment is TLB mapped */ - return env->tlb->map_address(env, physical, prot, real_address, rw, - access_type); + return env->tlb->map_address(env, physical, prot, real_address, rw= ); } else { /* The segment is unmapped */ *physical =3D physical_base | (real_address & segmask); @@ -314,7 +313,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, /* xuseg */ if (UX && address <=3D (0x3FFFFFFFFFFFFFFFULL & env->SEGMask)) { ret =3D env->tlb->map_address(env, physical, prot, - real_address, rw, access_type); + real_address, rw); } else { ret =3D TLBRET_BADADDR; } @@ -323,7 +322,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, if ((supervisor_mode || kernel_mode) && SX && address <=3D (0x7FFFFFFFFFFFFFFFULL & env->SEGMask)) { ret =3D env->tlb->map_address(env, physical, prot, - real_address, rw, access_type); + real_address, rw); } else { ret =3D TLBRET_BADADDR; } @@ -364,7 +363,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, if (kernel_mode && KX && address <=3D (0xFFFFFFFF7FFFFFFFULL & env->SEGMask)) { ret =3D env->tlb->map_address(env, physical, prot, - real_address, rw, access_type); + real_address, rw); } else { ret =3D TLBRET_BADADDR; } --=20 2.26.2