From nobody Mon Feb 9 20:10:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613659880; cv=none; d=zohomail.com; s=zohoarc; b=f11qDA4dy6D+f2/WnUThMVCoWpeZGENU+lTV4diHFZhJ7giwqUXUo/34SUBgJbhK9ad9a+/JHXdYe2TArvkZU4G6FXr9iDAyrKP5piTRB/IqhaOVMy/Nu+17ARs4I+2AFa3UaOMfV3yshQ0N7g9eUKeqIts0/62DSV1+mkGw9LQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613659880; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UgNWKpbMkhuIdSNTejo0CMTSoieY1NNbSQ6oJOSjciY=; b=OB6Q04mMCsnR/oiZXmwaBljLBp7NOBa73mfj4rJmDmgZKmKp5+MyYAn8UAHh5RoBhH6wCZDe5uQLCgChx103GwmmJ5S/0/Uk3DyqR8WBHEfWGBlXjEefm95BA48HZSwCbC4hRMnXY+tzsLijlfZG91nBNTvyNkWcAUbZ01GU/GU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1613659880272173.753717123059; Thu, 18 Feb 2021 06:51:20 -0800 (PST) Received: by mail-wr1-f49.google.com with SMTP id n8so3256305wrm.10 for ; Thu, 18 Feb 2021 06:51:19 -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 v15sm9263365wra.61.2021.02.18.06.51.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 06:51: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=UgNWKpbMkhuIdSNTejo0CMTSoieY1NNbSQ6oJOSjciY=; b=C4HGcmKJbKtZb1rd1T29R0Og0K6gUN0j7SPI0YuPrxxiGVVFPHcCRSvfyy5loDvgZ5 MVuXc25m6qKxxsoDsOlze61MeGyirMvOZrhr8g89zfGHU1Mz7o/Ny0ajGEy3u/iUM1I9 Lq5ay89L6VsybDqDMLeAeorWitYH3AlbTvL02p2sFk1rR4u9KD6QDnNzw4HCycrSyL1J 1vLG8U2eZo7RruS9zWpjx+b3CcGIw4i/hirbCC7I01Oh63xuvQclEP9xvxvwkWFU4Iil xhHRO7j/uuRgJhJc7EoSWzGi0ven1Rkvw2dexdHB64VXnfPcXqu8DeFr/5fO+EyDy9FS Idww== 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=UgNWKpbMkhuIdSNTejo0CMTSoieY1NNbSQ6oJOSjciY=; b=fuIP2FaFLvRXjgL010jXyMg6l6bLFFioUzRB6N6vUZ8BrD/rl6nikqmA7L68ncifNa /Fifvv9wTuAxINFCUFJgVAOGgRIoG2mxnl6LflDGURj2uml/oO8XuDU9+68sBhaagKnc 5L1Xi7sCY862zwWv+MCp7XqjLWSRomlY6xw/GcqdGBmMDNBgJ1NowzDr+KaDhdqh44en ndfM1U2KhNoCIcNoNb2BLNkqKh6LZZvfuKSJVWhOsH3yShXLCmXD3IpbPsHF+jZL9JbV 6+RPZpZO/x0uadXaMFQBdUADcbJBY6AUsNhYBfk4JqkM3EMRlUUEWpW8YD5GVynuoo8S s1QA== X-Gm-Message-State: AOAM533Xj/pREkLF95iMGZXRKVzoMR7azlPqnjf3HSra83NsOmzdBCr2 igRuTjR6MPHpLWcPFPm8EaI= X-Google-Smtp-Source: ABdhPJz1un6Tg6xoBihjnAt+A3dntywO0CGDTvrNg2vuiqfeyY3bAsGX2xs2i4WMCH9xzUNi+jW/NQ== X-Received: by 2002:adf:f542:: with SMTP id j2mr4677368wrp.46.1613659878535; Thu, 18 Feb 2021 06:51:18 -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: Richard Henderson , Yoshinori Sato , Joe Komlodi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/5] target/sh4: Fix code style for checkpatch.pl Date: Thu, 18 Feb 2021 15:51:07 +0100 Message-Id: <20210218145111.1591763-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210218145111.1591763-1-f4bug@amsat.org> References: <20210218145111.1591763-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) We are going to move this code, fix its style first. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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