From nobody Tue Feb 10 03:40:27 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=1611789813; cv=none; d=zohomail.com; s=zohoarc; b=lponjJ3lP+TifR6xQcMGQieLPVb4QIlQfwu1FtKhw9dhGRqPSFc2O1zS9yOw2j9HNXKJlHFPokOcIlPejcl/xNA7J2SSIzebBT2IDAvEuD5VJXMeSMluBGxQDQOWnj7u7lHsuR8UtRQzaZGf9ox95aQLg+1g7Oll8u0mztzTEg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611789813; 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=wrmBhBrTEeGFewV5R3wfy11aAEXgfzoclhrlpdg6/U8=; b=ZZPonVfJbEBfwod4YCxuURvP3e+NelLgESPUXGtDHV+J11sFAuzdF2XsEF+8czZhPdwKr+gi9kTh4CEDuTeBdv2xLuiJfJCEp9LUY+HGDZwTVgKu+88LHb3gvBfWvqS9MG9citSiTlPrG5MIvL4HyWjaLq6rvODYEN7fXauwVoA= 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 1611789813639619.2378707101294; Wed, 27 Jan 2021 15:23:33 -0800 (PST) Received: from localhost ([::1]:51856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4u9s-0002BU-H3 for importer@patchew.org; Wed, 27 Jan 2021 18:23:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4u8R-0000ml-0o for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:22:03 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:34994) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4u8O-0006Ej-W7 for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:22:02 -0500 Received: by mail-wr1-x433.google.com with SMTP id l12so3647157wry.2 for ; Wed, 27 Jan 2021 15:22:00 -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 r25sm5050321wrr.64.2021.01.27.15.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 15:21:58 -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=wrmBhBrTEeGFewV5R3wfy11aAEXgfzoclhrlpdg6/U8=; b=kIwDp4jab50EaNFYFJIW1KL0k931M7a/ZmBFJ7xCHzc2aA/nV2B8GQnGHX8A7rQppg AfoS9xmNjW/anla3cc7lrJwp3CutuWosXC9lAChHr1ltz2VF6RO/ijx7xlSr4xqkbeKs eRo2FaPtYjfrkDh7fzFMU8kDZB52GsuLccvYRJr4VNAxi36HswijsBIjlbwvI4riSWOA LjBHNQdLmpx784wqGlELuRR/LKy9cDLr3DpAslvqMT+eXIpTnGdGQqAcdQOFQTz1Oxlz 8eeSrk0sGEEeO+9RaEbMVmMWe3qaaJwGIR/1Us+iZbkqr6eWbk3KVJ/1UGm+gFev8ZBe QnOg== 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=wrmBhBrTEeGFewV5R3wfy11aAEXgfzoclhrlpdg6/U8=; b=czLd2XQ92pe6OYhZMozHm3XWjynpFs00q4DTw1f6JJ0h5/a4+COPMVyDFQWqQuVSaO YdM9cMcxz6zTAu0y7gxQ7BydyswzwAFD6Ds9q6rS9YyJWGWjp+UR60Yj/RsNeBTX5Who 5ScyTTP/mZMdK5I2F46138PfnkmB9JvxS8gfr5HAoMRkWcx454EklaczPiX+Ye3GaCuP CWYROrkLGeAmuc7S59auHwTjhGMQYoWumpuR/Y33VWIgPwjz6aBsCYfK93MFPp7xyHfo LG6TSJrz6g8n9SityIDJf5x4Nx14t0FJrK6IFV84v8N9Ij9RNTbzNboCRQ2Vx0+o1uuc Jy0Q== X-Gm-Message-State: AOAM531OCWWJz/xDCI20MrZa+dWqqMH8XpKuxylamC84dSYgKhsmBEsy 2yKdlHKaCdQmeTigc4/EQs+Gp7IP09g= X-Google-Smtp-Source: ABdhPJyDq/H0sS3f2oP4Y1W/2M+gFp8Ge215dCAFhDxnGYA9JswSEu0UH3C90RqVmEm8DQ8lTQyJIQ== X-Received: by 2002:adf:c413:: with SMTP id v19mr13483760wrf.158.1611789719270; Wed, 27 Jan 2021 15:21:59 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/5] target/sh4: Fix code style for checkpatch.pl Date: Thu, 28 Jan 2021 00:21:47 +0100 Message-Id: <20210127232151.3523581-2-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::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x433.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) We are going to move this code, fix its style first. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- Easier to review using 'git-diff -w -b' --- target/sh4/helper.c | 82 ++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/target/sh4/helper.c b/target/sh4/helper.c index 408478ce5dc..fc816137766 100644 --- a/target/sh4/helper.c +++ b/target/sh4/helper.c @@ -330,8 +330,8 @@ static int find_utlb_entry(CPUSH4State * env, target_ul= ong address, int use_asid MMU_IADDR_ERROR, MMU_DADDR_ERROR_READ, MMU_DADDR_ERROR_WRITE. */ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, - int *prot, target_ulong address, - int rw, int access_type) + int *prot, target_ulong address, + int rw, int access_type) { int use_asid, n; tlb_t *matching =3D NULL; @@ -340,12 +340,12 @@ static int get_mmu_address(CPUSH4State * env, target_= ulong * physical, =20 if (rw =3D=3D 2) { n =3D find_itlb_entry(env, address, use_asid); - if (n >=3D 0) { - matching =3D &env->itlb[n]; + if (n >=3D 0) { + matching =3D &env->itlb[n]; if (!(env->sr & (1u << SR_MD)) && !(matching->pr & 2)) { - n =3D MMU_ITLB_VIOLATION; + n =3D MMU_ITLB_VIOLATION; } else { - *prot =3D PAGE_EXEC; + *prot =3D PAGE_EXEC; } } else { n =3D find_utlb_entry(env, address, use_asid); @@ -365,14 +365,14 @@ static int get_mmu_address(CPUSH4State * env, target_= ulong * physical, } else if (n =3D=3D MMU_DTLB_MISS) { n =3D MMU_ITLB_MISS; } - } + } } else { - n =3D find_utlb_entry(env, address, use_asid); - if (n >=3D 0) { - matching =3D &env->utlb[n]; + n =3D find_utlb_entry(env, address, use_asid); + if (n >=3D 0) { + matching =3D &env->utlb[n]; if (!(env->sr & (1u << SR_MD)) && !(matching->pr & 2)) { - n =3D (rw =3D=3D 1) ? MMU_DTLB_VIOLATION_WRITE : - MMU_DTLB_VIOLATION_READ; + n =3D (rw =3D=3D 1) + ? MMU_DTLB_VIOLATION_WRITE : MMU_DTLB_VIOLATION_READ; } else if ((rw =3D=3D 1) && !(matching->pr & 1)) { n =3D MMU_DTLB_VIOLATION_WRITE; } else if ((rw =3D=3D 1) && !matching->d) { @@ -383,15 +383,15 @@ static int get_mmu_address(CPUSH4State * env, target_= ulong * physical, *prot |=3D PAGE_WRITE; } } - } else if (n =3D=3D MMU_DTLB_MISS) { - n =3D (rw =3D=3D 1) ? MMU_DTLB_MISS_WRITE : - MMU_DTLB_MISS_READ; - } + } else if (n =3D=3D MMU_DTLB_MISS) { + n =3D (rw =3D=3D 1) + ? MMU_DTLB_MISS_WRITE : MMU_DTLB_MISS_READ; + } } if (n >=3D 0) { - n =3D MMU_OK; - *physical =3D ((matching->ppn << 10) & ~(matching->size - 1)) | - (address & (matching->size - 1)); + n =3D MMU_OK; + *physical =3D ((matching->ppn << 10) & ~(matching->size - 1)) + | (address & (matching->size - 1)); } return n; } @@ -401,34 +401,34 @@ static int get_physical_address(CPUSH4State * env, ta= rget_ulong * physical, int rw, int access_type) { /* P1, P2 and P4 areas do not use translation */ - if ((address >=3D 0x80000000 && address < 0xc0000000) || - address >=3D 0xe0000000) { + if ((address >=3D 0x80000000 && address < 0xc0000000) || address >=3D = 0xe0000000) { if (!(env->sr & (1u << SR_MD)) - && (address < 0xe0000000 || address >=3D 0xe4000000)) { - /* Unauthorized access in user mode (only store queues are available)= */ + && (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) - return MMU_DADDR_ERROR_READ; - else if (rw =3D=3D 1) - return MMU_DADDR_ERROR_WRITE; - else - return MMU_IADDR_ERROR; - } - if (address >=3D 0x80000000 && address < 0xc0000000) { - /* Mask upper 3 bits for P1 and P2 areas */ - *physical =3D address & 0x1fffffff; - } else { - *physical =3D address; - } - *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; - return MMU_OK; + if (rw =3D=3D 0) { + return MMU_DADDR_ERROR_READ; + } else if (rw =3D=3D 1) { + return MMU_DADDR_ERROR_WRITE; + } else { + return MMU_IADDR_ERROR; + } + } + if (address >=3D 0x80000000 && address < 0xc0000000) { + /* Mask upper 3 bits for P1 and P2 areas */ + *physical =3D address & 0x1fffffff; + } else { + *physical =3D address; + } + *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; + return MMU_OK; } =20 /* If MMU is disabled, return the corresponding physical page */ if (!(env->mmucr & MMUCR_AT)) { - *physical =3D address & 0x1FFFFFFF; - *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; - return MMU_OK; + *physical =3D address & 0x1FFFFFFF; + *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; + return MMU_OK; } =20 /* We need to resort to the MMU */ --=20 2.26.2