From nobody Sun Nov 2 16:30:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527430771089939.3248741203474; Sun, 27 May 2018 07:19:31 -0700 (PDT) Received: from localhost ([::1]:52221 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMwWA-0003p6-9p for importer@patchew.org; Sun, 27 May 2018 10:19:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMwQi-0000BK-E1 for qemu-devel@nongnu.org; Sun, 27 May 2018 10:13:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fMwQh-0004Ry-3J for qemu-devel@nongnu.org; Sun, 27 May 2018 10:13:52 -0400 Received: from mail-pl0-x235.google.com ([2607:f8b0:400e:c01::235]:36009) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fMwQg-0004RI-R1 for qemu-devel@nongnu.org; Sun, 27 May 2018 10:13:51 -0400 Received: by mail-pl0-x235.google.com with SMTP id v24-v6so5734971plo.3 for ; Sun, 27 May 2018 07:13:50 -0700 (PDT) Received: from cloudburst.twiddle.net (50-233-235-3-static.hfc.comcastbusiness.net. [50.233.235.3]) by smtp.gmail.com with ESMTPSA id b89-v6sm66680075pfd.85.2018.05.27.07.13.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 May 2018 07:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lBp9UdKqYxesoFAmgXGQF2KaRB2InbN/OuxYQGwXxSk=; b=IdzC/9Dy1rkq+YBwuaLeTLiejcGO7V4y9CVReCS5XjeBEz+TVv3dOy++hOWwwY+bGe j0l4CP7Wujn0qx7f+X/sgR1BHbrrEdvqnL5lKN5Dho8fr5D0EAOouKrnNqBcQYF2AeOv Q5GxaK7qmIWLUpyMI9iHTESBuj23BvqILNHrM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lBp9UdKqYxesoFAmgXGQF2KaRB2InbN/OuxYQGwXxSk=; b=cjo89Tpw5IwVfOLCCN6xn5gaphBcI2MrdHaejsRhDd5F62NYZeZ+ZFcvoFVnRCvPfz RKwbb7g8MdOXiARNkzkdgT6qdyaHqosJV3Oeh/pVs7O5pn0oQEe7FhK3HSCb7EjApFJx g8BfXlFxAquZpxedAK5B5JL+0MDPtba2CP9uFPvsJGXMhXRCWOGYNcY7Oo5dWH4v068d U+ouGFRhNix6Ns0rZ2gc7lj+jG65RJ64SIlacmKDpLk0edpsRxUCUjscOpLjQ7YzZ6qS cq4Hys9BR5rRgOpf4BJiGePqW/2fkJ7Y23YzJhEpIoz7zZXMVe5PmJZ/afpK8/cEGa1h +d/w== X-Gm-Message-State: ALKqPwc1vs6JPAenx71HPa++eHN0Z35qBstG0iJLgh3EWEZSnseQHw9L njQ09XM9Zdu2TdlJWViVngzXCoJaf1EndQ== X-Google-Smtp-Source: AB8JxZr8LLOcrIFmKgsJZdbhB/H7GVtJqAWWnBtarXs9pKaxryMGL5zNODC33K0Ze7sOYLx4Q+DbkA== X-Received: by 2002:a17:902:b604:: with SMTP id b4-v6mr9656021pls.18.1527430429537; Sun, 27 May 2018 07:13:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 27 May 2018 09:13:18 -0500 Message-Id: <20180527141324.11937-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180527141324.11937-1-richard.henderson@linaro.org> References: <20180527141324.11937-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::235 Subject: [Qemu-devel] [PATCH 14/20] target/openrisc: Use identical sizes for ITLB and DTLB X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stafford Horne Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The sizes are already the same, however, we can improve things if they are identical by design. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/openrisc/cpu.h | 10 ++++------ target/openrisc/machine.c | 4 ++-- target/openrisc/mmu.c | 4 ++-- target/openrisc/sys_helper.c | 16 ++++++++-------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index c48802ad8f..53abe965e8 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -222,10 +222,8 @@ enum { =20 /* TLB size */ enum { - DTLB_SIZE =3D 64, - DTLB_MASK =3D (DTLB_SIZE-1), - ITLB_SIZE =3D 64, - ITLB_MASK =3D (ITLB_SIZE-1), + TLB_SIZE =3D 64, + TLB_MASK =3D TLB_SIZE - 1, }; =20 /* TLB prot */ @@ -254,8 +252,8 @@ typedef struct OpenRISCTLBEntry { =20 #ifndef CONFIG_USER_ONLY typedef struct CPUOpenRISCTLBContext { - OpenRISCTLBEntry itlb[ITLB_SIZE]; - OpenRISCTLBEntry dtlb[DTLB_SIZE]; + OpenRISCTLBEntry itlb[TLB_SIZE]; + OpenRISCTLBEntry dtlb[TLB_SIZE]; =20 int (*cpu_openrisc_map_address_code)(struct OpenRISCCPU *cpu, hwaddr *physical, diff --git a/target/openrisc/machine.c b/target/openrisc/machine.c index b795b56dc6..3fc837b925 100644 --- a/target/openrisc/machine.c +++ b/target/openrisc/machine.c @@ -42,9 +42,9 @@ static const VMStateDescription vmstate_cpu_tlb =3D { .minimum_version_id =3D 1, .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_STRUCT_ARRAY(itlb, CPUOpenRISCTLBContext, ITLB_SIZE, 0, + VMSTATE_STRUCT_ARRAY(itlb, CPUOpenRISCTLBContext, TLB_SIZE, 0, vmstate_tlb_entry, OpenRISCTLBEntry), - VMSTATE_STRUCT_ARRAY(dtlb, CPUOpenRISCTLBContext, DTLB_SIZE, 0, + VMSTATE_STRUCT_ARRAY(dtlb, CPUOpenRISCTLBContext, TLB_SIZE, 0, vmstate_tlb_entry, OpenRISCTLBEntry), VMSTATE_END_OF_LIST() } diff --git a/target/openrisc/mmu.c b/target/openrisc/mmu.c index 11b8187cda..ee3016a8b9 100644 --- a/target/openrisc/mmu.c +++ b/target/openrisc/mmu.c @@ -41,7 +41,7 @@ static int get_phys_code(OpenRISCCPU *cpu, hwaddr *physic= al, int *prot, target_ulong address, int rw, bool supervisor) { int vpn =3D address >> TARGET_PAGE_BITS; - int idx =3D vpn & ITLB_MASK; + int idx =3D vpn & TLB_MASK; int right =3D 0; uint32_t mr =3D cpu->env.tlb.itlb[idx].mr; uint32_t tr =3D cpu->env.tlb.itlb[idx].tr; @@ -74,7 +74,7 @@ static int get_phys_data(OpenRISCCPU *cpu, hwaddr *physic= al, int *prot, target_ulong address, int rw, bool supervisor) { int vpn =3D address >> TARGET_PAGE_BITS; - int idx =3D vpn & DTLB_MASK; + int idx =3D vpn & TLB_MASK; int right =3D 0; uint32_t mr =3D cpu->env.tlb.dtlb[idx].mr; uint32_t tr =3D cpu->env.tlb.dtlb[idx].tr; diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index 0a74c9522f..7254aa9830 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -79,7 +79,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong sp= r, target_ulong rb) idx =3D (spr - 1024); env->shadow_gpr[idx / 32][idx % 32] =3D rb; =20 - case TO_SPR(1, 512) ... TO_SPR(1, 512+DTLB_SIZE-1): /* DTLBW0MR 0-127 = */ + case TO_SPR(1, 512) ... TO_SPR(1, 512 + TLB_SIZE - 1): /* DTLBW0MR 0-1= 27 */ idx =3D spr - TO_SPR(1, 512); mr =3D env->tlb.dtlb[idx].mr; if (mr & 1) { @@ -90,7 +90,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong sp= r, target_ulong rb) } env->tlb.dtlb[idx].mr =3D rb; break; - case TO_SPR(1, 640) ... TO_SPR(1, 640+DTLB_SIZE-1): /* DTLBW0TR 0-127 = */ + case TO_SPR(1, 640) ... TO_SPR(1, 640 + TLB_SIZE - 1): /* DTLBW0TR 0-1= 27 */ idx =3D spr - TO_SPR(1, 640); env->tlb.dtlb[idx].tr =3D rb; break; @@ -102,7 +102,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong = spr, target_ulong rb) case TO_SPR(1, 1408) ... TO_SPR(1, 1535): /* DTLBW3TR 0-127 */ break; =20 - case TO_SPR(2, 512) ... TO_SPR(2, 512+ITLB_SIZE-1): /* ITLBW0MR 0-12= 7 */ + case TO_SPR(2, 512) ... TO_SPR(2, 512 + TLB_SIZE - 1): /* ITLBW0MR 0-1= 27 */ idx =3D spr - TO_SPR(2, 512); mr =3D env->tlb.itlb[idx].mr; if (mr & 1) { @@ -113,7 +113,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong = spr, target_ulong rb) } env->tlb.itlb[idx].mr =3D rb; break; - case TO_SPR(2, 640) ... TO_SPR(2, 640+ITLB_SIZE-1): /* ITLBW0TR 0-127 = */ + case TO_SPR(2, 640) ... TO_SPR(2, 640 + TLB_SIZE - 1): /* ITLBW0TR 0-1= 27 */ idx =3D spr - TO_SPR(2, 640); env->tlb.itlb[idx].tr =3D rb; break; @@ -246,11 +246,11 @@ target_ulong HELPER(mfspr)(CPUOpenRISCState *env, tar= get_ulong rd, idx =3D (spr - 1024); return env->shadow_gpr[idx / 32][idx % 32]; =20 - case TO_SPR(1, 512) ... TO_SPR(1, 512+DTLB_SIZE-1): /* DTLBW0MR 0-127 = */ + case TO_SPR(1, 512) ... TO_SPR(1, 512 + TLB_SIZE - 1): /* DTLBW0MR 0-1= 27 */ idx =3D spr - TO_SPR(1, 512); return env->tlb.dtlb[idx].mr; =20 - case TO_SPR(1, 640) ... TO_SPR(1, 640+DTLB_SIZE-1): /* DTLBW0TR 0-127 = */ + case TO_SPR(1, 640) ... TO_SPR(1, 640 + TLB_SIZE - 1): /* DTLBW0TR 0-1= 27 */ idx =3D spr - TO_SPR(1, 640); return env->tlb.dtlb[idx].tr; =20 @@ -262,11 +262,11 @@ target_ulong HELPER(mfspr)(CPUOpenRISCState *env, tar= get_ulong rd, case TO_SPR(1, 1408) ... TO_SPR(1, 1535): /* DTLBW3TR 0-127 */ break; =20 - case TO_SPR(2, 512) ... TO_SPR(2, 512+ITLB_SIZE-1): /* ITLBW0MR 0-127 = */ + case TO_SPR(2, 512) ... TO_SPR(2, 512 + TLB_SIZE - 1): /* ITLBW0MR 0-1= 27 */ idx =3D spr - TO_SPR(2, 512); return env->tlb.itlb[idx].mr; =20 - case TO_SPR(2, 640) ... TO_SPR(2, 640+ITLB_SIZE-1): /* ITLBW0TR 0-127 = */ + case TO_SPR(2, 640) ... TO_SPR(2, 640 + TLB_SIZE - 1): /* ITLBW0TR 0-1= 27 */ idx =3D spr - TO_SPR(2, 640); return env->tlb.itlb[idx].tr; =20 --=20 2.17.0