From nobody Tue May 21 07:08:30 2024 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 From nobody Tue May 21 07:08:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1613659884889167.20136690085087; Thu, 18 Feb 2021 06:51:24 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id l17so4038692wmq.2 for ; Thu, 18 Feb 2021 06:51:24 -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 d29sm2687874wra.51.2021.02.18.06.51.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 06:51:22 -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=o05FDCeP36VITlQ7CZFt1SlgtIKXEEbrqObKvoAaCbU=; b=T4Pa4nkWkDWqY0kWK6mCeW2mwOwjCqzJY19qeHE1W1imnNgVH3lwzanTGC9xgRHw+N JXL512NsPBq38Hfp/GanVWCYfKpyxywMNV2RM0BM8Sn0bxZjaVOpHXnlMscPn2I/Y4kH LGcZE7DBl1WXEjLBk+Do7fCQzmaXqRQh79rD60W1TZIsMGTfbJ0bjOW7G455pQKKnMe7 OgtjgczlFGV1W/bjZjOGRqvnw/1SfMFvOtX1zNuiesdUXMpGZ9/T1Cntp8ccWd7tODTp 0pgRC7aSfZMhnNFuz008mvZSlaPnf/5AmRBJJrT/IMobN261ZFg7K8gvhYDxRHrW8DvT je+g== 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=o05FDCeP36VITlQ7CZFt1SlgtIKXEEbrqObKvoAaCbU=; b=NlMUh1TPK/J3zoEXwyJJ1zFzZsEo8gg3wvsPhVSmJEVsY005JfESimPkai8dYYwiG6 8lZ51bhWEsTXo6hAIvk7LwqObkPs5ERRafOhLGEx7AYDJ6K8puOOgE1lvuXUyfhaNMJI UHsNQlvio5BQXCgBjd/NKMXnkg3jYdlN+CjNkdMlhuOPuRS+WHIHV/YaFUTEwmmc+BXq yWpoG7EOHgKBMLFplopye0pLlMlGtV1yLmb6kgAR5KBlpWCxokd17GsOj8soswwf9zm8 IzuWiU3a6777ikSAb5jvw9y4S257iPr184O3D2+jlA6ep8Ow3iG2uq68YTlHllSl+Mdp EOOw== X-Gm-Message-State: AOAM5325r5/tPkxAPOqRtzDZ2nTKQUkm/F9W+k3ecTimQdi1Xi6pLCG9 Yprmnael2hTQj7erT9YB6Do= X-Google-Smtp-Source: ABdhPJynXfIy/al+B3/dDO0r5J5jIf6ue2SToLhekob/C3tSIBASo+9raeKwVANjkc9eG4Rn53L2/g== X-Received: by 2002:a1c:5f84:: with SMTP id t126mr2183872wmb.52.1613659883115; Thu, 18 Feb 2021 06:51:23 -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 2/5] target/sh4: Replace magic value by MMUAccessType definitions Date: Thu, 18 Feb 2021 15:51:08 +0100 Message-Id: <20210218145111.1591763-3-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) 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 From nobody Tue May 21 07:08:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1613659889840544.4532021685825; Thu, 18 Feb 2021 06:51:29 -0800 (PST) Received: by mail-wm1-f49.google.com with SMTP id i7so2872952wmb.0 for ; Thu, 18 Feb 2021 06:51:29 -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 i3sm8559259wrr.19.2021.02.18.06.51.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 06:51:27 -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=Vrr/db47Qzv03uQ5HOCzDgMN9bgsfLjuAFvS1PFLBqU=; b=HwGfHuZKK+JqnORjAiDUI7FprIQVhz+MET9ho9AE9PFTIjATULL9HJgp+jgTy3Q+Cz 9L/WOocKYPcuYv7s25iEpvDBaXQo1waTnIRHWV0XUywqgxZZcAEU9M/40H9qkp1kypEV z13OibB8+HKx3zQsgTV5dA6BkazBjdpvQfxPfhroFuzYey7EI+AUCR/3IGmDfgQ77ZrI 1yFhWQ/JcePLLt/EuWvMiDiAcCxQuC1vBu4MBQFGnIVk8av1mqau4rsBMplci4tMIJGb kwtQdp+Q3LYRa+qXBBnNE++VM7ygclHijOuFGDaunCfrEx7q04K/nlIiAXQON0z9KyU6 7yoQ== 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=Vrr/db47Qzv03uQ5HOCzDgMN9bgsfLjuAFvS1PFLBqU=; b=pLNMQuRQGyRWNepvxzcRBDYEvcOL7c2brngq7D4W+9kT1pui2u71oeTZPG1Gc0mvjF 04TZ2QaqVLSD6IkOIz/rE7TNEe5QCoX3nluKBSaFPD5ja5D/Veu+PkKWmskPmQomlXD4 B0ETybEz92n9BpzbxQrl0khJc1ctbeiVIElaFslW/g0evNY/9pt02BT0XX2IBJfjxAy2 gTWlj8Mv0doyHd/VHf6sCjViP2lXEPIHkQNxAczPHfEAp0fiqgYBGdyM37Nm5cHYMbWc hIxJ6xf3GwpVoqrZTGIXlJAx38xJxaayUve8fE6JRYOwhfhjtnAippQEINpZzvNg02Ho 3sNg== X-Gm-Message-State: AOAM530UZaIlW+/ytgYDiuAFrXJPrqX5k9Yxqm+AqYPZLPVWfFbizRd1 6r4aivOhjLc/p6oO1dJkjY0= X-Google-Smtp-Source: ABdhPJxWrufPQ3GlgGe9I1zxJzIb1uFEvuyZewJjcRhxQ0M31M4qyq6fooWdBsSpgMYVD2MBwv85Gw== X-Received: by 2002:a1c:1f4d:: with SMTP id f74mr4161072wmf.12.1613659888135; Thu, 18 Feb 2021 06:51:28 -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 3/5] target/sh4: Remove unused 'int access_type' argument Date: Thu, 18 Feb 2021 15:51:09 +0100 Message-Id: <20210218145111.1591763-4-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) get_mmu_address() and get_physical_address() don't use their 'int access_type' argument: remove it along with ACCESS_INT in superh_cpu_tlb_fill(). Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/sh4/helper.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target/sh4/helper.c b/target/sh4/helper.c index 4303ebf018b..b49efe84916 100644 --- a/target/sh4/helper.c +++ b/target/sh4/helper.c @@ -331,7 +331,7 @@ static int find_utlb_entry(CPUSH4State * env, target_ul= ong address, int use_asid */ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, int *prot, target_ulong address, - int rw, int access_type) + int rw) { int use_asid, n; tlb_t *matching =3D NULL; @@ -398,7 +398,7 @@ static int get_mmu_address(CPUSH4State * env, target_ul= ong * physical, =20 static int get_physical_address(CPUSH4State * env, target_ulong * physical, int *prot, target_ulong address, - int rw, int access_type) + int rw) { /* P1, P2 and P4 areas do not use translation */ if ((address >=3D 0x80000000 && address < 0xc0000000) || address >=3D = 0xe0000000) { @@ -432,7 +432,7 @@ static int get_physical_address(CPUSH4State * env, targ= et_ulong * physical, } =20 /* We need to resort to the MMU */ - return get_mmu_address(env, physical, prot, address, rw, access_type); + return get_mmu_address(env, physical, prot, address, rw); } =20 hwaddr superh_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) @@ -441,7 +441,8 @@ 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, MMU_DATA_LOAD,= 0); + get_physical_address(&cpu->env, &physical, &prot, addr, MMU_DATA_LOAD); + return physical; } =20 @@ -813,11 +814,9 @@ bool superh_cpu_tlb_fill(CPUState *cs, vaddr address, = int size, MMU_DTLB_VIOLATION_READ); #else target_ulong physical; - int prot, sh_access_type; + int prot; =20 - sh_access_type =3D ACCESS_INT; - ret =3D get_physical_address(env, &physical, &prot, address, - access_type, sh_access_type); + ret =3D get_physical_address(env, &physical, &prot, address, access_ty= pe); =20 if (ret =3D=3D MMU_OK) { address &=3D TARGET_PAGE_MASK; --=20 2.26.2 From nobody Tue May 21 07:08:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 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=1613659894; cv=none; d=zohomail.com; s=zohoarc; b=MMNUIJGCbT85R/+MCceyM/et+99Sw3+ya4VFOei+eLZZs9jQqrBLZpeoUo6iAITzeIjwyrOuB/FrJJXQjAcUs7SlSMSZjzM6X0qpemJl83KjInqB1YEmTrpIzcoJeJ96ZATEs83bhFBnl+mLG+v7Qmd9cTn7VPLa8f8Gt13ezDw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613659894; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Wn8jQ1F6vZGAxx2sZR3p9sh3ZA1iePVwsZxGykv2HiE=; b=WelnpvhgdfnZZ87ly/JomvmlXKei66ehtzG+Ofsw+n2vEpRs+4hdj1cV7NrF4DvxKHL2Y0/F2FaHl87uVOCp7eKsmc5F9176v3TX7r4QqcAQ9q2BSlmLCqgXih2TygyUjxA0wHnO5fAzAFoBoW0WEMit/AXPIQsnYZ6sQFbB9uM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1613659894469180.06785599727357; Thu, 18 Feb 2021 06:51:34 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id v15so3304917wrx.4 for ; Thu, 18 Feb 2021 06:51:33 -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 z15sm11310896wrs.72.2021.02.18.06.51.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 06:51: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=Wn8jQ1F6vZGAxx2sZR3p9sh3ZA1iePVwsZxGykv2HiE=; b=psnzdD+9KOe32QKMbDX00d3r5haUFApT6RZnz4LepftEMRf83jvJ8Km1ZVEc9t3UvF s8vmpZUZqJjc4PEKakNxRQ7jBdXcYRNIkFuEf3IS5+WxmD5nZFi0qGt7uN8pj7oJ2vS5 zbEOEIAYAaUP/dYYMoTtxZqWDjmiWL6MlzEvJzWFSmhF7AQ1fj4SgLlwGfu2ZAs0yUwx bVDje+4KmmlJMFNlB6pSApVt/d2Ukc+XMeduYuN8KEh2SHNoHdeYaknHW8UzJ4KeCEXr IkfRyd3pzTASDcSro/ASEFiExK8xAA9JpdQZl2QFdFrnwPQ22ZQGzKImylbQRk8sfRJF Xoqw== 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=Wn8jQ1F6vZGAxx2sZR3p9sh3ZA1iePVwsZxGykv2HiE=; b=FImfF7kBRPGgwOjDnSS7MWFcDVudIQO9yVbc4bh8OiWJsTsRJumhbpWLv6nIBoMhna uHGI4r20F1z0vc7A3U+jWOyXCgB8rHiTDQJvdZmOonnOGo71syanQtmNXZIZdtksM7On ThA0X3MRvpPB+q2+ctixi8TOXnjjcEg4ZNQgTjtRe3smBwI5+CNyiCZsOrg6774GA4Yt uZdfrJHQfDF39VkTr0h1ZJjdYQnFD6zVti3BgCle+isFvVkinz6DZdRP0VQ3vIlBQR3u IRj0fZZ6oEX/JCTi/yM1GSBcZusZTAtlKQc2n3cllulFB6lChoCe26qVhwj5dpgc0seq Ikgw== X-Gm-Message-State: AOAM532tfI8jroh+G7wnwKBJnxRVK4gxRjcb6Nki4Ku+pVpSY+uuJu/E osiHX3UMyX41Yt9dzlRDpzZpasGwp8k= X-Google-Smtp-Source: ABdhPJzyBm+rNhngB0AfWRlomcP3MH/3vYkkWW0AsGZzCwKWC2SGKnNb0CE7BCLaMBBnGs+RNg3t8A== X-Received: by 2002:a05:6000:229:: with SMTP id l9mr4676765wrz.337.1613659892715; Thu, 18 Feb 2021 06:51:32 -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 4/5] target/sh4: Let get_physical_address() use MMUAccessType access_type Date: Thu, 18 Feb 2021 15:51:10 +0100 Message-Id: <20210218145111.1591763-5-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) superh_cpu_tlb_fill() already provides a access_type variable of type MMUAccessType, and it is passed along, but casted as integer and renamed 'rw'. Simply replace 'int rw' by 'MMUAccessType access_type'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/sh4/helper.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/sh4/helper.c b/target/sh4/helper.c index b49efe84916..bd8e034f174 100644 --- a/target/sh4/helper.c +++ b/target/sh4/helper.c @@ -331,14 +331,14 @@ static int find_utlb_entry(CPUSH4State * env, target_= ulong address, int use_asid */ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, int *prot, target_ulong address, - int rw) + MMUAccessType access_type) { int use_asid, n; tlb_t *matching =3D NULL; =20 use_asid =3D !(env->mmucr & MMUCR_SV) || !(env->sr & (1u << SR_MD)); =20 - if (rw =3D=3D MMU_INST_FETCH) { + if (access_type =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 MMU_DATA_STORE) + n =3D (access_type =3D=3D MMU_DATA_STORE) ? MMU_DTLB_VIOLATION_WRITE : MMU_DTLB_VIOLATION_READ; - } else if ((rw =3D=3D MMU_DATA_STORE) && !(matching->pr & 1)) { + } else if ((access_type =3D=3D MMU_DATA_STORE) && !(matching->= pr & 1)) { n =3D MMU_DTLB_VIOLATION_WRITE; - } else if ((rw =3D=3D MMU_DATA_STORE) && !matching->d) { + } else if ((access_type =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 MMU_DATA_STORE) + n =3D (access_type =3D=3D MMU_DATA_STORE) ? MMU_DTLB_MISS_WRITE : MMU_DTLB_MISS_READ; } } @@ -398,7 +398,7 @@ static int get_mmu_address(CPUSH4State * env, target_ul= ong * physical, =20 static int get_physical_address(CPUSH4State * env, target_ulong * physical, int *prot, target_ulong address, - int rw) + MMUAccessType access_type) { /* P1, P2 and P4 areas do not use translation */ if ((address >=3D 0x80000000 && address < 0xc0000000) || address >=3D = 0xe0000000) { @@ -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 MMU_DATA_LOAD) { + if (access_type =3D=3D MMU_DATA_LOAD) { return MMU_DADDR_ERROR_READ; - } else if (rw =3D=3D MMU_DATA_STORE) { + } else if (access_type =3D=3D MMU_DATA_STORE) { return MMU_DADDR_ERROR_WRITE; } else { return MMU_IADDR_ERROR; @@ -432,7 +432,7 @@ static int get_physical_address(CPUSH4State * env, targ= et_ulong * physical, } =20 /* We need to resort to the MMU */ - return get_mmu_address(env, physical, prot, address, rw); + return get_mmu_address(env, physical, prot, address, access_type); } =20 hwaddr superh_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) --=20 2.26.2 From nobody Tue May 21 07:08:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613659899; cv=none; d=zohomail.com; s=zohoarc; b=V6JJHug4ZX9ye7LQDh2A9wAlsk1roSzDhx50/mK7m2/HDVA1zxlXLpe2MVjI8tnhW/2ZyCw6UipGg9ENlLtIuh3XjE5IA2Q0FeolJaYxZCOWAlBeHLnarUuri3D1HLvMSEIB70vOc4EoXwzR77k3Kci96hoKmQG9Yx49XZqOXvQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613659899; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eJ2mryPZyGxmrHSucm5V4T5lhVL5/SUxYpq7hW0/TjU=; b=RPkhEi8/EqazG/roox0UYo9cDJU1bnsMETHzzUAMYscUFYoLLVqboabVIzj6KtH0yY0IP+B1KshIuPeL8XjpqM5mjorsHCY2XZAGV9GG6afVImcG9cFAe+gSu58LcdzaXxhejylmkmLqUphFwY/sbIT8CjeDQsPrcAaI2t/nhas= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1613659899033486.11766181622124; Thu, 18 Feb 2021 06:51:39 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id o82so4073195wme.1 for ; Thu, 18 Feb 2021 06:51:38 -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 o13sm11387917wrs.45.2021.02.18.06.51.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 06:51:36 -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=eJ2mryPZyGxmrHSucm5V4T5lhVL5/SUxYpq7hW0/TjU=; b=Zd6L2bCbithGXbyLs0tB7b4tU/L92XgGyCVS62gjkM/WkwqMJ0nEdyin6/G9vsZYOj ioT/V54adfxgCqoM49/DNPFKcq5U4Bxu9g9zLhUk5X6SIBxpvxd2mBJK0CLHlYnOIlxg kOTaENs06gI86DEDYJf4C+2IVy6ufWaLp3BI97LXwmxKEJcfoXwBcUpHBz7rnnyM2M/d olg5E0oy1zGLk4yYMUuJoDI+Jdvo3yZrgau47O5TEXRgo+B83uIIZC4ipSi+2PmgRS+K N0M6X/aWuoWAaSksgDNT36DYMchRZKMfoXQc20yrw73tRAsJo1M9ff9DlK0g15cAW4wx 4yCw== 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=eJ2mryPZyGxmrHSucm5V4T5lhVL5/SUxYpq7hW0/TjU=; b=mtX+yRLNKlrx3xad9srf15fim+S+wVEwaaZyWemjJd0t3TU46QJXXekmHUazokbOfk 9caWLpUkYw0v1f1Jr1iakOIN1Hcp+x91KS5R3Z8VLpcAp00teUwoF0FAoENcx2RbOTbJ EX3/yScUSKksFBIz2SxqxcBCa5GMP/88iZjVY/LhR+UdzCJywhTjspHtokBLRZLG61yf g2nvoQfeJb944lh08KImlKfNqkPWqhbYDZD49i5JJNN2MhILnPLd/KgXUjNue9WSEl2x J8aei6m2DWbSFGieH68NODOeMdb+jLqyrhac9bbCDIBMzSsIA/YmDX9/3oAk8zixCs97 PFAA== X-Gm-Message-State: AOAM533XqvZWlG7j/Am44iliv4eYIw/VN8vw/CjSgUT58IZHLf5DYNxn nIFPxLnhAQKH6hqqp76wWs4= X-Google-Smtp-Source: ABdhPJxPukVJWqxuXYHeajHavzMotijwV13NrSuLmcrfy025sGeCiA365VJO17ZYFtJU3gEBnmaHPg== X-Received: by 2002:a7b:c776:: with SMTP id x22mr2773412wmk.58.1613659897246; Thu, 18 Feb 2021 06:51:37 -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 5/5] target/sh4: Remove unused definitions Date: Thu, 18 Feb 2021 15:51:11 +0100 Message-Id: <20210218145111.1591763-6-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) Remove these confusing and unused definitions. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/sh4/cpu.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index 714e3b56413..01c43440822 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -271,17 +271,6 @@ typedef SuperHCPU ArchCPU; =20 #include "exec/cpu-all.h" =20 -/* Memory access type */ -enum { - /* Privilege */ - ACCESS_PRIV =3D 0x01, - /* Direction */ - ACCESS_WRITE =3D 0x02, - /* Type of instruction */ - ACCESS_CODE =3D 0x10, - ACCESS_INT =3D 0x20 -}; - /* MMU control register */ #define MMUCR 0x1F000010 #define MMUCR_AT (1<<0) --=20 2.26.2