From nobody Sun Feb 8 19:25:17 2026 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524239584587933.3659201755821; Fri, 20 Apr 2018 08:53:04 -0700 (PDT) Received: from localhost ([::1]:39043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9YLH-00076n-HW for importer@patchew.org; Fri, 20 Apr 2018 11:52:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9YJH-0005v7-Ka for qemu-devel@nongnu.org; Fri, 20 Apr 2018 11:50:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9YJG-0005qL-7S for qemu-devel@nongnu.org; Fri, 20 Apr 2018 11:50:51 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:37852) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f9YJG-0005pY-0y for qemu-devel@nongnu.org; Fri, 20 Apr 2018 11:50:50 -0400 Received: by mail-wr0-x241.google.com with SMTP id f14-v6so24222140wre.4 for ; Fri, 20 Apr 2018 08:50:49 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v111-v6sm7825434wrb.30.2018.04.20.08.50.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Apr 2018 08:50:46 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 391553E0321; Fri, 20 Apr 2018 16:50:45 +0100 (BST) 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 :mime-version:content-transfer-encoding; bh=NKRTWPx9XJvd8tXI8smZeEGIKMjvBcvS6l3yK5hH9tM=; b=Jvh4DbHp9TUmR3rg9sSVDaKbOx2Mo5lR2YwtHF34LrS/W2rXNIyp+EDNex0wjbjZsB OdeOl+WqbfJXB9IVHsBJPZr7VLOE2YjZKf7vOsjJWqZHfU+ewj7ky01HgMCf5AILxV6m qY5FYC7+i9dqaig8uPG1xXbpO7C78YK9yfg24= 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:mime-version:content-transfer-encoding; bh=NKRTWPx9XJvd8tXI8smZeEGIKMjvBcvS6l3yK5hH9tM=; b=ALF+heuznChuNbYkJ0v9SXRH8HWk+nab8mVUYAAaVSdPPjxz0gQoyucyI30F/pZ5Ip Melc82b0zcPV+qqTvaUDDJl2rqJW54aDHPj9E0cvszeBdjXY3untwC9q50DXZcpL5HFt m1aAnbpVYQd8AViDO8gWkp0ReOT+7BtNCNouKdcmOjEfe0/gR1dkpiwigxWyTwNog4WL NbTfg9dvpVda7FPm/uswSydR5QKhJs8sAdKKJKzTMglE0tr4CtUZSLUXN9jTZh3NLnUW Zs8xYCLq/3XeBPlOIl1sSWB25i+GxbEmQZYC9QpBoS8B7b6rGEBArLFSKHKlGdn+mHnU CS/g== X-Gm-Message-State: ALQs6tDxsdaJgUSHAyHgaHEi+haQsfKUPtyZLRahBmAxhCUajZGnTMC3 Mm9HFWzV/0enk4GRYq/4Cze7Xw== X-Google-Smtp-Source: AB8JxZqmdqaMo6yfVc7lYxspE2zRK4HtuUxb9ajLdfM3zmGVXWQXrcryWFk0po5CEvd8HxKnpkAX5A== X-Received: by 10.28.184.21 with SMTP id i21mr2432119wmf.94.1524239448798; Fri, 20 Apr 2018 08:50:48 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Fri, 20 Apr 2018 16:50:40 +0100 Message-Id: <20180420155045.18862-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180420155045.18862-1-alex.bennee@linaro.org> References: <20180420155045.18862-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [RFC PATCH 1/6] accel/tcg: export some cputlb functions 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: peter.maydell@linaro.org, Peter Crosthwaite , richard.henderson@linaro.org, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson 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 In preparation for having softmmu helpers in their own file rather than generated as part of softmmu-template.h we need to make a couple of helper functions public outside of cputlb. Signed-off-by: Alex Benn=C3=A9e --- accel/tcg/cputlb.c | 19 ++++++++++--------- accel/tcg/cputlb.h | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 accel/tcg/cputlb.h diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 05439039e9..43a89d3010 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "cpu.h" +#include "cputlb.h" #include "exec/exec-all.h" #include "exec/memory.h" #include "exec/address-spaces.h" @@ -760,9 +761,9 @@ static inline ram_addr_t qemu_ram_addr_from_host_nofail= (void *ptr) return ram_addr; } =20 -static uint64_t io_readx(CPUArchState *env, CPUIOTLBEntry *iotlbentry, - int mmu_idx, - target_ulong addr, uintptr_t retaddr, int size) +uint64_t io_readx(CPUArchState *env, CPUIOTLBEntry *iotlbentry, + int mmu_idx, + target_ulong addr, uintptr_t retaddr, int size) { CPUState *cpu =3D ENV_GET_CPU(env); hwaddr physaddr =3D iotlbentry->addr; @@ -796,10 +797,10 @@ static uint64_t io_readx(CPUArchState *env, CPUIOTLBE= ntry *iotlbentry, return val; } =20 -static void io_writex(CPUArchState *env, CPUIOTLBEntry *iotlbentry, - int mmu_idx, - uint64_t val, target_ulong addr, - uintptr_t retaddr, int size) +void io_writex(CPUArchState *env, CPUIOTLBEntry *iotlbentry, + int mmu_idx, + uint64_t val, target_ulong addr, + uintptr_t retaddr, int size) { CPUState *cpu =3D ENV_GET_CPU(env); hwaddr physaddr =3D iotlbentry->addr; @@ -831,8 +832,8 @@ static void io_writex(CPUArchState *env, CPUIOTLBEntry = *iotlbentry, =20 /* Return true if ADDR is present in the victim tlb, and has been copied back to the main tlb. */ -static bool victim_tlb_hit(CPUArchState *env, size_t mmu_idx, size_t index, - size_t elt_ofs, target_ulong page) +bool victim_tlb_hit(CPUArchState *env, size_t mmu_idx, size_t index, + size_t elt_ofs, target_ulong page) { size_t vidx; for (vidx =3D 0; vidx < CPU_VTLB_SIZE; ++vidx) { diff --git a/accel/tcg/cputlb.h b/accel/tcg/cputlb.h new file mode 100644 index 0000000000..4645693eb5 --- /dev/null +++ b/accel/tcg/cputlb.h @@ -0,0 +1,20 @@ +/* + * CPU TLB Helperss + */ + +#ifndef CPUTLB_H +#define CPUTBL_H + +uint64_t io_readx(CPUArchState *env, CPUIOTLBEntry *iotlbentry, + int mmu_idx, + target_ulong addr, uintptr_t retaddr, int size); + +void io_writex(CPUArchState *env, CPUIOTLBEntry *iotlbentry, + int mmu_idx, + uint64_t val, target_ulong addr, + uintptr_t retaddr, int size); + +bool victim_tlb_hit(CPUArchState *env, size_t mmu_idx, size_t index, + size_t elt_ofs, target_ulong page); + +#endif --=20 2.17.0