From nobody Tue Feb 10 11:56:23 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1611789963; cv=none; d=zohomail.com; s=zohoarc; b=gMhVMdaDfz++KKrphHOb+hB6Q8JW81nvoNdYB1VJsRCtGZ+z1yKF7FeRNB7wKf1z79T91aJYNc+2SYmt3EOjf6v47kGjjAX9lbk0oiVEXJvgs+wSwZrOavC8+/TeL3q5rRXHax7DBUx9AYi8xk+QHNmBirO6V8RVP3VvnErov3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611789963; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6WbbRQjXYliuhYJkNz9Ad7zq4xSuA4zUEY6hD8fYDAc=; b=blVtHu+28LvlzFt+FX04dEd9t0hoFl9/L34kTArqhOciYdvNsrFC92j8QvdFZhX/yZgIpE/1BaZMrHezx2fS2lkLQQLrXrT+YTIzCTRLhImsJkfimGMpyr357uVYKb7aPQNpt+nYfKCy0ijdOcypTNa9mmSQ9txCfhqfUQwHT+8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611789963584323.2103845256647; Wed, 27 Jan 2021 15:26:03 -0800 (PST) Received: from localhost ([::1]:59412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4uCI-0005Gn-FS for importer@patchew.org; Wed, 27 Jan 2021 18:26:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4u8V-0000t0-NT for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:22:07 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:39843) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4u8U-0006FP-6k for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:22:07 -0500 Received: by mail-wm1-x333.google.com with SMTP id u14so3055290wmq.4 for ; Wed, 27 Jan 2021 15:22:05 -0800 (PST) Received: from localhost.localdomain (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id z18sm4718576wro.91.2021.01.27.15.22.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 15:22:03 -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=6WbbRQjXYliuhYJkNz9Ad7zq4xSuA4zUEY6hD8fYDAc=; b=Gg8DYFX6calRieL6MDKlfaaCgjl7oBsLqytiTDOVCoGH5ub92DOwd51TUWnJ90VL3B RRBfMAEGluRMtUE4P0ZdOyRs82khuuur56/pXErjMgxybnhCnVP7EdlpWNLYYq0ShJ96 vYC9Zby7iXVT+MHtW+GX999WZS1jH6ohPuq+T/7FPyxS8l9hUPj3hYRWvSpOv4FY0Nj7 PRZNGKQepAVpJYxdy6YZDcqQqGTBiGVc8oglmPX1qD/cWKDOTJBWLKEGXqEyp6Ar4uRe PTi9kWIiBxY2t7dml/K9pf3CI5Ys8U0n6VqNW+6kVcs1tK1c3StxHjKlRnemSswr0DbH 6ywA== 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=6WbbRQjXYliuhYJkNz9Ad7zq4xSuA4zUEY6hD8fYDAc=; b=E3Y4atWWskywEoNtpq5SO0C750KoTb3WivAHX95VQ0EoHrPCjKA1GtLsLp2cBZ5n/9 RolRU/ykZ64jKJWNcHw/xQnlnG+/Pgp9QZ8OHC/ZN68l7jfpV9trJte4uzXu7S1d6ql9 UOfhzOx8QlkizmSRaVR8mNbi9PhQrSHcJIcDYlqNM8JrlrhxVW8uHEhAYgQDV/X4ImwP d/lU4hbyKF5jGDoU4YGCOGMjbAfH/3sWA0Kw4IlL3I0w2jWXov6W/vQfCM9WZbyLpw7K JLraQY31yS33NQoO/CfYuoRmktPdLuEY5j3kM98QCy6N4xAKlramOrPeIAtVFt7jbN+9 I3UQ== X-Gm-Message-State: AOAM533tO6ViRWW485x+pHMavuVWKJaY4mkS5rl238Pv7mdfNT4RRsJH Mchkp3qu4q3el+T7QTw62D+Bciu28bw= X-Google-Smtp-Source: ABdhPJxzmJTwgXnk3QX6d1wP10R7j3csvXIubXezi6zqy8RIcWvmwI48U+s3C52D54qOrF+74GsEOQ== X-Received: by 2002:a05:600c:3549:: with SMTP id i9mr6268002wmq.47.1611789724420; Wed, 27 Jan 2021 15:22:04 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/5] target/sh4: Replace magic value by MMUAccessType definitions Date: Thu, 28 Jan 2021 00:21:48 +0100 Message-Id: <20210127232151.3523581-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210127232151.3523581-1-f4bug@amsat.org> References: <20210127232151.3523581-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x333.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Joe Komlodi , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Replace the 0/1/2 magic values by the corresponding MMUAccessType. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/sh4/helper.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/sh4/helper.c b/target/sh4/helper.c index fc816137766..4303ebf018b 100644 --- a/target/sh4/helper.c +++ b/target/sh4/helper.c @@ -338,7 +338,7 @@ static int get_mmu_address(CPUSH4State * env, target_ul= ong * physical, =20 use_asid =3D !(env->mmucr & MMUCR_SV) || !(env->sr & (1u << SR_MD)); =20 - if (rw =3D=3D 2) { + if (rw =3D=3D MMU_INST_FETCH) { n =3D find_itlb_entry(env, address, use_asid); if (n >=3D 0) { matching =3D &env->itlb[n]; @@ -371,11 +371,11 @@ static int get_mmu_address(CPUSH4State * env, target_= ulong * physical, if (n >=3D 0) { matching =3D &env->utlb[n]; if (!(env->sr & (1u << SR_MD)) && !(matching->pr & 2)) { - n =3D (rw =3D=3D 1) + n =3D (rw =3D=3D MMU_DATA_STORE) ? MMU_DTLB_VIOLATION_WRITE : MMU_DTLB_VIOLATION_READ; - } else if ((rw =3D=3D 1) && !(matching->pr & 1)) { + } else if ((rw =3D=3D MMU_DATA_STORE) && !(matching->pr & 1)) { n =3D MMU_DTLB_VIOLATION_WRITE; - } else if ((rw =3D=3D 1) && !matching->d) { + } else if ((rw =3D=3D MMU_DATA_STORE) && !matching->d) { n =3D MMU_DTLB_INITIAL_WRITE; } else { *prot =3D PAGE_READ; @@ -384,7 +384,7 @@ static int get_mmu_address(CPUSH4State * env, target_ul= ong * physical, } } } else if (n =3D=3D MMU_DTLB_MISS) { - n =3D (rw =3D=3D 1) + n =3D (rw =3D=3D MMU_DATA_STORE) ? MMU_DTLB_MISS_WRITE : MMU_DTLB_MISS_READ; } } @@ -406,9 +406,9 @@ static int get_physical_address(CPUSH4State * env, targ= et_ulong * physical, && (address < 0xe0000000 || address >=3D 0xe4000000)) { /* Unauthorized access in user mode (only store queues are ava= ilable) */ qemu_log_mask(LOG_GUEST_ERROR, "Unauthorized access\n"); - if (rw =3D=3D 0) { + if (rw =3D=3D MMU_DATA_LOAD) { return MMU_DADDR_ERROR_READ; - } else if (rw =3D=3D 1) { + } else if (rw =3D=3D MMU_DATA_STORE) { return MMU_DADDR_ERROR_WRITE; } else { return MMU_IADDR_ERROR; @@ -441,7 +441,7 @@ hwaddr superh_cpu_get_phys_page_debug(CPUState *cs, vad= dr addr) target_ulong physical; int prot; =20 - get_physical_address(&cpu->env, &physical, &prot, addr, 0, 0); + get_physical_address(&cpu->env, &physical, &prot, addr, MMU_DATA_LOAD,= 0); return physical; } =20 --=20 2.26.2