From patchwork Wed Jan 27 23:21:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12051175 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD663C433E0 for ; Wed, 27 Jan 2021 23:23:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 894F660C3D for ; Wed, 27 Jan 2021 23:23:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 894F660C3D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4u9o-0002BU-Gh for qemu-devel@archiver.kernel.org; Wed, 27 Jan 2021 18:23:28 -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) 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) 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) From: =?utf-8?q?Philippe_Mathieu-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 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_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We are going to move this code, fix its style first. Signed-off-by: Philippe Mathieu-Daudé 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_ulong 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 = NULL; @@ -340,12 +340,12 @@ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, if (rw == 2) { n = find_itlb_entry(env, address, use_asid); - if (n >= 0) { - matching = &env->itlb[n]; + if (n >= 0) { + matching = &env->itlb[n]; if (!(env->sr & (1u << SR_MD)) && !(matching->pr & 2)) { - n = MMU_ITLB_VIOLATION; + n = MMU_ITLB_VIOLATION; } else { - *prot = PAGE_EXEC; + *prot = PAGE_EXEC; } } else { n = find_utlb_entry(env, address, use_asid); @@ -365,14 +365,14 @@ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, } else if (n == MMU_DTLB_MISS) { n = MMU_ITLB_MISS; } - } + } } else { - n = find_utlb_entry(env, address, use_asid); - if (n >= 0) { - matching = &env->utlb[n]; + n = find_utlb_entry(env, address, use_asid); + if (n >= 0) { + matching = &env->utlb[n]; if (!(env->sr & (1u << SR_MD)) && !(matching->pr & 2)) { - n = (rw == 1) ? MMU_DTLB_VIOLATION_WRITE : - MMU_DTLB_VIOLATION_READ; + n = (rw == 1) + ? MMU_DTLB_VIOLATION_WRITE : MMU_DTLB_VIOLATION_READ; } else if ((rw == 1) && !(matching->pr & 1)) { n = MMU_DTLB_VIOLATION_WRITE; } else if ((rw == 1) && !matching->d) { @@ -383,15 +383,15 @@ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, *prot |= PAGE_WRITE; } } - } else if (n == MMU_DTLB_MISS) { - n = (rw == 1) ? MMU_DTLB_MISS_WRITE : - MMU_DTLB_MISS_READ; - } + } else if (n == MMU_DTLB_MISS) { + n = (rw == 1) + ? MMU_DTLB_MISS_WRITE : MMU_DTLB_MISS_READ; + } } if (n >= 0) { - n = MMU_OK; - *physical = ((matching->ppn << 10) & ~(matching->size - 1)) | - (address & (matching->size - 1)); + n = MMU_OK; + *physical = ((matching->ppn << 10) & ~(matching->size - 1)) + | (address & (matching->size - 1)); } return n; } @@ -401,34 +401,34 @@ static int get_physical_address(CPUSH4State * env, target_ulong * physical, int rw, int access_type) { /* P1, P2 and P4 areas do not use translation */ - if ((address >= 0x80000000 && address < 0xc0000000) || - address >= 0xe0000000) { + if ((address >= 0x80000000 && address < 0xc0000000) || address >= 0xe0000000) { if (!(env->sr & (1u << SR_MD)) - && (address < 0xe0000000 || address >= 0xe4000000)) { - /* Unauthorized access in user mode (only store queues are available) */ + && (address < 0xe0000000 || address >= 0xe4000000)) { + /* Unauthorized access in user mode (only store queues are available) */ qemu_log_mask(LOG_GUEST_ERROR, "Unauthorized access\n"); - if (rw == 0) - return MMU_DADDR_ERROR_READ; - else if (rw == 1) - return MMU_DADDR_ERROR_WRITE; - else - return MMU_IADDR_ERROR; - } - if (address >= 0x80000000 && address < 0xc0000000) { - /* Mask upper 3 bits for P1 and P2 areas */ - *physical = address & 0x1fffffff; - } else { - *physical = address; - } - *prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; - return MMU_OK; + if (rw == 0) { + return MMU_DADDR_ERROR_READ; + } else if (rw == 1) { + return MMU_DADDR_ERROR_WRITE; + } else { + return MMU_IADDR_ERROR; + } + } + if (address >= 0x80000000 && address < 0xc0000000) { + /* Mask upper 3 bits for P1 and P2 areas */ + *physical = address & 0x1fffffff; + } else { + *physical = address; + } + *prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; + return MMU_OK; } /* If MMU is disabled, return the corresponding physical page */ if (!(env->mmucr & MMUCR_AT)) { - *physical = address & 0x1FFFFFFF; - *prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; - return MMU_OK; + *physical = address & 0x1FFFFFFF; + *prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; + return MMU_OK; } /* We need to resort to the MMU */ From patchwork Wed Jan 27 23:21:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12051181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BB9DC433E0 for ; Wed, 27 Jan 2021 23:25:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BB64F64D7F for ; Wed, 27 Jan 2021 23:25:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB64F64D7F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4uC8-0005Gn-3v for qemu-devel@archiver.kernel.org; Wed, 27 Jan 2021 18:25:53 -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) 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) 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) From: =?utf-8?q?Philippe_Mathieu-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 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_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Replace the 0/1/2 magic values by the corresponding MMUAccessType. Signed-off-by: Philippe Mathieu-Daudé 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_ulong * physical, use_asid = !(env->mmucr & MMUCR_SV) || !(env->sr & (1u << SR_MD)); - if (rw == 2) { + if (rw == MMU_INST_FETCH) { n = find_itlb_entry(env, address, use_asid); if (n >= 0) { matching = &env->itlb[n]; @@ -371,11 +371,11 @@ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, if (n >= 0) { matching = &env->utlb[n]; if (!(env->sr & (1u << SR_MD)) && !(matching->pr & 2)) { - n = (rw == 1) + n = (rw == MMU_DATA_STORE) ? MMU_DTLB_VIOLATION_WRITE : MMU_DTLB_VIOLATION_READ; - } else if ((rw == 1) && !(matching->pr & 1)) { + } else if ((rw == MMU_DATA_STORE) && !(matching->pr & 1)) { n = MMU_DTLB_VIOLATION_WRITE; - } else if ((rw == 1) && !matching->d) { + } else if ((rw == MMU_DATA_STORE) && !matching->d) { n = MMU_DTLB_INITIAL_WRITE; } else { *prot = PAGE_READ; @@ -384,7 +384,7 @@ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, } } } else if (n == MMU_DTLB_MISS) { - n = (rw == 1) + n = (rw == MMU_DATA_STORE) ? MMU_DTLB_MISS_WRITE : MMU_DTLB_MISS_READ; } } @@ -406,9 +406,9 @@ static int get_physical_address(CPUSH4State * env, target_ulong * physical, && (address < 0xe0000000 || address >= 0xe4000000)) { /* Unauthorized access in user mode (only store queues are available) */ qemu_log_mask(LOG_GUEST_ERROR, "Unauthorized access\n"); - if (rw == 0) { + if (rw == MMU_DATA_LOAD) { return MMU_DADDR_ERROR_READ; - } else if (rw == 1) { + } else if (rw == 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, vaddr addr) target_ulong physical; int prot; - get_physical_address(&cpu->env, &physical, &prot, addr, 0, 0); + get_physical_address(&cpu->env, &physical, &prot, addr, MMU_DATA_LOAD, 0); return physical; } From patchwork Wed Jan 27 23:21:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12051177 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31CAEC433E9 for ; Wed, 27 Jan 2021 23:23:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C555664DD3 for ; Wed, 27 Jan 2021 23:23:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C555664DD3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4u9z-0002ba-R7 for qemu-devel@archiver.kernel.org; Wed, 27 Jan 2021 18:23:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4u8a-00010C-Uj for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:22:12 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:50264) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4u8Z-0006Fp-Bk for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:22:12 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 190so2839242wmz.0 for ; Wed, 27 Jan 2021 15:22:10 -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=uaR1HWYQodSHOqm/Miyng3SlcyOxsAAfxUqWlGYCQF0=; b=VTBKgA5IKld8YRDDqG0RjhQ+wEQlpLRhpwP7iuShvOeFsANBBsxvGDvj0CZ4XzzZR5 PeB2AIU0eq3uBOpumQwgrsVf37VWhauTU0SS3lqIdbB25hTW8ZW7jrMydROk9phMvVvg c7hzAF/OQqrV4uQh+A593h9j+AHjcH3kVThhUUivrZs75YKzTti0oiJ4Ztiy583k7xzx KOyL9HR1pjHdNppwg/h94dhW8umHOem4xucONhQHb/nBH7KQorspD1DG6vGU1A4YXsQL +6UpPNaXZiLz9cHrP+7JGui4Q46dQQG1OAHU0cqP1v+CwTJMqvtwFCp2wHfszIHEx/Gl mh8Q== 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=uaR1HWYQodSHOqm/Miyng3SlcyOxsAAfxUqWlGYCQF0=; b=MDIUe+lT6MiAZa0R89BMB/fTSslRlWTE3sPsASiG6+xU7iPAS7ubHUzlGhAUa5EtDr IOnPSR/T5FiMt21NXFJRxX84o2UWTjsYazSSFWYkKJWWp62UaKRc2LOg2s8E7E+A7tce WLUh+X5dWswLxTL4p1EMkt57jvk9n/msG8KOTV4eBOFGCG5YDj3BXpqCDdhQ7UKmsy2i P861nKLQCQFdeFm0j4/sa83E+mmpmKDrRlu21OWYpiuzBSIHdJMZn3j2Zw8smvaQ0cl1 jQPQzncB8o8/SDMSeb9/2NuCR2A4cUVI9dqkM3UMsQfIOiwo/BvIF9Z4/husGpY+V1++ asHg== X-Gm-Message-State: AOAM530AybmO895Txil+BRzE265/B4nJgX3WcmOqW/eFLV3/QQfsodjY GGcJGmwWH6br5VqgR7Zctc6DNpXCMG8= X-Google-Smtp-Source: ABdhPJwe/1P/vFM7Ekq/q9Q6VfrctSacQRpMwS3no7nafIfuqZED9rC5iqIjXHey7UtCU7mU34tcIg== X-Received: by 2002:a05:600c:230e:: with SMTP id 14mr6040133wmo.161.1611789729590; Wed, 27 Jan 2021 15:22:09 -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 a6sm3760308wmj.27.2021.01.27.15.22.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 15:22:08 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/5] target/sh4: Pass mmu_idx to get_physical_address() Date: Thu, 28 Jan 2021 00:21:49 +0100 Message-Id: <20210127232151.3523581-4-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 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32c.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_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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(). Pass the MMU index along, as other targets do. Signed-off-by: Philippe Mathieu-Daudé --- target/sh4/helper.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/target/sh4/helper.c b/target/sh4/helper.c index 4303ebf018b..737938d2fd1 100644 --- a/target/sh4/helper.c +++ b/target/sh4/helper.c @@ -331,7 +331,7 @@ 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, int access_type) + int rw, int mmu_idx) { int use_asid, n; tlb_t *matching = NULL; @@ -398,7 +398,7 @@ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, static int get_physical_address(CPUSH4State * env, target_ulong * physical, int *prot, target_ulong address, - int rw, int access_type) + int rw, int mmu_idx) { /* P1, P2 and P4 areas do not use translation */ if ((address >= 0x80000000 && address < 0xc0000000) || address >= 0xe0000000) { @@ -432,7 +432,7 @@ static int get_physical_address(CPUSH4State * env, target_ulong * physical, } /* 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, mmu_idx); } hwaddr superh_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) @@ -813,11 +813,10 @@ 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; - sh_access_type = ACCESS_INT; ret = get_physical_address(env, &physical, &prot, address, - access_type, sh_access_type); + access_type, mmu_idx); if (ret == MMU_OK) { address &= TARGET_PAGE_MASK; From patchwork Wed Jan 27 23:21:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12051183 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5725C433E0 for ; Wed, 27 Jan 2021 23:26:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 47AC960C41 for ; Wed, 27 Jan 2021 23:26:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47AC960C41 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4uCO-0005hD-DV for qemu-devel@archiver.kernel.org; Wed, 27 Jan 2021 18:26:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4u8g-0001Ar-CB for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:22:18 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:43332) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4u8e-0006GR-OI for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:22:18 -0500 Received: by mail-wr1-x42e.google.com with SMTP id z6so3574272wrq.10 for ; Wed, 27 Jan 2021 15:22:16 -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=gC5PlB4hjqAvtWqskaMHj+n0ZuQPzFbL27s012MYxIQ=; b=H5xE26xeRn1Ith5Fs+yQgnliYA7j5mkeJshEczdDBWudhW1pZXHSQDWmRpz7K7Rz/Y FUTnzkwHTn8RcHJMWZWI13W6HO5xsO/vOq0SdBbgBnvUk8P1UzvU5vSV3/qf8ku9KhuA ZPNT18QABIH9PvOer9A4yv0aZsy6/mpwI+5mLAZCZUw9v3Fp0lAVYeMdMRoFsalEc1Z7 Xp5Mq7SP7zhnSmRLoIw5tM41Tnf/uJN+vyjUQXKgFg0efNgzr5nHWDoRWXuKKo9DiyeJ zSjs4oxEAezdY8UR+V/M3OMbO1mHBpsUGyaQh8RGXVbLNpLhGgFhWZK5BUELmi4QRCon bq/Q== 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=gC5PlB4hjqAvtWqskaMHj+n0ZuQPzFbL27s012MYxIQ=; b=DO6+5/HwODZmtG5TmOrZqHb7DZz+a88omR64f7wpVoKfigwRNgA3z/th5KyUgnQVGo 8yQNhHLC5yljCwqxEPt7NdkbPOY6TDnGuB4hobhWOKyIzRIofDVUk+AgkxRieKk2ntc5 yAXk3qWOStBWWGWfRGshUUAwvreRi7FbORptFsAeEPYiS5MLxo1hWIbZAIsQtwgabqDo AQ6k1/FS8DAkdjd/KNO57PVJvAvF7JLVkpaFqthViiNPh8ZAViJ0kab/sfVrLgRZEBZU DmaOVgcEFY0eH2nvs/VoGJEaiWHt/TU1O1dQyG7b+ncqhmRrXvOwm4q7aLKFFwKlVTRL f8HQ== X-Gm-Message-State: AOAM533Rs/yYyP97PzThQ250GnB8x+061Qj8uISa44qv8b09yCJhzmfC zOElENBSbzH57ZoyZMITSLYXThwlI+U= X-Google-Smtp-Source: ABdhPJyqDtskjb6l69TFXwJi9XzYBjXAvCNGGskflme52gmYkDhTNy1BkZrJR4xw6IbzQZdBdlTq9A== X-Received: by 2002:adf:fbd2:: with SMTP id d18mr13597474wrs.222.1611789734879; Wed, 27 Jan 2021 15:22:14 -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 l84sm3980079wmf.17.2021.01.27.15.22.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 15:22:14 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/5] target/sh4: Let get_physical_address() use MMUAccessType access_type Date: Thu, 28 Jan 2021 00:21:50 +0100 Message-Id: <20210127232151.3523581-5-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 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42e.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_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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 737938d2fd1..fad5f906ef6 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, int mmu_idx) + MMUAccessType access_type, int mmu_idx) { int use_asid, n; tlb_t *matching = NULL; use_asid = !(env->mmucr & MMUCR_SV) || !(env->sr & (1u << SR_MD)); - if (rw == MMU_INST_FETCH) { + if (access_type == MMU_INST_FETCH) { n = find_itlb_entry(env, address, use_asid); if (n >= 0) { matching = &env->itlb[n]; @@ -371,11 +371,11 @@ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, if (n >= 0) { matching = &env->utlb[n]; if (!(env->sr & (1u << SR_MD)) && !(matching->pr & 2)) { - n = (rw == MMU_DATA_STORE) + n = (access_type == MMU_DATA_STORE) ? MMU_DTLB_VIOLATION_WRITE : MMU_DTLB_VIOLATION_READ; - } else if ((rw == MMU_DATA_STORE) && !(matching->pr & 1)) { + } else if ((access_type == MMU_DATA_STORE) && !(matching->pr & 1)) { n = MMU_DTLB_VIOLATION_WRITE; - } else if ((rw == MMU_DATA_STORE) && !matching->d) { + } else if ((access_type == MMU_DATA_STORE) && !matching->d) { n = MMU_DTLB_INITIAL_WRITE; } else { *prot = PAGE_READ; @@ -384,7 +384,7 @@ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, } } } else if (n == MMU_DTLB_MISS) { - n = (rw == MMU_DATA_STORE) + n = (access_type == MMU_DATA_STORE) ? MMU_DTLB_MISS_WRITE : MMU_DTLB_MISS_READ; } } @@ -398,7 +398,7 @@ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, static int get_physical_address(CPUSH4State * env, target_ulong * physical, int *prot, target_ulong address, - int rw, int mmu_idx) + MMUAccessType access_type, int mmu_idx) { /* P1, P2 and P4 areas do not use translation */ if ((address >= 0x80000000 && address < 0xc0000000) || address >= 0xe0000000) { @@ -406,9 +406,9 @@ static int get_physical_address(CPUSH4State * env, target_ulong * physical, && (address < 0xe0000000 || address >= 0xe4000000)) { /* Unauthorized access in user mode (only store queues are available) */ qemu_log_mask(LOG_GUEST_ERROR, "Unauthorized access\n"); - if (rw == MMU_DATA_LOAD) { + if (access_type == MMU_DATA_LOAD) { return MMU_DADDR_ERROR_READ; - } else if (rw == MMU_DATA_STORE) { + } else if (access_type == MMU_DATA_STORE) { return MMU_DADDR_ERROR_WRITE; } else { return MMU_IADDR_ERROR; @@ -432,7 +432,7 @@ static int get_physical_address(CPUSH4State * env, target_ulong * physical, } /* We need to resort to the MMU */ - return get_mmu_address(env, physical, prot, address, rw, mmu_idx); + return get_mmu_address(env, physical, prot, address, access_type, mmu_idx); } hwaddr superh_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) From patchwork Wed Jan 27 23:21:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12051179 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 189DDC433DB for ; Wed, 27 Jan 2021 23:23:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AA1A364DD0 for ; Wed, 27 Jan 2021 23:23:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA1A364DD0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4uA8-0002xz-J4 for qemu-devel@archiver.kernel.org; Wed, 27 Jan 2021 18:23:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4u8l-0001K8-2s for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:22:24 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:34899) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4u8j-0006Gi-MJ for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:22:22 -0500 Received: by mail-wm1-x32b.google.com with SMTP id e15so3067986wme.0 for ; Wed, 27 Jan 2021 15:22:21 -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=vwNqOiA5PW40PQw1O00kFHSY1G6Pg3UV8mvbDmHKFwE=; b=ejU+uMffEJ180KMbpTYRAzO8WQfWdt3WG1jAi13CcWyjj2ahWumVdUHuTPDFxnq7/A LYXUts0GofDqz5G/QxQEMD1BwLaJ5UywkOoINPUQ3Fh0b7KSnmwNUWvKhz0BDyC/oQ/u h5MEth3diAOAF7tdWK4XVGYri6Xhuajj9dIiuRQGMwAerTtsxGU3o+H+t+fyMcO4vkPa y2FdfRvhz8ajWicu7cJOZMxAtNsU0FXIJKp5+UEf4hoBBMdTkF9Jxu1UQxmwFKOf2sdl R5A+l3aXpcLUUU0vepC8w1KxmINHViT0t2nU8j/yaFXwRN1mT3W8FcENhYYYeUDp8WHw ITUw== 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=vwNqOiA5PW40PQw1O00kFHSY1G6Pg3UV8mvbDmHKFwE=; b=joDZn9q9PQebxTI/QqEObHcTWZiKoKR3/zqjmaPR8nLys4asygF86yrswZ627bHd3Q Svgfo9JxwVPjZS/ps7MP2fxFNcjoEFR90ezSCNQyd/NNCJMPOzzIpBrOtfR9smvKJDs8 GPZYxhZnY/PSvpkb9LmVA1oTYuOLf4WHe8C9sGFHPYRbks8yZ2m7JXK0dc8WG1ThnGXn 4J92Tn2fBzb2C34JoJBl5VLZUy9UvGEMujybT/pq1ibH68wZr/SEtCK5XfeFo7Lne2sM ELe51FCQCYnYbeEY7gKddBn0QiJBIaCDG5iNuab6SAS30Aso6T9306nRJ6MlHgmSB6Dh xQ9w== X-Gm-Message-State: AOAM530isE0yfNbLVaSYwhmPtKDCzkHPETCxJj7CFkXF19KklBWVj+lP dm/OYHmwoQ4893jZXKMNQCUPv/nVPKc= X-Google-Smtp-Source: ABdhPJw0KQBWxfEg6MW3XHMuCpJ8N/VC1GdEPhgtQ3hUqPmQygvBvYI/pWDWWZ4plnkVJixpLDDJkg== X-Received: by 2002:a1c:2c0b:: with SMTP id s11mr5800716wms.13.1611789740220; Wed, 27 Jan 2021 15:22:20 -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 y6sm3887566wma.19.2021.01.27.15.22.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 15:22:19 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 5/5] target/sh4: Remove unused definitions Date: Thu, 28 Jan 2021 00:21:51 +0100 Message-Id: <20210127232151.3523581-6-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 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32b.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_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Remove these confusing and unused definitions. Signed-off-by: Philippe Mathieu-Daudé 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; #include "exec/cpu-all.h" -/* Memory access type */ -enum { - /* Privilege */ - ACCESS_PRIV = 0x01, - /* Direction */ - ACCESS_WRITE = 0x02, - /* Type of instruction */ - ACCESS_CODE = 0x10, - ACCESS_INT = 0x20 -}; - /* MMU control register */ #define MMUCR 0x1F000010 #define MMUCR_AT (1<<0)