From nobody Tue Feb 10 18:54:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.54 as permitted sender) client-ip=209.85.218.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1611844954; cv=none; d=zohomail.com; s=zohoarc; b=nSiZDQ+KNGWJFEeP1WDtvF4PVSGETxVDmFXCIIIOLhfhq8Wd+EpYp8hMuQVmCh2G4mtI8vUYIdO6XaPhWj3cb/FIvIcW25gGD8aJ1YveuhpuaC+8ZQFCYkxHC3BKr2FINn8PdRrNI/iGbEIaM97uR5pBD8NIEvq69Dmz9ThaSwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611844954; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=r+FuDmEP89SHTv5edxuWj6VZ9o05Wz8zJTpkyRmkCaQ=; b=FA6batm2ScNC7vvJYTOrIVgaaDZUCkGyDsJ2DjjQIfPtmrnYbRb+plI/FfLia9sut0RDMjclwF8dht1neyWvH6F+h51IyJwuE1YbHTlqTWynn4KmvVXKxqZdaxRym8NV2JnylHXSzE9hicLJis8SiTJr1tBKZaNWw3R1qTvGWEQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.zohomail.com with SMTPS id 1611844954860825.57785256827; Thu, 28 Jan 2021 06:42:34 -0800 (PST) Received: by mail-ej1-f54.google.com with SMTP id bl23so8130382ejb.5 for ; Thu, 28 Jan 2021 06:42:34 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id x6sm2360798ejw.69.2021.01.28.06.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 06:42:32 -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=r+FuDmEP89SHTv5edxuWj6VZ9o05Wz8zJTpkyRmkCaQ=; b=nWDU2OueGlOy4nc0xCzxgLcBMSydNZLQdd9WW6t2e7ggHlzAI7ljpafcbhHu+yT3+a YErFgP7vIxj87QefKu9Dek0B6sX5YC8IK26FC802jm6BNVG6tkU4mQxTAoNrYbcJ80aL 36J9BerM8zor+XZQxMkLKSG9wPYih3kRHVjdH16DQl6LmVfiG02Wr1fQXYivLkSo33h0 bhnJhMH4DCTAb0JDi0pHAR/tkwSc/YkhplqjUnX46DpL0+GpP/Bq2rcDcFXhLuqpxPbZ 2eLcLkFGiKkWf+BdIW9ClMnd4RiztIVPB5JSAVHCUAqQ8Ccjt2tzqdv9tPOWHcr+RpDk 161g== 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=r+FuDmEP89SHTv5edxuWj6VZ9o05Wz8zJTpkyRmkCaQ=; b=ZcWcZfbkzYgSCg6tpL3xDk7hQGNG1nmxkQJuGMLE+pJxAUc4Ms40ELP9Q+OsFjVB4C Wm9N7pKVa67VRohxGX9fTox99b+fMaaIqCmxY+CcHDp/dZcgaJ73kCHoFvAE4OCI9Xzg W5mOJWi25noYfES+Wr/Cprwbmcd836DNPRWv1C+zV850EWHODSklCzacqZ2Sc7n3BEXu 1G2dEMi9BJ9c5n4WHPWITtJIX3OVWH+dkhrWkRAH67GOJA2nLgvy7yuchQzlF79qCNsG AyYRkbhvwYWxF9KY72HOJwyLwbTOZghqT+464qGhafccgGAVvVtnYnHOlzVCEvCoyoa+ JKow== X-Gm-Message-State: AOAM533lJIY0/A4SqYEsHaHp0qe0I+IdIdeZV0DSIDUZUK+KZ/zw8cYs owJOpwOHHSvSV1eKpHkVYMQ= X-Google-Smtp-Source: ABdhPJz4sMZwa6P4bJFeAjbVzfraEnl/UdmYDFXY3INEH7FKZxP3oh3Uv3L7fOEJziEX4xDEqO6Lng== X-Received: by 2002:a17:906:f0c3:: with SMTP id dk3mr11189773ejb.540.1611844953105; Thu, 28 Jan 2021 06:42:33 -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: Jiaxun Yang , Huacai Chen , Joe Komlodi , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson Subject: [PATCH 12/13] target/mips: Let get_seg*_physical_address() take MMUAccessType arg Date: Thu, 28 Jan 2021 15:41:24 +0100 Message-Id: <20210128144125.3696119-13-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210128144125.3696119-1-f4bug@amsat.org> References: <20210128144125.3696119-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) get_physical_address() calls get_seg_physical_address() and get_segctl_physical_address() passing a MMUAccessType type. Let the prototypes use it as argument, as it is stricter than an integer. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jiaxun Yang --- target/mips/tlb_helper.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index 64e89591abc..14f5b1a0a9c 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -222,7 +222,7 @@ static int is_seg_am_mapped(unsigned int am, bool eu, i= nt mmu_idx) =20 static int get_seg_physical_address(CPUMIPSState *env, hwaddr *physical, int *prot, target_ulong real_address, - int rw, int mmu_idx, + MMUAccessType access_type, int mmu_idx, unsigned int am, bool eu, target_ulong segmask, hwaddr physical_base) @@ -234,7 +234,8 @@ 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= ); + return env->tlb->map_address(env, physical, prot, real_address, + access_type); } else { /* The segment is unmapped */ *physical =3D physical_base | (real_address & segmask); @@ -245,15 +246,15 @@ static int get_seg_physical_address(CPUMIPSState *env= , hwaddr *physical, =20 static int get_segctl_physical_address(CPUMIPSState *env, hwaddr *physical, int *prot, target_ulong real_addres= s, - int rw, int mmu_idx, + MMUAccessType access_type, int mmu_= idx, uint16_t segctl, target_ulong segma= sk) { unsigned int am =3D (segctl & CP0SC_AM_MASK) >> CP0SC_AM; bool eu =3D (segctl >> CP0SC_EU) & 1; hwaddr pa =3D ((hwaddr)segctl & CP0SC_PA_MASK) << 20; =20 - return get_seg_physical_address(env, physical, prot, real_address, rw, - mmu_idx, am, eu, segmask, + return get_seg_physical_address(env, physical, prot, real_address, + access_type, mmu_idx, am, eu, segmask, pa & ~(hwaddr)segmask); } =20 --=20 2.26.2