From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455420; cv=none; d=zohomail.com; s=zohoarc; b=Aq41dkrInnSj3xXV/DWlqglZskUy/rELIaXZ9FhqMd7IBJKmbvfY3FGYNE6ccr29tptNNTz+oh1hYIAKwM9LWdKLbVSxS97L/8g7dzL/VM8mxT8/YtGMtKT0/tE6LdneNDQG/UL+4y1jmReuNP4Dd0n5BTO/MprGQ6XVyf9bGB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455420; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jtgRZgZU54ZLuu3kEDdlzDMYHm/i2EeM+6uTqSYqeAM=; b=N7RaplsCR/Rt+goPnSIF/78SAe1bf3cXrMY2O3QC0RBqpWPn3sRPUYpViL3WqUeNWHr8wtRoDoZ89pn6DIkXV4yXpo/Ycy7+jOIgowmaUhyviOqCD572g4ZCnSHv6AZUzN9smxQ/RZ3J30IA0fKd7kJb4T5IaHL6zX7avqZL2Og= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455420387493.8345419328807; Tue, 7 Jan 2020 19:50:20 -0800 (PST) Received: from localhost ([::1]:35216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2MM-0000HG-HT for importer@patchew.org; Tue, 07 Jan 2020 22:50:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48385) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Hp-0002wk-5A for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Hn-0002QT-O5 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:37 -0500 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:45729) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Hn-0002LI-HE for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:35 -0500 Received: by mail-pl1-x643.google.com with SMTP id b22so530498pls.12 for ; Tue, 07 Jan 2020 19:45:32 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.45.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:45:30 -0800 (PST) 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=jtgRZgZU54ZLuu3kEDdlzDMYHm/i2EeM+6uTqSYqeAM=; b=X7W37y9vlnV4c7BjI4B3+DffP3yKnI0Cw+BBxEV6/EbqLgyFMehs+p+Ht+9CO5CnhL GRuTlRyJHH5plU/ZYLSJ83l1V1iyrgXdGLVdDsDHUieVZt65g0H1ugi1sWkWlRw8TY/v 5opLBTvboe7ZEROYC+hL2gLAJ3rhT22fN2he4CcHnIpY1dIQRVnIKoVdj/jLc9GEKhhh WwiHuO//75aBSrjJzgszYiL4O6vS6Tg/zlnE3sFFoNZ5xlSwbcTeZIG9sxhCZ9U9waA6 0m1Rbe1izPb4qn2nj248PuHkGxoLRYn3dd+78Q037OGIXvJdFG35zOEm1VkOBep4RDSj Mqiw== 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=jtgRZgZU54ZLuu3kEDdlzDMYHm/i2EeM+6uTqSYqeAM=; b=LR9AhxKVXV6NqOiYvGC8KCNGMer8aWIiUQiaTDNIp1Uyljfehr/l4ar5JZSQBDKe9s 1phjxArgX0wyRs6DOwCC+S590i+7UH0v7vnqC7CJUj0jsjvaADhkOmb/NnuXCV431MNA OjLaYV0MPyXwRbynmUTP1tfMq0dcs+X6zzlZyUrT2BjvneCyNvQVPMk3A4MP7m9qvK3t SwNJT3FtxBG/fiGHL8kPtXPMSX0hcD0uS/lH+6oVkQ16HXL3Pr7OKlgWlogTn55o3G7r oDDRgQM0a5iPd139WKDjo7RJYBvmA80APfG1wemsQ3qHSAxMA03KRSxsInoM4GigdXRb QB7g== X-Gm-Message-State: APjAAAWjELDUeM0frB2YU40nzmb6WM13JUakabc+Zwooxq40FONNIgvj co4srVjCd2osbmXMTFlX4Q6jhlj6vq/HKQ== X-Google-Smtp-Source: APXvYqzRNEkSn6bexZn21prKTpz8mp/KHqWw4ZeBz4p6C2H2iS5cj/gpmDcKvw+5SBfNqxUmrbPSCA== X-Received: by 2002:a17:90a:d995:: with SMTP id d21mr2145032pjv.118.1578455131072; Tue, 07 Jan 2020 19:45:31 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 01/41] configure: Drop adjustment of textseg Date: Wed, 8 Jan 2020 14:44:43 +1100 Message-Id: <20200108034523.17349-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::643 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: peter.maydell@linaro.org, Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This adjustment was random and unnecessary. The user mode startup code in probe_guest_base() will choose a value for guest_base that allows the host qemu binary to not conflict with the guest binary. With modern distributions, this isn't even used, as the default is PIE, which does the same job in a more portable way. Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson --- v2: Remove mention of config-host.ld from make distclean --- Makefile | 2 +- configure | 47 ----------------------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/Makefile b/Makefile index 6b5ad1121b..95809ec455 100644 --- a/Makefile +++ b/Makefile @@ -727,7 +727,7 @@ rm -f $(MANUAL_BUILDDIR)/$1/objects.inv $(MANUAL_BUILDD= IR)/$1/searchindex.js $(M endef =20 distclean: clean - rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.= texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi + rm -f config-host.mak config-host.h* $(DOCS) qemu-options.texi qemu-img-c= mds.texi qemu-monitor.texi qemu-monitor-info.texi rm -f tests/tcg/config-*.mak rm -f config-all-devices.mak config-all-disas.mak config.status rm -f $(SUBDIR_DEVICES_MAK) diff --git a/configure b/configure index 0ce2c0354a..0f365bfdf1 100755 --- a/configure +++ b/configure @@ -6308,49 +6308,6 @@ if test "$cpu" =3D "s390x" ; then fi fi =20 -# Probe for the need for relocating the user-only binary. -if ( [ "$linux_user" =3D yes ] || [ "$bsd_user" =3D yes ] ) && [ "$pie" = =3D no ]; then - textseg_addr=3D - case "$cpu" in - arm | i386 | ppc* | s390* | sparc* | x86_64 | x32) - # ??? Rationale for choosing this address - textseg_addr=3D0x60000000 - ;; - mips) - # A 256M aligned address, high in the address space, with enough - # room for the code_gen_buffer above it before the stack. - textseg_addr=3D0x60000000 - ;; - esac - if [ -n "$textseg_addr" ]; then - cat > $TMPC </dev/null 2>&1; then - error_exit \ - "We need to link the QEMU user mode binaries at a" \ - "specific text address. Unfortunately your linker" \ - "doesn't support either the -Ttext-segment option or" \ - "printing the default linker script with --verbose." \ - "If you don't want the user mode binaries, pass the" \ - "--disable-user option to configure." - fi - - $ld --verbose | sed \ - -e '1,/=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D/d' \ - -e '/=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D/,$d' \ - -e "s/[.] =3D [0-9a-fx]* [+] SIZEOF_HEADERS/. =3D $textseg_addr + = SIZEOF_HEADERS/" \ - -e "s/__executable_start =3D [0-9a-fx]*/__executable_start =3D $te= xtseg_addr/" > config-host.ld - textseg_ldflags=3D"-Wl,-T../config-host.ld" - fi - fi -fi - # Check that the C++ compiler exists and works with the C compiler. # All the QEMU_CXXFLAGS are based on QEMU_CFLAGS. Keep this at the end to = don't miss any other that could be added. if has $cxx; then @@ -7905,10 +7862,6 @@ if test "$gprof" =3D "yes" ; then fi fi =20 -if test "$target_linux_user" =3D "yes" || test "$target_bsd_user" =3D "yes= " ; then - ldflags=3D"$ldflags $textseg_ldflags" -fi - # Newer kernels on s390 check for an S390_PGSTE program header and # enable the pgste page table extensions in that case. This makes # the vm.allocate_pgste sysctl unnecessary. We enable this program --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455270; cv=none; d=zohomail.com; s=zohoarc; b=m0bGepgpgi747+Ibf8ltaa/Uk7QBuwKDeOWTz9f6OrZtAh3PgCvorKn89aw7/qKvv/sBDxp62LhSyEOYLKGUx+zlv0k0ift9NWNYe/qhOwmrPVMNKlydoEBE9mgsVbBZvCa5nsKxcsWk6ZhFctRczrL0ZhlTfcOjDfxGrH+EJhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455270; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xIsBUaQmXMuEnS1tO54/55Y3/tYO/CJY1dsQmwqrvNE=; b=eD++CpFE/lD2dYQadNfiW76z8wmTQajqrVMChTRFQ0a3OLw7ifwJPEHZqPdctjcm6KnR2xfbvvRwxFyAm4mTJ+tKc4a0QbciCQ6AmpwtmvblJUTtg7vMrDrB1+wwy+eInuLDvF+u1PYhAF0RkkQQH+I4BI5F1PvHEVwSMWxCZHg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455270135235.20479918694036; Tue, 7 Jan 2020 19:47:50 -0800 (PST) Received: from localhost ([::1]:35106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Jw-0005Fd-Dj for importer@patchew.org; Tue, 07 Jan 2020 22:47:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48384) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Hp-0002wj-4R for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Hn-0002QL-NZ for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:37 -0500 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:46710) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Hn-0002PE-GX for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:35 -0500 Received: by mail-pg1-x543.google.com with SMTP id z124so846545pgb.13 for ; Tue, 07 Jan 2020 19:45:35 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:45:33 -0800 (PST) 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=xIsBUaQmXMuEnS1tO54/55Y3/tYO/CJY1dsQmwqrvNE=; b=ZUhKDNsbepBldOdc5ELNy1AvL8cYTDY1m3Ol1SmDYh8vstL5R758B6yy9WMKF8CNBE lGdTacVSGdRHUFmSC7HTkjZyu+Mtv1BjZPwNAMTvK9Qp8CUK7CpPPPoTWwRSIaAge/M1 JFoGQo0fOZCIUxpoHoFZ263MSx5SycZkd2GxbPneMMZzytS1V4rJE5wyqMx55WlRsYTD 1PEQPlerxa9ft1fEnQvnVFvQ9+Z6rwXeLhMdmmm2WWl+J6mfok7KAVJNImssmkuvhFX4 QB9rRpwAoRvPInI8EdHEj40Jm09AytU2HkCJ6LUmehPscAA2P4HoJfk99hxvUYQlod7t 6VEA== 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=xIsBUaQmXMuEnS1tO54/55Y3/tYO/CJY1dsQmwqrvNE=; b=DO+AenAjfYK8NpN8tHyZ8+nCxBAgSzwMkz6AufdshotyMYJVKDNbDeERG4yswS4qk7 RFEWkewnl4G4e6QLdIgqZXkf2fmySsjypmysrWCZ/RNa+EZam2nKua0gFf71ZyFJKi34 S21mAFoxO+qzFesJtbrXSstERWMTC7lGS3FSfl1oWTtHPXup5zG3+M4FlDP70kaLgxLX XrVJIg3SNbMJYhT/+g+m4vXd7j12L9wyw3xl1WHa9+gJLxxdkvqr07Ht1uO/Zkhl/JZ2 q1bfKupICqSihCZDyuZXvHvleUN7hu2qkZsRCJaBl5GRfpC5pqbnvpjSPk8LFhu1YCQ0 cIgw== X-Gm-Message-State: APjAAAW6/O+z88fyaIpQMeHYyp8LP92JeibdUCINkeKWQzIqGtFc2R1w DGnqKZYrrAY6dyWvuSNaMpEMNnmgmkUTCg== X-Google-Smtp-Source: APXvYqzxFGnYm333AbApw5ouC64DuR5n6kW4w6fbCfqlzwMItaZquLghfC6FJw7Ofon5MBhHQWXotg== X-Received: by 2002:a63:4702:: with SMTP id u2mr3090426pga.125.1578455134000; Tue, 07 Jan 2020 19:45:34 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 02/41] tcg: Remove softmmu code_gen_buffer fixed address Date: Wed, 8 Jan 2020 14:44:44 +1100 Message-Id: <20200108034523.17349-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::543 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: peter.maydell@linaro.org, Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The commentary talks about "in concert with the addresses assigned in the relevant linker script", except there is no linker script for softmmu, nor has there been for some time. (Do not confuse the user-only linker script editing that was removed in the previous patch, because user-only does not use this code_gen_buffer allocation method.) Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson --- accel/tcg/translate-all.c | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index bb325a2bc4..7749c3dda5 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1032,47 +1032,20 @@ static inline void *alloc_code_gen_buffer(void) { int prot =3D PROT_WRITE | PROT_READ | PROT_EXEC; int flags =3D MAP_PRIVATE | MAP_ANONYMOUS; - uintptr_t start =3D 0; size_t size =3D tcg_ctx->code_gen_buffer_size; void *buf; =20 - /* Constrain the position of the buffer based on the host cpu. - Note that these addresses are chosen in concert with the - addresses assigned in the relevant linker script file. */ -# if defined(__PIE__) || defined(__PIC__) - /* Don't bother setting a preferred location if we're building - a position-independent executable. We're more likely to get - an address near the main executable if we let the kernel - choose the address. */ -# elif defined(__x86_64__) && defined(MAP_32BIT) - /* Force the memory down into low memory with the executable. - Leave the choice of exact location with the kernel. */ - flags |=3D MAP_32BIT; - /* Cannot expect to map more than 800MB in low memory. */ - if (size > 800u * 1024 * 1024) { - tcg_ctx->code_gen_buffer_size =3D size =3D 800u * 1024 * 1024; - } -# elif defined(__sparc__) - start =3D 0x40000000ul; -# elif defined(__s390x__) - start =3D 0x90000000ul; -# elif defined(__mips__) -# if _MIPS_SIM =3D=3D _ABI64 - start =3D 0x128000000ul; -# else - start =3D 0x08000000ul; -# endif -# endif - - buf =3D mmap((void *)start, size, prot, flags, -1, 0); + buf =3D mmap(NULL, size, prot, flags, -1, 0); if (buf =3D=3D MAP_FAILED) { return NULL; } =20 #ifdef __mips__ if (cross_256mb(buf, size)) { - /* Try again, with the original still mapped, to avoid re-acquiring - that 256mb crossing. This time don't specify an address. */ + /* + * Try again, with the original still mapped, to avoid re-acquiring + * the same 256mb crossing. + */ size_t size2; void *buf2 =3D mmap(NULL, size, prot, flags, -1, 0); switch ((int)(buf2 !=3D MAP_FAILED)) { --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455561; cv=none; d=zohomail.com; s=zohoarc; b=l0QH8YeMP42zhcwvRmCnP8qb9g+UY9e9Kxi04n+ZNHfEs0/2zHwLE6fnIzwbxBnjV0WR5DMLO3nui4rueQMzc78+p+MieF/fODbjs9IWVyroolTz3mJzeFV3HObTAxPGAqMGfSXNCWLxE+mpfqZdJeH7sObnkxw/zrcQUYIuC7k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455561; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QJWdcTP2J+BE/WP+ZDabDTmYnHjvwI2urBEoPPtrZzo=; b=W7BXvzkQjBklZlMOZyF2bOcm9RlyzCSSA93i75zidmGGDb2Lpwde6YmbJN2FcS1xsf514h0gGVSBeGuIEjRxv26k4ZVevBTGZwWCIQskWE6Hva/aWfDxk16T5e97WSMgFEeE/LII1z8QGDXzbk6cAug/XvBs+GsqeXBF09hJSTo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455561202757.8767806738372; Tue, 7 Jan 2020 19:52:41 -0800 (PST) Received: from localhost ([::1]:35276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Od-0004LC-V2 for importer@patchew.org; Tue, 07 Jan 2020 22:52:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48452) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Hr-0002zQ-Fd for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Hq-0002UM-Dt for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:39 -0500 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:40634) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Hq-0002TJ-7U for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:38 -0500 Received: by mail-pf1-x441.google.com with SMTP id q8so900877pfh.7 for ; Tue, 07 Jan 2020 19:45:38 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.45.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:45:36 -0800 (PST) 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=QJWdcTP2J+BE/WP+ZDabDTmYnHjvwI2urBEoPPtrZzo=; b=g/7YZrxJkrHkiWUpkg8YHuE1aykrrgOSsshh19A3rjwSISm/1IBbYTbHJcDFqti8uq PCd+SYG3BUCrla4Ktlqam6+xjDxrSkpDiwh6Td3X1cuemPNF6OzgnXr3fjxMfVciJCgK 8KFwPmmwPixV8htEQpGtFM4II/A1wM6vdCMh1YrG7wZ3kyIUmEX7MvX5K9H4Td3nq7QA BJBH9gTFdNx/7clm2YMuY4HgwHbFWM2NaPsggJnSZvj9tjaQ/XNM43ZRZUfOQCEn3lTE RMvmNSHs0FCycYJ1sw9mh/7VxjRadkK8QmPCOYKmXNIPILB9SXyeSu458paFFROHY2T7 MB7Q== 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=QJWdcTP2J+BE/WP+ZDabDTmYnHjvwI2urBEoPPtrZzo=; b=VB8crur3SlVPIiFFxezLJIEv/xHeIne2KwPypkOVVNmHKwv3wFNAB4md9gMW2iJJQO s0FAslKvUtrlbrIhbGfvRGFBC+JaPiVD69aRW9yWjCGc6VaFou91aPPJDS0jMyzuwrHl TbXyCoLVDAzfLKnTjvfO3EXL7+qpBNERJa2RDiUteVRvgMxmfuQADg8nH49Rkt5ekh1s 6OS+lvMQrIh3zvRdJLTbZkAhnhQ3rs3BNPETwdlCRhfk9wO+movegRqMz42aPGug3ZUO y1DuPCkxGqsW7/Lg0FyRn9Y5sDGRazuimkieQTVWV7Vbm1aD45UCc9h3PbHWlgpNEe6Z ejAQ== X-Gm-Message-State: APjAAAX7OnWQwPNnPtApSRar2oF3hoJ+XNSU4SZ9ZtqGdG9gHkKTGbyM 3rKg61wFWiaLT6P293xkr3+hOywtAqcDug== X-Google-Smtp-Source: APXvYqx3bD6Ls/pE4e3QilqpCy+T4Yw3VjhEKOMAyokJ+Bfex2icTvBKeBY3Du1PMQDIhrYIA+lWeg== X-Received: by 2002:a63:9d07:: with SMTP id i7mr3260006pgd.344.1578455136873; Tue, 07 Jan 2020 19:45:36 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 03/41] configure: Do not force pie=no for non-x86 Date: Wed, 8 Jan 2020 14:44:45 +1100 Message-Id: <20200108034523.17349-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::441 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: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) PIE is supported on many other hosts besides x86. The default for non-x86 is now the same as x86: pie is used if supported, and may be forced via --enable/--disable-pie. The original commit (40d6444e91c) said: "Non-x86 are not changed, as they require TCG changes" but I think that's wrong -- there's nothing about PIE that affects TCG one way or another. Tested on aarch64 (bionic) and ppc64le (centos 7) hosts. Tested-by: Alex Benn=C3=A9e Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- configure | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/configure b/configure index 0f365bfdf1..351e39795b 100755 --- a/configure +++ b/configure @@ -2019,16 +2019,6 @@ if ! compile_prog "-Werror" "" ; then "Thread-Local Storage (TLS). Please upgrade to a version that does." fi =20 -if test "$pie" =3D ""; then - case "$cpu-$targetos" in - i386-Linux|x86_64-Linux|x32-Linux|i386-OpenBSD|x86_64-OpenBSD) - ;; - *) - pie=3D"no" - ;; - esac -fi - if test "$pie" !=3D "no" ; then cat > $TMPC << EOF =20 --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455736; cv=none; d=zohomail.com; s=zohoarc; b=dizBia89g79rar2NMrfseFXKqB5PEp+mtixP+TJjOW1C2FcpF4EIa6ZiZa10+sJxv1QjT0u8Vx3fq4lhUVF+XY9tNJVEJotjq9nPTkBhsN6Cl9TUgqULk4ebR3TZFPaRhQoHLAgkcBarkf+wBwYtCWvzwpjUlmszKfLGnYFrYGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455736; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=A0N0dguL22OusnU3Aul2sGZtJ4sR0312gx6xckIIDM8=; b=O5K0Xyk0NfhNikUwFa6eN0E4GPwXjccUuwEi6fLm96z62f/9l0WtPSZ9jOhTZ05m2p3/YlsJfDpmE5pbruCAIq7qfHPolg7DT6/T4SpeWQy4M7+1tmhocmAEzoZp4C4VXC2qukX56Q9DaRwlh5Yaypmes+S5fSuhdmJU3Y8LV2s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455736660825.6008146908538; Tue, 7 Jan 2020 19:55:36 -0800 (PST) Received: from localhost ([::1]:35326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2RS-0008NS-Jr for importer@patchew.org; Tue, 07 Jan 2020 22:55:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48516) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Hv-00034B-1U for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Ht-0002Xg-UO for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:42 -0500 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:36563) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Ht-0002X6-Ov for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:41 -0500 Received: by mail-pg1-x543.google.com with SMTP id k3so877452pgc.3 for ; Tue, 07 Jan 2020 19:45:41 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.45.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:45:39 -0800 (PST) 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=A0N0dguL22OusnU3Aul2sGZtJ4sR0312gx6xckIIDM8=; b=OUyIdK3Mk05zg3M9AcYoDdbWRx4n5r0xRtIyyiN6Fzu4SfyNOy4C+zuUjT5tXZxPR/ RCLY70Aiv4U1IUY/X9zEVLVMe0QF36ic7ztCRandQ/GtGC2LNQgiNe4P4YwEstBakOQr w03D+1baPzaBjv7DOtdg/PmpOeKVZB0zj2JURI3RM7FVmm7HqTOvgLueGUynEGDCPFvn HJQmxyJG2pcIlxemfhTK/1z1r0joQXobQiucSxVYSbjIgguO0dwdM/Bqrib1djgx2ShQ Gz4w75yFlDcleIGPFu5/C2uW2W5gUM5k6TduBUnIjRpMMVVejftabmfFacLBwakTz0Fp NWAQ== 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=A0N0dguL22OusnU3Aul2sGZtJ4sR0312gx6xckIIDM8=; b=bNtnJ+uvC8Hpv73zWgzgAwSCtCsW6HaAccQstkQGhznh4FzUWyMnbFVuIj4CVq8v7B Y1QagN2yw11GhGqB1mETwNvtTjQ37YFO8OlsvKUa58ILbyZ4LJx+F/2EBjt9WwG4TQlI D65PxnmL+4rM22ri+AdYrEFl7NpzGMITda2XEbn1D5BPoa/gNTxqD0rzvZ1jr/LfzhSz FSAXoC6D0zoLHp99DABTqXVG2DEDf96rl1/JJcCoGg3XYPh08YMqHr4A1Zhxb1pnWZgq vH13slhRo0W4FoWVzlaCkmpY3ZxJsc5roAYeGqiLohfFJJXfZLusrF5Hh8DwQQpLQ+qz 0m6A== X-Gm-Message-State: APjAAAWcZ9rxytZvA+QwiJY/yBpVTbflQZEpxAIHvEO6ULJikD0tHwB/ gNnxfOuCD2msV6sZGv0d8VWyOL/DPQMPWg== X-Google-Smtp-Source: APXvYqyJLDrXMM8x71veEqmaQt9QNwbweQIITCF5/OlZdXC0t6E1Qedsu4Hc87yXA3R5fcMdj+J3VQ== X-Received: by 2002:a63:5211:: with SMTP id g17mr3220421pgb.426.1578455140562; Tue, 07 Jan 2020 19:45:40 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 04/41] configure: Always detect -no-pie toolchain support Date: Wed, 8 Jan 2020 14:44:46 +1100 Message-Id: <20200108034523.17349-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::543 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: peter.maydell@linaro.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The CFLAGS_NOPIE and LDFLAGS_NOPIE variables are used in pc-bios/optionrom/Makefile, which has nothing to do with the PIE setting of the main qemu executables. This overrides any operating system default to build all executables as PIE, which is important for ROMs. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson --- configure | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 351e39795b..f5248f86cd 100755 --- a/configure +++ b/configure @@ -2019,26 +2019,24 @@ if ! compile_prog "-Werror" "" ; then "Thread-Local Storage (TLS). Please upgrade to a version that does." fi =20 -if test "$pie" !=3D "no" ; then - cat > $TMPC << EOF +cat > $TMPC << EOF =20 #ifdef __linux__ # define THREAD __thread #else # define THREAD #endif - static THREAD int tls_var; - int main(void) { return tls_var; } - EOF - # check we support --no-pie first... - if compile_prog "-Werror -fno-pie" "-no-pie"; then - CFLAGS_NOPIE=3D"-fno-pie" - LDFLAGS_NOPIE=3D"-nopie" - fi =20 +# Check we support --no-pie first; we will need this for building ROMs. +if compile_prog "-Werror -fno-pie" "-no-pie"; then + CFLAGS_NOPIE=3D"-fno-pie" + LDFLAGS_NOPIE=3D"-no-pie" +fi + +if test "$pie" !=3D "no" ; then if compile_prog "-fPIE -DPIE" "-pie"; then QEMU_CFLAGS=3D"-fPIE -DPIE $QEMU_CFLAGS" LDFLAGS=3D"-pie $LDFLAGS" --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455879; cv=none; d=zohomail.com; s=zohoarc; b=DULOr2cIcmgYURJC4359O8g8idXubhBNXhhe+u9Ds0y+xDMy8RNpO5UIDVzcWHhWE7SlhR2p8DuEGq0s1W8EnCu0Dj4aIZ2GMVL/Zg+aS8PAUaFM0Q45cpFKRAQfl24BdrTKMtFambJcj0dn7SVV88BpTySNpOGupTlr9LJbOho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455879; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9XBwaLHF8KEizZazlqtConhjNieZR2lcZTE6WMySySg=; b=dfJw6Nfb9LuMgrJOlVQ7lMBlVUf44CnVFomWTBLQJjTYm8CvRc8eqiy/FI0i8dzsmOJ4OapOt0KAgqusWQqpS+yS8Nf/jcQVFeHnPVDZjbDUwH3TVEpgLb+6Cxlo+IzTrUA6epHawDu6yZ6cTujeZAfRsx4Yw66gFwgQe90RrDg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455879707664.8963076835231; Tue, 7 Jan 2020 19:57:59 -0800 (PST) Received: from localhost ([::1]:35392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Tl-0003TP-Vr for importer@patchew.org; Tue, 07 Jan 2020 22:57:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48595) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Hz-0003A3-36 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Hy-0002dX-04 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:47 -0500 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:45528) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Hx-0002cu-Qo for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:45 -0500 Received: by mail-pf1-x444.google.com with SMTP id 2so890374pfg.12 for ; Tue, 07 Jan 2020 19:45:45 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.45.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:45:44 -0800 (PST) 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=9XBwaLHF8KEizZazlqtConhjNieZR2lcZTE6WMySySg=; b=GWdirTW1e0n4wYNVtN+Ax940cr9mjRdOqdlet9n7qoz5Ql6YDow8O8HszgxrwrchmG NzcStEo+I4Qt33lHBl7E+XZ0vSHaVHjgBpEw1jw42bRqlHRCUSoh34M8j2sLjzXpC6BS bTiWjfDiRn7Dw52HPQ4KvVlBkRUFsNFMIP0x7D1PQ42ZRj21X4P2LvvtKX4WPFxqtOXc s7Zt/0a6vLfo49blOxZwHw4qpNlfaYHqnJSIuWilt6mnB5WgP5+sGmMA50uvQYdxVqx+ rjMH7eC0FtK9sDEwAuo+ZEH3a95Bb5eTK9t3JpHYFXI/th5e5du2bV/rVfrZUfyACdTE Wv8Q== 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=9XBwaLHF8KEizZazlqtConhjNieZR2lcZTE6WMySySg=; b=oASVmkLwJPXH/bao23LF/3xtgnTkhpuPQDIXjeLO7Ax0NN0PaablYzY46FUadFh7pT ozxtMvoBwR+bZQoCoNKnnXdnwuaIXf2P+ej/XaYaD93WY+W9jM3k36eqTUYER4n3AR+g lz1Ybq9Z4J6/jB8M3sjSuhREJYVyc0QDQ8ED7GRJGsnDm5IkZAn3B6GUh7ckHAa/CvBE 8fm3gFvBQSF/YIu6ODrx1Ji9euzYOACsBoj68ZmWS/mWg8j3D22UgLMt22zOfvoxF5Vd ZAtCBQCqCId8fgMVCu4fmqUC7qgc6JPoQxbAD6XEIBvbJS/ryNhJZ6d5b1xQ0smo73yF XrqA== X-Gm-Message-State: APjAAAVLzXcUsIUqaapu67Q1QniLmXDhnRK/30C76p+It3E52Ig30aHm Rq1x4MsA8Exf++KvO0Sqfgl/pd2yBF+Dig== X-Google-Smtp-Source: APXvYqytZaUKs2Weqs/KqucBtW3KAzdANxD42GtSHdeAlpheYjlniHGsiY89h69yDS7xesrCqQN0qw== X-Received: by 2002:a63:cf41:: with SMTP id b1mr3080026pgj.53.1578455144595; Tue, 07 Jan 2020 19:45:44 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 05/41] configure: Unnest detection of -z,relro and -z,now Date: Wed, 8 Jan 2020 14:44:47 +1100 Message-Id: <20200108034523.17349-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::444 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: peter.maydell@linaro.org, Fangrui Song , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) There is nothing about these options that is related to PIE. Use them unconditionally. Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Fangrui Song Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- v2: Do not split into two tests. --- configure | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configure b/configure index f5248f86cd..1dd12edcc3 100755 --- a/configure +++ b/configure @@ -2041,9 +2041,6 @@ if test "$pie" !=3D "no" ; then QEMU_CFLAGS=3D"-fPIE -DPIE $QEMU_CFLAGS" LDFLAGS=3D"-pie $LDFLAGS" pie=3D"yes" - if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then - LDFLAGS=3D"-Wl,-z,relro -Wl,-z,now $LDFLAGS" - fi else if test "$pie" =3D "yes"; then error_exit "PIE not available due to missing toolchain support" @@ -2054,6 +2051,12 @@ if test "$pie" !=3D "no" ; then fi fi =20 +# Detect support for PT_GNU_RELRO + DT_BIND_NOW. +# The combination is known as "full relro", because .got.plt is read-only = too. +if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then + LDFLAGS=3D"-Wl,-z,relro -Wl,-z,now $LDFLAGS" +fi + ########################################## # __sync_fetch_and_and requires at least -march=3Di486. Many toolchains # use i686 as default anyway, but for those that don't, an explicit --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455323; cv=none; d=zohomail.com; s=zohoarc; b=h5SwMdBCYN9rVyvLOVK7OCLnlF2itsJR6r0TyrzgqNDaFn3ch+rUhXQF3xptSa5mgaF19MbFEh+d9Qkdv4UwiFn1S5dinUIcviSW28XHZeuyseYO7WwSQp7kMqmMFqIiwZ3JfLaBA5k7PrVuBma2XE7qJpfLDW/M1fkC2CV3RW4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455323; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QROkLTblnGhCZH9GNWCjPQW6ivwBc2Lh/2EXrbymzQY=; b=Ar1XI9xwXwnogKXp/Pvp9asM/XZj5o9uXJtb0JyIL8HnjPewX1tiJCaOEyMUZdLPG9biLdob/z8FlDeQCyQx29H/NNW3Ca2YQHaIbnfdjBUF0JstWLz0jpaNBdy60pe4D00UBMTMqv4aV8xrSaAdqr/1o7lrZDB8xHWG8WVgWqE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455323632459.8317074553287; Tue, 7 Jan 2020 19:48:43 -0800 (PST) Received: from localhost ([::1]:35180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Ko-0006N2-7l for importer@patchew.org; Tue, 07 Jan 2020 22:48:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48662) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2I2-0003FA-ED for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2I1-0002hS-9V for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:50 -0500 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]:39481) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2I1-0002gT-4B for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:49 -0500 Received: by mail-pg1-x52e.google.com with SMTP id b137so869503pga.6 for ; Tue, 07 Jan 2020 19:45:49 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.45.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:45:47 -0800 (PST) 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=QROkLTblnGhCZH9GNWCjPQW6ivwBc2Lh/2EXrbymzQY=; b=P0A9Q5nnAMsJwLdGR1IMrrf3H3W/URNvmLTdIOeQGczlWoBJDn7lPPo7j0DnK6K8f/ VPHjrLbDbaOYlzXod9ZqZclZkxekLr6J7Rffbz4xVl4JCheWl2EMoPW3EZA/T0qH+Py4 Jw4LrV485f/slcCZE7gbNf22790EvG/I3CUbTudBJQHiNUdxDX4YDIO84dbPpckvsufk eYitvQmNLFZ/+RxrZBaYLJBL4KbM4o5P4SCF+up2tNLLJPj4N8vWTyUrrLggTtIOIuUU i1F/Zpptpll4BtuKBuAg0unYtswBKh7kyyYU+jntRCvDbIfaOd7ZXU3tyNo/XVTMAYDO t+GA== 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=QROkLTblnGhCZH9GNWCjPQW6ivwBc2Lh/2EXrbymzQY=; b=Qno9H+dwqvyinkI1gs+Rlmz0hlUC2PoqnzRr1CjpAy42SjW4BOOwcshXtc/9un/bm7 In8pIzRFpQPJ6rEbZ6IuhqmHdYn1p9O7YZUQ7/bTKOV0sap00r9Mb59A3qgT7Ya5yUFD Js+6j6eYLWRvh6I3UI2OtpEbhbQtTwSADc/dA/CR6hmr0dEojcQHkdDj3RqJwX9Zmx2x doCCPURzSJJcscCEvYdsj3J14n7HfGxsGqXZjdOjgNjyfp9skH2aDwl2hP7gLeQRO5WU XlgGxXc3hltVJdPfVK1J6KhfE7gGUQRE6SxPbaUyYZ4Fq3kllG6+zwvzJP6WuBUctwZn hLyw== X-Gm-Message-State: APjAAAWwA32YUNrw/gyln1pAPHhTH8tVvEawPgGhbupN7fPz72AlQB+r yaqgFWHaYFSKDGvntwyI1jEvLJoIJmne+Q== X-Google-Smtp-Source: APXvYqz8fSsZ9S14GMvC6oWjtDnrdAATaB4uFHjJsgLwm8w/0on7fUfwJJtiPfN9+ygJgVFi7bG/7g== X-Received: by 2002:a63:1f16:: with SMTP id f22mr3017809pgf.2.1578455147870; Tue, 07 Jan 2020 19:45:47 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 06/41] configure: Override the os default with --disable-pie Date: Wed, 8 Jan 2020 14:44:48 +1100 Message-Id: <20200108034523.17349-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::52e 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: peter.maydell@linaro.org, Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Some distributions, e.g. Ubuntu 19.10, enable PIE by default. If for some reason one wishes to build a non-pie binary, we must provide additional options to override. At the same time, reorg the code to an elif chain. Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson --- configure | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 1dd12edcc3..de2c4867ad 100755 --- a/configure +++ b/configure @@ -2036,19 +2036,18 @@ if compile_prog "-Werror -fno-pie" "-no-pie"; then LDFLAGS_NOPIE=3D"-no-pie" fi =20 -if test "$pie" !=3D "no" ; then - if compile_prog "-fPIE -DPIE" "-pie"; then - QEMU_CFLAGS=3D"-fPIE -DPIE $QEMU_CFLAGS" - LDFLAGS=3D"-pie $LDFLAGS" - pie=3D"yes" - else - if test "$pie" =3D "yes"; then - error_exit "PIE not available due to missing toolchain support" - else - echo "Disabling PIE due to missing toolchain support" - pie=3D"no" - fi - fi +if test "$pie" =3D "no"; then + QEMU_CFLAGS=3D"$CFLAGS_NOPIE $QEMU_CFLAGS" + LDFLAGS=3D"$LDFLAGS_NOPIE $LDFLAGS" +elif compile_prog "-fPIE -DPIE" "-pie"; then + QEMU_CFLAGS=3D"-fPIE -DPIE $QEMU_CFLAGS" + LDFLAGS=3D"-pie $LDFLAGS" + pie=3D"yes" +elif test "$pie" =3D "yes"; then + error_exit "PIE not available due to missing toolchain support" +else + echo "Disabling PIE due to missing toolchain support" + pie=3D"no" fi =20 # Detect support for PT_GNU_RELRO + DT_BIND_NOW. --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455289; cv=none; d=zohomail.com; s=zohoarc; b=jGAwtvivX3H65sl8mPdzRMxKeSH6XD4pVsjOLg+Qe168BfmnW3SMTB8KfgyCd4kTunll+F8PXs1xpfotUF0aEsFlCP6e0YWj4Jm6wGkRYjZpx1lpCQqOQBCbfZerMLIcHB6YrtA/AZdqIqkhfmX1ZV/GsQ5iuKPJCdSeUhXge/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455289; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WAyFVokvd/qDR4nuAyVDRmGp5pg99piONaTKi+oPUR0=; b=d7oUTaOq0uMDF92dDW/iZ3qPqnTeqsr1OUDY43BsHoeIR4GCjo6KTulqIIhRVKqRHtoOy85sCHJ2tcho2SuVsjKdxpDz1OFAa38uHqG9oQ0m+VgnON+oEMa/NjSae+vgCYcnqhwNlUA3mHkowxOp9Gf3JH/ixLfHYsSi6WyLZuY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455289286618.3063136366959; Tue, 7 Jan 2020 19:48:09 -0800 (PST) Received: from localhost ([::1]:35146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2KF-0005iQ-FI for importer@patchew.org; Tue, 07 Jan 2020 22:48:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48716) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2I4-0003Jo-Sp for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2I3-0002k5-Lv for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:52 -0500 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:36286) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2I3-0002jG-GK for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:51 -0500 Received: by mail-pf1-x432.google.com with SMTP id x184so912797pfb.3 for ; Tue, 07 Jan 2020 19:45:51 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.45.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:45:49 -0800 (PST) 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=WAyFVokvd/qDR4nuAyVDRmGp5pg99piONaTKi+oPUR0=; b=XSX0wIsTN6Rprrhea0R4b3vHQgYQIZeUwGeWQqqBru0235sJqfM8YgMes6LEFPAzjY vl9W9J8ta5W1IvJKv+cIcvq0mhrrB8bn9lR90lKhQaFr0xfPiCaQyd//mhmR3uoIFhH3 PtljSA9Rv7KZmpgH+3XeftjsxKqBcnLQX6lYy72nZNv2xxq6yS0Quc+0sTot0x2HWbNj w+gZnxrghhtGTAs0uXHpFRZX5NLPebL7ZFy/+j13RnyDjVp0qtGw6kUEzRpfh1EIehnB /wRAaBf8lNmioV3vU62AKolgVLqHmBEi04AlM/Sluxefm5btMrtTRpFToIHpI8fcWJt2 s+dQ== 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=WAyFVokvd/qDR4nuAyVDRmGp5pg99piONaTKi+oPUR0=; b=CjGhaT6+SgcQM/7s1N+L5i6wX10F3E6fnNSmPJA/mALBXWdQ0IzfKb4Y+Wb7VsYX/P 1jwczXz8AgOv+I0wcVjXqPutQjtZ6wR69N6LlpBVN7HDTJtA5mO/U0rNUeWheQ/W0HsF VNxeU6HuKMAwtbV1SRqcABCyxXX1Rdtg6aHgPpEylXDVU/DZAbTW3oTHsaZTI5a6CVCs MIMr/AffvB6hsrP+AafcpoS2d83cqf5rrUNMM8sq2G1LVqZIxHe263vxY+CKRPFOiEtW Ytbnxui7I+7Eb+fIS6BPCCEgQxuAV48u1mby2h47kE8UmYMxTYkhC+OjOYYQujh2R0kT eqoA== X-Gm-Message-State: APjAAAUQ/MfVaRC9+r/MrV83Z+z2tAAwHA5U6ZMeQnzKhjhDGJf+4JB4 QPYJe/Hm4mKkAHbluhLUp3QNPPht9tPfvA== X-Google-Smtp-Source: APXvYqyo/y2l25JmbNfQkGSc1w2aPPLpQGGsNPAUw3XCnrc9H28Pb+HKce6TKkJczk3PZpNcPL4Sdw== X-Received: by 2002:a62:62c4:: with SMTP id w187mr2940652pfb.216.1578455150297; Tue, 07 Jan 2020 19:45:50 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 07/41] configure: Support -static-pie if requested Date: Wed, 8 Jan 2020 14:44:49 +1100 Message-Id: <20200108034523.17349-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::432 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: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Recent toolchains support static and pie at the same time. As with normal dynamic builds, allow --static to default to PIE if supported by the toolchain. Allow --enable/--disable-pie to override the default. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- v2: Fix --disable-pie --static --- configure | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/configure b/configure index de2c4867ad..94a4b1c848 100755 --- a/configure +++ b/configure @@ -1025,7 +1025,6 @@ for opt do ;; --static) static=3D"yes" - LDFLAGS=3D"-static $LDFLAGS" QEMU_PKG_CONFIG_FLAGS=3D"--static $QEMU_PKG_CONFIG_FLAGS" ;; --mandir=3D*) mandir=3D"$optarg" @@ -2001,11 +2000,6 @@ if test "$static" =3D "yes" ; then if test "$modules" =3D "yes" ; then error_exit "static and modules are mutually incompatible" fi - if test "$pie" =3D "yes" ; then - error_exit "static and pie are mutually incompatible" - else - pie=3D"no" - fi fi =20 # Unconditional check for compiler __thread support @@ -2036,7 +2030,18 @@ if compile_prog "-Werror -fno-pie" "-no-pie"; then LDFLAGS_NOPIE=3D"-no-pie" fi =20 -if test "$pie" =3D "no"; then +if test "$static" =3D "yes"; then + if test "$pie" !=3D "no" && compile_prog "-fPIE -DPIE" "-static-pie"; th= en + QEMU_CFLAGS=3D"-fPIE -DPIE $QEMU_CFLAGS" + LDFLAGS=3D"-static-pie $LDFLAGS" + pie=3D"yes" + elif test "$pie" =3D "yes"; then + error_exit "-static-pie not available due to missing toolchain support" + else + LDFLAGS=3D"-static $LDFLAGS" + pie=3D"no" + fi +elif test "$pie" =3D "no"; then QEMU_CFLAGS=3D"$CFLAGS_NOPIE $QEMU_CFLAGS" LDFLAGS=3D"$LDFLAGS_NOPIE $LDFLAGS" elif compile_prog "-fPIE -DPIE" "-pie"; then --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456049; cv=none; d=zohomail.com; s=zohoarc; b=BPo0P5Idzwa5EiLaUOH0oMaiY79wAFG3L6P2dNZW7gdxhZajc5GJG9nE/mWhVkIuBBF4I1/ckgw5Kbm+g6zrxyZyIw5IUd5CGRuxGAR4l39BNhXwr1YZdGq1FGPubmCXMP1r4EouS3IyLnroiWOuysYV4PtEZm5ZzZnJ8A/NSPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456049; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uRKHrWARyM8biRjRhD8zM8zj3LVGuF9F2ZiUru1yT6w=; b=NkcM2UZd/KDaUZN6b8w8grkD8NUW1gM1AjrhDaKysu4lBPOB17vw35JS671zFjliCnurRdjgbjMP9ZZIhf9xxLNXro8zEIaKU8wdGsdH8oufVMcs1LWcVk1dlY4pNfPMugDhg8TdjXpaEyCmoG7qjuAieznUun6eYq4U5tO8WDg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456049885919.5876854568311; Tue, 7 Jan 2020 20:00:49 -0800 (PST) Received: from localhost ([::1]:35442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2WU-0007Y8-U4 for importer@patchew.org; Tue, 07 Jan 2020 23:00:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48772) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2I7-0003Os-PE for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2I6-0002mc-MY for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:55 -0500 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:43721) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2I6-0002m4-Gz for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:54 -0500 Received: by mail-pl1-x643.google.com with SMTP id p27so535429pli.10 for ; Tue, 07 Jan 2020 19:45:54 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.45.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:45:52 -0800 (PST) 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=uRKHrWARyM8biRjRhD8zM8zj3LVGuF9F2ZiUru1yT6w=; b=tddqG9QyGZPTspGH0T36v+NUOqtew0Gh97oipmWt8rHFKCKEntZkwjhBDMJXNxYd0O eplIZNwzroS2O9fr5v2qKh6LAvITJdmNVmT3tbSO6843W3JYF4ki9OV764sFAzHQxgvY 4n4u+617x61hpYSxMiAoTv1faD+N2RygK7VbFOJ2BxV8Byx3W2c1vziY9cd6S+uPZz5t 9YEo2Fqa7H34TyT0VKtXtt8GLa9H5dJLhD9Q7zES/nF22rs2cVqtWSIoicw+14brO5MW 2dkpUlOnHUXE7EjPG69HhC2ezbVkNW40a0uoTqUIlYXJEts1sJ+x55hKvOTUb3/DUEMI g2lg== 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=uRKHrWARyM8biRjRhD8zM8zj3LVGuF9F2ZiUru1yT6w=; b=fP/7kMSQdRDD8nHQioRQotRy83MPqd8pSHHMJOBBFZepPMgGvNy+g9W7xNwBebvQN0 ulWOpFb8qGdRXBhkkSOWlkhtWVc4WvlahpTkG09WyuZYSQHSRnbYZGqAOSNzdJe0Ln53 J6tRSU86T+PfLKkKmABXBdRdHNgXAoxRZxCRLb6aFsppaDKgRy+g7ueQeAt24PsK6THH r6OfvuRtqYPh+ddEgwh66OAVUmalhao3eKDv1WF4JHsUAm54IRpH1FXophnfm9u5I/wn oBAjT+zK40NogNP/1iGM3pnaRxZSTacCAJB7EEAHwRQdcBfpJcyVLOIP+ck0oaMpTg0H TTqg== X-Gm-Message-State: APjAAAXIhpr3YBl17om/8sanWlSnknV+B+ErW8mYhy/v1jkG6cho2AOS aSPZ8zaoM3YHgJHNdQEhIgkFb+ZuxCn+vA== X-Google-Smtp-Source: APXvYqyVZK1lc5Tf6y7oSB1AqXN/JAW9uflZZvftmOoonTjVPT5RpqAtTaZE+AxMyWLpfCJ5vSd3xw== X-Received: by 2002:a17:902:988f:: with SMTP id s15mr3027147plp.98.1578455153317; Tue, 07 Jan 2020 19:45:53 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 08/41] target/xtensa: Use probe_access for itlb_hit_test Date: Wed, 8 Jan 2020 14:44:50 +1100 Message-Id: <20200108034523.17349-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::643 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We don't actually need the result of the read, only to probe that the memory mapping exists. This is exactly what probe_access does. This is also the only user of any cpu_ld*_code_ra function. Removing this allows the interface to be removed shortly. Tested-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Max Filippov Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- target/xtensa/mmu_helper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c index f15bff306f..b01ff9399a 100644 --- a/target/xtensa/mmu_helper.c +++ b/target/xtensa/mmu_helper.c @@ -63,10 +63,11 @@ void HELPER(itlb_hit_test)(CPUXtensaState *env, uint32_t vaddr) { /* - * Attempt the memory load; we don't care about the result but + * Probe the memory; we don't care about the result but * only the side-effects (ie any MMU or other exception) */ - cpu_ldub_code_ra(env, vaddr, GETPC()); + probe_access(env, vaddr, 1, MMU_INST_FETCH, + cpu_mmu_index(env, true), GETPC()); } =20 void HELPER(wsr_rasid)(CPUXtensaState *env, uint32_t v) --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455425; cv=none; d=zohomail.com; s=zohoarc; b=GSejXOiUXKqomhdi98zy7dXzqNrx9TF5IDrAdawNbdhoQQTfWk3RaLMeja/GpPxpOKD+OR9+Rs86HZUjYyX/25nKYVef5NXwti8Cp3VLpIsV/DgdtRFLNqdluof41rEjd2NuZC9+PhEqnXlMvQxf+bjyyuZke8qpr+Rqj2mFyww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455425; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=q5vJOghVRdDlALEm4T0uJnn6jnvHJUhH0NdnFSF4Cms=; b=L+mxHbk8NKs0sqn+PgqVxhcWjdYg2Sex0ySWA8KsjJMB42dJR02tcELiqf88voc0r/CXsL+gRBywmtmHM6a/JB2AzVcCCZxe8aAdDeB8IJYydd6BLyTqr1TRF3+9xT8+AdUjfFA//VzE0kU8aa07Zk6a5nHx1HxB5XE79ijKJck= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455425401742.3305819869694; Tue, 7 Jan 2020 19:50:25 -0800 (PST) Received: from localhost ([::1]:35220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2MR-0000Q0-Nw for importer@patchew.org; Tue, 07 Jan 2020 22:50:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48828) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2IB-0003Ux-7m for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2I9-0002px-N2 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:59 -0500 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:40963) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2I9-0002pa-Gj for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:45:57 -0500 Received: by mail-pg1-x52c.google.com with SMTP id x8so863023pgk.8 for ; Tue, 07 Jan 2020 19:45:57 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.45.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:45:55 -0800 (PST) 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=q5vJOghVRdDlALEm4T0uJnn6jnvHJUhH0NdnFSF4Cms=; b=tx17hTwWYwvWeMVgoT3IqrD/6BB2/tDQy4cHBLJ2H9RwjPIlJ/gj+3GQI+qvwRYG4i s7qpMpgLouTOH3bqIIE6gK6FsoGgQNZsO9rxQvKEnYV0m4zCqcRMOe9yuWZYXcVdxDrX kQvkbf48v8A1IOjSYb5tW6Cn8EhXTJrmmqbgM8uQD3yv+ysA/C/6qNwn1w07WI8iBQR8 71UXNut/VKmKby5H2tvBLKflnL6ZStDs4zy85et/sLNxMJRRco6tE8YfvYbpdt7bbjqV MVcgQcZdS9BPtuJ/JDqSp9TgxVfQtE+4F7a61pmELqEGFyxPEPaZfTnheks/+DlIr1k9 TsdA== 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=q5vJOghVRdDlALEm4T0uJnn6jnvHJUhH0NdnFSF4Cms=; b=Ro7SXeXuNpNxIQZ40ypSm2d2aahKd5ZxZm7P45Di2CqvPofrGJ0HIZIA9o5ip7h3EX HHMLKKrA7BLiFScp1/Vfwe4/yslQScwUTxMku6+KU3SSkj/2uJUAA8FflZ1+VaOPF6Jj uwwdYA+U0QPLS16IXOoEd4BLE6OqlZsw0kdTM7NoW4827Y6TmDsXFaqJPKSBhuE8CRXy ePoW2Q2KhSTzSJ4xr+wdotxjgzbmuM4eV1UZq2DF1TZk9SqaUp1WBPFA+gapYXlliRF8 SlzrR76ex6SnqiZDU1cpKoW1I3cKau/IkkVNu0+ScFPfNQqHDGGGHLdNRV/5bkma67/A SQ7w== X-Gm-Message-State: APjAAAU5hg+uR0XDKPIubXCr23cGO4jh4a1yepfDigPE5MeYrkTJAuwx QsIfWnHgwWyV17LXQSjpJOl/QDBec9swdw== X-Google-Smtp-Source: APXvYqyQaXc6n1heufnWPu4yDSl+8EnfnhPPwXEM8YItuc26qa03ytltFdBroTdBc132isPfzq5BvA== X-Received: by 2002:a62:5214:: with SMTP id g20mr2831546pfb.101.1578455156217; Tue, 07 Jan 2020 19:45:56 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 09/41] cputlb: Use trace_mem_get_info instead of trace_mem_build_info Date: Wed, 8 Jan 2020 14:44:51 +1100 Message-Id: <20200108034523.17349-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::52c 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) In the cpu_ldst templates, we already require a MemOp, and it is cleaner and clearer to pass that instead of 3 separate arguments describing the memory operation. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- include/exec/cpu_ldst_template.h | 22 +++++++++++----------- include/exec/cpu_ldst_useronly_template.h | 12 ++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/exec/cpu_ldst_template.h b/include/exec/cpu_ldst_templ= ate.h index 54b5e858ce..0ad5de3ef9 100644 --- a/include/exec/cpu_ldst_template.h +++ b/include/exec/cpu_ldst_template.h @@ -86,9 +86,9 @@ glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArch= State *env, RES_TYPE res; target_ulong addr; int mmu_idx =3D CPU_MMU_INDEX; - TCGMemOpIdx oi; + MemOp op =3D MO_TE | SHIFT; #if !defined(SOFTMMU_CODE_ACCESS) - uint16_t meminfo =3D trace_mem_build_info(SHIFT, false, MO_TE, false, = mmu_idx); + uint16_t meminfo =3D trace_mem_get_info(op, mmu_idx, false); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); #endif =20 @@ -96,9 +96,9 @@ glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArch= State *env, entry =3D tlb_entry(env, mmu_idx, addr); if (unlikely(entry->ADDR_READ !=3D (addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) { - oi =3D make_memop_idx(SHIFT, mmu_idx); + TCGMemOpIdx oi =3D make_memop_idx(op, mmu_idx); res =3D glue(glue(helper_ret_ld, URETSUFFIX), MMUSUFFIX)(env, addr, - oi, retaddr); + oi, retaddr= ); } else { uintptr_t hostaddr =3D addr + entry->addend; res =3D glue(glue(ld, USUFFIX), _p)((uint8_t *)hostaddr); @@ -125,9 +125,9 @@ glue(glue(glue(cpu_lds, SUFFIX), MEMSUFFIX), _ra)(CPUAr= chState *env, int res; target_ulong addr; int mmu_idx =3D CPU_MMU_INDEX; - TCGMemOpIdx oi; -#if !defined(SOFTMMU_CODE_ACCESS) - uint16_t meminfo =3D trace_mem_build_info(SHIFT, true, MO_TE, false, m= mu_idx); + MemOp op =3D MO_TE | MO_SIGN | SHIFT; +#ifndef SOFTMMU_CODE_ACCESS + uint16_t meminfo =3D trace_mem_get_info(op, mmu_idx, false); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); #endif =20 @@ -135,7 +135,7 @@ glue(glue(glue(cpu_lds, SUFFIX), MEMSUFFIX), _ra)(CPUAr= chState *env, entry =3D tlb_entry(env, mmu_idx, addr); if (unlikely(entry->ADDR_READ !=3D (addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) { - oi =3D make_memop_idx(SHIFT, mmu_idx); + TCGMemOpIdx oi =3D make_memop_idx(op & ~MO_SIGN, mmu_idx); res =3D (DATA_STYPE)glue(glue(helper_ret_ld, SRETSUFFIX), MMUSUFFIX)(env, addr, oi, retaddr); } else { @@ -167,9 +167,9 @@ glue(glue(glue(cpu_st, SUFFIX), MEMSUFFIX), _ra)(CPUArc= hState *env, CPUTLBEntry *entry; target_ulong addr; int mmu_idx =3D CPU_MMU_INDEX; - TCGMemOpIdx oi; + MemOp op =3D MO_TE | SHIFT; #if !defined(SOFTMMU_CODE_ACCESS) - uint16_t meminfo =3D trace_mem_build_info(SHIFT, false, MO_TE, true, m= mu_idx); + uint16_t meminfo =3D trace_mem_get_info(op, mmu_idx, true); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); #endif =20 @@ -177,7 +177,7 @@ glue(glue(glue(cpu_st, SUFFIX), MEMSUFFIX), _ra)(CPUArc= hState *env, entry =3D tlb_entry(env, mmu_idx, addr); if (unlikely(tlb_addr_write(entry) !=3D (addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) { - oi =3D make_memop_idx(SHIFT, mmu_idx); + TCGMemOpIdx oi =3D make_memop_idx(op, mmu_idx); glue(glue(helper_ret_st, SUFFIX), MMUSUFFIX)(env, addr, v, oi, retaddr); } else { diff --git a/include/exec/cpu_ldst_useronly_template.h b/include/exec/cpu_l= dst_useronly_template.h index dbdc7a845d..e5a3d1983a 100644 --- a/include/exec/cpu_ldst_useronly_template.h +++ b/include/exec/cpu_ldst_useronly_template.h @@ -70,8 +70,8 @@ glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(CPUArchState *env,= abi_ptr ptr) ret =3D glue(glue(ld, USUFFIX), _p)(g2h(ptr)); clear_helper_retaddr(); #else - uint16_t meminfo =3D trace_mem_build_info(SHIFT, false, MO_TE, false, - MMU_USER_IDX); + MemOp op =3D MO_TE | SHIFT; + uint16_t meminfo =3D trace_mem_get_info(op, MMU_USER_IDX, false); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); ret =3D glue(glue(ld, USUFFIX), _p)(g2h(ptr)); #endif @@ -102,8 +102,8 @@ glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(CPUArchState *en= v, abi_ptr ptr) ret =3D glue(glue(lds, SUFFIX), _p)(g2h(ptr)); clear_helper_retaddr(); #else - uint16_t meminfo =3D trace_mem_build_info(SHIFT, true, MO_TE, false, - MMU_USER_IDX); + MemOp op =3D MO_TE | MO_SIGN | SHIFT; + uint16_t meminfo =3D trace_mem_get_info(op, MMU_USER_IDX, false); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); ret =3D glue(glue(lds, SUFFIX), _p)(g2h(ptr)); qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); @@ -131,8 +131,8 @@ static inline void glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr, RES_TYPE v) { - uint16_t meminfo =3D trace_mem_build_info(SHIFT, false, MO_TE, true, - MMU_USER_IDX); + MemOp op =3D MO_TE | SHIFT; + uint16_t meminfo =3D trace_mem_get_info(op, MMU_USER_IDX, true); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); glue(glue(st, SUFFIX), _p)(g2h(ptr), v); qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455445; cv=none; d=zohomail.com; s=zohoarc; b=EVLMJ5gacJspGxye30LyeBNJrO6rpHi5rn/qPvvi+zXI7EnuzSCjoZwK38/Py4q2v3LyUwF+Dvz9WLUJ+4uXIU+fgVXupF4ZUNnu/2E/yQ656zalt1NvqPX/3pS/hGzROkqEsu94E+waAQNvTTTumTys+OrgfHVEOE+Xt3tiXMc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455445; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RJG/9WXsiYhyTY2e8WA3sBBf4U0aC4vD0LzEvAIaj5k=; b=ItK1p4bFqFeeyVBbHgjlvlq84wVuoz5kUfLSX2eQqzpY/+2M/Knp+tgis6RDCcYgrM7p4xLUgynoqerMhYdGslKp469GqXR9p6h69WYPOX19WOqtdwRl+6Au7teaDzDZVVKy3s/U4lzhqBFuxFz0Hugn0hfzTD3R5zdWeqw5To0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455445572217.7891492958588; Tue, 7 Jan 2020 19:50:45 -0800 (PST) Received: from localhost ([::1]:35224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Mk-000119-Mq for importer@patchew.org; Tue, 07 Jan 2020 22:50:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48881) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2IE-0003aD-2t for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2IC-0002sy-GH for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:01 -0500 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:39501) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2IC-0002rv-8e for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:00 -0500 Received: by mail-pf1-x433.google.com with SMTP id q10so905893pfs.6 for ; Tue, 07 Jan 2020 19:46:00 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.45.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:45:58 -0800 (PST) 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=RJG/9WXsiYhyTY2e8WA3sBBf4U0aC4vD0LzEvAIaj5k=; b=g5fhP+czOZPdzPmkjhJU5VvW4Idkk3N9UBKnngs5uziDurB6kYIM3rUXoYUS6cqVwq tEdgWriwe1iY8PxCsQ0i9QxYf8BbM2crK1NmSNWldFIn8xM+i4yD4TATDcfdixppklCA jZA1Ta69iLIggN8MN091avlJooLs9YHK+K7XUmOQYnQCBZjNBKTiZOdTG5UyPUqZ+z+Y 4kdRv/67CQ9GSUT2X3Kd4dcC7MwWKDpbFtiJt90UkgkOrwmUVAVQdnGGukUnIHNsQJG4 1DMgsV+TLPhGRvgReKUCZk4P+6cxPS9CdOxBAB4sxYmYPLc0O/qO67k4E903UYIheEsf 0M5g== 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=RJG/9WXsiYhyTY2e8WA3sBBf4U0aC4vD0LzEvAIaj5k=; b=jbS329DaPOhRG8mDRf7u1D8t80DEw29Y8A2tfghI/sN266x8nW4CE4uvc0tCYCCKeG E5ZDVJcoI62/6GjNl1RCUszAz//iTiKSiarUOLWweabKU9Ze5O6urwivzfdkiOnP2EE3 YZfq0zDGErK9UZy885K+SHQmMyLNeqRnBwX2NdcA9+qVFRGr/jXp/v9vqZiXympIsWSO qSmLmwPHTUJGo+LFPDQVqwNJZpIZgkOE1OyH76r0jxlPOGkUsBbLpaOVO9SPfSsD7zNI psd+co3FkmLayh16TTXjKf2+l8xtiKTZQ24OjDK8MvHAHcpHxDHU4dVyWzv3IkZWan+3 XPFQ== X-Gm-Message-State: APjAAAWSsd7Ndn9yRmMBIbpL1A2NuvCdfVc9WXZtMib207Wk1355TgZG Ij1fo5T+imiwcVHszyvX70v6m4azGK/JyQ== X-Google-Smtp-Source: APXvYqySHh7BLcOT+IT2kGdSD+7QJ+Mg8drwHiI5BJ/3Xg3IZH8Kq6mr8dCV/ccbCO2cnZAJA4azcA== X-Received: by 2002:aa7:9145:: with SMTP id 5mr2919081pfi.74.1578455159001; Tue, 07 Jan 2020 19:45:59 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 10/41] trace: Remove trace_mem_build_info_no_se_[bl]e Date: Wed, 8 Jan 2020 14:44:52 +1100 Message-Id: <20200108034523.17349-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::433 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) It is easy for the atomic helpers to use trace_mem_build_info directly, without resorting to symbol pasting. For this usage, we cannot use trace_mem_get_info, because the MemOp does not support 16-byte accesses. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- accel/tcg/atomic_template.h | 67 +++++++++++++------------------------ trace/mem-internal.h | 17 ---------- 2 files changed, 24 insertions(+), 60 deletions(-) diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h index 837676231f..26969487d6 100644 --- a/accel/tcg/atomic_template.h +++ b/accel/tcg/atomic_template.h @@ -64,13 +64,10 @@ the ATOMIC_NAME macro, and redefined below. */ #if DATA_SIZE =3D=3D 1 # define END -# define MEND _be /* either le or be would be fine */ #elif defined(HOST_WORDS_BIGENDIAN) # define END _be -# define MEND _be #else # define END _le -# define MEND _le #endif =20 ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, target_ulong addr, @@ -79,8 +76,8 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, target_u= long addr, ATOMIC_MMU_DECLS; DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; DATA_TYPE ret; - uint16_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, false, - ATOMIC_MMU_IDX); + uint16_t info =3D trace_mem_build_info(SHIFT, false, 0, false, + ATOMIC_MMU_IDX); =20 atomic_trace_rmw_pre(env, addr, info); #if DATA_SIZE =3D=3D 16 @@ -99,8 +96,8 @@ ABI_TYPE ATOMIC_NAME(ld)(CPUArchState *env, target_ulong = addr EXTRA_ARGS) { ATOMIC_MMU_DECLS; DATA_TYPE val, *haddr =3D ATOMIC_MMU_LOOKUP; - uint16_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, false, - ATOMIC_MMU_IDX); + uint16_t info =3D trace_mem_build_info(SHIFT, false, 0, false, + ATOMIC_MMU_IDX); =20 atomic_trace_ld_pre(env, addr, info); val =3D atomic16_read(haddr); @@ -114,8 +111,8 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong ad= dr, { ATOMIC_MMU_DECLS; DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; - uint16_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, true, - ATOMIC_MMU_IDX); + uint16_t info =3D trace_mem_build_info(SHIFT, false, 0, true, + ATOMIC_MMU_IDX); =20 atomic_trace_st_pre(env, addr, info); atomic16_set(haddr, val); @@ -130,8 +127,8 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, target_ul= ong addr, ATOMIC_MMU_DECLS; DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; DATA_TYPE ret; - uint16_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, false, - ATOMIC_MMU_IDX); + uint16_t info =3D trace_mem_build_info(SHIFT, false, 0, false, + ATOMIC_MMU_IDX); =20 atomic_trace_rmw_pre(env, addr, info); ret =3D atomic_xchg__nocheck(haddr, val); @@ -147,10 +144,8 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulon= g addr, \ ATOMIC_MMU_DECLS; \ DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; \ DATA_TYPE ret; \ - uint16_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, \ - false, \ - ATOMIC_MMU_IDX)= ; \ - \ + uint16_t info =3D trace_mem_build_info(SHIFT, false, 0, false, \ + ATOMIC_MMU_IDX); \ atomic_trace_rmw_pre(env, addr, info); \ ret =3D atomic_##X(haddr, val); \ ATOMIC_MMU_CLEANUP; \ @@ -183,10 +178,8 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulon= g addr, \ ATOMIC_MMU_DECLS; \ XDATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; \ XDATA_TYPE cmp, old, new, val =3D xval; \ - uint16_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, \ - false, \ - ATOMIC_MMU_IDX)= ; \ - \ + uint16_t info =3D trace_mem_build_info(SHIFT, false, 0, false, \ + ATOMIC_MMU_IDX); \ atomic_trace_rmw_pre(env, addr, info); \ smp_mb(); \ cmp =3D atomic_read__nocheck(haddr); \ @@ -213,7 +206,6 @@ GEN_ATOMIC_HELPER_FN(umax_fetch, MAX, DATA_TYPE, new) #endif /* DATA SIZE >=3D 16 */ =20 #undef END -#undef MEND =20 #if DATA_SIZE > 1 =20 @@ -221,10 +213,8 @@ GEN_ATOMIC_HELPER_FN(umax_fetch, MAX, DATA_TYPE, new) within the ATOMIC_NAME macro. */ #ifdef HOST_WORDS_BIGENDIAN # define END _le -# define MEND _le #else # define END _be -# define MEND _be #endif =20 ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, target_ulong addr, @@ -233,9 +223,8 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, target= _ulong addr, ATOMIC_MMU_DECLS; DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; DATA_TYPE ret; - uint16_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, - false, - ATOMIC_MMU_IDX); + uint16_t info =3D trace_mem_build_info(SHIFT, false, MO_BSWAP, false, + ATOMIC_MMU_IDX); =20 atomic_trace_rmw_pre(env, addr, info); #if DATA_SIZE =3D=3D 16 @@ -254,9 +243,8 @@ ABI_TYPE ATOMIC_NAME(ld)(CPUArchState *env, target_ulon= g addr EXTRA_ARGS) { ATOMIC_MMU_DECLS; DATA_TYPE val, *haddr =3D ATOMIC_MMU_LOOKUP; - uint16_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, - false, - ATOMIC_MMU_IDX); + uint16_t info =3D trace_mem_build_info(SHIFT, false, MO_BSWAP, false, + ATOMIC_MMU_IDX); =20 atomic_trace_ld_pre(env, addr, info); val =3D atomic16_read(haddr); @@ -270,9 +258,8 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong ad= dr, { ATOMIC_MMU_DECLS; DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; - uint16_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, - true, - ATOMIC_MMU_IDX); + uint16_t info =3D trace_mem_build_info(SHIFT, false, MO_BSWAP, true, + ATOMIC_MMU_IDX); =20 val =3D BSWAP(val); atomic_trace_st_pre(env, addr, info); @@ -289,9 +276,8 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, target_ul= ong addr, ATOMIC_MMU_DECLS; DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; ABI_TYPE ret; - uint16_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, - false, - ATOMIC_MMU_IDX); + uint16_t info =3D trace_mem_build_info(SHIFT, false, MO_BSWAP, false, + ATOMIC_MMU_IDX); =20 atomic_trace_rmw_pre(env, addr, info); ret =3D atomic_xchg__nocheck(haddr, BSWAP(val)); @@ -307,10 +293,8 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulon= g addr, \ ATOMIC_MMU_DECLS; \ DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; \ DATA_TYPE ret; \ - uint16_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, \ - false, \ - ATOMIC_MMU_IDX)= ; \ - \ + uint16_t info =3D trace_mem_build_info(SHIFT, false, MO_BSWAP, \ + false, ATOMIC_MMU_IDX); \ atomic_trace_rmw_pre(env, addr, info); \ ret =3D atomic_##X(haddr, BSWAP(val)); \ ATOMIC_MMU_CLEANUP; \ @@ -341,10 +325,8 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulon= g addr, \ ATOMIC_MMU_DECLS; \ XDATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; \ XDATA_TYPE ldo, ldn, old, new, val =3D xval; \ - uint16_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, \ - false, \ - ATOMIC_MMU_IDX)= ; \ - \ + uint16_t info =3D trace_mem_build_info(SHIFT, false, MO_BSWAP, \ + false, ATOMIC_MMU_IDX); \ atomic_trace_rmw_pre(env, addr, info); \ smp_mb(); \ ldn =3D atomic_read__nocheck(haddr); \ @@ -378,7 +360,6 @@ GEN_ATOMIC_HELPER_FN(add_fetch, ADD, DATA_TYPE, new) #endif /* DATA_SIZE >=3D 16 */ =20 #undef END -#undef MEND #endif /* DATA_SIZE > 1 */ =20 #undef BSWAP diff --git a/trace/mem-internal.h b/trace/mem-internal.h index 0a32aa22ca..8b72b678fa 100644 --- a/trace/mem-internal.h +++ b/trace/mem-internal.h @@ -47,21 +47,4 @@ static inline uint16_t trace_mem_get_info(MemOp op, mmu_idx); } =20 -/* Used by the atomic helpers */ -static inline -uint16_t trace_mem_build_info_no_se_be(int size_shift, bool store, - TCGMemOpIdx oi) -{ - return trace_mem_build_info(size_shift, false, MO_BE, store, - get_mmuidx(oi)); -} - -static inline -uint16_t trace_mem_build_info_no_se_le(int size_shift, bool store, - TCGMemOpIdx oi) -{ - return trace_mem_build_info(size_shift, false, MO_LE, store, - get_mmuidx(oi)); -} - #endif /* TRACE__MEM_INTERNAL_H */ --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455573; cv=none; d=zohomail.com; s=zohoarc; b=IZagC53FM4ChPeIuQwRBIbXcvQJ87ZB1uYdVBlR+PFyKKS/jtC7HevaqswoPHr8B8fUdUI7SHhW5g6umOFjY02dBCd9Ro2ofhykdU/J1jZ4SBo7bG0AldI9o5QgtaQLPt2umiNWQBvCF6CH04yQFOod/0SdJow6gM69ors/cLqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455573; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hhHB6i0A+5MwcgIQSr5VNpYjYgYnhF/9Apso16V9eJA=; b=nZpGv+04WtWXBXTN3ygrmiSbCP9eq5GS687OTQx9I2zDbhfjO4Gpwij8ll3jAxx+f1wSPqi5tPjXGJ2z0kAvoBFdVQ+xpYrHuVKYBpZFKK7GVUXY6wXHWOQDYwcPCE4rHjXjZYdkH+Y61tTNhVOcY9Wek8fyNAE5d9yCedvwPe0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455573598930.921924435491; Tue, 7 Jan 2020 19:52:53 -0800 (PST) Received: from localhost ([::1]:35280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Op-0004VN-Vp for importer@patchew.org; Tue, 07 Jan 2020 22:52:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48950) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2IH-0003gK-JQ for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2IG-0002wQ-KO for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:05 -0500 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:39950) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2IF-0002vF-SY for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:04 -0500 Received: by mail-pf1-x42f.google.com with SMTP id q8so901359pfh.7 for ; Tue, 07 Jan 2020 19:46:03 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.45.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:01 -0800 (PST) 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=hhHB6i0A+5MwcgIQSr5VNpYjYgYnhF/9Apso16V9eJA=; b=E3VREGMivbEy57IJX9Zc8ejNz2y28vCTzimJUMmUrGnPUnLU5/VPN63fYibCRapD0O hXW7mzHTT+mxqctZ/d06lzstGaD06yOmkeWPbY4yoWF6FnGbb7eownvtSm1jMZpWL8Dz 3F4TEr4R2ZmjxWJ/Q219Eoprs1TiQwvCOkSpAso94t41/s5Rxyd/QsRy4O6BbkaXtJQe IQvR8Ef3I2eeMAmL0cuNVDdc6CB8MP5VZXW0yvAaT1cNwXb41qF9VEdNj4A3vhhzG7Om 8gJOfm0H2jS1fESDyzJyi/wtofP5njbra4I0d+JBo5bk/ZdeaMsBhOUpbOHp4ZIo2Tpr Be7A== 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=hhHB6i0A+5MwcgIQSr5VNpYjYgYnhF/9Apso16V9eJA=; b=jsS+QfUHzua1vLCjfD5W/T6AYoi7BPQ5PnqyMv0Ja3GAtfOxZaWe/Zz/I3eoY4OlR1 C7mrFEWmK8LFsEmLuyA9feJEgzJP4q3wiuOtmSejkA4R+0gUDuNAhHKZNSgnpimxd/ly uGZYeXp09BfY7Ee/O9S92T2H+AuJPchDVPpEP179y+0Ywr74clcIm4HeZoecumI4AJuI jT50cAmgGaeprwWJj9eHI5D0S3lPKkyHt0EwP2Wzf3gZDDnJu9ez+7ARU+wlBzeveaD/ MduimhsSfjqW4hmqE8DPyIrq0Y66F6V43q5T03nQyTHY0hHQhxJNvqd28phrB0UvslLC GVrg== X-Gm-Message-State: APjAAAUU4girJljl0a1ol0HvMbQkgJsaRkcHz3A/RdxSKoXzEqhdOMQX 4EtQtapjpcaCZqzcyu9qBw2utdM0ddqiPA== X-Google-Smtp-Source: APXvYqzrA2LFd1IQkFR2iTlkC2ijNKxGHeMHTolbD3apf6JrlFJbIMnQamklAJvPb41JR5C4MNaNGw== X-Received: by 2002:a63:181:: with SMTP id 123mr3079272pgb.36.1578455162199; Tue, 07 Jan 2020 19:46:02 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 11/41] target/s390x: Include tcg.h in mem_helper.c Date: Wed, 8 Jan 2020 14:44:53 +1100 Message-Id: <20200108034523.17349-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::42f 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Code movement in an upcoming patch will show that this file was implicitly depending on tcg.h being included indirectly. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 2921419c27..20a84b3912 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -27,6 +27,7 @@ #include "exec/cpu_ldst.h" #include "qemu/int128.h" #include "qemu/atomic128.h" +#include "tcg.h" =20 #if !defined(CONFIG_USER_ONLY) #include "hw/s390x/storage-keys.h" --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456263; cv=none; d=zohomail.com; s=zohoarc; b=HybFQb63E+Q9EkHrVOtc76ouLZS/JPgDgdg30uh1fbKRP4SGH0IV0ll+/16TXFWzGtJgjHg4CdThtUykD8NM2Bpweu/gWwMO1eSth9iq1L94IRzOiE3dUM9WIsEVi6YdUYkiAnd9qemAmmDMPUQhsF39qq4BlPKXejjTyXKX8qo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456263; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3sJKl8Kqo9iJWsY7dUcwVH9r5rdr0o0t2wlvfjyFaBQ=; b=LwuIO/iB5qusG2vn3eHQhQRnJkC36X5UadquBw+DwR8kgrjzZkMTI+W/BglXM/+VHPtzlPOVECaIa2CAxl/BNPuctMRYUhO3eQGMdDEtVxvFzwD8DlYI79dtj0vVLJBz+9C6TMFDcBNZqNaplCkl1dXxl3n/V0pFGYu/wZ4dh7g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157845626339960.5613537792143; Tue, 7 Jan 2020 20:04:23 -0800 (PST) Received: from localhost ([::1]:35512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Zx-0003M0-PG for importer@patchew.org; Tue, 07 Jan 2020 23:04:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49003) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2IL-0003px-N1 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2IJ-00030f-P4 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:09 -0500 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:46830) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2II-0002yB-KK for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:06 -0500 Received: by mail-pf1-x42f.google.com with SMTP id n9so885712pff.13 for ; Tue, 07 Jan 2020 19:46:06 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:04 -0800 (PST) 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=3sJKl8Kqo9iJWsY7dUcwVH9r5rdr0o0t2wlvfjyFaBQ=; b=NcOjsdsDpeQfvoCjMr8B29U9jayzfw91l1xlVezz25ShU7yj7exQsrnhnjQmOK1amy K+7cHn2L4oHj0fqDf3Y5I9949eFj7lnqr6GgmJiZ3WUzHXjtZHzjVoGr3/bQ5tZCpNDj zzIyA+7gfvjhrp3U+Q8i/uFhSOldfZ7S+fThI+/cMMPkCn2EosShAohzRRjdUVrRBp4Z YISac+NfQsD/JaUyman56PinZXZaLyGWw2OTpbBBkHG3m/+yHkkR7UpP2AMQvViv/h6n 7P5EmHEMk4j+PLzbze5lPxjKBSV24BFh37llcis1VqTfPVxCfD67P3KxWpfBWNGPRXV1 lVug== 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=3sJKl8Kqo9iJWsY7dUcwVH9r5rdr0o0t2wlvfjyFaBQ=; b=PSRraMxlR2MniM8LFqfEy7UfmH+KR3v3JzdHS3FQBkPV2cB0F2++ByYaLMPl9WlvJh oaaoAS7gbn3hMKGnBccOs5Y6HXo7Q5uUUhjfsWeWZ0eRAStR83jEFqDlI/Pl1G+DdSAI eTXk74gI2DHave4S7+mvOZ0QIxBW5ll65YPZDewL1BYDrFLRj2mhQa51UZINnIjvZGep QBZytEz/pG1bmI3HbWwlPTLjeuOUY7gIJJhbkEDxujidrB7f7qxCLad3WCMpUQ/NNWuX fVCN+Y1u3JLN02pJYN0OJKXt8MlDvvmMcRXnBj61RS++a5BqbqlKI5QfkZU63bKpBLFl qVjA== X-Gm-Message-State: APjAAAUwasHoBTTBgdlQTpC6E2ZnW6DBJOD17BiVvEtp7oP4QiOGfhu1 TzQIbHBM/DxyJOc+pPrEj3PvEdMWMmBLsA== X-Google-Smtp-Source: APXvYqwEvbSPTpT0V/2oPLQjgJBzORh5/zAh5+/7oYIKEOf6ZrHCAX+jwFpD6xG92dTXpsjv/ScChQ== X-Received: by 2002:aa7:979a:: with SMTP id o26mr2934491pfp.0.1578455165520; Tue, 07 Jan 2020 19:46:05 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 12/41] target/arm: Include tcg.h in sve_helper.c Date: Wed, 8 Jan 2020 14:44:54 +1100 Message-Id: <20200108034523.17349-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::42f 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Code movement in an upcoming patch will show that this file was implicitly depending on tcg.h being included indirectly. Cc: Peter Maydell Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/arm/sve_helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index fc0c1755d2..83cc7f5bb5 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -25,6 +25,7 @@ #include "exec/helper-proto.h" #include "tcg/tcg-gvec-desc.h" #include "fpu/softfloat.h" +#include "tcg.h" =20 =20 /* Note that vector data is stored in host-endian 64-bit chunks, --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455467; cv=none; d=zohomail.com; s=zohoarc; b=Cv/0AxjXx5shEjXfZkB5VamM0j9oB5IvKe+Pk/7vIWhzvUK3/h4rzjwk0sAms7QsYIldvp3eWFKM83nDnBT7/QZks7dnSmkURypP49gGS1ibfM9ieAejLVIL410NDFO6Sgml7T6Ry0wU/UtOYanwx0yMWrSjI0xlQLMgQ8Jvh+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455467; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=70gIRC3ozz6Ck0EZOpvXdwR/Q+/44XMCWq0hBLqYbys=; b=g6FFlyy2nHUFEautFLL+Hr1Da7Oc7/E9tOYBKmjUrUn1TrgMxBCfYkLQWHy78mSBlzsKwQNwdAsxoUMwHjL+y3dluHjmskWCls0ek70pWYZYfb/3InuqnMubVgrZRTg5PBqGOwN3H+SZzKAw7CIT3eMXGVhbfaQz6Fyxmtemnrk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455467158768.6174273012588; Tue, 7 Jan 2020 19:51:07 -0800 (PST) Received: from localhost ([::1]:35240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2N7-0001sc-8y for importer@patchew.org; Tue, 07 Jan 2020 22:51:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49041) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2IN-0003sM-0l for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2IL-00032r-Ue for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:10 -0500 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]:42613) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2IL-000323-Mk for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:09 -0500 Received: by mail-pg1-x52e.google.com with SMTP id s64so861745pgb.9 for ; Tue, 07 Jan 2020 19:46:09 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:08 -0800 (PST) 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=70gIRC3ozz6Ck0EZOpvXdwR/Q+/44XMCWq0hBLqYbys=; b=UBgM/EaTMkHpFsrSn0zqhrvl+YuTWb/KvNepzACb0txmLeQEYMl28e+CqyjlYNPv5X bOzfy3/k+SYnKJIUKO0HTEtTOBHE+rbwVtp1tmG/BUGWi/pwbsLBB1tiNZzGMra7Bz2n otnTn8jMAsfoQGch9/7+jvr5Vn0sUhxW9yISzTtwU44WIyWgX2IiORrSqcfhGFOB6qwT YCGEUi+vXlUAXf57UJ5pjHi7nfVPnKiv787PNtV1+tsrMwwBVqqcFJAGaRQZ435LQWcv S7xI4HytiVyW9RrL+aepX7UNQgnOgC6GdE2iF+Q9z+wfpLKhVchA0YzllqddqfNEnMS+ FYFQ== 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=70gIRC3ozz6Ck0EZOpvXdwR/Q+/44XMCWq0hBLqYbys=; b=CqTbQTVVnfLfBaEJ28qtU3x0/yy5GsJiT+Cg8zm/8ABnL/fXAvOpJbH6n/wlD2dxi4 wxr19ghdpr6gIOS8zBExVQwDyljAjfbY7qu+cXHhyV3cR8cCFRfCCJJbzeI6aMM4c+vl /+6KeTp4zjzxRzhUcM836cDh3TKK/FD7ZOBfRdKFqhqe/nT5SVLHrTfQSJl5WZT1RG9i dgzYFdzhc2aCbsKWIo1tVDPriyjMWeI8zP947NF2BYK8JyJKsp+o/zIr2sugIfj4C2q8 G1AMRkK1d71DQKbZ8AE/vR1FpYQpaWfp/Lvk7pSA9JhwEES6Cp0uUMpcyveH80yF0cKe kbFA== X-Gm-Message-State: APjAAAWrUfBVefdEgWHTv+Qh2DAFrtuILnf/6JCGTU0exxDgwqqLcqQK 01qQsdSaXcu9GO4IN09ASyE1Mruuc9dIiQ== X-Google-Smtp-Source: APXvYqy+Yixw/b/KGBdo+4YCvEpXTYUh7omXN+Ka4+RYzKDYPJB1co+oaFhrEJH2rzen9Dc/ukRMkw== X-Received: by 2002:aa7:86d4:: with SMTP id h20mr2789630pfo.232.1578455168614; Tue, 07 Jan 2020 19:46:08 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 13/41] accel/tcg: Include tcg.h in tcg-runtime.c Date: Wed, 8 Jan 2020 14:44:55 +1100 Message-Id: <20200108034523.17349-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::52e 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Code movement in an upcoming patch will show that this file was implicitly depending on tcg.h being included indirectly. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- accel/tcg/tcg-runtime.c | 1 + 1 file changed, 1 insertion(+) diff --git a/accel/tcg/tcg-runtime.c b/accel/tcg/tcg-runtime.c index 8a1e408e31..4ab2cf7f75 100644 --- a/accel/tcg/tcg-runtime.c +++ b/accel/tcg/tcg-runtime.c @@ -30,6 +30,7 @@ #include "exec/tb-lookup.h" #include "disas/disas.h" #include "exec/log.h" +#include "tcg.h" =20 /* 32-bit helpers */ =20 --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456401; cv=none; d=zohomail.com; s=zohoarc; b=P7Vocx9L2+6Ds/NwXcQwV0x4/OhKbBqMFC+N5PkUgfaxwZhFDWp9cpuHenVF5hV643w2a6aGL5nAtX2w+j+UPCDWqcrIgt+1+Bq94nn7XlOhOGZ2S9UYz8x95kk68NA2vgv2k2vw3Z0BVo6HJU7sz5Z2+/T8m4cXH9diFubxJss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456401; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jQF5VrEZeBR4M+X3J6whzntO7zMYieHMFU8i9iH/tgE=; b=ZCqJ/gKW/KunorEwEJQ8+8vdNfYm0vVdXbE8qFWQ/gyua8ALJImgX3VVI2Y8FTWP8vj7SMoL3k9OefBTgdIhEGxsaYRrl6UqSTWqCCo3B4suUC/PFzq+7ddaw1IhOXc8VQ/7mPLx5NpppwEGSf+rLuphNfNVWTIZjBkiyy6MzOE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456401569865.2798843774798; Tue, 7 Jan 2020 20:06:41 -0800 (PST) Received: from localhost ([::1]:35584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2cB-000738-QU for importer@patchew.org; Tue, 07 Jan 2020 23:06:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49104) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2IQ-00041J-K4 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2IP-00035q-Jr for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:14 -0500 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]:37213) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2IP-00034m-57 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:13 -0500 Received: by mail-pg1-x530.google.com with SMTP id q127so873099pga.4 for ; Tue, 07 Jan 2020 19:46:13 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:11 -0800 (PST) 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=jQF5VrEZeBR4M+X3J6whzntO7zMYieHMFU8i9iH/tgE=; b=SbrmNMJng32wFRhvzM8SJa1KETz0h8384DvU3AHe3dMWiU+jyBoI6UqvLV/yyvEWG3 FYcFEpJ9iob7FpLOY6GnGfOadVAdcVgBO0C+X4y9R+5hzwGySJHal6FUMK3S0ozAJgDP 5zCVlOSVF8uz1vu6ZY3YbzyjjPFEP5mLB1cbZnZNFaMWwriMi3iMSiNhfFonoDs5djUB NL5kHDjdJfD/FWQ7VjGmd7aBfhR2hPnRLEU1NN5IsbwdDLf4eEaHjfgsObz5/CE0sOTx 1BS9rULH0gh7bSwOrHAmLXed/XhL6ymzIsrE9XOvpP1WykaNyteHPSC+0G9Es9KdpYxp fQXw== 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=jQF5VrEZeBR4M+X3J6whzntO7zMYieHMFU8i9iH/tgE=; b=G02vjxvshj3926J526871gkzZwtiyBGYM1r/6kKCUFAL9VnrYDNfFk5ObFcohhgFO7 1nv3jTXO5a07RLuYSybuA/ImPn01zBP1edYiHwhdSNJfTe8chCytglDOtWJZdVemOXCx 5SMNjIiZeb8wnVoDiT/VTjEOThK1OpD3AkXznMBOaiTknVeYU/4ljv1JYNYoKMIgzj6l X+DdjH3aF1xoPuRXbe4QEqF9NxE2yattFRkyv1hqVkl4a362HvuVZY64j7mciITSWBif OAiFmX4RpMeQefF5NbCQsB+1X2qwxIivZwucBeCN9TvfB8s8qWzbDrjkkCPrOfsky7PA uEOg== X-Gm-Message-State: APjAAAWCojkb/vAq1o1oPQXs4xF2bvpAMP7W7qzuoNCo7dv+BDUjACQY uG0dqMsBDLFJ0QDncqIYR9CweDgm66PEoA== X-Google-Smtp-Source: APXvYqwnyfghpQfqJ3vr/7lCZ+Qvix1s9BB7Kru1cMRULzepn5f+RMOZL3k2bwUvf5wDV/zsrIF4fQ== X-Received: by 2002:aa7:86ce:: with SMTP id h14mr2936068pfo.31.1578455171880; Tue, 07 Jan 2020 19:46:11 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 14/41] linux-user: Include tcg.h in syscall.c Date: Wed, 8 Jan 2020 14:44:56 +1100 Message-Id: <20200108034523.17349-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::530 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Code movement in an upcoming patch will show that this file was implicitly depending on tcg.h being included indirectly. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- linux-user/syscall.c | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 171c0caef3..34825f15bf 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -115,6 +115,7 @@ #include "user/syscall-trace.h" #include "qapi/error.h" #include "fd-trans.h" +#include "tcg.h" =20 #ifndef CLONE_IO #define CLONE_IO 0x80000000 /* Clone io context */ --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455599; cv=none; d=zohomail.com; s=zohoarc; b=QYYZvrPDCTmM/FJ/UM2L8H9L/lAZh9gu6/Mi1U0Sd39JcM5FxIwtvkUZ18rZ3I6Y3aL8dan9pZZO9q7YJYsjZNrdB4n4XDEEV0hCZwbUrJhvkQ/5/kd2Wb0nl/VY5UtwTKlpeMA3A9qYxCIM7QVZRk/de3iIyPsbhq5ylNS+cQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455599; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Gm7iqEPQvMunngBh30eboJwTun7O9zyL7QzovpYUrMw=; b=Raj9+X6mrO8Dk3ttPYn4Yo84y7tk/MVQCt6kqZZKKr3LtndOuteFkIz3jtXQSIh8k3ksSeGxVHJSwM018jCY/UifZCxOsNk4XL9zD0sL/MI35+2drcOxtLc6x1XypSGxwdW1aovsWlAOFhi0I5pUwbuYLZcJ6dhAH0GyCYyGdV8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455599477882.3232291703704; Tue, 7 Jan 2020 19:53:19 -0800 (PST) Received: from localhost ([::1]:35284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2PF-0004xC-O3 for importer@patchew.org; Tue, 07 Jan 2020 22:53:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49173) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2IU-00047L-Et for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2IS-00038G-F4 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:17 -0500 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:37082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2IS-00037w-9F for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:16 -0500 Received: by mail-pf1-x441.google.com with SMTP id p14so910226pfn.4 for ; Tue, 07 Jan 2020 19:46:16 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:14 -0800 (PST) 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=Gm7iqEPQvMunngBh30eboJwTun7O9zyL7QzovpYUrMw=; b=eY64CS/x8vqqpGODjIbhdlctW11cdkwbebZ3J8VMDo0UAOoiH+84cDz2+Dovq8Hlsu fH0RYW62qZjR6sr03dvz/Ox9UYJeBJlPzaUC3BrLlgB2PXB4e2P4ydrVHCcqnW20XUym zgI96zJMXQQ8NEVDSBhvzHsByQJ7QR2yxIw4scOHkahUREhIINEdXwX5Bgwz1ogAeUO5 vs1wYgdZ3hmahCfg3qDHvpUlyABAjl7Ml7pvOuiU2Rf2jC49nTis+98bSC4vuNX98R6K 5QvYMzJXiq8YBbiD9cQa4LM7wSCRb4BFjKGo/euD1atdtg/F1WYS+Z3pUMeqLTUk9DgD YKEw== 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=Gm7iqEPQvMunngBh30eboJwTun7O9zyL7QzovpYUrMw=; b=OCafFRfejkHgq8BnQSPDQpzIHUOe62AHzvYWWxuBLKvGSoZ5+2AOa9kN5CoTiScZ1S 98ZwH9qja8mExFt8VBSE5OZDwih7tu6lOa2eBeEQbdqfJWf3zeRi84u/hRvtGA4wyi8W nzO/+vfZQ5q5foIzH75q5Ix+EQOMhTdq8o94d+2j8mpkGL5uJI2QEfsnLrBdlbTy+QfP FclR0me2q3oAIfWqjfm1FuYxcGn+qm7u7oA8XCb/4vQzWAo1J9ACkyaqRUzyEjUd7inO 4vt2ZNOqH6AxBUqKEYa2fjD9XdUwIXwBphAM+DUvW6gyjJMS7yFa48Qz/xliRtyo9J8l sZHg== X-Gm-Message-State: APjAAAVqh4oE37SA7BJKJ0llc8Kda3J2cI6IwCJSrpSKHivnX4c/ln/r cTQlTH9LU3nL9ZiZBq/COJXwBMwzsm1fDQ== X-Google-Smtp-Source: APXvYqzeh1hjbbczbyn55W+1yjMGPXk6CD2zgszBVKK2dOGlOL5VG46bvpB47VgrXoP95kW4EmFXgA== X-Received: by 2002:a62:5216:: with SMTP id g22mr2941566pfb.196.1578455175143; Tue, 07 Jan 2020 19:46:15 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 15/41] linux-user: Include trace-root.h in syscall-trace.h Date: Wed, 8 Jan 2020 14:44:57 +1100 Message-Id: <20200108034523.17349-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::441 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Code movement in an upcoming patch will show that this file was implicitly depending on trace-root.h being included beforehand. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- include/user/syscall-trace.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/user/syscall-trace.h b/include/user/syscall-trace.h index 9e60473643..79fd3e5aa9 100644 --- a/include/user/syscall-trace.h +++ b/include/user/syscall-trace.h @@ -10,6 +10,8 @@ #ifndef _SYSCALL_TRACE_H_ #define _SYSCALL_TRACE_H_ =20 +#include "trace-root.h" + /* * These helpers just provide a common place for the various * subsystems that want to track syscalls to put their hooks in. We --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455762; cv=none; d=zohomail.com; s=zohoarc; b=ehNbuxPwoNW5tbAp+qjUyjftVXLH5+DeZDZB7/alVFPdGMs4raUUXz2SCyMdIkgAioA+KQ7mhrdFL2ptj0ZjYYKjdiw7lxdz63g8GftXxD+i2hZ0ZzzVZhbc3qVkuULzmVHkrWt5z0x/Xk1uD+KlqKsWYw8D2EEhV3WF3gGojKE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455762; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pn0fekFXNL0OWRArNV6f/06ch7ZUVwBYGTtvKiM2998=; b=LZTqQprmYrfxs/drc7OlNxjG64PiQM4r1ShCWyQ0/Gfznbz/eV4gJRPyJg3VrHlCLsj0iu2e8AVRd03A3C13M2SyS3AsmssCGKMBqZ2g7z5QOE6KpcsaRZrsvAVxhdA0917Jv/sPaKcof5AAPJIhIKBfD4oBRdNE/EA97VvsC7Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455762346769.1740162569087; Tue, 7 Jan 2020 19:56:02 -0800 (PST) Received: from localhost ([::1]:35346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Rs-0000h5-Mc for importer@patchew.org; Tue, 07 Jan 2020 22:56:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49218) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2IW-0004BZ-So for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2IV-0003Bi-R6 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:20 -0500 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:45076) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2IV-0003Az-Lc for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:19 -0500 Received: by mail-pf1-x42d.google.com with SMTP id 2so891015pfg.12 for ; Tue, 07 Jan 2020 19:46:19 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:17 -0800 (PST) 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=pn0fekFXNL0OWRArNV6f/06ch7ZUVwBYGTtvKiM2998=; b=MYB/HUHxSH7qSH3pT0CL0DGlqsJEr1uotx52IOEKkIfZAHFSy68IEFh2AE8/mMuHXU kahTPKrHssIQPBkg0rM/jChsRBl04r9UWstQx4l9qWGtdXU3vBhFL4hosAtEUUDrdQNu VbBo6tVNNLeYHZl25/V+hu88GEKno511kDloqjsnDfj9v4i3hhGi35KMOMsWMGoG+ioo ecAmHlXl0GWPAvdUHqJ90bj+JVXwcFKzw45dGC/YKR3I+pVTikzhFvidzDrtr5i8d/0a kWAlaC82owQ/8DUqBzo2Sg9eIO9G766QVqVgAfP7M+YEDrfq6JgsI/X5lBjliYa9I1OU dXGg== 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=pn0fekFXNL0OWRArNV6f/06ch7ZUVwBYGTtvKiM2998=; b=aACKyXkK0e8B3Y3XHq9QcXxcWTo24cD2bKbdzmWawFNEvHFAfATWe+r+iprw4rQdzo iSQ7dZ+xyy3av69cawu3Yg65gtKWVQdzGP0Tucv5zRutB7vnZK2JIV0fixvPWrYCSvaV nApCOLMHvyBfYR8muem/A2n12/UE6roPP151mMiSkOIxSxggsLbmZty/ySsFXonE4fUq 5Xpu/K5I/wEuGsuLGFCqRjhQWdcfJfzEZaVFj0RjnH44kO3K/NOvlf7NDtMJnsEZcS6O KqAI+iuSo2qU15k74bx7MrqKOH5T2kS68c39HvcGuZ1UD3lRsesTiq0LmsB1dyGv77Ur R1Qg== X-Gm-Message-State: APjAAAVmOFEBU7wKVej6FC4ecJ/UFu2dQ7jzChenh+Lgbu20BISdOEwB QwvB8oqmKP+5P6gAVMaRYtfBHDIuYtHEwg== X-Google-Smtp-Source: APXvYqwEDgZjzzFUwjOYma+bVfPH/14SQbVm6cqyqevBheRc5HEtF8+j1F/q/ns68akWfdSGPZjddw== X-Received: by 2002:a63:48d:: with SMTP id 135mr3110716pge.66.1578455178323; Tue, 07 Jan 2020 19:46:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 16/41] plugins: Include trace/mem.h in api.c Date: Wed, 8 Jan 2020 14:44:58 +1100 Message-Id: <20200108034523.17349-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::42d 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Code movement in an upcoming patch will show that this file was implicitly depending on trace/mem.h being included beforehand. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reported-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- plugins/api.c | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/api.c b/plugins/api.c index fa1d9f276d..53c8a73582 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -46,6 +46,7 @@ #include "qemu/plugin-memory.h" #include "hw/boards.h" #endif +#include "trace/mem.h" =20 /* Uninstall and Reset handlers */ =20 --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456554; cv=none; d=zohomail.com; s=zohoarc; b=ZJT6A2+cR8MpHwKMyFycat2HCdgt3XwmC5x2ql170J/51vGvQ00DttQjnFZA0hp9cXyTgPoCKgvuwtBFiXJPl7qDPhSRy1T+1Gj+hckGoVjCS4sAtqouRFVBxHswXiEvLAM238yLckF1L4HLrnbAP64r9hC8XO2AR095+nJYXHE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456554; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jGoOsFurbigLva/OV5ICoiqTrBzkpqpbZOpPnVmq+A0=; b=cNVgDTNNiP1J4SzqulMLLoTYgP3GTx2BW/Zb/ZOcpKTqn7Iyabq18IzIyTPr5rXwGmP7wZeGW6VoJ7989yELMIaiqkVk9RQTcyUUoT+XA3vPhZPPw1nGbJ4XcKroXuhepooK+L5t6JOf6yqSsSuJBLKUXjAHN+XxubhdunMgQ1w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456554726545.8891979447935; Tue, 7 Jan 2020 20:09:14 -0800 (PST) Received: from localhost ([::1]:35670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2ef-00030E-9y for importer@patchew.org; Tue, 07 Jan 2020 23:09:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49288) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Ib-0004I8-3J for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2IY-0003Ek-Tk for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:25 -0500 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:39946) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2IY-0003Dm-LF for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:22 -0500 Received: by mail-pf1-x42a.google.com with SMTP id q8so901676pfh.7 for ; Tue, 07 Jan 2020 19:46:22 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:20 -0800 (PST) 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=jGoOsFurbigLva/OV5ICoiqTrBzkpqpbZOpPnVmq+A0=; b=LXInVkbe9OZrS68kcQr1L2VUJm0zZl967oRKZrFgPZecVlQDiX8bcWVoKnWqkeGq1j yYWCbK919CHj7urBtj/xLMYiuyH0cKTUVGKy/4nxxmCQeJ3tItqqwYvDNViXqgBMIjgb k6+iEoireWJ0Anr8u6Obo/HOQb0O/eS+VosT5Ebh/vSFiq0Hk9rFGn1AayRD1/twgRQ0 9xRJb6ryzGlzB1xJuOcpBPrIY9U/hDJUu+lNYgLkLXyGUbPjD56RZZtIK3ibVXtUZqiX aJONS1zEMmbMxJXRdgI/w6k5jqEur+IIxST7rlSNmn1UQPvGCVPH5QECDwrrlvq8iz4s Fbgw== 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=jGoOsFurbigLva/OV5ICoiqTrBzkpqpbZOpPnVmq+A0=; b=ryvmuvjvtuTsDLe/dR2Vh8q4/0ClxpGwGi+/c3VcnH52ZAjlfzse/h5ngjpHWTVh1S qGHeMUoGVqG8It5ybcITuMxEgXLkbS2155+FGEXxEaBk8K/y753UozVC0NbLAitIKDk0 DGsBPQGZS4ccQqmuuHUCbuCX8Q6s0rUoJ7oyLSSAt4gJiYFDz/O1fzhwHT3fdgkweLJM TgoghqLKuqhDvZ91hzBgR8ktvlOwcE8zgt2EcfU0gkk/MqMOU4zHXJQFphhH4KoO+/fx KMLboCXSEn23KBsC+zAuSqS/65saEPeACw5DFOqGCbkMl1cNiVChrGO4JLtuk11uCglP DmVQ== X-Gm-Message-State: APjAAAWWwVXcCdVWkG51BCKeyM4VHksaB+G2+/Mwj2RiQ6x0wCDIHsgN KUr69pPJwqd9XKc2oKN8q69WMz9TWuF3/Q== X-Google-Smtp-Source: APXvYqziRoNAkfV27loPmWJ3OfiW+cDbMX33yK5/0j+iocKcS4JQ5VSGkD36eWdDYq3WaZvdnNYM7g== X-Received: by 2002:a63:4d4c:: with SMTP id n12mr3204411pgl.212.1578455181113; Tue, 07 Jan 2020 19:46:21 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 17/41] cputlb: Move body of cpu_ldst_template.h out of line Date: Wed, 8 Jan 2020 14:44:59 +1100 Message-Id: <20200108034523.17349-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::42a 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: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) With the tracing hooks, the inline functions are no longer so simple. Once out-of-line, the current tlb_entry lookup is redundant with the one in the main load/store_helper. This also begins the introduction of a new target facing interface, with suffix *_mmuidx_ra. This is not yet official because the interface is not done for user-only. Use abi_ptr instead of target_ulong in preparation for user-only; the two types are identical for softmmu. What remains in cpu_ldst_template.h are the expansions for _code, _data, and MMU_MODE_SUFFIX. Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- include/exec/cpu_ldst.h | 25 ++++++- include/exec/cpu_ldst_template.h | 125 +++++++------------------------ accel/tcg/cputlb.c | 116 ++++++++++++++++++++++++++++ 3 files changed, 166 insertions(+), 100 deletions(-) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index fd499f7e2f..cf8af36dbc 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -152,7 +152,7 @@ static inline void clear_helper_retaddr(void) =20 #else =20 -/* The memory helpers for tcg-generated code need tcg_target_long etc. */ +/* Needed for TCG_OVERSIZED_GUEST */ #include "tcg.h" =20 static inline target_ulong tlb_addr_write(const CPUTLBEntry *entry) @@ -185,6 +185,29 @@ static inline CPUTLBEntry *tlb_entry(CPUArchState *env= , uintptr_t mmu_idx, return &env_tlb(env)->f[mmu_idx].table[tlb_index(env, mmu_idx, addr)]; } =20 +uint32_t cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra); +uint32_t cpu_lduw_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra); +uint32_t cpu_ldl_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra); +uint64_t cpu_ldq_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra); + +int cpu_ldsb_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra); +int cpu_ldsw_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra); + +void cpu_stb_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val, + int mmu_idx, uintptr_t retaddr); +void cpu_stw_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val, + int mmu_idx, uintptr_t retaddr); +void cpu_stl_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val, + int mmu_idx, uintptr_t retaddr); +void cpu_stq_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val, + int mmu_idx, uintptr_t retaddr); + #ifdef MMU_MODE0_SUFFIX #define CPU_MMU_INDEX 0 #define MEMSUFFIX MMU_MODE0_SUFFIX diff --git a/include/exec/cpu_ldst_template.h b/include/exec/cpu_ldst_templ= ate.h index 0ad5de3ef9..ea39e29c19 100644 --- a/include/exec/cpu_ldst_template.h +++ b/include/exec/cpu_ldst_template.h @@ -24,13 +24,6 @@ * License along with this library; if not, see . */ =20 -#if !defined(SOFTMMU_CODE_ACCESS) -#include "trace-root.h" -#endif - -#include "qemu/plugin.h" -#include "trace/mem.h" - #if DATA_SIZE =3D=3D 8 #define SUFFIX q #define USUFFIX q @@ -63,56 +56,40 @@ #define RES_TYPE uint32_t #endif =20 +/* generic load/store macros */ + #ifdef SOFTMMU_CODE_ACCESS -#define ADDR_READ addr_code -#define MMUSUFFIX _cmmu -#define URETSUFFIX USUFFIX -#define SRETSUFFIX glue(s, SUFFIX) -#else -#define ADDR_READ addr_read -#define MMUSUFFIX _mmu -#define URETSUFFIX USUFFIX -#define SRETSUFFIX glue(s, SUFFIX) + +static inline RES_TYPE +glue(glue(cpu_ld, USUFFIX), _code)(CPUArchState *env, target_ulong ptr) +{ + TCGMemOpIdx oi =3D make_memop_idx(MO_TE | SHIFT, CPU_MMU_INDEX); + return glue(glue(helper_ret_ld, USUFFIX), _cmmu)(env, ptr, oi, 0); +} + +#if DATA_SIZE <=3D 2 +static inline int +glue(glue(cpu_lds, SUFFIX), _code)(CPUArchState *env, target_ulong ptr) +{ + return (DATA_STYPE)glue(glue(cpu_ld, USUFFIX), _code)(env, ptr); +} #endif =20 -/* generic load/store macros */ +#else =20 static inline RES_TYPE glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, target_ulong ptr, uintptr_t retaddr) { - CPUTLBEntry *entry; - RES_TYPE res; - target_ulong addr; - int mmu_idx =3D CPU_MMU_INDEX; - MemOp op =3D MO_TE | SHIFT; -#if !defined(SOFTMMU_CODE_ACCESS) - uint16_t meminfo =3D trace_mem_get_info(op, mmu_idx, false); - trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); -#endif - - addr =3D ptr; - entry =3D tlb_entry(env, mmu_idx, addr); - if (unlikely(entry->ADDR_READ !=3D - (addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) { - TCGMemOpIdx oi =3D make_memop_idx(op, mmu_idx); - res =3D glue(glue(helper_ret_ld, URETSUFFIX), MMUSUFFIX)(env, addr, - oi, retaddr= ); - } else { - uintptr_t hostaddr =3D addr + entry->addend; - res =3D glue(glue(ld, USUFFIX), _p)((uint8_t *)hostaddr); - } -#ifndef SOFTMMU_CODE_ACCESS - qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); -#endif - return res; + return glue(glue(cpu_ld, USUFFIX), _mmuidx_ra)(env, ptr, CPU_MMU_INDEX, + retaddr); } =20 static inline RES_TYPE glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr) { - return glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(env, ptr, 0); + return glue(glue(cpu_ld, USUFFIX), _mmuidx_ra)(env, ptr, CPU_MMU_INDEX= , 0); } =20 #if DATA_SIZE <=3D 2 @@ -121,42 +98,17 @@ glue(glue(glue(cpu_lds, SUFFIX), MEMSUFFIX), _ra)(CPUA= rchState *env, target_ulong ptr, uintptr_t retaddr) { - CPUTLBEntry *entry; - int res; - target_ulong addr; - int mmu_idx =3D CPU_MMU_INDEX; - MemOp op =3D MO_TE | MO_SIGN | SHIFT; -#ifndef SOFTMMU_CODE_ACCESS - uint16_t meminfo =3D trace_mem_get_info(op, mmu_idx, false); - trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); -#endif - - addr =3D ptr; - entry =3D tlb_entry(env, mmu_idx, addr); - if (unlikely(entry->ADDR_READ !=3D - (addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) { - TCGMemOpIdx oi =3D make_memop_idx(op & ~MO_SIGN, mmu_idx); - res =3D (DATA_STYPE)glue(glue(helper_ret_ld, SRETSUFFIX), - MMUSUFFIX)(env, addr, oi, retaddr); - } else { - uintptr_t hostaddr =3D addr + entry->addend; - res =3D glue(glue(lds, SUFFIX), _p)((uint8_t *)hostaddr); - } -#ifndef SOFTMMU_CODE_ACCESS - qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); -#endif - return res; + return glue(glue(cpu_lds, SUFFIX), _mmuidx_ra)(env, ptr, CPU_MMU_INDEX, + retaddr); } =20 static inline int glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr) { - return glue(glue(glue(cpu_lds, SUFFIX), MEMSUFFIX), _ra)(env, ptr, 0); + return glue(glue(cpu_lds, SUFFIX), _mmuidx_ra)(env, ptr, CPU_MMU_INDEX= , 0); } #endif =20 -#ifndef SOFTMMU_CODE_ACCESS - /* generic store macro */ =20 static inline void @@ -164,36 +116,15 @@ glue(glue(glue(cpu_st, SUFFIX), MEMSUFFIX), _ra)(CPUA= rchState *env, target_ulong ptr, RES_TYPE v, uintptr_t ret= addr) { - CPUTLBEntry *entry; - target_ulong addr; - int mmu_idx =3D CPU_MMU_INDEX; - MemOp op =3D MO_TE | SHIFT; -#if !defined(SOFTMMU_CODE_ACCESS) - uint16_t meminfo =3D trace_mem_get_info(op, mmu_idx, true); - trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); -#endif - - addr =3D ptr; - entry =3D tlb_entry(env, mmu_idx, addr); - if (unlikely(tlb_addr_write(entry) !=3D - (addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) { - TCGMemOpIdx oi =3D make_memop_idx(op, mmu_idx); - glue(glue(helper_ret_st, SUFFIX), MMUSUFFIX)(env, addr, v, oi, - retaddr); - } else { - uintptr_t hostaddr =3D addr + entry->addend; - glue(glue(st, SUFFIX), _p)((uint8_t *)hostaddr, v); - } -#ifndef SOFTMMU_CODE_ACCESS - qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); -#endif + glue(glue(cpu_st, SUFFIX), _mmuidx_ra)(env, ptr, v, CPU_MMU_INDEX, + retaddr); } =20 static inline void glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr, RES_TYPE v) { - glue(glue(glue(cpu_st, SUFFIX), MEMSUFFIX), _ra)(env, ptr, v, 0); + glue(glue(cpu_st, SUFFIX), _mmuidx_ra)(env, ptr, v, CPU_MMU_INDEX, 0); } =20 #endif /* !SOFTMMU_CODE_ACCESS */ @@ -204,8 +135,4 @@ glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env= , target_ulong ptr, #undef SUFFIX #undef USUFFIX #undef DATA_SIZE -#undef MMUSUFFIX -#undef ADDR_READ -#undef URETSUFFIX -#undef SRETSUFFIX #undef SHIFT diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 98221948d6..ddd19718bf 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -34,6 +34,9 @@ #include "qemu/atomic.h" #include "qemu/atomic128.h" #include "translate-all.h" +#include "trace-root.h" +#include "qemu/plugin.h" +#include "trace/mem.h" #ifdef CONFIG_PLUGIN #include "qemu/plugin-memory.h" #endif @@ -1625,6 +1628,75 @@ tcg_target_ulong helper_be_ldsl_mmu(CPUArchState *en= v, target_ulong addr, return (int32_t)helper_be_ldul_mmu(env, addr, oi, retaddr); } =20 +/* + * Load helpers for cpu_ldst.h. + */ + +static inline uint64_t cpu_load_helper(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t retaddr, + MemOp op, FullLoadHelper *full_load) +{ + uint16_t meminfo; + TCGMemOpIdx oi; + uint64_t ret; + + meminfo =3D trace_mem_get_info(op, mmu_idx, false); + trace_guest_mem_before_exec(env_cpu(env), addr, meminfo); + + op &=3D ~MO_SIGN; + oi =3D make_memop_idx(op, mmu_idx); + ret =3D full_load(env, addr, oi, retaddr); + + qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, meminfo); + + return ret; +} + +uint32_t cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra) +{ + return cpu_load_helper(env, addr, mmu_idx, ra, MO_UB, full_ldub_mmu); +} + +int cpu_ldsb_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra) +{ + return (int8_t)cpu_load_helper(env, addr, mmu_idx, ra, MO_SB, + full_ldub_mmu); +} + +uint32_t cpu_lduw_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra) +{ + return cpu_load_helper(env, addr, mmu_idx, ra, MO_TEUW, + MO_TE =3D=3D MO_LE + ? full_le_lduw_mmu : full_be_lduw_mmu); +} + +int cpu_ldsw_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra) +{ + return (int16_t)cpu_load_helper(env, addr, mmu_idx, ra, MO_TESW, + MO_TE =3D=3D MO_LE + ? full_le_lduw_mmu : full_be_lduw_mmu); +} + +uint32_t cpu_ldl_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra) +{ + return cpu_load_helper(env, addr, mmu_idx, ra, MO_TEUL, + MO_TE =3D=3D MO_LE + ? full_le_ldul_mmu : full_be_ldul_mmu); +} + +uint64_t cpu_ldq_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra) +{ + return cpu_load_helper(env, addr, mmu_idx, ra, MO_TEQ, + MO_TE =3D=3D MO_LE + ? helper_le_ldq_mmu : helper_be_ldq_mmu); +} + /* * Store Helpers */ @@ -1854,6 +1926,50 @@ void helper_be_stq_mmu(CPUArchState *env, target_ulo= ng addr, uint64_t val, store_helper(env, addr, val, oi, retaddr, MO_BEQ); } =20 +/* + * Store Helpers for cpu_ldst.h + */ + +static inline void QEMU_ALWAYS_INLINE +cpu_store_helper(CPUArchState *env, target_ulong addr, uint64_t val, + int mmu_idx, uintptr_t retaddr, MemOp op) +{ + TCGMemOpIdx oi; + uint16_t meminfo; + + meminfo =3D trace_mem_get_info(op, mmu_idx, true); + trace_guest_mem_before_exec(env_cpu(env), addr, meminfo); + + oi =3D make_memop_idx(op, mmu_idx); + store_helper(env, addr, val, oi, retaddr, op); + + qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, meminfo); +} + +void cpu_stb_mmuidx_ra(CPUArchState *env, target_ulong addr, uint32_t val, + int mmu_idx, uintptr_t retaddr) +{ + cpu_store_helper(env, addr, val, mmu_idx, retaddr, MO_UB); +} + +void cpu_stw_mmuidx_ra(CPUArchState *env, target_ulong addr, uint32_t val, + int mmu_idx, uintptr_t retaddr) +{ + cpu_store_helper(env, addr, val, mmu_idx, retaddr, MO_TEUW); +} + +void cpu_stl_mmuidx_ra(CPUArchState *env, target_ulong addr, uint32_t val, + int mmu_idx, uintptr_t retaddr) +{ + cpu_store_helper(env, addr, val, mmu_idx, retaddr, MO_TEUL); +} + +void cpu_stq_mmuidx_ra(CPUArchState *env, target_ulong addr, uint64_t val, + int mmu_idx, uintptr_t retaddr) +{ + cpu_store_helper(env, addr, val, mmu_idx, retaddr, MO_TEQ); +} + /* First set of helpers allows passing in of OI and RETADDR. This makes them callable from other helpers. */ =20 --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455627; cv=none; d=zohomail.com; s=zohoarc; b=OvOWXy66FHM5qsV9wKaqG1ha9ebx4WjzJ6z6LLjMksWgK2k1tFAuEvKiF9ZaeYbGmRETG8Bq5Ks7jmyzoexxBGmNnyN5zIsN42zod4GT8J8prvxXU07U9d6gDLfQA+gxxj2/Aa3aWGVZqqxadKIq3TpOheSLpvfzn8GG+37ZbIQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455627; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=faAugBeokiD1YGU1Iv9nZEtzi4df+5lrosBg6LkytF4=; b=eWBpgwW6QI5/x6k4kJQdgrvIwHb/2z/Os0adSJBz/0UuzAk9uUjWVmte6tta4kh6W9eRW49yOnAX0kgE0ewNRjapqwhK0b2f9cGAIHZSGnXsX4TZCahaFeGVnFqOeeEQjqlzWNYQpwXmulbGybr5qhwOyRA7CSZUlhnVkLEGXz8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157845562707252.7884579567592; Tue, 7 Jan 2020 19:53:47 -0800 (PST) Received: from localhost ([::1]:35288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Ph-0005Xj-18 for importer@patchew.org; Tue, 07 Jan 2020 22:53:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49321) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Id-0004Ll-W6 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Ib-0003HX-NW for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:27 -0500 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]:46828) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Ib-0003Gk-HF for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:25 -0500 Received: by mail-pf1-x42c.google.com with SMTP id n9so886044pff.13 for ; Tue, 07 Jan 2020 19:46:25 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:23 -0800 (PST) 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=faAugBeokiD1YGU1Iv9nZEtzi4df+5lrosBg6LkytF4=; b=VA+UsOjFKlY61VQaDHsbZN9LSpBs1MmQFOLMGasuE53FaPgTjlxxIXJxjfjKvOGonT JmND89cf580Lf9eTSvzveBybwCnnuG0aO7Zc/Swt3cKmvP0L7riGSTv8Lgs/+U9OWNe3 aK5hcIRqIRcfP35fgnnizeG0pqMps9cfoG4gQsv1AtTBB9Q8r8hZp6+P2w8Bf+NIdkUr HZFIawlt5H9gZ1MXie9FYlwproVxPfoegooqIK1JFC3XWx7fjnspHYW90tGYf32mH5L6 5ZJNP7efPJwaHszxhbEv9IMYCk8U531lTXYPm++cUBby/m4xsfEPsCAb8dlpr7MUJGl9 BTBw== 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=faAugBeokiD1YGU1Iv9nZEtzi4df+5lrosBg6LkytF4=; b=pjsBPfz3e9s6CFGANdxzU4YodI2T9coP1FtvcllTkkdhFBcbdpIYYHC+eHr7m7bMsY yMiyng/9K6KPYWJW/xGormgSwxC3I0avdVUlUv3P47iVPERLWBteC5Xkru9rgFRiMGmE aU8YH8JH9o3NJrH9mMP1qRrJM+h2HfT9nmKKvKiP8mQG6HTJGZkwRO5iToSEQbaWy/+/ 3OB9v6D1+6B2eLwIC/23/lSOpb7W2MDfJJrr0SQZasxu2AgPqqVqXo/Vq95hUddHG7AS Ub1c7Z3hLLypYfgUCq5Y+AqJWDCHybO9+H9XVZ1YBcgVMmWHH1Vba6Y8rhRGaQ8iNXLD zo8w== X-Gm-Message-State: APjAAAV84sgfKOK7BbJao3hJax6jFWhSWYve+6U03F1McBky8lGdxL+2 rSyvNKDXcvi8GzOMET3uXt5ponX4KIzEgQ== X-Google-Smtp-Source: APXvYqyOrA9OPJd0cREdG6BKsOr8xOK8T2HQC0U25pfEA99x01SvrCVMTGfYHJSHnb5sh6vvCAqivw== X-Received: by 2002:a63:9d07:: with SMTP id i7mr3262741pgd.344.1578455184175; Tue, 07 Jan 2020 19:46:24 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 18/41] translator: Use cpu_ld*_code instead of open-coding Date: Wed, 8 Jan 2020 14:45:00 +1100 Message-Id: <20200108034523.17349-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::42c 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The DO_LOAD macros replicate the distinction already performed by the cpu_ldst.h functions. Use them. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- include/exec/cpu_ldst.h | 11 --------- include/exec/translator.h | 48 +++++++++++---------------------------- 2 files changed, 13 insertions(+), 46 deletions(-) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index cf8af36dbc..399ff6c3da 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -129,11 +129,6 @@ static inline void clear_helper_retaddr(void) #include "exec/cpu_ldst_useronly_template.h" #undef MEMSUFFIX =20 -/* - * Code access is deprecated in favour of translator_ld* functions - * (see translator.h). However there are still users that need to - * converted so for now these stay. - */ #define MEMSUFFIX _code #define CODE_ACCESS #define DATA_SIZE 1 @@ -455,12 +450,6 @@ void cpu_stq_mmuidx_ra(CPUArchState *env, abi_ptr addr= , uint64_t val, #undef CPU_MMU_INDEX #undef MEMSUFFIX =20 -/* - * Code access is deprecated in favour of translator_ld* functions - * (see translator.h). However there are still users that need to - * converted so for now these stay. - */ - #define CPU_MMU_INDEX (cpu_mmu_index(env, true)) #define MEMSUFFIX _code #define SOFTMMU_CODE_ACCESS diff --git a/include/exec/translator.h b/include/exec/translator.h index 459dd72aab..638e1529c5 100644 --- a/include/exec/translator.h +++ b/include/exec/translator.h @@ -148,41 +148,19 @@ void translator_loop_temp_check(DisasContextBase *db); /* * Translator Load Functions * - * These are intended to replace the old cpu_ld*_code functions and - * are mandatory for front-ends that have been migrated to the common - * translator_loop. These functions are only intended to be called - * from the translation stage and should not be called from helper - * functions. Those functions should be converted to encode the - * relevant information at translation time. + * These are intended to replace the direct usage of the cpu_ld*_code + * functions and are mandatory for front-ends that have been migrated + * to the common translator_loop. These functions are only intended + * to be called from the translation stage and should not be called + * from helper functions. Those functions should be converted to encode + * the relevant information at translation time. */ =20 -#ifdef CONFIG_USER_ONLY - -#define DO_LOAD(type, name, shift) \ - do { \ - set_helper_retaddr(1); \ - ret =3D name ## _p(g2h(pc)); \ - clear_helper_retaddr(); \ - } while (0) - -#else - -#define DO_LOAD(type, name, shift) \ - do { \ - int mmu_idx =3D cpu_mmu_index(env, true); \ - TCGMemOpIdx oi =3D make_memop_idx(shift, mmu_idx); \ - ret =3D helper_ret_ ## name ## _cmmu(env, pc, oi, 0); \ - } while (0) - -#endif - -#define GEN_TRANSLATOR_LD(fullname, name, type, shift, swap_fn) \ +#define GEN_TRANSLATOR_LD(fullname, type, load_fn, swap_fn) \ static inline type \ fullname ## _swap(CPUArchState *env, abi_ptr pc, bool do_swap) \ { \ - type ret; \ - DO_LOAD(type, name, shift); \ - \ + type ret =3D load_fn(env, pc); \ if (do_swap) { \ ret =3D swap_fn(ret); \ } \ @@ -195,11 +173,11 @@ void translator_loop_temp_check(DisasContextBase *db); return fullname ## _swap(env, pc, false); \ } =20 -GEN_TRANSLATOR_LD(translator_ldub, ldub, uint8_t, 0, /* no swap */ ) -GEN_TRANSLATOR_LD(translator_ldsw, ldsw, int16_t, 1, bswap16) -GEN_TRANSLATOR_LD(translator_lduw, lduw, uint16_t, 1, bswap16) -GEN_TRANSLATOR_LD(translator_ldl, ldl, uint32_t, 2, bswap32) -GEN_TRANSLATOR_LD(translator_ldq, ldq, uint64_t, 3, bswap64) +GEN_TRANSLATOR_LD(translator_ldub, uint8_t, cpu_ldub_code, /* no swap */) +GEN_TRANSLATOR_LD(translator_ldsw, int16_t, cpu_ldsw_code, bswap16) +GEN_TRANSLATOR_LD(translator_lduw, uint16_t, cpu_lduw_code, bswap16) +GEN_TRANSLATOR_LD(translator_ldl, uint32_t, cpu_ldl_code, bswap32) +GEN_TRANSLATOR_LD(translator_ldq, uint64_t, cpu_ldq_code, bswap64) #undef GEN_TRANSLATOR_LD =20 #endif /* EXEC__TRANSLATOR_H */ --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455914; cv=none; d=zohomail.com; s=zohoarc; b=UIn9sW/RSYDgleeAivpyvQ2lvUyA+g7LJ9OeHib/Q/gzvodIlLC87p7ToCO1BZ5djx81YbQVgBc3KdWX11zxdDEQXvW1/H4t7AqzELcnOTAkTLPS78FTr8gQLhFGPW1fMQA9DVtGBcUXE6cKBI4iFwLdRKlvYUmAaNdWvB3md8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455914; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cfMFnwoQZRNo8oRtznSSFsbjPoKtkh7p2L2908Wm83U=; b=AqbdnhAm/oC7y+2GhMVu1xXFW/jlgcO1+Ogy7+hKS9gMs5fwhj6PYK6kwY5C536KYCWsTuAIDqvXJgpchm8M2MkB5TScjZIuvrd4MNyXZyenOqinU6THjVAa39qjkL545wi71cfZZ/fIZiPU54MP6ppHp7Gpl/LTXLhqiOvvIe0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455914198249.01148348399465; Tue, 7 Jan 2020 19:58:34 -0800 (PST) Received: from localhost ([::1]:35400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2UK-0004Kw-H0 for importer@patchew.org; Tue, 07 Jan 2020 22:58:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49373) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Ih-0004Q8-Iy for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2If-0003Ko-BW for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:31 -0500 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:38262) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2If-0003Ji-2Y for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:29 -0500 Received: by mail-pf1-x442.google.com with SMTP id x185so908595pfc.5 for ; Tue, 07 Jan 2020 19:46:28 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:26 -0800 (PST) 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=cfMFnwoQZRNo8oRtznSSFsbjPoKtkh7p2L2908Wm83U=; b=hv0nYjjHLqrrysVHT8OZ/nWAN4PS6DGDBdM+s3wdw51T+AgpahLf+0TeRpt8gq5xah bMPHWUs3egelTLOonB/d3Apv+dFOfAdJh4+UwsTc6aVc76KCcmTNfyJ75Bgjk002yc02 kj0dWOwEblVU49B9x02CWF7/Dag+2RTwP6qVk3hTv8zQ2tY2IYJc6OtCwWtEzdpmtGgp fGE4QpN36IE0SnLTrh9elVg/AAS8TW0rsyTcLuZHI2acFBBqLHoplWablURVXUHQnOck umzdLI0SK4JGqvfXxJ+zhZRlE80KPoculuy8o6HhLtEW+fO34hd2I1v/Axn3XzKabDGw vYQw== 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=cfMFnwoQZRNo8oRtznSSFsbjPoKtkh7p2L2908Wm83U=; b=UYtAOsKvlZVO+UfUpk008hl/DpACILL5SB/wcsdeqbsvAat8rgol6BYqtv72l9Uz0t HnRAlAuaTWdIJbvQ5yDrE9z6KGxbN2z9vRZiloX7q38jLfjqr6IO/3PqJuX6YIum1n2w yvYiEtOOS3ee5KoY25cYFYrdqn8CwX2hbq52+s13FYMooG8fhCoz1ZIPTy1RqPu+cLtk H9TTI1WNWzibm+lv/1s6Cau2HvgDmHgDDbNApRw3U01MqFjEYH8OHzEu7DzFaHcqozZI oP4a1KOQ74EC/mraZiPM0WLPRp3qCbyAkJeGrSsJUmUfA77t4Gp4nfSgWAUk/lmTMLlf bKNg== X-Gm-Message-State: APjAAAVNg2YTWXJcyM0O6qjaaXYo6fgpYZaytaIlsUoQjqlsltaMjh39 3LAYaTBU9ApXuiyuhlNBurHhOctRg2HYoQ== X-Google-Smtp-Source: APXvYqyqDjm5p+pfCxzIW3e/lvnLSM9BI7l8MTUE/0HbZM4DtQJ0fK7mzpbd6RxHjFhfq1/ZILTYwA== X-Received: by 2002:a63:5211:: with SMTP id g17mr3223062pgb.426.1578455187152; Tue, 07 Jan 2020 19:46:27 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 19/41] cputlb: Rename helper_ret_ld*_cmmu to cpu_ld*_code Date: Wed, 8 Jan 2020 14:45:01 +1100 Message-Id: <20200108034523.17349-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::442 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: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) There are no uses of the *_cmmu names other than the bare wrapping within the *_code inlines. Therefore rename the functions so we can drop the inlines. Use abi_ptr instead of target_ulong in preparation for user-only; the two types are identical for softmmu. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic Signed-off-by: Richard Henderson --- include/exec/cpu_ldst.h | 29 ++++------ include/exec/cpu_ldst_template.h | 21 ------- tcg/tcg.h | 29 ---------- accel/tcg/cputlb.c | 94 ++++++++------------------------ docs/devel/loads-stores.rst | 4 +- 5 files changed, 36 insertions(+), 141 deletions(-) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 399ff6c3da..ef59ed61e4 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -450,25 +450,20 @@ void cpu_stq_mmuidx_ra(CPUArchState *env, abi_ptr add= r, uint64_t val, #undef CPU_MMU_INDEX #undef MEMSUFFIX =20 -#define CPU_MMU_INDEX (cpu_mmu_index(env, true)) -#define MEMSUFFIX _code -#define SOFTMMU_CODE_ACCESS +uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr); +uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr); +uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr); +uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr); =20 -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" +static inline int cpu_ldsb_code(CPUArchState *env, abi_ptr addr) +{ + return (int8_t)cpu_ldub_code(env, addr); +} =20 -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" - -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#undef SOFTMMU_CODE_ACCESS +static inline int cpu_ldsw_code(CPUArchState *env, abi_ptr addr) +{ + return (int16_t)cpu_lduw_code(env, addr); +} =20 #endif /* defined(CONFIG_USER_ONLY) */ =20 diff --git a/include/exec/cpu_ldst_template.h b/include/exec/cpu_ldst_templ= ate.h index ea39e29c19..e400979f23 100644 --- a/include/exec/cpu_ldst_template.h +++ b/include/exec/cpu_ldst_template.h @@ -58,25 +58,6 @@ =20 /* generic load/store macros */ =20 -#ifdef SOFTMMU_CODE_ACCESS - -static inline RES_TYPE -glue(glue(cpu_ld, USUFFIX), _code)(CPUArchState *env, target_ulong ptr) -{ - TCGMemOpIdx oi =3D make_memop_idx(MO_TE | SHIFT, CPU_MMU_INDEX); - return glue(glue(helper_ret_ld, USUFFIX), _cmmu)(env, ptr, oi, 0); -} - -#if DATA_SIZE <=3D 2 -static inline int -glue(glue(cpu_lds, SUFFIX), _code)(CPUArchState *env, target_ulong ptr) -{ - return (DATA_STYPE)glue(glue(cpu_ld, USUFFIX), _code)(env, ptr); -} -#endif - -#else - static inline RES_TYPE glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, target_ulong ptr, @@ -127,8 +108,6 @@ glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env= , target_ulong ptr, glue(glue(cpu_st, SUFFIX), _mmuidx_ra)(env, ptr, v, CPU_MMU_INDEX, 0); } =20 -#endif /* !SOFTMMU_CODE_ACCESS */ - #undef RES_TYPE #undef DATA_TYPE #undef DATA_STYPE diff --git a/tcg/tcg.h b/tcg/tcg.h index 92ca10dffc..3b4f79301c 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -1290,27 +1290,6 @@ void helper_be_stl_mmu(CPUArchState *env, target_ulo= ng addr, uint32_t val, void helper_be_stq_mmu(CPUArchState *env, target_ulong addr, uint64_t val, TCGMemOpIdx oi, uintptr_t retaddr); =20 -uint8_t helper_ret_ldub_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr); -int8_t helper_ret_ldsb_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr); -uint16_t helper_le_lduw_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr); -int16_t helper_le_ldsw_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr); -uint32_t helper_le_ldl_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr); -uint64_t helper_le_ldq_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr); -uint16_t helper_be_lduw_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr); -int16_t helper_be_ldsw_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr); -uint32_t helper_be_ldl_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr); -uint64_t helper_be_ldq_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr); - /* Temporary aliases until backends are converted. */ #ifdef TARGET_WORDS_BIGENDIAN # define helper_ret_ldsw_mmu helper_be_ldsw_mmu @@ -1322,10 +1301,6 @@ uint64_t helper_be_ldq_cmmu(CPUArchState *env, targe= t_ulong addr, # define helper_ret_stw_mmu helper_be_stw_mmu # define helper_ret_stl_mmu helper_be_stl_mmu # define helper_ret_stq_mmu helper_be_stq_mmu -# define helper_ret_lduw_cmmu helper_be_lduw_cmmu -# define helper_ret_ldsw_cmmu helper_be_ldsw_cmmu -# define helper_ret_ldl_cmmu helper_be_ldl_cmmu -# define helper_ret_ldq_cmmu helper_be_ldq_cmmu #else # define helper_ret_ldsw_mmu helper_le_ldsw_mmu # define helper_ret_lduw_mmu helper_le_lduw_mmu @@ -1336,10 +1311,6 @@ uint64_t helper_be_ldq_cmmu(CPUArchState *env, targe= t_ulong addr, # define helper_ret_stw_mmu helper_le_stw_mmu # define helper_ret_stl_mmu helper_le_stl_mmu # define helper_ret_stq_mmu helper_le_stq_mmu -# define helper_ret_lduw_cmmu helper_le_lduw_cmmu -# define helper_ret_ldsw_cmmu helper_le_ldsw_cmmu -# define helper_ret_ldl_cmmu helper_le_ldl_cmmu -# define helper_ret_ldq_cmmu helper_le_ldq_cmmu #endif =20 uint32_t helper_atomic_cmpxchgb_mmu(CPUArchState *env, target_ulong addr, diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index ddd19718bf..f0e4b0aee4 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2028,98 +2028,50 @@ void cpu_stq_mmuidx_ra(CPUArchState *env, target_ul= ong addr, uint64_t val, =20 /* Code access functions. */ =20 -static uint64_t full_ldub_cmmu(CPUArchState *env, target_ulong addr, +static uint64_t full_ldub_code(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi, uintptr_t retaddr) { - return load_helper(env, addr, oi, retaddr, MO_8, true, full_ldub_cmmu); + return load_helper(env, addr, oi, retaddr, MO_8, true, full_ldub_code); } =20 -uint8_t helper_ret_ldub_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) +uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr) { - return full_ldub_cmmu(env, addr, oi, retaddr); + TCGMemOpIdx oi =3D make_memop_idx(MO_UB, cpu_mmu_index(env, true)); + return full_ldub_code(env, addr, oi, 0); } =20 -int8_t helper_ret_ldsb_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) +static uint64_t full_lduw_code(CPUArchState *env, target_ulong addr, + TCGMemOpIdx oi, uintptr_t retaddr) { - return (int8_t) full_ldub_cmmu(env, addr, oi, retaddr); + return load_helper(env, addr, oi, retaddr, MO_TEUW, true, full_lduw_co= de); } =20 -static uint64_t full_le_lduw_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) +uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr) { - return load_helper(env, addr, oi, retaddr, MO_LEUW, true, - full_le_lduw_cmmu); + TCGMemOpIdx oi =3D make_memop_idx(MO_TEUW, cpu_mmu_index(env, true)); + return full_lduw_code(env, addr, oi, 0); } =20 -uint16_t helper_le_lduw_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) +static uint64_t full_ldl_code(CPUArchState *env, target_ulong addr, + TCGMemOpIdx oi, uintptr_t retaddr) { - return full_le_lduw_cmmu(env, addr, oi, retaddr); + return load_helper(env, addr, oi, retaddr, MO_TEUL, true, full_ldl_cod= e); } =20 -int16_t helper_le_ldsw_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) +uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr) { - return (int16_t) full_le_lduw_cmmu(env, addr, oi, retaddr); + TCGMemOpIdx oi =3D make_memop_idx(MO_TEUL, cpu_mmu_index(env, true)); + return full_ldl_code(env, addr, oi, 0); } =20 -static uint64_t full_be_lduw_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) +static uint64_t full_ldq_code(CPUArchState *env, target_ulong addr, + TCGMemOpIdx oi, uintptr_t retaddr) { - return load_helper(env, addr, oi, retaddr, MO_BEUW, true, - full_be_lduw_cmmu); + return load_helper(env, addr, oi, retaddr, MO_TEQ, true, full_ldq_code= ); } =20 -uint16_t helper_be_lduw_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) +uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr) { - return full_be_lduw_cmmu(env, addr, oi, retaddr); -} - -int16_t helper_be_ldsw_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) -{ - return (int16_t) full_be_lduw_cmmu(env, addr, oi, retaddr); -} - -static uint64_t full_le_ldul_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) -{ - return load_helper(env, addr, oi, retaddr, MO_LEUL, true, - full_le_ldul_cmmu); -} - -uint32_t helper_le_ldl_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) -{ - return full_le_ldul_cmmu(env, addr, oi, retaddr); -} - -static uint64_t full_be_ldul_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) -{ - return load_helper(env, addr, oi, retaddr, MO_BEUL, true, - full_be_ldul_cmmu); -} - -uint32_t helper_be_ldl_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) -{ - return full_be_ldul_cmmu(env, addr, oi, retaddr); -} - -uint64_t helper_le_ldq_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) -{ - return load_helper(env, addr, oi, retaddr, MO_LEQ, true, - helper_le_ldq_cmmu); -} - -uint64_t helper_be_ldq_cmmu(CPUArchState *env, target_ulong addr, - TCGMemOpIdx oi, uintptr_t retaddr) -{ - return load_helper(env, addr, oi, retaddr, MO_BEQ, true, - helper_be_ldq_cmmu); + TCGMemOpIdx oi =3D make_memop_idx(MO_TEQ, cpu_mmu_index(env, true)); + return full_ldq_code(env, addr, oi, 0); } diff --git a/docs/devel/loads-stores.rst b/docs/devel/loads-stores.rst index c74cd090e6..8a5bc912a5 100644 --- a/docs/devel/loads-stores.rst +++ b/docs/devel/loads-stores.rst @@ -171,8 +171,6 @@ more in line with the other memory access functions. =20 load: ``helper_{endian}_ld{sign}{size}_mmu(env, addr, opindex, retaddr)`` =20 -load (code): ``helper_{endian}_ld{sign}{size}_cmmu(env, addr, opindex, ret= addr)`` - store: ``helper_{endian}_st{size}_mmu(env, addr, val, opindex, retaddr)`` =20 ``sign`` @@ -192,7 +190,7 @@ store: ``helper_{endian}_st{size}_mmu(env, addr, val, o= pindex, retaddr)`` - ``ret`` : target endianness =20 Regexes for git grep - - ``\`` + - ``\`` - ``\`` =20 ``address_space_*`` --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455748; cv=none; d=zohomail.com; s=zohoarc; b=Fi9/KS6ujfYEZCjIcnZ82sgPDxdu3+5pWZ7QCFXocDB8Mjglai2Ce8xlbM+35qGH6zOhM/lwkJjyxz/MOKjlRBGTsrdPOlg7JndJZ+gfxHl5FK4svnDpLm2xUpvc74y5WbX/S2z5jPM8Gi7MRFJnFffJnKJvEJB/1LJlTIa55+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455748; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gEAlRH/6E/do1dPM1Y5Beo98Aszl0pfXxuarudYqYio=; b=OW2uhsKrq98DYfxEIoz8VfJ6SPi5eujKXO+YlzuHE3LTG0JweyrCgr5nwoJNBaFVXFEbwQ5bI/i3rKDiCc65Dm8+WxoNNDrCKw3/Lef2VLsftVgE+DDtTQrpkt8xfB55xeGY25x0ufaIWICtmohB/PP1RMkJqdODL06MyFqqncU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455748669254.5652519862266; Tue, 7 Jan 2020 19:55:48 -0800 (PST) Received: from localhost ([::1]:35330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Re-0000DH-SL for importer@patchew.org; Tue, 07 Jan 2020 22:55:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49423) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Ik-0004XV-Oj for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Ii-0003NC-4R for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:34 -0500 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]:35579) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Ih-0003MI-Sb for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:32 -0500 Received: by mail-pj1-x1042.google.com with SMTP id s7so478318pjc.0 for ; Tue, 07 Jan 2020 19:46:31 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:29 -0800 (PST) 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=gEAlRH/6E/do1dPM1Y5Beo98Aszl0pfXxuarudYqYio=; b=fC5Y6rMa534jjRKWcD5QhYMg38t/CfeFF7Rl0/O1/Ln5CJjhEgZ/r6bu12rQ1lpQDC /NkxyNwe68zV9QbiaT4gEoDurz8MxWYacm0bSCbkl0gSXlC/zFG13fH51/p3ulKhbxyH U2SnUhfc8oyN+JDwwol493OdKPtvq3rmIQnIbMghWyal06JN/axMf3R8IHJY/YK5mqSp RfVXKF8TF26X0/U/pSCycIjIajU3xxSagvYqyiNWxMnlDstvjE1RMt/muBACo8IOGTZq bSVreyCgB9G8LvOyxY336cNm3ZSvXLhHs8XkSaLcAOjqcKP7E5/ZpG3lI/3fzpILlLtF g+AA== 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=gEAlRH/6E/do1dPM1Y5Beo98Aszl0pfXxuarudYqYio=; b=j17hEdDQAn9XdxEhydUcs8Abx4MNdigGIrn3YO2C3rpr53CmFguxzFpndH1uFa57fr P+LjQnw1kp4k/TL0ZPAlMOCLkZ+mapO2MGfGoaLJOjWUvgCSUOwnYckGSdpfys04+qQj CP4CayjDwhsiHTV0YhAkDJuiJEGOaaTwBUbjnDS1dSzdCbyCtIX0cDpTBPpd0sS4mR5s 13wqCa5cTfzRTejt9Xi8ui6vkWV5DePfaG1cu8GSfpx1Tt2/a8E9VaSqIoTck+8vomNu TV3NIuK1Z3ivK/zBWnfgEVeF5wBUFblAA/2zRLnVdGqN7SnfqYmeoseXmVu+jT9+AMeT fXPA== X-Gm-Message-State: APjAAAUT2WpITFYPyRpK38A96BspwGs8SQsLYmea+Nk1oR4RoTs8/jFy qBdzfveBcMFINJkQyvEcJZIfYnPbNBunQQ== X-Google-Smtp-Source: APXvYqyXZqjCFy35TOypgqGLHIAOEZ/eAkJ9T3mkZqU86fQYQcoaiHQBWnkt+Lsn1VHLRzvF8Tsldw== X-Received: by 2002:a17:90a:6587:: with SMTP id k7mr2048821pjj.40.1578455190361; Tue, 07 Jan 2020 19:46:30 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 20/41] cputlb: Provide cpu_(ld,st}*_mmuidx_ra for user-only Date: Wed, 8 Jan 2020 14:45:02 +1100 Message-Id: <20200108034523.17349-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::1042 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This finishes the new interface began with the previous patch. Document the interface and deprecate MMU_MODE_SUFFIX. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- include/exec/cpu_ldst.h | 80 +++++++++++++- docs/devel/loads-stores.rst | 211 ++++++++++++++++++++++++++---------- 2 files changed, 230 insertions(+), 61 deletions(-) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index ef59ed61e4..41b98ba801 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -25,9 +25,13 @@ * * The syntax for the accessors is: * - * load: cpu_ld{sign}{size}_{mmusuffix}(env, ptr) + * load: cpu_ld{sign}{size}_{mmusuffix}(env, ptr) + * cpu_ld{sign}{size}_{mmusuffix}_ra(env, ptr, retaddr) + * cpu_ld{sign}{size}_mmuidx_ra(env, ptr, mmu_idx, retaddr) * - * store: cpu_st{sign}{size}_{mmusuffix}(env, ptr, val) + * store: cpu_st{size}_{mmusuffix}(env, ptr, val) + * cpu_st{size}_{mmusuffix}_ra(env, ptr, val, retaddr) + * cpu_st{size}_mmuidx_ra(env, ptr, val, mmu_idx, retaddr) * * sign is: * (empty): for 32 and 64 bit sizes @@ -40,9 +44,10 @@ * l: 32 bits * q: 64 bits * - * mmusuffix is one of the generic suffixes "data" or "code", or - * (for softmmu configs) a target-specific MMU mode suffix as defined - * in target cpu.h. + * mmusuffix is one of the generic suffixes "data" or "code", or "mmuidx". + * The "mmuidx" suffix carries an extra mmu_idx argument that specifies + * the index to use; the "data" and "code" suffixes take the index from + * cpu_mmu_index(). */ #ifndef CPU_LDST_H #define CPU_LDST_H @@ -145,6 +150,71 @@ static inline void clear_helper_retaddr(void) #undef MEMSUFFIX #undef CODE_ACCESS =20 +/* + * Provide the same *_mmuidx_ra interface as for softmmu. + * The mmu_idx argument is ignored. + */ + +static inline uint32_t cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra) +{ + return cpu_ldub_data_ra(env, addr, ra); +} + +static inline uint32_t cpu_lduw_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra) +{ + return cpu_lduw_data_ra(env, addr, ra); +} + +static inline uint32_t cpu_ldl_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra) +{ + return cpu_ldl_data_ra(env, addr, ra); +} + +static inline uint64_t cpu_ldq_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra) +{ + return cpu_ldq_data_ra(env, addr, ra); +} + +static inline int cpu_ldsb_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra) +{ + return cpu_ldsb_data_ra(env, addr, ra); +} + +static inline int cpu_ldsw_mmuidx_ra(CPUArchState *env, abi_ptr addr, + int mmu_idx, uintptr_t ra) +{ + return cpu_ldsw_data_ra(env, addr, ra); +} + +static inline void cpu_stb_mmuidx_ra(CPUArchState *env, abi_ptr addr, + uint32_t val, int mmu_idx, uintptr_t = ra) +{ + cpu_stb_data_ra(env, addr, val, ra); +} + +static inline void cpu_stw_mmuidx_ra(CPUArchState *env, abi_ptr addr, + uint32_t val, int mmu_idx, uintptr_t = ra) +{ + cpu_stw_data_ra(env, addr, val, ra); +} + +static inline void cpu_stl_mmuidx_ra(CPUArchState *env, abi_ptr addr, + uint32_t val, int mmu_idx, uintptr_t = ra) +{ + cpu_stl_data_ra(env, addr, val, ra); +} + +static inline void cpu_stq_mmuidx_ra(CPUArchState *env, abi_ptr addr, + uint64_t val, int mmu_idx, uintptr_t = ra) +{ + cpu_stq_data_ra(env, addr, val, ra); +} + #else =20 /* Needed for TCG_OVERSIZED_GUEST */ diff --git a/docs/devel/loads-stores.rst b/docs/devel/loads-stores.rst index 8a5bc912a5..03aa9e7ff8 100644 --- a/docs/devel/loads-stores.rst +++ b/docs/devel/loads-stores.rst @@ -72,31 +72,34 @@ Regexes for git grep - ``\`` - ``\`` =20 -``cpu_{ld,st}_*`` -~~~~~~~~~~~~~~~~~ +``cpu_{ld,st}*_mmuidx_ra`` +~~~~~~~~~~~~~~~~~~~~~~~~~~ =20 -These functions operate on a guest virtual address. Be aware -that these functions may cause a guest CPU exception to be -taken (e.g. for an alignment fault or MMU fault) which will -result in guest CPU state being updated and control longjumping -out of the function call. They should therefore only be used -in code that is implementing emulation of the target CPU. +These functions operate on a guest virtual address plus a context, +known as a "mmu index" or ``mmuidx``, which controls how that virtual +address is translated. The meaning of the indexes are target specific, +but specifying a particular index might be necessary if, for instance, +the helper requires an "always as non-privileged" access rather that +the default access for the current state of the guest CPU. =20 -These functions may throw an exception (longjmp() back out -to the top level TCG loop). This means they must only be used -from helper functions where the translator has saved all -necessary CPU state before generating the helper function call. -It's usually better to use the ``_ra`` variants described below -from helper functions, but these functions are the right choice -for calls made from hooks like the CPU do_interrupt hook or -when you know for certain that the translator had to save all -the CPU state that ``cpu_restore_state()`` would restore anyway. +These functions may cause a guest CPU exception to be taken +(e.g. for an alignment fault or MMU fault) which will result in +guest CPU state being updated and control longjmp'ing out of the +function call. They should therefore only be used in code that is +implementing emulation of the guest CPU. + +The ``retaddr`` parameter is used to control unwinding of the +guest CPU state in case of a guest CPU exception. This is passed +to ``cpu_restore_state()``. Therefore the value should either be 0, +to indicate that the guest CPU state is already synchronized, or +the result of ``GETPC()`` from the top level ``HELPER(foo)`` +function, which is a return address into the generated code. =20 Function names follow the pattern: =20 -load: ``cpu_ld{sign}{size}_{mmusuffix}(env, ptr)`` +load: ``cpu_ld{sign}{size}_mmuidx_ra(env, ptr, mmuidx, retaddr)`` =20 -store: ``cpu_st{size}_{mmusuffix}(env, ptr, val)`` +store: ``cpu_st{size}_mmuidx_ra(env, ptr, val, mmuidx, retaddr)`` =20 ``sign`` - (empty) : for 32 or 64 bit sizes @@ -109,56 +112,151 @@ store: ``cpu_st{size}_{mmusuffix}(env, ptr, val)`` - ``l`` : 32 bits - ``q`` : 64 bits =20 -``mmusuffix`` is one of the generic suffixes ``data`` or ``code``, or -(for softmmu configs) a target-specific MMU mode suffix as defined -in the target's ``cpu.h``. +Regexes for git grep: + - ``\`` + - ``\`` =20 -Regexes for git grep - - ``\`` - - ``\`` +``cpu_{ld,st}*_data_ra`` +~~~~~~~~~~~~~~~~~~~~~~~~ =20 -``cpu_{ld,st}_*_ra`` -~~~~~~~~~~~~~~~~~~~~ - -These functions work like the ``cpu_{ld,st}_*`` functions except -that they also take a ``retaddr`` argument. This extra argument -allows for correct unwinding of any exception that is taken, -and should generally be the result of GETPC() called directly -from the top level HELPER(foo) function (i.e. the return address -in the generated code). +These functions work like the ``cpu_{ld,st}_mmuidx_ra`` functions +except that the ``mmuidx`` parameter is taken from the current mode +of the guest CPU, as determined by ``cpu_mmu_index(env, false)``. =20 These are generally the preferred way to do accesses by guest -virtual address from helper functions; see the documentation -of the non-``_ra`` variants for when those would be better. - -Calling these functions with a ``retaddr`` argument of 0 is -equivalent to calling the non-``_ra`` version of the function. +virtual address from helper functions, unless the access should +be performed with a context other than the default. =20 Function names follow the pattern: =20 -load: ``cpu_ld{sign}{size}_{mmusuffix}_ra(env, ptr, retaddr)`` +load: ``cpu_ld{sign}{size}_data_ra(env, ptr, ra)`` =20 -store: ``cpu_st{sign}{size}_{mmusuffix}_ra(env, ptr, val, retaddr)`` +store: ``cpu_st{size}_data_ra(env, ptr, val, ra)`` + +``sign`` + - (empty) : for 32 or 64 bit sizes + - ``u`` : unsigned + - ``s`` : signed + +``size`` + - ``b`` : 8 bits + - ``w`` : 16 bits + - ``l`` : 32 bits + - ``q`` : 64 bits + +Regexes for git grep: + - ``\`` + - ``\`` + +``cpu_{ld,st}*_data`` +~~~~~~~~~~~~~~~~~~~~~ + +These functions work like the ``cpu_{ld,st}_data_ra`` functions +except that the ``retaddr`` parameter is 0, and thus does not +unwind guest CPU state. + +This means they must only be used from helper functions where the +translator has saved all necessary CPU state. These functions are +the right choice for calls made from hooks like the CPU ``do_interrupt`` +hook or when you know for certain that the translator had to save all +the CPU state anyway. + +Function names follow the pattern: + +load: ``cpu_ld{sign}{size}_data(env, ptr)`` + +store: ``cpu_st{size}_data(env, ptr, val)`` + +``sign`` + - (empty) : for 32 or 64 bit sizes + - ``u`` : unsigned + - ``s`` : signed + +``size`` + - ``b`` : 8 bits + - ``w`` : 16 bits + - ``l`` : 32 bits + - ``q`` : 64 bits =20 Regexes for git grep - - ``\`` - - ``\`` + - ``\`` + - ``\`` =20 -``helper_*_{ld,st}*mmu`` -~~~~~~~~~~~~~~~~~~~~~~~~ +``cpu_ld*_code`` +~~~~~~~~~~~~~~~~ + +These functions perform a read for instruction execution. The ``mmuidx`` +parameter is taken from the current mode of the guest CPU, as determined +by ``cpu_mmu_index(env, true)``. The ``retaddr`` parameter is 0, and +thus does not unwind guest CPU state, because CPU state is always +synchronized while translating instructions. Any guest CPU exception +that is raised will indicate an instruction execution fault rather than +a data read fault. + +In general these functions should not be used directly during translation. +There are wrapper functions that are to be used which also take care of +plugins for tracing. + +Function names follow the pattern: + +load: ``cpu_ld{sign}{size}_code(env, ptr)`` + +``sign`` + - (empty) : for 32 or 64 bit sizes + - ``u`` : unsigned + - ``s`` : signed + +``size`` + - ``b`` : 8 bits + - ``w`` : 16 bits + - ``l`` : 32 bits + - ``q`` : 64 bits + +Regexes for git grep: + - ``\`` + +``translator_ld*`` +~~~~~~~~~~~~~~~~~~ + +These functions are a wrapper for ``cpu_ld*_code`` which also perform +any actions required by any tracing plugins. They are only to be +called during the translator callback ``translate_insn``. + +There is a set of functions ending in ``_swap`` which, if the parameter +is true, returns the value in the endianness that is the reverse of +the guest native endianness, as determined by ``TARGET_WORDS_BIGENDIAN``. + +Function names follow the pattern: + +load: ``translator_ld{sign}{size}(env, ptr)`` + +swap: ``translator_ld{sign}{size}_swap(env, ptr, swap)`` + +``sign`` + - (empty) : for 32 or 64 bit sizes + - ``u`` : unsigned + - ``s`` : signed + +``size`` + - ``b`` : 8 bits + - ``w`` : 16 bits + - ``l`` : 32 bits + - ``q`` : 64 bits + +Regexes for git grep + - ``\`` + +``helper_*_{ld,st}*_mmu`` +~~~~~~~~~~~~~~~~~~~~~~~~~ =20 These functions are intended primarily to be called by the code generated by the TCG backend. They may also be called by target -CPU helper function code. Like the ``cpu_{ld,st}_*_ra`` functions -they perform accesses by guest virtual address; the difference is -that these functions allow you to specify an ``opindex`` parameter -which encodes (among other things) the mmu index to use for the -access. This is necessary if your helper needs to make an access -via a specific mmu index (for instance, an "always as non-privileged" -access) rather than using the default mmu index for the current state -of the guest CPU. +CPU helper function code. Like the ``cpu_{ld,st}_mmuidx_ra`` functions +they perform accesses by guest virtual address, with a given ``mmuidx``. =20 -The ``opindex`` parameter should be created by calling ``make_memop_idx()`= `. +These functions specify an ``opindex`` parameter which encodes +(among other things) the mmu index to use for the access. This parameter +should be created by calling ``make_memop_idx()``. =20 The ``retaddr`` parameter should be the result of GETPC() called directly from the top level HELPER(foo) function (or 0 if no guest CPU state @@ -166,8 +264,9 @@ unwinding is required). =20 **TODO** The names of these functions are a bit odd for historical reasons because they were originally expected to be called only from -within generated code. We should rename them to bring them -more in line with the other memory access functions. +within generated code. We should rename them to bring them more in +line with the other memory access functions. The explicit endianness +is the only feature they have beyond ``*_mmuidx_ra``. =20 load: ``helper_{endian}_ld{sign}{size}_mmu(env, addr, opindex, retaddr)`` =20 --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456652; cv=none; d=zohomail.com; s=zohoarc; b=ezpk+jlaLBFwju3pipDUvMnvTnZEHMWJENResOGR1fntAnNmuL963mMV8sueV3QnKGI9FdPKNjQwE0egRFLD0MuRTlGuHv0Zfg236JB8aFuN7eM8MDgIbk5SnDPtYTuSaCLSLs3fLcB1cHKwZvnLUhqCi3lRzR+U2qOXTeiCEUs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456652; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UNrK4ZquBPwuG+9pKKZp2KPV+Uf9shFIJ31MhFoEhsY=; b=KQNEN2hiSSi0iAvGVIKln8xOv5YOE8vm7Mvlor2GkVAyFrS9x5hul7PDpOuMjjm+YM8rl0lf3upAxYelRtDFnjsraQlwCK6MixP+5I/Wn74pOSkTXbWzrexLjCqBksVHnNO1phh7q6fxCPudNClYiShL+2b8twtZVE1/8TMrt2o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456652507648.0537436308093; Tue, 7 Jan 2020 20:10:52 -0800 (PST) Received: from localhost ([::1]:35724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2gF-0006Ez-CV for importer@patchew.org; Tue, 07 Jan 2020 23:10:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49460) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Im-0004ai-Ig for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Il-0003QK-5O for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:36 -0500 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:45074) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Ik-0003Or-TD for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:35 -0500 Received: by mail-pg1-x536.google.com with SMTP id b9so851831pgk.12 for ; Tue, 07 Jan 2020 19:46:34 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:33 -0800 (PST) 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=UNrK4ZquBPwuG+9pKKZp2KPV+Uf9shFIJ31MhFoEhsY=; b=nzc7aLYXFi7mkTuqyvsQf9GXdE71CREQsWnW0Y0SjrxrtHJCPpk/cBpfkUNRwHHlso luOIxjxbnOOrZXqFQ0fTVhHpkkvdViD+8GJPOn1+Ci+P16yaYZ1UMr0Gr1Vw/xEd5yP7 H4wq+t1RcHJB6pc/qgFBHAC85FKoW84wzsEazgL3ku3cGK8mV6cDSG7o9m3hG9F+wTjS 9vaR9TikYpW0sGm4TP80quW/c9VONVgqLKtUTWZqXC82lw9cJSbYa+4o4K683C4iWYOy iteOIYazzswl4oVVkJGHJfJJ6IRF3LC+vgBXLd3xAXIMisunVG3dagHLIbQ9G0/CzYJN Jc8A== 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=UNrK4ZquBPwuG+9pKKZp2KPV+Uf9shFIJ31MhFoEhsY=; b=AihvJicWOJRVgdpDAied1sktue55d4wcHLkfrd8A66kOa6yN/k9HQFUf2VWa9PIeCi sWDzCOl2YBtK2Qpv5GmRSFs8b+OUOcMOQZElSzn502fZMnc2QZ4cM2+a/6mtLolvD+4Q wr7/FV2EkxFTyJnl+//vRNdtXZj1PFF6CBcb7/DtVURmdrtMzhXEYmqvvkA0inUrfST3 6eLQJUkIYAB8iMPzDeq3V0/Iz/+wImVe1Rmb+3RUZEgfF1MietUvDUsKkUIQW4/jVun1 0AG1HyDYH7r4owGSRNKu6T8YRQlvIVBEzCiLjYbf2u0deI1dFAB79VJAm7OLKLs+B3vf R1gQ== X-Gm-Message-State: APjAAAV1Cyl8E4LhXyZgW/HUQb0vi7empjPP1KHACDGXAf9XnpHVPMza ZRlxFlNtdgcbvJrkUFWiNy3IKbnvkWwemg== X-Google-Smtp-Source: APXvYqy39oA8xd7SPOMQMWt5M7e1Ka/KwZX+8mi8Msyko7VOoZASHpBJHCkIeV4VuRTWSTvDxOnM9Q== X-Received: by 2002:a62:62c4:: with SMTP id w187mr2943240pfb.216.1578455193742; Tue, 07 Jan 2020 19:46:33 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 21/41] target/i386: Use cpu_*_mmuidx_ra instead of templates Date: Wed, 8 Jan 2020 14:45:03 +1100 Message-Id: <20200108034523.17349-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::536 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Do not use exec/cpu_ldst_{,useronly_}template.h directly, but instead use the functional interface. Cc: Eduardo Habkost Tested-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/i386/seg_helper.c | 56 ++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/target/i386/seg_helper.c b/target/i386/seg_helper.c index 87a627f9dc..b96de068ca 100644 --- a/target/i386/seg_helper.c +++ b/target/i386/seg_helper.c @@ -37,37 +37,37 @@ # define LOG_PCALL_STATE(cpu) do { } while (0) #endif =20 -#ifdef CONFIG_USER_ONLY -#define MEMSUFFIX _kernel -#define DATA_SIZE 1 -#include "exec/cpu_ldst_useronly_template.h" +/* + * TODO: Convert callers to compute cpu_mmu_index_kernel once + * and use *_mmuidx_ra directly. + */ +#define cpu_ldub_kernel_ra(e, p, r) \ + cpu_ldub_mmuidx_ra(e, p, cpu_mmu_index_kernel(e), r) +#define cpu_lduw_kernel_ra(e, p, r) \ + cpu_lduw_mmuidx_ra(e, p, cpu_mmu_index_kernel(e), r) +#define cpu_ldl_kernel_ra(e, p, r) \ + cpu_ldl_mmuidx_ra(e, p, cpu_mmu_index_kernel(e), r) +#define cpu_ldq_kernel_ra(e, p, r) \ + cpu_ldq_mmuidx_ra(e, p, cpu_mmu_index_kernel(e), r) =20 -#define DATA_SIZE 2 -#include "exec/cpu_ldst_useronly_template.h" +#define cpu_stb_kernel_ra(e, p, v, r) \ + cpu_stb_mmuidx_ra(e, p, v, cpu_mmu_index_kernel(e), r) +#define cpu_stw_kernel_ra(e, p, v, r) \ + cpu_stw_mmuidx_ra(e, p, v, cpu_mmu_index_kernel(e), r) +#define cpu_stl_kernel_ra(e, p, v, r) \ + cpu_stl_mmuidx_ra(e, p, v, cpu_mmu_index_kernel(e), r) +#define cpu_stq_kernel_ra(e, p, v, r) \ + cpu_stq_mmuidx_ra(e, p, v, cpu_mmu_index_kernel(e), r) =20 -#define DATA_SIZE 4 -#include "exec/cpu_ldst_useronly_template.h" +#define cpu_ldub_kernel(e, p) cpu_ldub_kernel_ra(e, p, 0) +#define cpu_lduw_kernel(e, p) cpu_lduw_kernel_ra(e, p, 0) +#define cpu_ldl_kernel(e, p) cpu_ldl_kernel_ra(e, p, 0) +#define cpu_ldq_kernel(e, p) cpu_ldq_kernel_ra(e, p, 0) =20 -#define DATA_SIZE 8 -#include "exec/cpu_ldst_useronly_template.h" -#undef MEMSUFFIX -#else -#define CPU_MMU_INDEX (cpu_mmu_index_kernel(env)) -#define MEMSUFFIX _kernel -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif +#define cpu_stb_kernel(e, p, v) cpu_stb_kernel_ra(e, p, v, 0) +#define cpu_stw_kernel(e, p, v) cpu_stw_kernel_ra(e, p, v, 0) +#define cpu_stl_kernel(e, p, v) cpu_stl_kernel_ra(e, p, v, 0) +#define cpu_stq_kernel(e, p, v) cpu_stq_kernel_ra(e, p, v, 0) =20 /* return non zero if error */ static inline int load_segment_ra(CPUX86State *env, uint32_t *e1_ptr, --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456743; cv=none; d=zohomail.com; s=zohoarc; b=gOmyz4OFsRsJ6i9qXWHMwC6ugryBeECDAuwF3mGLKyktYeSR33KHVgKNpjWbpoL7lBfftuASpkiBywHwbBXm7yVwfGePCAF+YyTVtXn/iamSMjAREGeueH2Y9fpTJZQd85/P4+2zT7hqu29bEyYT3143pxHEQv2zsXjutkW/XRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456743; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zc75EjE8w8RVB6gBDV3zhh7cLhbg3IDqBzTdm5jMpgw=; b=Cf13dleV2HW6AdLKhGHXeb4sZ+vtZbeMukJM3wHSKfKK5puOIFXkVASUweWJ7zwdpuTnG1/PJ13v2MkbthpR/oTEmn4XIKbkGJWXfng1b393LgT6pWIISiy/F4gkyuRNdZ4Bs/q5RxWVq6AcpDaGuAVwoSp2nRubc8zv0C9OC+0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456743759692.8639242835326; Tue, 7 Jan 2020 20:12:23 -0800 (PST) Received: from localhost ([::1]:35748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2hi-0007wn-8n for importer@patchew.org; Tue, 07 Jan 2020 23:12:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49559) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Ir-0004gI-NU for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Ip-0003UJ-71 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:41 -0500 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:51226) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Io-0003ST-TG for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:39 -0500 Received: by mail-pj1-x1033.google.com with SMTP id j11so466325pjs.1 for ; Tue, 07 Jan 2020 19:46:38 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:36 -0800 (PST) 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=zc75EjE8w8RVB6gBDV3zhh7cLhbg3IDqBzTdm5jMpgw=; b=amlU88bcUdXwao84i0GyHTJ96561A2uYSYvetUaFpYlqEFM6/YVM4HNd7Gg48RtWt2 6RglW6s8zbaJtwzDlpF/gxNGOitC4pPgpkbrYhiuV6khtlu1gWeUghJpVfVUpKYG4Cnh jnA+dyGJPkZ6MGB/eFZy2L3ippTDtA7B6Lk9UN037YIk2ahlMsHZly8+vd3wUu+a0oVd 8MZk1pICMcnkghyrEmpwns6+mXuGn/ch7+r0cQaSmG+WvoIZvyWHpf74Rdu+QzRHKHFX 14HxDM+2g00lXRoJpBaM+gZcHoeT1M8d70MHGTWipfNq7tQtdpqZeJnbduFVqVoBttkW E4Zw== 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=zc75EjE8w8RVB6gBDV3zhh7cLhbg3IDqBzTdm5jMpgw=; b=HmoeUQrn+AQmODkMu6akush9fLbKu+MNa9iNZF5ABYmDdsfjVKiLFjsJXyEyE5nuBg IJh56AKyReLHVrm46JLLtp+tQzHFzWlyCJBMVGDryHnVBo2/UPDAdGOab0APx6HNBXtd tnwuP0SmCICU/BQNqJZl4Ui2CG0KeE6UvOQvbw9wK3TZku8R8t6bc/uqYGTEbWg1p3yp xvij6+XRhYKMIyqqT5F8lxNvm9egf5B9GUPxSRxR7iZjHcDtfNgLHClhkiDNOE5SPu6K bC53DxJGg/H/24+kfp3d5EjfP1wgBr9fEhlkQFaMtSL6s0vNykCAewfm5L6oNK9G5+OS IAaQ== X-Gm-Message-State: APjAAAUe1aKGDGV1wl1CeJphp3FkRUN9olrUocOI5GBjxDUXIzQmxEe4 fR67TYjyYAIa7wg58Xu2Vid0oZGogK28dw== X-Google-Smtp-Source: APXvYqzgPCqZiS6tFNONmw7EvvcRzDtTGNLIMJmRACKeQOzzQukptOn7uB88/CRjtqaT7AyKuhQS7w== X-Received: by 2002:a17:90b:1110:: with SMTP id gi16mr2064114pjb.110.1578455196690; Tue, 07 Jan 2020 19:46:36 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 22/41] cputlb: Expand cpu_ldst_useronly_template.h in user-exec.c Date: Wed, 8 Jan 2020 14:45:04 +1100 Message-Id: <20200108034523.17349-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::1033 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) With the tracing hooks, the inline functions are no longer so simple. Reduce the amount of preprocessor obfuscation by expanding the text of each of the functions generated. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- include/exec/cpu_ldst.h | 54 +++-- include/exec/cpu_ldst_useronly_template.h | 159 --------------- accel/tcg/user-exec.c | 236 ++++++++++++++++++++++ 3 files changed, 262 insertions(+), 187 deletions(-) delete mode 100644 include/exec/cpu_ldst_useronly_template.h diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 41b98ba801..0f3c49a005 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -120,35 +120,33 @@ static inline void clear_helper_retaddr(void) =20 /* In user-only mode we provide only the _code and _data accessors. */ =20 -#define MEMSUFFIX _data -#define DATA_SIZE 1 -#include "exec/cpu_ldst_useronly_template.h" +uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr); +uint32_t cpu_lduw_data(CPUArchState *env, abi_ptr ptr); +uint32_t cpu_ldl_data(CPUArchState *env, abi_ptr ptr); +uint64_t cpu_ldq_data(CPUArchState *env, abi_ptr ptr); +int cpu_ldsb_data(CPUArchState *env, abi_ptr ptr); +int cpu_ldsw_data(CPUArchState *env, abi_ptr ptr); =20 -#define DATA_SIZE 2 -#include "exec/cpu_ldst_useronly_template.h" +uint32_t cpu_ldub_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retadd= r); +uint32_t cpu_lduw_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retadd= r); +uint32_t cpu_ldl_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr= ); +uint64_t cpu_ldq_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr= ); +int cpu_ldsb_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr); +int cpu_ldsw_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr); =20 -#define DATA_SIZE 4 -#include "exec/cpu_ldst_useronly_template.h" +void cpu_stb_data(CPUArchState *env, abi_ptr ptr, uint32_t val); +void cpu_stw_data(CPUArchState *env, abi_ptr ptr, uint32_t val); +void cpu_stl_data(CPUArchState *env, abi_ptr ptr, uint32_t val); +void cpu_stq_data(CPUArchState *env, abi_ptr ptr, uint64_t val); =20 -#define DATA_SIZE 8 -#include "exec/cpu_ldst_useronly_template.h" -#undef MEMSUFFIX - -#define MEMSUFFIX _code -#define CODE_ACCESS -#define DATA_SIZE 1 -#include "exec/cpu_ldst_useronly_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_useronly_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_useronly_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_useronly_template.h" -#undef MEMSUFFIX -#undef CODE_ACCESS +void cpu_stb_data_ra(CPUArchState *env, abi_ptr ptr, + uint32_t val, uintptr_t retaddr); +void cpu_stw_data_ra(CPUArchState *env, abi_ptr ptr, + uint32_t val, uintptr_t retaddr); +void cpu_stl_data_ra(CPUArchState *env, abi_ptr ptr, + uint32_t val, uintptr_t retaddr); +void cpu_stq_data_ra(CPUArchState *env, abi_ptr ptr, + uint64_t val, uintptr_t retaddr); =20 /* * Provide the same *_mmuidx_ra interface as for softmmu. @@ -520,6 +518,8 @@ void cpu_stq_mmuidx_ra(CPUArchState *env, abi_ptr addr,= uint64_t val, #undef CPU_MMU_INDEX #undef MEMSUFFIX =20 +#endif /* defined(CONFIG_USER_ONLY) */ + uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr); uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr); uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr); @@ -535,8 +535,6 @@ static inline int cpu_ldsw_code(CPUArchState *env, abi_= ptr addr) return (int16_t)cpu_lduw_code(env, addr); } =20 -#endif /* defined(CONFIG_USER_ONLY) */ - /** * tlb_vaddr_to_host: * @env: CPUArchState diff --git a/include/exec/cpu_ldst_useronly_template.h b/include/exec/cpu_l= dst_useronly_template.h deleted file mode 100644 index e5a3d1983a..0000000000 --- a/include/exec/cpu_ldst_useronly_template.h +++ /dev/null @@ -1,159 +0,0 @@ -/* - * User-only accessor function support - * - * Generate inline load/store functions for one data size. - * - * Generate a store function as well as signed and unsigned loads. - * - * Not used directly but included from cpu_ldst.h. - * - * Copyright (c) 2015 Linaro Limited - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ - -#if !defined(CODE_ACCESS) -#include "trace-root.h" -#endif - -#include "trace/mem.h" - -#if DATA_SIZE =3D=3D 8 -#define SUFFIX q -#define USUFFIX q -#define DATA_TYPE uint64_t -#define SHIFT 3 -#elif DATA_SIZE =3D=3D 4 -#define SUFFIX l -#define USUFFIX l -#define DATA_TYPE uint32_t -#define SHIFT 2 -#elif DATA_SIZE =3D=3D 2 -#define SUFFIX w -#define USUFFIX uw -#define DATA_TYPE uint16_t -#define DATA_STYPE int16_t -#define SHIFT 1 -#elif DATA_SIZE =3D=3D 1 -#define SUFFIX b -#define USUFFIX ub -#define DATA_TYPE uint8_t -#define DATA_STYPE int8_t -#define SHIFT 0 -#else -#error unsupported data size -#endif - -#if DATA_SIZE =3D=3D 8 -#define RES_TYPE uint64_t -#else -#define RES_TYPE uint32_t -#endif - -static inline RES_TYPE -glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr) -{ - RES_TYPE ret; -#ifdef CODE_ACCESS - set_helper_retaddr(1); - ret =3D glue(glue(ld, USUFFIX), _p)(g2h(ptr)); - clear_helper_retaddr(); -#else - MemOp op =3D MO_TE | SHIFT; - uint16_t meminfo =3D trace_mem_get_info(op, MMU_USER_IDX, false); - trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); - ret =3D glue(glue(ld, USUFFIX), _p)(g2h(ptr)); -#endif - return ret; -} - -#ifndef CODE_ACCESS -static inline RES_TYPE -glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, - abi_ptr ptr, - uintptr_t retaddr) -{ - RES_TYPE ret; - set_helper_retaddr(retaddr); - ret =3D glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(env, ptr); - clear_helper_retaddr(); - return ret; -} -#endif - -#if DATA_SIZE <=3D 2 -static inline int -glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr) -{ - int ret; -#ifdef CODE_ACCESS - set_helper_retaddr(1); - ret =3D glue(glue(lds, SUFFIX), _p)(g2h(ptr)); - clear_helper_retaddr(); -#else - MemOp op =3D MO_TE | MO_SIGN | SHIFT; - uint16_t meminfo =3D trace_mem_get_info(op, MMU_USER_IDX, false); - trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); - ret =3D glue(glue(lds, SUFFIX), _p)(g2h(ptr)); - qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); -#endif - return ret; -} - -#ifndef CODE_ACCESS -static inline int -glue(glue(glue(cpu_lds, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, - abi_ptr ptr, - uintptr_t retaddr) -{ - int ret; - set_helper_retaddr(retaddr); - ret =3D glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(env, ptr); - clear_helper_retaddr(); - return ret; -} -#endif /* CODE_ACCESS */ -#endif /* DATA_SIZE <=3D 2 */ - -#ifndef CODE_ACCESS -static inline void -glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr, - RES_TYPE v) -{ - MemOp op =3D MO_TE | SHIFT; - uint16_t meminfo =3D trace_mem_get_info(op, MMU_USER_IDX, true); - trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); - glue(glue(st, SUFFIX), _p)(g2h(ptr), v); - qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); -} - -static inline void -glue(glue(glue(cpu_st, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, - abi_ptr ptr, - RES_TYPE v, - uintptr_t retaddr) -{ - set_helper_retaddr(retaddr); - glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(env, ptr, v); - clear_helper_retaddr(); -} -#endif - -#undef RES_TYPE -#undef DATA_TYPE -#undef DATA_STYPE -#undef SUFFIX -#undef USUFFIX -#undef DATA_SIZE -#undef SHIFT diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index b09f7a1577..79da4219bb 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -26,6 +26,8 @@ #include "translate-all.h" #include "exec/helper-proto.h" #include "qemu/atomic128.h" +#include "trace-root.h" +#include "trace/mem.h" =20 #undef EAX #undef ECX @@ -734,6 +736,240 @@ int cpu_signal_handler(int host_signum, void *pinfo, =20 /* The softmmu versions of these helpers are in cputlb.c. */ =20 +uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr) +{ + uint32_t ret; + uint16_t meminfo =3D trace_mem_get_info(MO_UB, MMU_USER_IDX, false); + + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); + ret =3D ldub_p(g2h(ptr)); + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); + return ret; +} + +int cpu_ldsb_data(CPUArchState *env, abi_ptr ptr) +{ + int ret; + uint16_t meminfo =3D trace_mem_get_info(MO_SB, MMU_USER_IDX, false); + + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); + ret =3D ldsb_p(g2h(ptr)); + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); + return ret; +} + +uint32_t cpu_lduw_data(CPUArchState *env, abi_ptr ptr) +{ + uint32_t ret; + uint16_t meminfo =3D trace_mem_get_info(MO_TEUW, MMU_USER_IDX, false); + + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); + ret =3D lduw_p(g2h(ptr)); + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); + return ret; +} + +int cpu_ldsw_data(CPUArchState *env, abi_ptr ptr) +{ + int ret; + uint16_t meminfo =3D trace_mem_get_info(MO_TESW, MMU_USER_IDX, false); + + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); + ret =3D ldsw_p(g2h(ptr)); + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); + return ret; +} + +uint32_t cpu_ldl_data(CPUArchState *env, abi_ptr ptr) +{ + uint32_t ret; + uint16_t meminfo =3D trace_mem_get_info(MO_TEUL, MMU_USER_IDX, false); + + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); + ret =3D ldl_p(g2h(ptr)); + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); + return ret; +} + +uint64_t cpu_ldq_data(CPUArchState *env, abi_ptr ptr) +{ + uint64_t ret; + uint16_t meminfo =3D trace_mem_get_info(MO_TEQ, MMU_USER_IDX, false); + + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); + ret =3D ldq_p(g2h(ptr)); + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); + return ret; +} + +uint32_t cpu_ldub_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retadd= r) +{ + uint32_t ret; + + set_helper_retaddr(retaddr); + ret =3D cpu_ldub_data(env, ptr); + clear_helper_retaddr(); + return ret; +} + +int cpu_ldsb_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) +{ + int ret; + + set_helper_retaddr(retaddr); + ret =3D cpu_ldsb_data(env, ptr); + clear_helper_retaddr(); + return ret; +} + +uint32_t cpu_lduw_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retadd= r) +{ + uint32_t ret; + + set_helper_retaddr(retaddr); + ret =3D cpu_lduw_data(env, ptr); + clear_helper_retaddr(); + return ret; +} + +int cpu_ldsw_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) +{ + int ret; + + set_helper_retaddr(retaddr); + ret =3D cpu_ldsw_data(env, ptr); + clear_helper_retaddr(); + return ret; +} + +uint32_t cpu_ldl_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) +{ + uint32_t ret; + + set_helper_retaddr(retaddr); + ret =3D cpu_ldl_data(env, ptr); + clear_helper_retaddr(); + return ret; +} + +uint64_t cpu_ldq_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) +{ + uint64_t ret; + + set_helper_retaddr(retaddr); + ret =3D cpu_ldq_data(env, ptr); + clear_helper_retaddr(); + return ret; +} + +void cpu_stb_data(CPUArchState *env, abi_ptr ptr, uint32_t val) +{ + uint16_t meminfo =3D trace_mem_get_info(MO_UB, MMU_USER_IDX, true); + + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); + stb_p(g2h(ptr), val); + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); +} + +void cpu_stw_data(CPUArchState *env, abi_ptr ptr, uint32_t val) +{ + uint16_t meminfo =3D trace_mem_get_info(MO_TEUW, MMU_USER_IDX, true); + + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); + stw_p(g2h(ptr), val); + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); +} + +void cpu_stl_data(CPUArchState *env, abi_ptr ptr, uint32_t val) +{ + uint16_t meminfo =3D trace_mem_get_info(MO_TEUL, MMU_USER_IDX, true); + + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); + stl_p(g2h(ptr), val); + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); +} + +void cpu_stq_data(CPUArchState *env, abi_ptr ptr, uint64_t val) +{ + uint16_t meminfo =3D trace_mem_get_info(MO_TEQ, MMU_USER_IDX, true); + + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); + stq_p(g2h(ptr), val); + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); +} + +void cpu_stb_data_ra(CPUArchState *env, abi_ptr ptr, + uint32_t val, uintptr_t retaddr) +{ + set_helper_retaddr(retaddr); + cpu_stb_data(env, ptr, val); + clear_helper_retaddr(); +} + +void cpu_stw_data_ra(CPUArchState *env, abi_ptr ptr, + uint32_t val, uintptr_t retaddr) +{ + set_helper_retaddr(retaddr); + cpu_stw_data(env, ptr, val); + clear_helper_retaddr(); +} + +void cpu_stl_data_ra(CPUArchState *env, abi_ptr ptr, + uint32_t val, uintptr_t retaddr) +{ + set_helper_retaddr(retaddr); + cpu_stl_data(env, ptr, val); + clear_helper_retaddr(); +} + +void cpu_stq_data_ra(CPUArchState *env, abi_ptr ptr, + uint64_t val, uintptr_t retaddr) +{ + set_helper_retaddr(retaddr); + cpu_stq_data(env, ptr, val); + clear_helper_retaddr(); +} + +uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr ptr) +{ + uint32_t ret; + + set_helper_retaddr(1); + ret =3D ldub_p(g2h(ptr)); + clear_helper_retaddr(); + return ret; +} + +uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr ptr) +{ + uint32_t ret; + + set_helper_retaddr(1); + ret =3D lduw_p(g2h(ptr)); + clear_helper_retaddr(); + return ret; +} + +uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr ptr) +{ + uint32_t ret; + + set_helper_retaddr(1); + ret =3D ldl_p(g2h(ptr)); + clear_helper_retaddr(); + return ret; +} + +uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr ptr) +{ + uint64_t ret; + + set_helper_retaddr(1); + ret =3D ldq_p(g2h(ptr)); + clear_helper_retaddr(); + return ret; +} + /* Do not allow unaligned operations to proceed. Return the host address.= */ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr, int size, uintptr_t retaddr) --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455789; cv=none; d=zohomail.com; s=zohoarc; b=afE0NShDcMQEo+TFKBxvoFV4FX5xeHftp+sFNiJN6D6rQd7buHHLG48Tfa3LWBX52njsDHnw4782PuWBdKkzw99lQmcvpPNvywPnTOgrwd4n1zIiCYpbvf3qeQ6vmrkfqEyRNBfe0exRwMjOPTIVQvVRN5JyVXXuTMscrKhJbgg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455789; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2F9qWviD9JHiCQKLhGkXywwQFXF+bVbb46hoHf6Ex9Q=; b=Hc/R94C2HhmaWViQx6Uw1HznXLi1A8BwP8bpxKFBVlyUlKlZ4YWT94scU2poVyjg8WGyBCeXosd+lF3SlSPgX+wl7njLW7eRlW6bA/ZZ1yaCy7mB3WOS5jAm/g2S1Z7rb438PfbI1MKGY197jutebsy6e1vD0+kFcUhdBaKUI48= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455789292148.35795886637732; Tue, 7 Jan 2020 19:56:29 -0800 (PST) Received: from localhost ([::1]:35354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2SJ-0001Hn-NR for importer@patchew.org; Tue, 07 Jan 2020 22:56:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49601) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2It-0004i7-MS for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Ir-0003Wk-Gm for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:43 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:33706) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Ir-0003W0-BJ for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:41 -0500 Received: by mail-pl1-x62d.google.com with SMTP id ay11so524348plb.0 for ; Tue, 07 Jan 2020 19:46:41 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:39 -0800 (PST) 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=2F9qWviD9JHiCQKLhGkXywwQFXF+bVbb46hoHf6Ex9Q=; b=TrypOgagiXmNiSYHH7ONrO5G6z/YAdXFPbOKOVlv0hvccjJ7Ev/nr+Rdnsb8rZWSrt 7CGRxXv4xi/+1vvTvzIupIH6LMHdpPmC5qm3A/XLeggg/XR2tHpcr63mEvhEN15julw7 JWqx4RKOntbp2PUIp+QvLM8+jyMb6OZjzoF2m/AgFwvUhwXQALck4VgLXv/dn3I5vqJg iyPQMXbKwMXLjy4SGYZ2lZfssxSDiO+VLkCsUHboRfl7DmWAmD1VuRUOihQvm5reWhZj FrCJouqo7+l+v63weFkq5HwFVfPmMpxg+Ujk/ekiKS4gcQEV6n69BZgRxuvrxhCFRsuW pPNQ== 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=2F9qWviD9JHiCQKLhGkXywwQFXF+bVbb46hoHf6Ex9Q=; b=NsSkoKjw/5CHxiy7sY2OAGZupG4d3MpPCLffFGkXT4jSZBBKi5fhXX/jA3k4n9bBJq 1fFHCfwNFmy4+qs20HV86OwB/XwUmcoRl4i+Gfxguvr0FWTe+s1NlHvJEEOzCnZMWSyy 0+jGO8voxlojCIGcHGyE5Tx39tfLhAeF0XMnUFkFMLvMdzOtA2IWJXroGI9fp0GOUsxc ODIwCim6EdJHjTLMiR8pmq9LuzfSMrwWNVd2SFe26iQ+XgoIgMhaHxM1DV01hfUHo7cV xsm7J/Yf2DspclyJuBGL1p4EiNL1QL9ot5ISnB/8EijahHHX2QOHFmIxhXjpvylDTxix N3QQ== X-Gm-Message-State: APjAAAWDbZTZQurkOyvlbq5Wda1e8QNXmqc1YAJojfPmlou1ZqnPVVFM GdWIY0y9VyjIox2yumfOeBih53DDml9GmA== X-Google-Smtp-Source: APXvYqx2SuMRVLF39DQi/VatkOWh1oMxfRvuQCDmIFA0210i8bj0vP5XLv5AFw/2AgCE4R61cz0GSA== X-Received: by 2002:a17:902:d902:: with SMTP id c2mr3060438plz.298.1578455200084; Tue, 07 Jan 2020 19:46:40 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 23/41] target/nios2: Remove MMU_MODE{0,1}_SUFFIX Date: Wed, 8 Jan 2020 14:45:05 +1100 Message-Id: <20200108034523.17349-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::62d 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: Marek Vasut , peter.maydell@linaro.org, Chris Wulff , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The functions generated by these macros are unused. Cc: Chris Wulff Cc: Marek Vasut Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/nios2/cpu.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index 361b06ffeb..78f633f970 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -217,8 +217,6 @@ void do_nios2_semihosting(CPUNios2State *env); #define CPU_SAVE_VERSION 1 =20 /* MMU modes definitions */ -#define MMU_MODE0_SUFFIX _kernel -#define MMU_MODE1_SUFFIX _user #define MMU_SUPERVISOR_IDX 0 #define MMU_USER_IDX 1 =20 --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456830; cv=none; d=zohomail.com; s=zohoarc; b=iEko3xVWPwVsudJawI2x232IYnLwF1sjDIj3glTgV+pAMWgP9SZqdLgxyRoH7fp2XWEYocyD3mJuZU7qyGikjpAPZi/03M2YTxav0zSmvZ+2mCmnyFcHbuOui/dxPEjY+giIk7+nmExj63zE7CvWuukXrmd/TjxA7gpTyr19Jw0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456830; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BxIVssEy5SXP5eel2z2kxdVW9xUhLnYxR5gpT8BmfJc=; b=Ag0YsVfGPw4yPQw0E1J2xDfuwNsMyrbKXshC2tyeB/BODEK20A+PEtrhB2DGSlo28UV+lwAeYDjmh866ROL3P5O9kE4Sj/AZUmkKNfLGQv4d7+hquv5Bs6IxgLHLNd3pQqVKq1PPLOhvqPln+0zxryodu0ZxLYg0QP6PfKXF2ps= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456830202897.6912716596812; Tue, 7 Jan 2020 20:13:50 -0800 (PST) Received: from localhost ([::1]:35774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2j7-0001IH-0S for importer@patchew.org; Tue, 07 Jan 2020 23:13:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49653) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Iv-0004kz-Re for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Iu-0003ap-KC for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:45 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:33708) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Iu-0003aF-EF for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:44 -0500 Received: by mail-pl1-x62f.google.com with SMTP id ay11so524398plb.0 for ; Tue, 07 Jan 2020 19:46:44 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:42 -0800 (PST) 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=BxIVssEy5SXP5eel2z2kxdVW9xUhLnYxR5gpT8BmfJc=; b=qqO5zo4y8O/VCitdunyfWefgyXHeRrq9Qez53lzSCXz0KLGnrvTmB62+hnsQiCmucB EGRr/aCDt6Gu0qvg1hJBVzvnHfOxJVr4adQOtBZfl0mzg6m7xchg2ggouUyL2TSIrftw fq4ibd1o7qSMgt9E1GTG983cWL9ghix+y5ibOlpqqDfoOWxOTnMrd8WdR0ReqBdVOaxh BEb5xpf4QieMlaUj04elFd+ZAteRjzRB4FzaJQQLVzk5KvrBGC9pNFFuJ+k/O27h/BU8 hRsPV9yQLVf1HzQFpXDuwDjf99qksrxuQjkfRPOOk6Wtcdw9x5djLjmBAOmAApz+LLgP KJJQ== 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=BxIVssEy5SXP5eel2z2kxdVW9xUhLnYxR5gpT8BmfJc=; b=KoGNCizGYPqXOLZOVzbFPT+lHUgnKg3SN7KKjTGlNUwwRXz0EmlKhsNGFGWd7ci6nG 2yynYNU4+4vJiEoMywjxey4O0wrjd7uyBPSwUNuxid/1Spw4TrVU4/8cp3DZxwFlobbq 354FQc1Sd2RFjjIgyo8t8TrZxLmvXzCtDodowJ0KGhg+ZeRMgIqTSCbmJOvEKEGOq3nf I0wuZweBKnj+hDr3Sy9Ff5s66WzHVhR3ixjFzzKTNzwv7IwFxPFm3qP2gmsUVcbjWzB+ 89eYslcgQTrT5b+57UVWCZdJJXa9+48TsZrOACYhVCkU5O4QiJHwn0chnqb1EIcqWqvg h7jw== X-Gm-Message-State: APjAAAXYlG6pnQ3WNPE/RjqPxzVskbsjdaHBOJGK+LAl2cvFXTe4SevV f16wfd4TRWo+zZCZ5a1Wia2r5N/Vz9s+Ng== X-Google-Smtp-Source: APXvYqw5lwkcMEU6JZXWm9eySHqSoPwz/N+Aa8fhQL6pzxh94pgTeSMzfYiTXN/ldMKwXoiVH/ozZg== X-Received: by 2002:a17:90a:3ae5:: with SMTP id b92mr2084158pjc.26.1578455203208; Tue, 07 Jan 2020 19:46:43 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 24/41] target/alpha: Remove MMU_MODE{0,1}_SUFFIX Date: Wed, 8 Jan 2020 14:45:06 +1100 Message-Id: <20200108034523.17349-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::62f 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The functions generated by these macros are unused. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/alpha/cpu.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index a530249a5b..3f782c0efe 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -193,8 +193,6 @@ enum { PALcode cheats and usees the KSEG mapping for its code+data rather than physical addresses. */ =20 -#define MMU_MODE0_SUFFIX _kernel -#define MMU_MODE1_SUFFIX _user #define MMU_KERNEL_IDX 0 #define MMU_USER_IDX 1 #define MMU_PHYS_IDX 2 --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456108; cv=none; d=zohomail.com; s=zohoarc; b=EWO71irDCVieFQ/8LprCX07JXJyMJsL8ngydqjQ6FrElVAXoWLO2xMNob/NjPkTGzJoCI0n2oazbfac27fXgQRzL/Y5HeZlgoDcTHE9a67F6SBR7LQuerbRMlb4Rw4RVuiIcmfGUjpYMdKQUxU4lrInOAguM9U2VsI88hLYWqm8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456108; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=epQ8gnLIG21U33fUc1Ykb+d66gYp2VTQnVaLDtLK2uk=; b=BH+cu/2MHIp8kMldV8gfk8LrA5Ah6wFCZ+Yqit9rBLqC6qW/pZI8QaoV0DN6wRvPvAdvGbgcIbLs/uT/p2bKDIs4V8+2KdLkBMqFQNdPL7mvtpSY4XXYdFLVUFqzWZ+jaCJk+jiEHDQAjpymabX5RHGthEpI50ZdZxtVlLeWfFY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456108102598.4946670522803; Tue, 7 Jan 2020 20:01:48 -0800 (PST) Received: from localhost ([::1]:35468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2XS-0008U8-Co for importer@patchew.org; Tue, 07 Jan 2020 23:01:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49725) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Iz-0004pT-3I for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Ix-0003e3-KT for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:48 -0500 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:38762) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Ix-0003dK-FC for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:47 -0500 Received: by mail-pl1-x629.google.com with SMTP id f20so546023plj.5 for ; Tue, 07 Jan 2020 19:46:47 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:45 -0800 (PST) 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=epQ8gnLIG21U33fUc1Ykb+d66gYp2VTQnVaLDtLK2uk=; b=DEyZSVjPHA3AvT08H88qb7qYX3igVzEEr5n51CqxYH6+F/XopkVeYdbDzRpTeBqjWP OJfP9hI6Jk+d+wI/vCoJgbvUUNc9Mcn/bX1jqLdqFpL2fKdMph0Lg4WGwE8yPYAsHoRN CFk/O7+xeY9Y3tNxfiwSXWa68l3hknVPWVrUeiuIAhALYLWPLNKyZ53jOgeWG8/MMXt7 vRM36IcKaPWflVv4Bg+712rvTHBew7D9VKJo7QRZ9n+OJ7x4SzeBDHUIJ0u0nhk9HI6U VDgetQZHlNNBV3RBDuwYtE4J71Y3K5OoSOuCcm7GrgIqSgdRQ2UhQhuW4ceYyPBFVvkB yWyg== 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=epQ8gnLIG21U33fUc1Ykb+d66gYp2VTQnVaLDtLK2uk=; b=Ewc48sjIVmZU0wepmXFSt4BF0frFZL1UkR+1rC0xySzLYyGhHs8oFTDQHrjPhoOesm V4Yb0/9fAx84EdUMqi9s4E8hqkRrqH3B5+25TKvMb+XfR0Rqu/vvNUCEC9Gkg6gEEVAT Kz0TooptbpapdminumoUhF2R03cpwn7iSIJZRrEjy48TqZeLSxMHPBQZ6Jx/yHQobz6I 33x5eyBc2mjVzAV7lk2pD3rLkceOuhFXrP2M3kQuUBQOrRPL7BZfDf/xmvDRGxnblsq4 LHBGgNL9BkFWHVTaexR5oxckLn86WKJuh5ATCsR4LqFwZKTCCFbReyuMwq29OCr7EoAT K8Ag== X-Gm-Message-State: APjAAAXGfIwPbM23UoZaUZ6dzSQ/dww1WH7kurBzkVb+2g5YEFNVuoYP DCDokK5JKqxPTUwyxaZL+g7/kjpLnuzj8w== X-Google-Smtp-Source: APXvYqx5Ko0voebBLKQoP+ogfhIRBNZg240AKm3KV9f7v1xoURtUebVPTcsF9MtnoWPgnd/77K49Dw== X-Received: by 2002:a17:902:7484:: with SMTP id h4mr3109306pll.206.1578455206205; Tue, 07 Jan 2020 19:46:46 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 25/41] target/cris: Remove MMU_MODE{0,1}_SUFFIX Date: Wed, 8 Jan 2020 14:45:07 +1100 Message-Id: <20200108034523.17349-26-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::629 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E . Iglesias" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The functions generated by these macros are unused. Cc: Edgar E. Iglesias Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/cris/cpu.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/cris/cpu.h b/target/cris/cpu.h index aba0a66474..bc43bc23a1 100644 --- a/target/cris/cpu.h +++ b/target/cris/cpu.h @@ -252,8 +252,6 @@ enum { #define cpu_signal_handler cpu_cris_signal_handler =20 /* MMU modes definitions */ -#define MMU_MODE0_SUFFIX _kernel -#define MMU_MODE1_SUFFIX _user #define MMU_USER_IDX 1 static inline int cpu_mmu_index (CPUCRISState *env, bool ifetch) { --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455930; cv=none; d=zohomail.com; s=zohoarc; b=YON4EJgbxAxCKbKOwitEJCgmSex8NVsEroe8Xw7n/VR0t0at8C67/BmMDMM5MElEY7X/VLBopqNa1h82Osi7C49oEFyQu0POhl8DgC7zPFUKnBm1V2Nwzd+6ZRhJNOGPMw5tkFDsrvKdRSwIoeuB5TjAJy8XG7Pf+Gg6oqlZe5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455930; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z0FD/atDVuTouuMhumTq1HgV7wZSwz0LnpdmbMaMHY8=; b=KIgVwWi0X+ci5xPFc5bNl9jP728L6Trrm6IbPgZ4ssXYnR9KIUCrpe8WgSaq0QQ+UptY5vrt9ij7pM/ZxNZ4J8Lrs+RHohDWjhIxsTSz/VlPU2YLNmbtSqwILFKqg8Z3mWzpebktJ2ME1hYnYl5u7rJ5hax/qaErRcpyvmOiQUU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455930839441.6158601402832; Tue, 7 Jan 2020 19:58:50 -0800 (PST) Received: from localhost ([::1]:35404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Ub-0004yz-58 for importer@patchew.org; Tue, 07 Jan 2020 22:58:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49790) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2J2-0004u4-I9 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2J1-0003iG-FA for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:52 -0500 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:37851) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2J1-0003gh-9J for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:51 -0500 Received: by mail-pf1-x429.google.com with SMTP id p14so910975pfn.4 for ; Tue, 07 Jan 2020 19:46:51 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:49 -0800 (PST) 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=Z0FD/atDVuTouuMhumTq1HgV7wZSwz0LnpdmbMaMHY8=; b=G209Vhfz8zzAREVP5+X7jMQiXeCx3KZzA/2WzIojkRRHAQgf9wD5fqvj1IhkX6pi0b X5XfccDwhCcmXQ6tIHwhL3ryz8GvWkVmSnBoRK7cWsni8LW8cupJKusWqJY8ksRocmKU J07UuekoghlmMkxYbPasbAqtdCRYF5XNJq1tYq5RKvHvoKdHlJF+g039lXNdsvG9zzc+ g/Q6HlvKnHFOgFggvW9dBjp2GQlu07nK5f22gbnUVPNj1cVD2mlvWB9ETGrkcrPJHglG jhiXwmBbZlQoEHA5H5MplHP7oDw+OY+rf1k7kSwhIMBESOa2UoH86Yjq2NmGeRatARi8 lSIQ== 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=Z0FD/atDVuTouuMhumTq1HgV7wZSwz0LnpdmbMaMHY8=; b=YeyuyYhxKBmEooKXMmFHMcSKC/sTFePY4KupDb7b+8boVKU+y2fJtevspzFcA8x+uu nEuRWO1SEepVV/uQvXMde+9DP+BaGplQr1NE2JXTHVHO4hSZX4HJ/lpaCkcmhnXq89ML ufnlSKToPopKBl1rtT8e4E9L3zHi0K3k1Sw89x50UDIrfKd5R4XIC4rg88YC2moi5H7H 1QpFaZOQbEAZeLRmFo+WdH9ZhSqb/gmTUT16acnUO4YlSgjWYhRINNB2rF1r41Y/M5wC vUIlRAkFypVoDaCPVuEH9DRLei9smpd6gvSPCirS0Wwku6Zbeqr7f6Oc5GPa6msd12sW 5svA== X-Gm-Message-State: APjAAAUTvHaCIAqrAeX6ATZBbni/7RHig66mvKZrcj/QXr9RbTCutJjV njNEdY5ndr/he62YhYeJf69a/u+2rG/l2g== X-Google-Smtp-Source: APXvYqxmElP35/a0OCHvHg4o1914tNk1P0ZStzgWPC4zO9MmPD8fuNX/9B8DwCTHEX8a8iXWYXgYcA== X-Received: by 2002:a63:d14:: with SMTP id c20mr3028319pgl.77.1578455209870; Tue, 07 Jan 2020 19:46:49 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 26/41] target/i386: Remove MMU_MODE{0,1,2}_SUFFIX Date: Wed, 8 Jan 2020 14:45:08 +1100 Message-Id: <20200108034523.17349-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::429 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The functions generated by these macros are unused. Cc: Eduardo Habkost Tested-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/i386/cpu.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index af282936a7..1b4b90556c 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1952,9 +1952,6 @@ uint64_t cpu_get_tsc(CPUX86State *env); #define cpu_list x86_cpu_list =20 /* MMU modes definitions */ -#define MMU_MODE0_SUFFIX _ksmap -#define MMU_MODE1_SUFFIX _user -#define MMU_MODE2_SUFFIX _knosmap /* SMAP disabled or CPL<3 && AC=3D1 */ #define MMU_KSMAP_IDX 0 #define MMU_USER_IDX 1 #define MMU_KNOSMAP_IDX 2 --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578455892; cv=none; d=zohomail.com; s=zohoarc; b=Yh41sdq7g4kThCurquonn0bxQ2JkEqOoZDF4eel8o6KyuaRT6amBtP4zuOZcWG5b1d70VMW6RUY+ZuHuNeTC0aKhg/hZWbGAVOntaChJ1USGDgjhkZ8vzZl3H1BKLxGrMGkqlbX5hT+C2UEyCHrjHWp8MXrepe/EkqTDwZnew6c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578455892; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SVfGBVbDnSFcIUB7kDREDDgKw+EkqJztHZWHPhrl2hw=; b=aY7Nc2ixUQBrBLaY7UGyvddqYspgCTkXn+f4ivld0pco8SdFUuAyXGvatvF3yInO6dtJbnJ35CRmW3CC7fXd+DW9L7Rv73ywLChaWEgDGBJTiXCH9JoZK1VSrf1UpM1rd57FcFZ0fcKvwi8nAtiLC0KOFLgrOpBWPabxP2+Mz4I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578455892035156.39297572210035; Tue, 7 Jan 2020 19:58:12 -0800 (PST) Received: from localhost ([::1]:35396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Ty-0003nj-Cs for importer@patchew.org; Tue, 07 Jan 2020 22:58:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49844) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2J5-0004y2-G6 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2J4-0003lz-FV for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:55 -0500 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:46625) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2J4-0003lC-A7 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:54 -0500 Received: by mail-pl1-x62a.google.com with SMTP id y8so531785pll.13 for ; Tue, 07 Jan 2020 19:46:54 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:52 -0800 (PST) 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=SVfGBVbDnSFcIUB7kDREDDgKw+EkqJztHZWHPhrl2hw=; b=CBdfX0Zjo93DRJx3DpIcEPyJgk2YVXylsCXc4DMQuBj5Vv7DphpaNjIat5tMw4nMAb 3xKgjJVoKdnuSRihmX0JWG8C2RYEmzcqPeBZfdKxS+888Pn6PKz+vgPTUpZcftWjpgk7 Rzw3vr3Ug6Di1V9wjKs3dU1ii3F7xZgnwWxDx5OCRUNUIU53xLD1Mobm0lXT20L7+/s9 Yt9bJiEWEFWrAg8YHIFPedHHPF8BsqkhCG6kXfZQYBU2OydTkeVtYa3EmsQmtVYTaaFA 0VCK6N/nd5qx3wN7uVaeEiyNebs69VHw8GdQiYSDBpbgG25otrw402FvrRxvPVRAUCyw Dlyw== 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=SVfGBVbDnSFcIUB7kDREDDgKw+EkqJztHZWHPhrl2hw=; b=BfhakXq7bhKKnpOp04QewEkIk7wdteOa9vIbSyBJxL6BBpBpuXBIHC4TQXQEwfhZU1 oHzdWCnAzqkaC5o/XxhfvJoqIMpRDSdGUaW7l9wQLhLaUQwPeU5o8TrQvb0ykuf8TKiw /JqWHaXICdHiP/LaaDijmNQTLPmn9yxoTJDMN3xw3fWTn7ZPtsgWYq/WEAlFFVxfFon7 0QCQJJ3Pd7pGo9Bn0xOz5wh/KTdnAIvYoMbROnefM57yJyHbTDKv8Oep98jo3MVou2vM RibdabTF0o+Soz1hV4Q5QIcvi729S5rBAYwKMqhdiexF9rAs8XKVvs1qz+U0tiZYG5La uf6A== X-Gm-Message-State: APjAAAVao3KDpSuD1CxsiTYeNf/2/nTypKtzez3CRTgfKrGGDjgWBOyW JMKo+CMWN68WEdNCo7iUg3Af+Pw4Auq/LQ== X-Google-Smtp-Source: APXvYqxN1lUYHv10MHmOoEl4GpT8dyfcdnMT0kWQlGJ0yRb1k940N+uCCJ+3fgu+qTueZPGj/DDP6Q== X-Received: by 2002:a17:90a:ead3:: with SMTP id ev19mr2129331pjb.80.1578455213094; Tue, 07 Jan 2020 19:46:53 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 27/41] target/microblaze: Remove MMU_MODE{0,1,2}_SUFFIX Date: Wed, 8 Jan 2020 14:45:09 +1100 Message-Id: <20200108034523.17349-28-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::62a 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E . Iglesias" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The functions generated by these macros are unused. Cc: Edgar E. Iglesias Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/microblaze/cpu.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 95773089aa..32522f606b 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -328,9 +328,6 @@ int cpu_mb_signal_handler(int host_signum, void *pinfo, #define cpu_signal_handler cpu_mb_signal_handler =20 /* MMU modes definitions */ -#define MMU_MODE0_SUFFIX _nommu -#define MMU_MODE1_SUFFIX _kernel -#define MMU_MODE2_SUFFIX _user #define MMU_NOMMU_IDX 0 #define MMU_KERNEL_IDX 1 #define MMU_USER_IDX 2 --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456072; cv=none; d=zohomail.com; s=zohoarc; b=dVCkj1GfYc7EjIb4uSmSdUh7qygK3GYNb26++EiPT4a3rxDlCsQQaYZ2pfrz3CrPEpmOW36mnO3ImQeLwCVkdI+mRupM/aG62iZq87/0Ee2FKGARYPrz4dVMZY0Zpnm6eBYZ63hO+/md7s3INlgHqRYjXl7eZPJlx0pkuOQ2aoY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456072; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J0NbyLl5+EmsVs3kA4BMAH1WI7D6bmJtQQCfcSxRCUE=; b=SOlaTHtIaP8v5df8vJiMj/SUahRc8/KzlnAk5TJSkH7LVTJSlQzgBrRM+h2ASlwb3xyDwlryUbe8GPicd9w2VhmZyQiyIRVuzU1yQcGWeyhx+YUIc4GABDNI8xq3l2cIvNrLhauzgAnctD/aOm2iaqEAvohSrkdYABfjMA1oTu8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456072427129.2673173158496; Tue, 7 Jan 2020 20:01:12 -0800 (PST) Received: from localhost ([::1]:35452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Ws-0007qC-Tp for importer@patchew.org; Tue, 07 Jan 2020 23:01:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49890) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2J8-00052H-Iq for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2J7-0003oz-JD for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:58 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:33715) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2J7-0003oD-Do for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:46:57 -0500 Received: by mail-pl1-x636.google.com with SMTP id ay11so524584plb.0 for ; Tue, 07 Jan 2020 19:46:57 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:55 -0800 (PST) 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=J0NbyLl5+EmsVs3kA4BMAH1WI7D6bmJtQQCfcSxRCUE=; b=W0hf9oMSh32fM/AC4MH+xzti4XfCbDGjqc5jrF+j9ot+ligOAd3wdnWQuPdjCfx8aQ FpNmcrY1IWBr6fJnSn5gjMHdSjzg2NLYeaQvrTg66frlqyVF3X9worc4KRPzqsrAwiJ9 I+sNKoK3qS7pU38xJGmBeTk/wWvnQ+l7x5R4pGUMHJMtKqWl3QnUncYTjxV1/kC7OEVH TB7e/VoeJQOcImtFfP8TVb0v++ncj2cJglhPsui2/WmwTfVOMXPeDwi+W1tPXamC/qCG Asi7evl2+JGvzvvZD6njGYMPPrrMxnk6Z0xYvQRp65ROperluDNYzHiW72koiv3nBdgf fwgQ== 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=J0NbyLl5+EmsVs3kA4BMAH1WI7D6bmJtQQCfcSxRCUE=; b=VCudZdVdNO85NPjF8VlHWUCPJ5A1kQ9erRRmnSU8KytddFkJ2AipifeOraF+0W3b4V 63ZSA6ZzJY5BlBspsqDuO/B3xRw+k55eMmCtfzqrbUfwE2TldqWPYFIwryXQShpm1+ar KQdT5anlrbvSslfIOYlVg3fKk0OIkat7Y3KdA78lvxjzW2rBCnWORqJubjUOR5jES4SA 1j9k6qAZ1h/7diL+4XbhnTqrL8CBcfm/MBjK3YpSTqDJfjYf3PCZiTRcEM67U4rmXkdZ jh82P3YFo7Wx6lnWoOJSWKoC5i/6bHGAzk/zDhIAPymLOaurYIN9awWYagLCFBOdNz1Z QtwA== X-Gm-Message-State: APjAAAVdHXC4brFQ/1RSVixjLSnEYR9lzWMPPd4ZHc8ao421t9JEMgqm hWg7ZkoXBdL8jRiX+pr1piBenZgrFrpntg== X-Google-Smtp-Source: APXvYqzVvkIyu+gQ+1dLxxzSL51yFzHAhNbLIcnrbJXBKyHePUTmOv9z0mInZF0vzwXdoFpnZ7jMvQ== X-Received: by 2002:a17:90a:928a:: with SMTP id n10mr2220760pjo.58.1578455216206; Tue, 07 Jan 2020 19:46:56 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 28/41] target/sh4: Remove MMU_MODE{0,1}_SUFFIX Date: Wed, 8 Jan 2020 14:45:10 +1100 Message-Id: <20200108034523.17349-29-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::636 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The functions generated by these macros are unused. Cc: Aurelien Jarno Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/sh4/cpu.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index ecaa7a18a9..452a596e67 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -254,8 +254,6 @@ void cpu_load_tlb(CPUSH4State * env); #define cpu_list sh4_cpu_list =20 /* MMU modes definitions */ -#define MMU_MODE0_SUFFIX _kernel -#define MMU_MODE1_SUFFIX _user #define MMU_USER_IDX 1 static inline int cpu_mmu_index (CPUSH4State *env, bool ifetch) { --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456122; cv=none; d=zohomail.com; s=zohoarc; b=GSuaNrOspeqreBcHee9j7hESgN051N9Muj5DnYv4B2fse9JnugUxGxE/VuIAzz+tno9NBE+u8c0uJxqs8o/LtxiSiZ3C8yjeneb7tixOnVGU114snvz+Wb0b3UzQJvdwDrjURXTsZ1xqJA1J9M3kpCQnLNFK8OvzSXYVxMyz0RQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456122; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oVEAuPQVi3GPH490Dgn06PxWdedtC6S15waZ9SOo96s=; b=EcelBVxiTGD25k83ywoOaxMwYfAHoOVY5F60syf+TeQieVlFpv+rjeOs19KhFlZospzjEiQv3of9YkIYMdr2C9xiujdybqdX2af2kXYjumqXbHG+jwbfI6z7WG2H4j69qftWwMleX2jtIPnlou7gZYZQqh0p9R4ieQbpAosFrSw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456122942134.55857534712788; Tue, 7 Jan 2020 20:02:02 -0800 (PST) Received: from localhost ([::1]:35472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Xh-0000Os-3B for importer@patchew.org; Tue, 07 Jan 2020 23:02:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49945) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2JC-00056T-TU for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2JB-0003tB-Q4 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:02 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:44639) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2JB-0003ro-KM for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:01 -0500 Received: by mail-pl1-x62f.google.com with SMTP id az3so535368plb.11 for ; Tue, 07 Jan 2020 19:47:01 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:46:58 -0800 (PST) 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=oVEAuPQVi3GPH490Dgn06PxWdedtC6S15waZ9SOo96s=; b=sLNM0YvvHhXgT1k/B1PN0paV2le9fJmRGD+ACi8jKcBUpboGpvo25mNwv+eYmrM3/y DQq0IVxUZCVhG66wQw+tE/9F16pxk+HFdmYTrUxkYF+vB5Vn+q19NdvsHGxNnGIr5Kup CHvzsUTnqdLJna31gCy/ey1Pj9B91y6WylsmqfH3sjKlLGn85Z782s3ebb8XwyzCdWuD tvYkLjYSBF3nvIUvvrfMtBLM13R4pyZsl7bHg3PvK1ZzNeGqaQEzh3+IINLLAwVaO6z4 QiQiK3Z+2XEvlUkn48JNFr3/YPIkZhxi+axyLLlV2l6dbCj5ATndZXKtZt8FLPMnrjGp igyQ== 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=oVEAuPQVi3GPH490Dgn06PxWdedtC6S15waZ9SOo96s=; b=TWsdRk6k5Qn2puom0nPF8SwAq62Ezf6oJOgF6NkggYzauHj76f3B3gxV0UwXP30hOO MD8EzguhEqQaEDUWqYqeW2pkPIQTqLhEbCe2D9w30Nqp4xt+Tb382BehL+ko18P5VYy+ 95k6btvWmBK/ciRP+sptviX61mJ1u3E10brryGp49vz2RjA0/jQovPj0GEFvcFzuplAp PM+ykzBZrYzAl7ntWSKu7sx68meleFpZWgGXipkXeLkY2qUApRp0P5unfKhl5/UK5Uw0 Rg5xE3uTBp28jC4lPIOPR0TlxfnN/gsOFYJAmaDBcpgr5P49C8Y1WUc62Q485jf3Pooc 91sA== X-Gm-Message-State: APjAAAUpFrilId0F4+lu4d7hCxRhb150fy8RzmcvYH5NKQQAc9XV9tIf Ah6tTLIA8wEUFj0cnqdkyF+J+G2ZxvWgsg== X-Google-Smtp-Source: APXvYqwInPIvCt3bFtWxTXYyWZKwtnjU72ell/zDr1pYFUt/3hyjmnozS816k4bci9WiXZ3cydqL/A== X-Received: by 2002:a17:90a:8912:: with SMTP id u18mr2100717pjn.21.1578455219412; Tue, 07 Jan 2020 19:46:59 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 29/41] target/unicore32: Remove MMU_MODE{0,1}_SUFFIX Date: Wed, 8 Jan 2020 14:45:11 +1100 Message-Id: <20200108034523.17349-30-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::62f 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, Guan Xuetao , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The functions generated by these macros are unused. Cc: Guan Xuetao Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/unicore32/cpu.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/unicore32/cpu.h b/target/unicore32/cpu.h index 50ed9dd99c..7a32e086ed 100644 --- a/target/unicore32/cpu.h +++ b/target/unicore32/cpu.h @@ -133,8 +133,6 @@ void cpu_asr_write(CPUUniCore32State *env1, target_ulon= g val, target_ulong mask) int uc32_cpu_signal_handler(int host_signum, void *pinfo, void *puc); =20 /* MMU modes definitions */ -#define MMU_MODE0_SUFFIX _kernel -#define MMU_MODE1_SUFFIX _user #define MMU_USER_IDX 1 static inline int cpu_mmu_index(CPUUniCore32State *env, bool ifetch) { --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456273; cv=none; d=zohomail.com; s=zohoarc; b=biPOF8ptT5bN7D2aYpwJK1C4cvubTHSnjE+H1/CmUL00eBaJQXBXyVvUjqLH9ceQ4JVtuIDAvh0Yrydvd0I9TWwnsmCF0KnJUBXu17P95RzxFyNHNu0dvHgUxZFEX6M8FPWsE3WtRW/KP9Zy8RBtnqqrIbU8+GdrgO2kh5HDfAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456273; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TWAsBzCoriAb7ux23wFGxM2iykLABej28qb4JsXtnPw=; b=Kc9TYVLm8f0hPbYTDfA8rl2qThmcHE8XDWrohjCH0Kt/ACM4jhFaq4Ne9GGf5Z+3xHfiX4XcN14obTRPeIOWIu4xn/g+eur3yjBWHWGqrp3x2BuG/CAM1WQVJUjLl6AFoSnTW6A1ViQiDonigrVjFMEtjDMRT39xrF0ZYKhabWo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157845627303637.33055832437378; Tue, 7 Jan 2020 20:04:33 -0800 (PST) Received: from localhost ([::1]:35518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2a7-0003Ze-J8 for importer@patchew.org; Tue, 07 Jan 2020 23:04:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49980) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2JF-000597-0o for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2JD-0003vW-Qt for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:04 -0500 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:53597) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2JD-0003uI-L8 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:03 -0500 Received: by mail-pj1-x1031.google.com with SMTP id n96so464410pjc.3 for ; Tue, 07 Jan 2020 19:47:03 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.46.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:47:01 -0800 (PST) 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=TWAsBzCoriAb7ux23wFGxM2iykLABej28qb4JsXtnPw=; b=es1Odej8Obq31DnMppCRcmBbsH3VFXrFT4yBboUbcmVtm4P4jOsV2lGcazE9TOxREg NLoyaDakddaOtP+2uQNMqjzkIifPN+uaLxzMYXR0MzEC636zvIpOkADVRa4XF4FvqiZy wRIAXglhQW8lSiUAoT+PBfufNK/NAUz5eLYVfN7x1/yoCnKkVOYxj40Eisjhit1+KBIn d9//ImK2t4KrLWPs1WVOH+A2A8i2UZdUfTPLnf70/4AGQocNR6umW8NXnbB/l7DmMdFH 53riYClWcWEEngBRbSpSDfkZlbur/4rj/I3zBVkZzQAEMPQKn7OMFJaF+RpTZDcrFjHt raaA== 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=TWAsBzCoriAb7ux23wFGxM2iykLABej28qb4JsXtnPw=; b=l2QLCCyNvlLWhSftFvUUXS1gv7Dh5Z3zTbcSMBMe9x6VFZPO7+WLKQ0y37RMt4YHAk ciStV33Iwv4xZCGt+UNkTo5S9zhy+/gDzCP25AWq9s0YnGrR502oW2kSm6rcEUmJLV6P lgVdYdyGYvJyERWQpsOgw64B9p1J/JG1U08FDtnR6dBi+XTDFNTR78fEv5Q+rFcx6Ps6 zVH448Du759ER02Z0m+Uu+xvuL+CgjdZrvhY5VSMbj5KhsVzoKs7SrsDWciKotzYLunn Rmvq/AgAfllrFKiUwLTqzXoKhJy+vpEkqZpTS+qLh/7oWjTdt+nWGUwNALjybDqaQtDU 6CJw== X-Gm-Message-State: APjAAAW9XtepfzAFD8KEcyWBhwMWG1GnLFPFcmcJ2nRy/EABIprbNa6F uCxX0+BMgtXpWO83/BYXveHu63XrW4RlkQ== X-Google-Smtp-Source: APXvYqwXGBVuhCRsYPfNb73TvOPL8Y2/3ZDCaJ57+UcawIUUGl91S4frs01TYR9WbM2SMipjPWfWSA== X-Received: by 2002:a17:90a:d807:: with SMTP id a7mr2185325pjv.15.1578455222365; Tue, 07 Jan 2020 19:47:02 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 30/41] target/xtensa: Remove MMU_MODE{0,1,2,3}_SUFFIX Date: Wed, 8 Jan 2020 14:45:12 +1100 Message-Id: <20200108034523.17349-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::1031 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The functions generated by these macros are unused. Tested-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Max Filippov Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/xtensa/cpu.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 75e65df597..493f4fc80c 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -689,10 +689,6 @@ static inline uint32_t xtensa_replicate_windowstart(CP= UXtensaState *env) } =20 /* MMU modes definitions */ -#define MMU_MODE0_SUFFIX _ring0 -#define MMU_MODE1_SUFFIX _ring1 -#define MMU_MODE2_SUFFIX _ring2 -#define MMU_MODE3_SUFFIX _ring3 #define MMU_USER_IDX 3 =20 static inline int cpu_mmu_index(CPUXtensaState *env, bool ifetch) --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456308; cv=none; d=zohomail.com; s=zohoarc; b=Leo98lmL6FtO2dtWRiLGLRf+C1NrPcxOwZEYzi+bMH6t8X9hAtidXGY0y67Ki+cov0vqJ3rR2kIV8tCcqyqUxx74pVjJO6091jS5U24DKoXPmbFzEEwdUVZ/l1OItNLZJ3Dnay+/6/VQ7pUmj3CKdZQ97Zc0ZGDg6KO84N4408g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456308; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W3QOqVQcKxICfZINGRR4Q5RpPfv/b9Q6JOcMtLEYvg8=; b=h1Ox8RV5BAmtgokxvn5q301Q6zMhJqRD2SM80uEELjTL5Y72h2Dng0qmnY2fr4efp2uMzPmV1A1sJwgzBUN1p/LFzaIePS2/dACHpQxNEYpm7e006MIxy7dZlFgXkHWwvB8suOxc+joW3spEYsbCPlmt7VAFr4W7JvIvK4L8vL8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456308723674.1583831149491; Tue, 7 Jan 2020 20:05:08 -0800 (PST) Received: from localhost ([::1]:35532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2ah-0004SV-6W for importer@patchew.org; Tue, 07 Jan 2020 23:05:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50035) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2JI-0005Fm-Vw for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2JH-0003zp-Ap for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:08 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:43158) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2JH-0003yp-3J for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:07 -0500 Received: by mail-pl1-x62e.google.com with SMTP id p27so536471pli.10 for ; Tue, 07 Jan 2020 19:47:07 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.47.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:47:05 -0800 (PST) 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=W3QOqVQcKxICfZINGRR4Q5RpPfv/b9Q6JOcMtLEYvg8=; b=o0ve0wywOlN2ERZ3vmg31g7DtnywCk6pts9m/npu6li7XQyFCsx6p9IqC0NJxliPS4 bycMD/KLjfVj7TZBoTL5YnjWk1Q6aVKSjWcsvkfe5Gn7wS242fiaHtaECPesEeiSEICV Wy9gfdeW6EG6RsYoGYLtv26xLWtBj7xRK3cgxpWjSl0uxz1SOyOmtoCQuRg7PXvIOGrR 1731eyJzzNz+sFpvcHCI4uLAgtFX4xYuMlRM+MvlvJUb2Bl6e8k9UeSlPXbt0w2o1PW0 3kmQoO9odXIiU+vCZ8FKa7cSSK2k7H592B8xSzhrK6h3IvG+TS1KMaibNy1szufF5Sfm BZvw== 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=W3QOqVQcKxICfZINGRR4Q5RpPfv/b9Q6JOcMtLEYvg8=; b=dPg3zNix1As2K1yVOAAun/rnr0kvPLNz6ywY4PgdcU/MdJ14HBk5wfbrymSHrGnXS9 oAaBwSgtKt8hfuE44nnu8jVw0WNZTecxd2Nkc7KQJ6XkLBnCBfz/QnBuctq+HIlQ5K6H UZYjuus+Bbg+UUxkWF0+6w1Zpn20SMN5X6QfWqZbFtnA3CrLC+NzPL1DaerKoc1c7G03 2goG+W11hKMdHf0ig7pWvC68xTPk6LhpHe93rdXYRma3UayhReM0cruLJ7DPAjn/bIcq o94BHqVbsvZSi+e1s3TgSwNxp3aUxJU3TfpL8wD6rc/Ckvm0bBiipYhxVwM9vsgDoFUi +hoA== X-Gm-Message-State: APjAAAUqYMZM5lcWSnbY0hidfOyYmmKhed1QmonPWeyGzEy+gIMTUarM lV8x/uD0CeIyUMEC+DrsUjOB6QCTJKNTGg== X-Google-Smtp-Source: APXvYqyd/brezsHSTc4OOpL5u5URgyawG7tIWNGakBUZRsM29RLZKKhBdSZB2z2MP3AAr5yU07mcmA== X-Received: by 2002:a17:90a:3945:: with SMTP id n5mr2125150pjf.34.1578455225780; Tue, 07 Jan 2020 19:47:05 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 31/41] target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0, 1}_SUFFIX Date: Wed, 8 Jan 2020 14:45:13 +1100 Message-Id: <20200108034523.17349-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::62e 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The generated *_user functions are unused. The *_kernel functions have a couple of users in op_helper.c; use *_mmuidx_ra instead, with MMU_KERNEL_IDX. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- v2: Use *_mmuidx_ra directly, without intermediate macros. --- target/m68k/cpu.h | 2 -- target/m68k/op_helper.c | 77 +++++++++++++++++++++++++---------------- 2 files changed, 47 insertions(+), 32 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 11c71fa962..3de8e06dfe 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -519,8 +519,6 @@ enum { #define cpu_list m68k_cpu_list =20 /* MMU modes definitions */ -#define MMU_MODE0_SUFFIX _kernel -#define MMU_MODE1_SUFFIX _user #define MMU_KERNEL_IDX 0 #define MMU_USER_IDX 1 static inline int cpu_mmu_index (CPUM68KState *env, bool ifetch) diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index bc4f845e3f..202498deb5 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -42,8 +42,8 @@ static void cf_rte(CPUM68KState *env) uint32_t fmt; =20 sp =3D env->aregs[7]; - fmt =3D cpu_ldl_kernel(env, sp); - env->pc =3D cpu_ldl_kernel(env, sp + 4); + fmt =3D cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); + env->pc =3D cpu_ldl_mmuidx_ra(env, sp + 4, MMU_KERNEL_IDX, 0); sp |=3D (fmt >> 28) & 3; env->aregs[7] =3D sp + 8; =20 @@ -58,13 +58,13 @@ static void m68k_rte(CPUM68KState *env) =20 sp =3D env->aregs[7]; throwaway: - sr =3D cpu_lduw_kernel(env, sp); + sr =3D cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); sp +=3D 2; - env->pc =3D cpu_ldl_kernel(env, sp); + env->pc =3D cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); sp +=3D 4; if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) { /* all except 68000 */ - fmt =3D cpu_lduw_kernel(env, sp); + fmt =3D cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0); sp +=3D 2; switch (fmt >> 12) { case 0: @@ -260,12 +260,12 @@ static void cf_interrupt_all(CPUM68KState *env, int i= s_hw) /* ??? This could cause MMU faults. */ sp &=3D ~3; sp -=3D 4; - cpu_stl_kernel(env, sp, retaddr); + cpu_stl_mmuidx_ra(env, sp, retaddr, MMU_KERNEL_IDX, 0); sp -=3D 4; - cpu_stl_kernel(env, sp, fmt); + cpu_stl_mmuidx_ra(env, sp, fmt, MMU_KERNEL_IDX, 0); env->aregs[7] =3D sp; /* Jump to vector. */ - env->pc =3D cpu_ldl_kernel(env, env->vbr + vector); + env->pc =3D cpu_ldl_mmuidx_ra(env, env->vbr + vector, MMU_KERNEL_IDX, = 0); } =20 static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp, @@ -278,23 +278,24 @@ static inline void do_stack_frame(CPUM68KState *env, = uint32_t *sp, switch (format) { case 4: *sp -=3D 4; - cpu_stl_kernel(env, *sp, env->pc); + cpu_stl_mmuidx_ra(env, *sp, env->pc, MMU_KERNEL_IDX, 0); *sp -=3D 4; - cpu_stl_kernel(env, *sp, addr); + cpu_stl_mmuidx_ra(env, *sp, addr, MMU_KERNEL_IDX, 0); break; case 3: case 2: *sp -=3D 4; - cpu_stl_kernel(env, *sp, addr); + cpu_stl_mmuidx_ra(env, *sp, addr, MMU_KERNEL_IDX, 0); break; } *sp -=3D 2; - cpu_stw_kernel(env, *sp, (format << 12) + (cs->exception_index << = 2)); + cpu_stw_mmuidx_ra(env, *sp, (format << 12) + (cs->exception_index = << 2), + MMU_KERNEL_IDX, 0); } *sp -=3D 4; - cpu_stl_kernel(env, *sp, retaddr); + cpu_stl_mmuidx_ra(env, *sp, retaddr, MMU_KERNEL_IDX, 0); *sp -=3D 2; - cpu_stw_kernel(env, *sp, sr); + cpu_stw_mmuidx_ra(env, *sp, sr, MMU_KERNEL_IDX, 0); } =20 static void m68k_interrupt_all(CPUM68KState *env, int is_hw) @@ -353,36 +354,52 @@ static void m68k_interrupt_all(CPUM68KState *env, int= is_hw) cpu_abort(cs, "DOUBLE MMU FAULT\n"); } env->mmu.fault =3D true; + /* push data 3 */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* push data 3 */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* push data 2 */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* push data 2 */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* push data 1 */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* push data 1 */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 1 / push data 0 */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* write back 1 / push data 0 */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 1 address */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* write back 1 address */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 2 data */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* write back 2 data */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 2 address */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* write back 2 address */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 3 data */ sp -=3D 4; - cpu_stl_kernel(env, sp, 0); /* write back 3 data */ + cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 3 address */ sp -=3D 4; - cpu_stl_kernel(env, sp, env->mmu.ar); /* write back 3 address */ + cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0); + /* fault address */ sp -=3D 4; - cpu_stl_kernel(env, sp, env->mmu.ar); /* fault address */ + cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0); + /* write back 1 status */ sp -=3D 2; - cpu_stw_kernel(env, sp, 0); /* write back 1 status */ + cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 2 status */ sp -=3D 2; - cpu_stw_kernel(env, sp, 0); /* write back 2 status */ + cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* write back 3 status */ sp -=3D 2; - cpu_stw_kernel(env, sp, 0); /* write back 3 status */ + cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0); + /* special status word */ sp -=3D 2; - cpu_stw_kernel(env, sp, env->mmu.ssw); /* special status word */ + cpu_stw_mmuidx_ra(env, sp, env->mmu.ssw, MMU_KERNEL_IDX, 0); + /* effective address */ sp -=3D 4; - cpu_stl_kernel(env, sp, env->mmu.ar); /* effective address */ + cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0); + do_stack_frame(env, &sp, 7, oldsr, 0, retaddr); env->mmu.fault =3D false; if (qemu_loglevel_mask(CPU_LOG_INT)) { @@ -414,7 +431,7 @@ static void m68k_interrupt_all(CPUM68KState *env, int i= s_hw) =20 env->aregs[7] =3D sp; /* Jump to vector. */ - env->pc =3D cpu_ldl_kernel(env, env->vbr + vector); + env->pc =3D cpu_ldl_mmuidx_ra(env, env->vbr + vector, MMU_KERNEL_IDX, = 0); } =20 static void do_interrupt_all(CPUM68KState *env, int is_hw) --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456443; cv=none; d=zohomail.com; s=zohoarc; b=l63SNsQpIK1YGnh37g+FPfWfhkFbDHej1WPq+pEMRrJRaPFi1jfQMC3dQS8mspCZWaKfPLXHavj6b2nWiAtt45Bt6e4NwkR26TQWX52elKQG7hTLVb7kCp2L9O6Ff6wxv7VHh1aXO9YrogZSf/2MWs9LsJ0nmlvSR22zX1CY9b4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456443; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ezEeSrf5p80+7TzBbXiEVRb6neZry8ckhAyomoelFAc=; b=OZOTlASW3HKor72s9mLTD/5eyOLIs1t75EJLdVqqBCBvDJf/ctxWzXTBWhZddLFRcqfxB5pZ8pOVpjz4Gf2+wVATEto1g1GBaTLyRg/ZTuYS+/Ig/ivOFwaFsqg+4mvvAVG3fIiglPQ6+VEQfuPTEmgVZIx+4SBS177X9vay01A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456443816612.3870199780911; Tue, 7 Jan 2020 20:07:23 -0800 (PST) Received: from localhost ([::1]:35594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2cs-00088I-8f for importer@patchew.org; Tue, 07 Jan 2020 23:07:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50083) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2JM-0005L9-Ue for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2JL-00043e-1v for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:12 -0500 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:35358) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2JK-00042u-Pi for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:11 -0500 Received: by mail-pj1-x1033.google.com with SMTP id s7so478869pjc.0 for ; Tue, 07 Jan 2020 19:47:10 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:47:08 -0800 (PST) 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=ezEeSrf5p80+7TzBbXiEVRb6neZry8ckhAyomoelFAc=; b=yf3lR2XS49D0nMc7OyS/CsDx9wTA/EGkQfMTXpUPZvKw7DfxGhJq9e9KAkacV2xetu eFvwFdlNbtGywVvNoP/Xlitip3W3PZofjwChWw72Buph/zImhXgxUfdlupgZ1/NeVtne 7sLhJfbdHcC7352FmaUgxrGGtf8LNxrSE1xvqml9Wei5JRZUv2ut+2w85vRlRYbcKvvr nY0zqSZXI9i+MZVklGxrTa+MRTXLaiZKVTQVQEB6BU/TTYuYLucSAQwDRdFENe3vU0lN Yz5TvcMFuLYHqN/gH7xyQZVyC4+Ei8Ml0eHaswKwUfuepvq9M+8DN3SOfIyDAhhSIKk8 ldSA== 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=ezEeSrf5p80+7TzBbXiEVRb6neZry8ckhAyomoelFAc=; b=TnK6OOYOmzjK3J9psKhLWIKaTw3dP/r4p6awZa3ha+V58Hbc3vpLfCwqCGn/tBmJww WxeQ9eQiuzTCL46dEnr34FbS0pGEHuXbJK5uwIJdUdtAadgQzs1lEyyoAZhikjdl4IfC xYKn5MkbAxyH7NHks0cCqHqe2UlbuVfwRUl/dtOxUrYJ6SI3sBWPCCnBAHS1mzeCr3xK gr/lI+y5YVVI9Z7cr/Kp/IlU38xwJPtTvTaXrfaXVk/YavPLtunu+ncuzQRHcg5WBzSl rTTMDKKlRJxqQI4dRbNaWCL/1bVg96VB2ga4WAwPkZQWSlK1WXsb4V4+lUCW86JGRJrA aTFA== X-Gm-Message-State: APjAAAVDxuyyoUqcuXfg6JS8xu8ZDI3sPM21JKbl/xFhMzss9pWEZ97t Z/zl3yJDmjnLZ6Zr/wIEGaImW9CSBE5A0g== X-Google-Smtp-Source: APXvYqxM58GMrT4/69ZdJ2jBh2x0jWxL/FNdcSbVlDc7cPr/L9mfNHz45YBa+4aIaB6VIpeNrHNYLQ== X-Received: by 2002:a17:90a:6587:: with SMTP id k7mr2051219pjj.40.1578455229442; Tue, 07 Jan 2020 19:47:09 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 32/41] target/mips: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX Date: Wed, 8 Jan 2020 14:45:14 +1100 Message-Id: <20200108034523.17349-33-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::1033 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: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Aleksandar Rikalo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The separate suffixed functions were used to construct some do_##insn function switched on mmu_idx. The interface is exactly identical to the *_mmuidx_ra functions. Replace them directly and remove the constructions. Cc: Aurelien Jarno Cc: Aleksandar Rikalo Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/mips/cpu.h | 4 - target/mips/op_helper.c | 182 +++++++++++++--------------------------- 2 files changed, 60 insertions(+), 126 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index ca00f41daf..c218ccc4a8 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1147,10 +1147,6 @@ extern uint32_t cpu_rddsp(uint32_t mask_num, CPUMIPS= State *env); * MMU modes definitions. We carefully match the indices with our * hflags layout. */ -#define MMU_MODE0_SUFFIX _kernel -#define MMU_MODE1_SUFFIX _super -#define MMU_MODE2_SUFFIX _user -#define MMU_MODE3_SUFFIX _error #define MMU_USER_IDX 2 =20 static inline int hflags_mmu_index(uint32_t hflags) diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c index 18fcee4a78..79d44da6fa 100644 --- a/target/mips/op_helper.c +++ b/target/mips/op_helper.c @@ -52,69 +52,6 @@ static void raise_exception(CPUMIPSState *env, uint32_t = exception) do_raise_exception(env, exception, 0); } =20 -#if defined(CONFIG_USER_ONLY) -#define HELPER_LD(name, insn, type) \ -static inline type do_##name(CPUMIPSState *env, target_ulong addr, \ - int mem_idx, uintptr_t retaddr) \ -{ \ - return (type) cpu_##insn##_data_ra(env, addr, retaddr); \ -} -#else -#define HELPER_LD(name, insn, type) \ -static inline type do_##name(CPUMIPSState *env, target_ulong addr, \ - int mem_idx, uintptr_t retaddr) \ -{ \ - switch (mem_idx) { \ - case 0: return (type) cpu_##insn##_kernel_ra(env, addr, retaddr); \ - case 1: return (type) cpu_##insn##_super_ra(env, addr, retaddr); \ - default: \ - case 2: return (type) cpu_##insn##_user_ra(env, addr, retaddr); \ - case 3: return (type) cpu_##insn##_error_ra(env, addr, retaddr); \ - } \ -} -#endif -HELPER_LD(lw, ldl, int32_t) -#if defined(TARGET_MIPS64) -HELPER_LD(ld, ldq, int64_t) -#endif -#undef HELPER_LD - -#if defined(CONFIG_USER_ONLY) -#define HELPER_ST(name, insn, type) \ -static inline void do_##name(CPUMIPSState *env, target_ulong addr, \ - type val, int mem_idx, uintptr_t retaddr) \ -{ \ - cpu_##insn##_data_ra(env, addr, val, retaddr); \ -} -#else -#define HELPER_ST(name, insn, type) \ -static inline void do_##name(CPUMIPSState *env, target_ulong addr, \ - type val, int mem_idx, uintptr_t retaddr) \ -{ \ - switch (mem_idx) { \ - case 0: \ - cpu_##insn##_kernel_ra(env, addr, val, retaddr); \ - break; \ - case 1: \ - cpu_##insn##_super_ra(env, addr, val, retaddr); \ - break; \ - default: \ - case 2: \ - cpu_##insn##_user_ra(env, addr, val, retaddr); \ - break; \ - case 3: \ - cpu_##insn##_error_ra(env, addr, val, retaddr); \ - break; \ - } \ -} -#endif -HELPER_ST(sb, stb, uint8_t) -HELPER_ST(sw, stl, uint32_t) -#if defined(TARGET_MIPS64) -HELPER_ST(sd, stq, uint64_t) -#endif -#undef HELPER_ST - /* 64 bits arithmetic for 32 bits hosts */ static inline uint64_t get_HILO(CPUMIPSState *env) { @@ -379,12 +316,12 @@ target_ulong helper_##name(CPUMIPSState *env, target_= ulong arg, int mem_idx) \ } = \ env->CP0_LLAddr =3D do_translate_address(env, arg, 0, GETPC()); = \ env->lladdr =3D arg; = \ - env->llval =3D do_##insn(env, arg, mem_idx, GETPC()); = \ + env->llval =3D cpu_##insn##_mmuidx_ra(env, arg, mem_idx, GETPC()); = \ return env->llval; = \ } -HELPER_LD_ATOMIC(ll, lw, 0x3) +HELPER_LD_ATOMIC(ll, ldl, 0x3) #ifdef TARGET_MIPS64 -HELPER_LD_ATOMIC(lld, ld, 0x7) +HELPER_LD_ATOMIC(lld, ldq, 0x7) #endif #undef HELPER_LD_ATOMIC #endif @@ -400,42 +337,42 @@ HELPER_LD_ATOMIC(lld, ld, 0x7) void helper_swl(CPUMIPSState *env, target_ulong arg1, target_ulong arg2, int mem_idx) { - do_sb(env, arg2, (uint8_t)(arg1 >> 24), mem_idx, GETPC()); + cpu_stb_mmuidx_ra(env, arg2, (uint8_t)(arg1 >> 24), mem_idx, GETPC()); =20 if (GET_LMASK(arg2) <=3D 2) { - do_sb(env, GET_OFFSET(arg2, 1), (uint8_t)(arg1 >> 16), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 1), (uint8_t)(arg1 >> 16), + mem_idx, GETPC()); } =20 if (GET_LMASK(arg2) <=3D 1) { - do_sb(env, GET_OFFSET(arg2, 2), (uint8_t)(arg1 >> 8), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 2), (uint8_t)(arg1 >> 8), + mem_idx, GETPC()); } =20 if (GET_LMASK(arg2) =3D=3D 0) { - do_sb(env, GET_OFFSET(arg2, 3), (uint8_t)arg1, mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 3), (uint8_t)arg1, + mem_idx, GETPC()); } } =20 void helper_swr(CPUMIPSState *env, target_ulong arg1, target_ulong arg2, int mem_idx) { - do_sb(env, arg2, (uint8_t)arg1, mem_idx, GETPC()); + cpu_stb_mmuidx_ra(env, arg2, (uint8_t)arg1, mem_idx, GETPC()); =20 if (GET_LMASK(arg2) >=3D 1) { - do_sb(env, GET_OFFSET(arg2, -1), (uint8_t)(arg1 >> 8), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -1), (uint8_t)(arg1 >> 8), + mem_idx, GETPC()); } =20 if (GET_LMASK(arg2) >=3D 2) { - do_sb(env, GET_OFFSET(arg2, -2), (uint8_t)(arg1 >> 16), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -2), (uint8_t)(arg1 >> 16), + mem_idx, GETPC()); } =20 if (GET_LMASK(arg2) =3D=3D 3) { - do_sb(env, GET_OFFSET(arg2, -3), (uint8_t)(arg1 >> 24), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -3), (uint8_t)(arg1 >> 24), + mem_idx, GETPC()); } } =20 @@ -453,82 +390,82 @@ void helper_swr(CPUMIPSState *env, target_ulong arg1,= target_ulong arg2, void helper_sdl(CPUMIPSState *env, target_ulong arg1, target_ulong arg2, int mem_idx) { - do_sb(env, arg2, (uint8_t)(arg1 >> 56), mem_idx, GETPC()); + cpu_stb_mmuidx_ra(env, arg2, (uint8_t)(arg1 >> 56), mem_idx, GETPC()); =20 if (GET_LMASK64(arg2) <=3D 6) { - do_sb(env, GET_OFFSET(arg2, 1), (uint8_t)(arg1 >> 48), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 1), (uint8_t)(arg1 >> 48), + mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) <=3D 5) { - do_sb(env, GET_OFFSET(arg2, 2), (uint8_t)(arg1 >> 40), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 2), (uint8_t)(arg1 >> 40), + mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) <=3D 4) { - do_sb(env, GET_OFFSET(arg2, 3), (uint8_t)(arg1 >> 32), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 3), (uint8_t)(arg1 >> 32), + mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) <=3D 3) { - do_sb(env, GET_OFFSET(arg2, 4), (uint8_t)(arg1 >> 24), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 4), (uint8_t)(arg1 >> 24), + mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) <=3D 2) { - do_sb(env, GET_OFFSET(arg2, 5), (uint8_t)(arg1 >> 16), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 5), (uint8_t)(arg1 >> 16), + mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) <=3D 1) { - do_sb(env, GET_OFFSET(arg2, 6), (uint8_t)(arg1 >> 8), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 6), (uint8_t)(arg1 >> 8), + mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) <=3D 0) { - do_sb(env, GET_OFFSET(arg2, 7), (uint8_t)arg1, mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 7), (uint8_t)arg1, + mem_idx, GETPC()); } } =20 void helper_sdr(CPUMIPSState *env, target_ulong arg1, target_ulong arg2, int mem_idx) { - do_sb(env, arg2, (uint8_t)arg1, mem_idx, GETPC()); + cpu_stb_mmuidx_ra(env, arg2, (uint8_t)arg1, mem_idx, GETPC()); =20 if (GET_LMASK64(arg2) >=3D 1) { - do_sb(env, GET_OFFSET(arg2, -1), (uint8_t)(arg1 >> 8), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -1), (uint8_t)(arg1 >> 8), + mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) >=3D 2) { - do_sb(env, GET_OFFSET(arg2, -2), (uint8_t)(arg1 >> 16), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -2), (uint8_t)(arg1 >> 16), + mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) >=3D 3) { - do_sb(env, GET_OFFSET(arg2, -3), (uint8_t)(arg1 >> 24), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -3), (uint8_t)(arg1 >> 24), + mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) >=3D 4) { - do_sb(env, GET_OFFSET(arg2, -4), (uint8_t)(arg1 >> 32), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -4), (uint8_t)(arg1 >> 32), + mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) >=3D 5) { - do_sb(env, GET_OFFSET(arg2, -5), (uint8_t)(arg1 >> 40), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -5), (uint8_t)(arg1 >> 40), + mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) >=3D 6) { - do_sb(env, GET_OFFSET(arg2, -6), (uint8_t)(arg1 >> 48), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -6), (uint8_t)(arg1 >> 48), + mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) =3D=3D 7) { - do_sb(env, GET_OFFSET(arg2, -7), (uint8_t)(arg1 >> 56), mem_idx, - GETPC()); + cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -7), (uint8_t)(arg1 >> 56), + mem_idx, GETPC()); } } #endif /* TARGET_MIPS64 */ @@ -546,14 +483,14 @@ void helper_lwm(CPUMIPSState *env, target_ulong addr,= target_ulong reglist, =20 for (i =3D 0; i < base_reglist; i++) { env->active_tc.gpr[multiple_regs[i]] =3D - (target_long)do_lw(env, addr, mem_idx, GETPC()); + (target_long)cpu_ldl_mmuidx_ra(env, addr, mem_idx, GETPC()= ); addr +=3D 4; } } =20 if (do_r31) { - env->active_tc.gpr[31] =3D (target_long)do_lw(env, addr, mem_idx, - GETPC()); + env->active_tc.gpr[31] =3D + (target_long)cpu_ldl_mmuidx_ra(env, addr, mem_idx, GETPC()); } } =20 @@ -567,14 +504,14 @@ void helper_swm(CPUMIPSState *env, target_ulong addr,= target_ulong reglist, target_ulong i; =20 for (i =3D 0; i < base_reglist; i++) { - do_sw(env, addr, env->active_tc.gpr[multiple_regs[i]], mem_idx, - GETPC()); + cpu_stw_mmuidx_ra(env, addr, env->active_tc.gpr[multiple_regs[= i]], + mem_idx, GETPC()); addr +=3D 4; } } =20 if (do_r31) { - do_sw(env, addr, env->active_tc.gpr[31], mem_idx, GETPC()); + cpu_stw_mmuidx_ra(env, addr, env->active_tc.gpr[31], mem_idx, GETP= C()); } } =20 @@ -589,14 +526,15 @@ void helper_ldm(CPUMIPSState *env, target_ulong addr,= target_ulong reglist, target_ulong i; =20 for (i =3D 0; i < base_reglist; i++) { - env->active_tc.gpr[multiple_regs[i]] =3D do_ld(env, addr, mem_= idx, - GETPC()); + env->active_tc.gpr[multiple_regs[i]] =3D + cpu_ldq_mmuidx_ra(env, addr, mem_idx, GETPC()); addr +=3D 8; } } =20 if (do_r31) { - env->active_tc.gpr[31] =3D do_ld(env, addr, mem_idx, GETPC()); + env->active_tc.gpr[31] =3D + cpu_ldq_mmuidx_ra(env, addr, mem_idx, GETPC()); } } =20 @@ -610,14 +548,14 @@ void helper_sdm(CPUMIPSState *env, target_ulong addr,= target_ulong reglist, target_ulong i; =20 for (i =3D 0; i < base_reglist; i++) { - do_sd(env, addr, env->active_tc.gpr[multiple_regs[i]], mem_idx, - GETPC()); + cpu_stq_mmuidx_ra(env, addr, env->active_tc.gpr[multiple_regs[= i]], + mem_idx, GETPC()); addr +=3D 8; } } =20 if (do_r31) { - do_sd(env, addr, env->active_tc.gpr[31], mem_idx, GETPC()); + cpu_stq_mmuidx_ra(env, addr, env->active_tc.gpr[31], mem_idx, GETP= C()); } } #endif --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456911; cv=none; d=zohomail.com; s=zohoarc; b=bgwTAAreQ3LwtMIA2sbu5TmM5Xt7JlAcSx/7BYI0W56gy3CY1k8d0msmk34zd9IVyaXDSR1jum4HlAc5N+obhJFztndMpKQZdJViHvPjX8YW+sgKMeGmiaUw+2+9tjDytxW3EF9Fv3SsWpbEcB2YyQBkdqObkdzsEsdtSYvt8s4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456911; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WYN2QItvAay87lkoXnlW2XXwTd6qqngmCswIOi1zNl8=; b=PMoP3IRCxSlq7N8GnyAwRDK3v0yUy+WJlktrVzT5BCFlpCdNpoQeBNMDO1XVXfYRsMyacyIfAULc7uexy55PMCEx2ldIS63pyclzBTu+WS6ik0EHohXXIBKtIUqnbl7l6fBfa4mET96wIm0B7StxifR2RL+LkWfZiuXn7LbRkfY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456911265292.99354084281686; Tue, 7 Jan 2020 20:15:11 -0800 (PST) Received: from localhost ([::1]:35818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2kQ-00034h-4a for importer@patchew.org; Tue, 07 Jan 2020 23:15:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50116) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2JP-0005OI-6y for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2JN-00045h-Vu for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:14 -0500 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:45539) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2JN-00045A-QC for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:13 -0500 Received: by mail-pf1-x442.google.com with SMTP id 2so892004pfg.12 for ; Tue, 07 Jan 2020 19:47:13 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.47.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:47:12 -0800 (PST) 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=WYN2QItvAay87lkoXnlW2XXwTd6qqngmCswIOi1zNl8=; b=V7q8O0WS60WKvKBVV0XINZCjXqnfNV4NJvm1D61JRyccIJXYr4Kg32e7hDpQY1Srcs 7D6FGM/yXmZM2S/3GV4WFZuJWt+BV/SNNqpmOdLF1t2VpfDA/sVHnZ1cfMEkTs7qyDrH 5NE93+hdIi6HtqHlSfeNQpB0lUoa4Uxf+baC+KcFzSl1QPhOQu52cCSItXj6G1g1QTnu W8csSjxvYXVMIUG9rWlYd1r+CYv8vDhtQFt8IwKh/b0cNyA5B1gZq5ClrfFG0m2eZPSB jjdfzat0km4LDq2SniqmuLVHqt7U5yLR1oUX3CSoQP+LpZxPAD9+MX7jBlVY9cKqaTEB t5cA== 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=WYN2QItvAay87lkoXnlW2XXwTd6qqngmCswIOi1zNl8=; b=hFvMAAPi67SFofF3V5Rf6R+sbKmJg71DDomzdyCeVfVBOeT8uqiL3qduaJMjfj5ldl BJEV1U7cTAPDE4rLgqxxagLwdCIVEU2ceKVKPHNk/TNmCXcpKzleE7E6ef34SWOYTc7p nFKwRwlewmTPzDqfz2jAmVnWvziN8IEezpjYf2Bo+4t+OVeAKIPdqqLZtNmNTl314nzg SUHxe2012cj7HXSToVsvHGi2EME1KIQ6jByFf+YuyNmjuKCcGr4rGkgcy20q7efcE/Kd KkuOkC5ZSxmk0TQEgQ2zoUByP9m2lDyPMhRj27V84PonLPFYtcEAAsOcCMSYwhKdjOpP zyYQ== X-Gm-Message-State: APjAAAVGoYMdXcKVQpM4xZ0p0fN6lHth5RV0PHwC/lQ7imb8EoezplhS OZfEQZNhF//SKdjVySugVVshD1v3mAnkEw== X-Google-Smtp-Source: APXvYqyy3USIgzif9biIYk3l95gdnCGNdX7QPfSrFrPmywsYtMoD+bNSpnIrOgZNY+U3d7+aRf9vGw== X-Received: by 2002:a62:1883:: with SMTP id 125mr2844812pfy.166.1578455232689; Tue, 07 Jan 2020 19:47:12 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 33/41] target/s390x: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX Date: Wed, 8 Jan 2020 14:45:15 +1100 Message-Id: <20200108034523.17349-34-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::442 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The generated functions aside from *_real are unused. The *_real functions have a couple of users in mem_helper.c; use *_mmuidx_ra instead, with MMU_REAL_IDX. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- v2: Use *_mmuidx_ra directly, without intermediate macros. --- target/s390x/cpu.h | 5 ----- target/s390x/mem_helper.c | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index e195e5c7c8..8a557fd8d1 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -36,11 +36,6 @@ =20 #define TARGET_INSN_START_EXTRA_WORDS 2 =20 -#define MMU_MODE0_SUFFIX _primary -#define MMU_MODE1_SUFFIX _secondary -#define MMU_MODE2_SUFFIX _home -#define MMU_MODE3_SUFFIX _real - #define MMU_USER_IDX 0 =20 #define S390_MAX_CPUS 248 diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 20a84b3912..428bde4c54 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -2026,7 +2026,7 @@ uint32_t HELPER(testblock)(CPUS390XState *env, uint64= _t real_addr) real_addr =3D wrap_address(env, real_addr) & TARGET_PAGE_MASK; =20 for (i =3D 0; i < TARGET_PAGE_SIZE; i +=3D 8) { - cpu_stq_real_ra(env, real_addr + i, 0, ra); + cpu_stq_mmuidx_ra(env, real_addr + i, 0, MMU_REAL_IDX, ra); } =20 return 0; @@ -2260,11 +2260,11 @@ void HELPER(idte)(CPUS390XState *env, uint64_t r1, = uint64_t r2, uint32_t m4) for (i =3D 0; i < entries; i++) { /* addresses are not wrapped in 24/31bit mode but table index = is */ raddr =3D table + ((index + i) & 0x7ff) * sizeof(entry); - entry =3D cpu_ldq_real_ra(env, raddr, ra); + entry =3D cpu_ldq_mmuidx_ra(env, raddr, MMU_REAL_IDX, ra); if (!(entry & REGION_ENTRY_I)) { /* we are allowed to not store if already invalid */ entry |=3D REGION_ENTRY_I; - cpu_stq_real_ra(env, raddr, entry, ra); + cpu_stq_mmuidx_ra(env, raddr, entry, MMU_REAL_IDX, ra); } } } @@ -2291,9 +2291,9 @@ void HELPER(ipte)(CPUS390XState *env, uint64_t pto, u= int64_t vaddr, pte_addr +=3D VADDR_PAGE_TX(vaddr) * 8; =20 /* Mark the page table entry as invalid */ - pte =3D cpu_ldq_real_ra(env, pte_addr, ra); + pte =3D cpu_ldq_mmuidx_ra(env, pte_addr, MMU_REAL_IDX, ra); pte |=3D PAGE_ENTRY_I; - cpu_stq_real_ra(env, pte_addr, pte, ra); + cpu_stq_mmuidx_ra(env, pte_addr, pte, MMU_REAL_IDX, ra); =20 /* XXX we exploit the fact that Linux passes the exact virtual address here - it's not obliged to! */ --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456297; cv=none; d=zohomail.com; s=zohoarc; b=UtgdGN3Qvsibo5C+SSnguwB49x9Hu9ZdPv76Y5v277P+WSL3rN+h5/r8GLDNxwsVLlr6mzAoUFRrVNUwUfJVCE4+oFzWr6iGk4inoTPWrQjRzmgT3DFiGBjqkYWv7oHX2GgRtGyUUiTSNexSBOzwJqOh2jX63jGtCrwn0TvXi0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456297; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UQQL71nxDv+NQizXBLJ7meGttjVPXVB9/ApNcux5IwY=; b=ZIukyKN796smSfyzEv8asEAHg1LTYCIwRUrUeX5YGqtqDi6QfbA/Abkn6bCKdYVwhtyCCetki+3wPr0T4BHOhirIxS66IgQLGxD5WuWs3A60uruQG336PqxRO9yffkSvYzKK31+oH7p4cLjbsgWFHjV2HEgh1CwEbOe7sje464I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456297692409.5470605500527; Tue, 7 Jan 2020 20:04:57 -0800 (PST) Received: from localhost ([::1]:35528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2aW-0004CD-5I for importer@patchew.org; Tue, 07 Jan 2020 23:04:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50167) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2JS-0005SR-BM for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2JR-00048u-4S for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:18 -0500 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:33878) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2JQ-00048O-VJ for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:17 -0500 Received: by mail-pg1-x534.google.com with SMTP id r11so883783pgf.1 for ; Tue, 07 Jan 2020 19:47:16 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.47.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:47:15 -0800 (PST) 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=UQQL71nxDv+NQizXBLJ7meGttjVPXVB9/ApNcux5IwY=; b=NNyhk+s//Dqr3R8gpv/NmUGeYAyamg36eUKOIuBnhPZG3UW4h1BAsP1WUhsYoFwm+n rbnlwJ8KGOcqT2dD0gagfhRa8mxrWgIomADWpzqtwIprtkxUzHi/PQuaeB5k5tAmPedw KqFzOdoPzZU8hOoqlv22iTY+PfJQ7uxXrX3IPokqH53V0xxMhAmywf64hWYcxsfWdCu5 /+rVC+FOY5XyWCNkT9y/5kMCP1vlXOblXrBscxUwhxovtJfNpwxwc9fpMWBGksJoQvHI EL0ppfgSmZKOg0H53TmT7yK/+UMKQwdIjxLGfigtuy12eBkGUJmRq0QvPbgNJyVip+WM zy9A== 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=UQQL71nxDv+NQizXBLJ7meGttjVPXVB9/ApNcux5IwY=; b=YTm93He4zl5t6JgzKW9xAeKC5JprszXq10+ltuWYuzGUkSlTd704q4c3VSV9nJtZnu XeX66m0wTFJR/vLgI2VrfjWPf6oKy2MRO++VxFQYJyD2639lnegbjBhRR0LO0RPkCNoH OFygId4OSXfzJ5wDKJNsfwuzyKdJ7h37nSJiNGoPmvHjKR7MTWi8RE3ZWZ+uk/ZDyMVV jWjoye1GfIBCFkK43jAsVfKXud5ZJgOKLgKSJ2AN2+wpJi4qKBc7PNuBa6vmR2l6EQJv SEzsA5VFTyX60lyHEMjuAyLZnXlf5aFQu3zWbqBggXDhah68S+RHRqz4NT06ugHJKLNh pJTg== X-Gm-Message-State: APjAAAUy1gc1NZ5TUU7C/fpDTxBdPFiDIizLsea/RtL+8BgZONXQY91r UvNZ9oHqiuSMVLg1KRN1WoltFyPJieRAcw== X-Google-Smtp-Source: APXvYqyWZxXPSi/PHBCVyxKiXBF4zFOJez9e3UKZu1+aV9NDhkitq3RAOh8zfSDi7VTiGEvwvXHsUw== X-Received: by 2002:aa7:8dd0:: with SMTP id j16mr2933068pfr.186.1578455235792; Tue, 07 Jan 2020 19:47:15 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 34/41] target/ppc: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX Date: Wed, 8 Jan 2020 14:45:16 +1100 Message-Id: <20200108034523.17349-35-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::534 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) There are only two uses. Within dcbz_common, the local variable mmu_idx already contains the epid computation, and we can avoid repeating it for the store. Within helper_icbiep, the usage is trivially expanded using PPC_TLB_EPID_LOAD. Tested-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/ppc/cpu.h | 2 -- target/ppc/mem_helper.c | 11 ++--------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 103bfe9dc2..8ebeaba649 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -951,8 +951,6 @@ struct ppc_radix_page_info { * + real/paged mode combinations. The other two modes are for * external PID load/store. */ -#define MMU_MODE8_SUFFIX _epl -#define MMU_MODE9_SUFFIX _eps #define PPC_TLB_EPID_LOAD 8 #define PPC_TLB_EPID_STORE 9 =20 diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c index 1351b53f28..56855f2381 100644 --- a/target/ppc/mem_helper.c +++ b/target/ppc/mem_helper.c @@ -177,14 +177,7 @@ static void dcbz_common(CPUPPCState *env, target_ulong= addr, } else { /* Slow path */ for (i =3D 0; i < dcbz_size; i +=3D 8) { - if (epid) { -#if !defined(CONFIG_USER_ONLY) - /* Does not make sense on USER_ONLY config */ - cpu_stq_eps_ra(env, addr + i, 0, retaddr); -#endif - } else { - cpu_stq_data_ra(env, addr + i, 0, retaddr); - } + cpu_stq_mmuidx_ra(env, addr + i, 0, mmu_idx, retaddr); } } } @@ -216,7 +209,7 @@ void helper_icbiep(CPUPPCState *env, target_ulong addr) #if !defined(CONFIG_USER_ONLY) /* See comments above */ addr &=3D ~(env->dcache_line_size - 1); - cpu_ldl_epl_ra(env, addr, GETPC()); + cpu_ldl_mmuidx_ra(env, addr, PPC_TLB_EPID_LOAD, GETPC()); #endif } =20 --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456555; cv=none; d=zohomail.com; s=zohoarc; b=giDJ8JBpB+NvGHN6zL46TLFdAsLFxYKRm3zBSnrvRU1qa+KsDqQ6T50U9CMEV+J2rUvkpFSaVDvQTMZMOHZxI9/1Tw9cU/ZyDUiXdtd1g57x+kmVNV5cetTAylJSw0nK+89/pEMMFvnZx8SrnK/Xg9T6doRWCq9+39nWWdSO/Ak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456555; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=40U6j5jG8ujheReF1SUs50iurr4GUkD3XD9r1UeyH6c=; b=LAaaQvYKoiUi4CA0D3aR8vAOjRyKN5OjGVj3FgCskY4ULFgAFHytggoXmleCXltvhsaKQvOJeZhzp3J2Y0FPkr07KVchzMdWhE356sjvY1r3TY6wORdiWVNVleGzwYCVCvFo25F90kiaTdxBBMDmwBjOLciJB1vnYnrO8Kamc7w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456555332842.5509487461999; Tue, 7 Jan 2020 20:09:15 -0800 (PST) Received: from localhost ([::1]:35666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2ef-0002zz-VR for importer@patchew.org; Tue, 07 Jan 2020 23:09:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50221) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2JV-0005Wg-HW for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2JT-0004CE-Ut for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:21 -0500 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:38848) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2JT-0004Bo-Of for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:19 -0500 Received: by mail-pg1-x52b.google.com with SMTP id a33so871721pgm.5 for ; Tue, 07 Jan 2020 19:47:19 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:47:17 -0800 (PST) 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=40U6j5jG8ujheReF1SUs50iurr4GUkD3XD9r1UeyH6c=; b=m4avyYIoCC6tv6qVmAExWM6m2ul1/1xEHal95C1kLvoI+3cKfXM/iigLemLyt2UWWq aFI+xgt6PXuSizUhQOB/1p2rDlKfuPIeESvTiWRKKtHFjuLEoS7WruuGhUcvWlpQ1fIg Iw95HO6IsBUV/YWDRR/82xKJesEQfQJTQtio8HtV0gJfgwMkS3+w6A9bSMLrAznDdBCf jKw2UPHTptHn0XeLKy3hkAf4vkGCYgmMHL43cCJW5p8pTcAsA05vwiE/+XyDMlD/hGsp iEZrMqPOv1oOOBqEpC9X4koi3P0bOYfJ3PAuR4p/hJ1ET4JbYHSbyRkReWjwu7JwKRYn AdWg== 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=40U6j5jG8ujheReF1SUs50iurr4GUkD3XD9r1UeyH6c=; b=U5AgY8d9fyiSg93twLPaS9ZgmcQcUdb7OGFl2GLROX5WWFpaZo7STb8PtoSdSPyRsL JLDCbPz2cZowX2UFmK5acO27tVFNhcXf6QKIdbkVOsopVMiK0edbRiw5lvLdzFlYZzTc nP8GTjJrJkF8KaT4DIf+NDmkgkv3SnjPHU3ltcWV0tPIlPTCvsNpdLsF6JQpy4b4v5to JJUhPKKE/jmjVcBdyA0eSjPlEBgCLwxStQXT1Zncj1IAewM8lipEcU9V/vfigbbxdpb0 w48A/xs5lrtymOaGJdk8XgvhfboPC/gKI35I3sXojaINR7TLphuC82HLmdQvOjn1qIZF Iqxw== X-Gm-Message-State: APjAAAUrwzRoUXd0k1VCeWNvZtvy49aYWP8RafQCxBsvkEzVo+p1CTpD PknhTTHSCWgFg5Ybazmya1od+R+RNn21qQ== X-Google-Smtp-Source: APXvYqyLxoZbGSXeHCuIMVviR19FvvaTLPxpFzN62fCccV/9uduhOAU4c5g5AhrBekx3Ji0aTLe+6g== X-Received: by 2002:a63:cf41:: with SMTP id b1mr3085284pgj.53.1578455238556; Tue, 07 Jan 2020 19:47:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 35/41] cputlb: Remove support for MMU_MODE*_SUFFIX Date: Wed, 8 Jan 2020 14:45:17 +1100 Message-Id: <20200108034523.17349-36-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::52b 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) All users have now been converted to cpu_*_mmuidx_ra. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- include/exec/cpu_ldst.h | 230 ---------------------------------------- 1 file changed, 230 deletions(-) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 0f3c49a005..cf4652bf48 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -271,236 +271,6 @@ void cpu_stl_mmuidx_ra(CPUArchState *env, abi_ptr add= r, uint32_t val, void cpu_stq_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val, int mmu_idx, uintptr_t retaddr); =20 -#ifdef MMU_MODE0_SUFFIX -#define CPU_MMU_INDEX 0 -#define MEMSUFFIX MMU_MODE0_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif - -#if (NB_MMU_MODES >=3D 2) && defined(MMU_MODE1_SUFFIX) -#define CPU_MMU_INDEX 1 -#define MEMSUFFIX MMU_MODE1_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif - -#if (NB_MMU_MODES >=3D 3) && defined(MMU_MODE2_SUFFIX) - -#define CPU_MMU_INDEX 2 -#define MEMSUFFIX MMU_MODE2_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >=3D 3) */ - -#if (NB_MMU_MODES >=3D 4) && defined(MMU_MODE3_SUFFIX) - -#define CPU_MMU_INDEX 3 -#define MEMSUFFIX MMU_MODE3_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >=3D 4) */ - -#if (NB_MMU_MODES >=3D 5) && defined(MMU_MODE4_SUFFIX) - -#define CPU_MMU_INDEX 4 -#define MEMSUFFIX MMU_MODE4_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >=3D 5) */ - -#if (NB_MMU_MODES >=3D 6) && defined(MMU_MODE5_SUFFIX) - -#define CPU_MMU_INDEX 5 -#define MEMSUFFIX MMU_MODE5_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >=3D 6) */ - -#if (NB_MMU_MODES >=3D 7) && defined(MMU_MODE6_SUFFIX) - -#define CPU_MMU_INDEX 6 -#define MEMSUFFIX MMU_MODE6_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >=3D 7) */ - -#if (NB_MMU_MODES >=3D 8) && defined(MMU_MODE7_SUFFIX) - -#define CPU_MMU_INDEX 7 -#define MEMSUFFIX MMU_MODE7_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >=3D 8) */ - -#if (NB_MMU_MODES >=3D 9) && defined(MMU_MODE8_SUFFIX) - -#define CPU_MMU_INDEX 8 -#define MEMSUFFIX MMU_MODE8_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >=3D 9) */ - -#if (NB_MMU_MODES >=3D 10) && defined(MMU_MODE9_SUFFIX) - -#define CPU_MMU_INDEX 9 -#define MEMSUFFIX MMU_MODE9_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >=3D 10) */ - -#if (NB_MMU_MODES >=3D 11) && defined(MMU_MODE10_SUFFIX) - -#define CPU_MMU_INDEX 10 -#define MEMSUFFIX MMU_MODE10_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >=3D 11) */ - -#if (NB_MMU_MODES >=3D 12) && defined(MMU_MODE11_SUFFIX) - -#define CPU_MMU_INDEX 11 -#define MEMSUFFIX MMU_MODE11_SUFFIX -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX -#endif /* (NB_MMU_MODES >=3D 12) */ - -#if (NB_MMU_MODES > 12) -#error "NB_MMU_MODES > 12 is not supported for now" -#endif /* (NB_MMU_MODES > 12) */ - /* these access are slower, they must be as rare as possible */ #define CPU_MMU_INDEX (cpu_mmu_index(env, false)) #define MEMSUFFIX _data --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578457018; cv=none; d=zohomail.com; s=zohoarc; b=Q3TofIRgttvBkilm6OVPmMAFr0oNkyZQcInPF5c2+oIjOgYmz4PM8FIStdG6+D/PrnPsijJvOnkrTzl04ozpKYX+MWu3NGn5POnTZYlheYxLw/et1aGzdM6KdE3ACvojPv8WGi1gu/XFNb0u9J2UEcZbjCY6saZz0sYlF5Sjl88= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578457018; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=t2thyoGvsbaFk+uMDj/uOOcbmAbs4TE41aB8Qd+9rug=; b=nt64FPTMyOo2wykpZ/a8MtWO9cqlDcj2+2kZJlzqNPSHORc73FB7BW48tWXR9jGzv8qL357rCtdMk18rSW07DwzVODAfBEmv8ocen9V1BvcSGCXuIdRgg6kykdN7IO7MyastxwV6POFmc03cfT6rhfEqsqfTeOhUNNh8uvXzI3M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578457018888235.23534080814647; Tue, 7 Jan 2020 20:16:58 -0800 (PST) Received: from localhost ([::1]:35868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2m9-0004se-R9 for importer@patchew.org; Tue, 07 Jan 2020 23:16:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50285) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2JZ-0005bt-CV for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2JX-0004HD-A0 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:25 -0500 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]:40674) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2JX-0004FM-1d for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:23 -0500 Received: by mail-pg1-x52e.google.com with SMTP id k25so866800pgt.7 for ; Tue, 07 Jan 2020 19:47:22 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.47.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:47:21 -0800 (PST) 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=t2thyoGvsbaFk+uMDj/uOOcbmAbs4TE41aB8Qd+9rug=; b=qaECD4XoI/yNtkmW4CUXnW0cHCxkDUYb6/A+jxzS827gHrD1cG5aA8s1To/F/qoNqm ZLMIKhmxDo3vp1B1sZf6zJreKnfbqOdCfa04au/hFQaiJl2dnuDulyq3WIVh2AeILHJR SeRWO53UVADNF4s+5/dXbkTKR1A0ylGPKgF+XmQOPJ5woTmGmoJk5cMNWwHo9SJRJOuq EpWkFKmzoUx3yqf8jS8DpN8N/ZHaZrgpIXSHdATSU1zb27ddWfzfPUlb9ZVfMp2ka6V9 mEMeIAEeIoSqSEQrO3XMlES52+n+XSAQOwPffENROPHPnA/7qdzDMvvke0w60gRmMiVz xIXg== 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=t2thyoGvsbaFk+uMDj/uOOcbmAbs4TE41aB8Qd+9rug=; b=SGzeyRWG6r4jNr8F2pM6q8YV26VaWnpetlsnIRLCDRRyqPKB8NOoqdJSbtf4mMuOLG 9uQySni0Q4bj7yGR8KCaPay0GFC70Raj7fsEVIZDRBTTKpj3Z4wuLCJFCtgV33OvAtkK jz3EtBVBsbqd3HaZwGg0fnEHhVzsAUdC6e0Uq6QlRB4plRZVuxHW29ROurOwvR8eYeAc FV5Xym/C4Eq6BdOWg22wAetSzeYv4MS0pL1ihKUWHT/M2VIFLEVDsq54AD9iurbNIt5T 7em47VlyC0gY1najnLFsNFx0BGX+eplksQb0SdvJAw/zgNcAxhnLiGhyCc+4Lh/CapHR 1+fQ== X-Gm-Message-State: APjAAAUPFRsNwIu+J+n63YLSh/EnzNiq6zS3CIe7XBfQftYd123ALIS+ b07CHScYlem1pTIbQCrMo8yGR/bqbnD7cQ== X-Google-Smtp-Source: APXvYqztH5o7VYn3bxDf4rit103ymO9ldZr5nYP8E4qqDBnolxx4y05+mLDkb/QGpwd7YUYsUobBcg== X-Received: by 2002:a63:358a:: with SMTP id c132mr3190698pga.286.1578455241650; Tue, 07 Jan 2020 19:47:21 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 36/41] cputlb: Expand cpu_ldst_template.h in cputlb.c Date: Wed, 8 Jan 2020 14:45:18 +1100 Message-Id: <20200108034523.17349-37-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::52e 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Reduce the amount of preprocessor obfuscation by expanding the text of each of the functions generated. The result is only slightly smaller than the original. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Aleksandar Markovic Signed-off-by: Richard Henderson --- include/exec/cpu_ldst.h | 67 +++++++----------- include/exec/cpu_ldst_template.h | 117 ------------------------------- accel/tcg/cputlb.c | 107 +++++++++++++++++++++++++++- 3 files changed, 130 insertions(+), 161 deletions(-) delete mode 100644 include/exec/cpu_ldst_template.h diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index cf4652bf48..62f38d5a22 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -94,32 +94,6 @@ typedef target_ulong abi_ptr; #define TARGET_ABI_FMT_ptr TARGET_ABI_FMT_lx #endif =20 -#if defined(CONFIG_USER_ONLY) - -extern __thread uintptr_t helper_retaddr; - -static inline void set_helper_retaddr(uintptr_t ra) -{ - helper_retaddr =3D ra; - /* - * Ensure that this write is visible to the SIGSEGV handler that - * may be invoked due to a subsequent invalid memory operation. - */ - signal_barrier(); -} - -static inline void clear_helper_retaddr(void) -{ - /* - * Ensure that previous memory operations have succeeded before - * removing the data visible to the signal handler. - */ - signal_barrier(); - helper_retaddr =3D 0; -} - -/* In user-only mode we provide only the _code and _data accessors. */ - uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr); uint32_t cpu_lduw_data(CPUArchState *env, abi_ptr ptr); uint32_t cpu_ldl_data(CPUArchState *env, abi_ptr ptr); @@ -148,6 +122,30 @@ void cpu_stl_data_ra(CPUArchState *env, abi_ptr ptr, void cpu_stq_data_ra(CPUArchState *env, abi_ptr ptr, uint64_t val, uintptr_t retaddr); =20 +#if defined(CONFIG_USER_ONLY) + +extern __thread uintptr_t helper_retaddr; + +static inline void set_helper_retaddr(uintptr_t ra) +{ + helper_retaddr =3D ra; + /* + * Ensure that this write is visible to the SIGSEGV handler that + * may be invoked due to a subsequent invalid memory operation. + */ + signal_barrier(); +} + +static inline void clear_helper_retaddr(void) +{ + /* + * Ensure that previous memory operations have succeeded before + * removing the data visible to the signal handler. + */ + signal_barrier(); + helper_retaddr =3D 0; +} + /* * Provide the same *_mmuidx_ra interface as for softmmu. * The mmu_idx argument is ignored. @@ -271,23 +269,6 @@ void cpu_stl_mmuidx_ra(CPUArchState *env, abi_ptr addr= , uint32_t val, void cpu_stq_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val, int mmu_idx, uintptr_t retaddr); =20 -/* these access are slower, they must be as rare as possible */ -#define CPU_MMU_INDEX (cpu_mmu_index(env, false)) -#define MEMSUFFIX _data -#define DATA_SIZE 1 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 2 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 4 -#include "exec/cpu_ldst_template.h" - -#define DATA_SIZE 8 -#include "exec/cpu_ldst_template.h" -#undef CPU_MMU_INDEX -#undef MEMSUFFIX - #endif /* defined(CONFIG_USER_ONLY) */ =20 uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr); diff --git a/include/exec/cpu_ldst_template.h b/include/exec/cpu_ldst_templ= ate.h deleted file mode 100644 index e400979f23..0000000000 --- a/include/exec/cpu_ldst_template.h +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Software MMU support - * - * Generate inline load/store functions for one MMU mode and data - * size. - * - * Generate a store function as well as signed and unsigned loads. - * - * Not used directly but included from cpu_ldst.h. - * - * Copyright (c) 2003 Fabrice Bellard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ - -#if DATA_SIZE =3D=3D 8 -#define SUFFIX q -#define USUFFIX q -#define DATA_TYPE uint64_t -#define SHIFT 3 -#elif DATA_SIZE =3D=3D 4 -#define SUFFIX l -#define USUFFIX l -#define DATA_TYPE uint32_t -#define SHIFT 2 -#elif DATA_SIZE =3D=3D 2 -#define SUFFIX w -#define USUFFIX uw -#define DATA_TYPE uint16_t -#define DATA_STYPE int16_t -#define SHIFT 1 -#elif DATA_SIZE =3D=3D 1 -#define SUFFIX b -#define USUFFIX ub -#define DATA_TYPE uint8_t -#define DATA_STYPE int8_t -#define SHIFT 0 -#else -#error unsupported data size -#endif - -#if DATA_SIZE =3D=3D 8 -#define RES_TYPE uint64_t -#else -#define RES_TYPE uint32_t -#endif - -/* generic load/store macros */ - -static inline RES_TYPE -glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, - target_ulong ptr, - uintptr_t retaddr) -{ - return glue(glue(cpu_ld, USUFFIX), _mmuidx_ra)(env, ptr, CPU_MMU_INDEX, - retaddr); -} - -static inline RES_TYPE -glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr) -{ - return glue(glue(cpu_ld, USUFFIX), _mmuidx_ra)(env, ptr, CPU_MMU_INDEX= , 0); -} - -#if DATA_SIZE <=3D 2 -static inline int -glue(glue(glue(cpu_lds, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, - target_ulong ptr, - uintptr_t retaddr) -{ - return glue(glue(cpu_lds, SUFFIX), _mmuidx_ra)(env, ptr, CPU_MMU_INDEX, - retaddr); -} - -static inline int -glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr) -{ - return glue(glue(cpu_lds, SUFFIX), _mmuidx_ra)(env, ptr, CPU_MMU_INDEX= , 0); -} -#endif - -/* generic store macro */ - -static inline void -glue(glue(glue(cpu_st, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, - target_ulong ptr, - RES_TYPE v, uintptr_t ret= addr) -{ - glue(glue(cpu_st, SUFFIX), _mmuidx_ra)(env, ptr, v, CPU_MMU_INDEX, - retaddr); -} - -static inline void -glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr, - RES_TYPE v) -{ - glue(glue(cpu_st, SUFFIX), _mmuidx_ra)(env, ptr, v, CPU_MMU_INDEX, 0); -} - -#undef RES_TYPE -#undef DATA_TYPE -#undef DATA_STYPE -#undef SUFFIX -#undef USUFFIX -#undef DATA_SIZE -#undef SHIFT diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index f0e4b0aee4..a991ea2964 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -35,7 +35,6 @@ #include "qemu/atomic128.h" #include "translate-all.h" #include "trace-root.h" -#include "qemu/plugin.h" #include "trace/mem.h" #ifdef CONFIG_PLUGIN #include "qemu/plugin-memory.h" @@ -1697,6 +1696,68 @@ uint64_t cpu_ldq_mmuidx_ra(CPUArchState *env, abi_pt= r addr, ? helper_le_ldq_mmu : helper_be_ldq_mmu); } =20 +uint32_t cpu_ldub_data_ra(CPUArchState *env, target_ulong ptr, + uintptr_t retaddr) +{ + return cpu_ldub_mmuidx_ra(env, ptr, cpu_mmu_index(env, false), retaddr= ); +} + +int cpu_ldsb_data_ra(CPUArchState *env, target_ulong ptr, uintptr_t retadd= r) +{ + return cpu_ldsb_mmuidx_ra(env, ptr, cpu_mmu_index(env, false), retaddr= ); +} + +uint32_t cpu_lduw_data_ra(CPUArchState *env, target_ulong ptr, + uintptr_t retaddr) +{ + return cpu_lduw_mmuidx_ra(env, ptr, cpu_mmu_index(env, false), retaddr= ); +} + +int cpu_ldsw_data_ra(CPUArchState *env, target_ulong ptr, uintptr_t retadd= r) +{ + return cpu_ldsw_mmuidx_ra(env, ptr, cpu_mmu_index(env, false), retaddr= ); +} + +uint32_t cpu_ldl_data_ra(CPUArchState *env, target_ulong ptr, uintptr_t re= taddr) +{ + return cpu_ldl_mmuidx_ra(env, ptr, cpu_mmu_index(env, false), retaddr); +} + +uint64_t cpu_ldq_data_ra(CPUArchState *env, target_ulong ptr, uintptr_t re= taddr) +{ + return cpu_ldq_mmuidx_ra(env, ptr, cpu_mmu_index(env, false), retaddr); +} + +uint32_t cpu_ldub_data(CPUArchState *env, target_ulong ptr) +{ + return cpu_ldub_data_ra(env, ptr, 0); +} + +int cpu_ldsb_data(CPUArchState *env, target_ulong ptr) +{ + return cpu_ldsb_data_ra(env, ptr, 0); +} + +uint32_t cpu_lduw_data(CPUArchState *env, target_ulong ptr) +{ + return cpu_lduw_data_ra(env, ptr, 0); +} + +int cpu_ldsw_data(CPUArchState *env, target_ulong ptr) +{ + return cpu_ldsw_data_ra(env, ptr, 0); +} + +uint32_t cpu_ldl_data(CPUArchState *env, target_ulong ptr) +{ + return cpu_ldl_data_ra(env, ptr, 0); +} + +uint64_t cpu_ldq_data(CPUArchState *env, target_ulong ptr) +{ + return cpu_ldq_data_ra(env, ptr, 0); +} + /* * Store Helpers */ @@ -1970,6 +2031,50 @@ void cpu_stq_mmuidx_ra(CPUArchState *env, target_ulo= ng addr, uint64_t val, cpu_store_helper(env, addr, val, mmu_idx, retaddr, MO_TEQ); } =20 +void cpu_stb_data_ra(CPUArchState *env, target_ulong ptr, + uint32_t val, uintptr_t retaddr) +{ + cpu_stb_mmuidx_ra(env, ptr, val, cpu_mmu_index(env, false), retaddr); +} + +void cpu_stw_data_ra(CPUArchState *env, target_ulong ptr, + uint32_t val, uintptr_t retaddr) +{ + cpu_stw_mmuidx_ra(env, ptr, val, cpu_mmu_index(env, false), retaddr); +} + +void cpu_stl_data_ra(CPUArchState *env, target_ulong ptr, + uint32_t val, uintptr_t retaddr) +{ + cpu_stl_mmuidx_ra(env, ptr, val, cpu_mmu_index(env, false), retaddr); +} + +void cpu_stq_data_ra(CPUArchState *env, target_ulong ptr, + uint64_t val, uintptr_t retaddr) +{ + cpu_stq_mmuidx_ra(env, ptr, val, cpu_mmu_index(env, false), retaddr); +} + +void cpu_stb_data(CPUArchState *env, target_ulong ptr, uint32_t val) +{ + cpu_stb_data_ra(env, ptr, val, 0); +} + +void cpu_stw_data(CPUArchState *env, target_ulong ptr, uint32_t val) +{ + cpu_stw_data_ra(env, ptr, val, 0); +} + +void cpu_stl_data(CPUArchState *env, target_ulong ptr, uint32_t val) +{ + cpu_stl_data_ra(env, ptr, val, 0); +} + +void cpu_stq_data(CPUArchState *env, target_ulong ptr, uint64_t val) +{ + cpu_stq_data_ra(env, ptr, val, 0); +} + /* First set of helpers allows passing in of OI and RETADDR. This makes them callable from other helpers. */ =20 --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456654; cv=none; d=zohomail.com; s=zohoarc; b=fqp4jiQP+/l54AkIyfGnCfiPSqfpD+iI7iSlhNL+HVXeiNYCHvfI3BUhBD3IYqa8FzVOdaIqRjfJuONfMU91MMYmzX4lQBASasVyakJpCN0pto5sWtofxZXujMCG29dbE2cGt4YcXhcQzYORJYb8TzSf3Y62s/+Hotmd1uLD/hM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456654; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=d5BbDtB4nFvZXvllnPFuns4hse6XKdV2w63eaThIgUg=; b=UkgHemhyTSU51YCTXsGfaDE3lzWTd3ExIXwPc31XaNFTyiyNQyu+LcdRtQpscnvkVBSzqC5aPtsO5k4qYJYxVUalkPc4KYA9XxBQ/9eCbEBtWhNGXml2JESGLaPE2pIADzcA2P+nRT5thvcc5AYDsdqh1ya2c493HrxNbjQOs4A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157845665478634.48824688153593; Tue, 7 Jan 2020 20:10:54 -0800 (PST) Received: from localhost ([::1]:35728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2gH-0006Fx-L9 for importer@patchew.org; Tue, 07 Jan 2020 23:10:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50356) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Je-0005iY-JE for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Jb-0004LV-B8 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:30 -0500 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:37221) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Jb-0004KU-1b for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:27 -0500 Received: by mail-pg1-x536.google.com with SMTP id q127so874390pga.4 for ; Tue, 07 Jan 2020 19:47:26 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:47:24 -0800 (PST) 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=d5BbDtB4nFvZXvllnPFuns4hse6XKdV2w63eaThIgUg=; b=XjY0i3cOoWQyPDr2nFZZAd4iDJ3WopTZ0+eUgXSOTEUuUmtugi0h6YZd1QQ6cXrqiy OCaQj6g1v52Tivkb7r5WLWQWJ+A1Awi7jduHM71uye0G3QrNBPSvkCE/H2kTkirw3/XU uLM5Hp7AzAbyQ007a5wPHjtxV7SQ1KI11Y2A0ZuLgbWFfsfcWKjG1qSYVNIyF6AwiG7k W1WxeylpNMwQMq8szC9qBfXK/6rsq3S0Lj8uMmmdTj08k4Jp5JsURwSjMUxbizYNJIQ0 W2mUQxxPSERqwUD1f9nFWJAyf/SSH/KMbKS26WeKZ11inMHCEuKPTjJNuvZi4ryrRhi1 0tMA== 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=d5BbDtB4nFvZXvllnPFuns4hse6XKdV2w63eaThIgUg=; b=brm3Zthiw4hKJ6zr63c+JoZHVery0B2TP1oo7ZJlTIXl9satmqpETHsy9ORbiKSyHC 9gPgJsPKXbZh3SS5I94P45yIi4v3muyAr/KCssYqYBObK23vVIE8o5lO/2W99SBq7/L9 JplkkUDGnAtQ7sw9kyuwI5lMRSzAoSLifmZ2K8KaXnyDVIgk1Ds94WUOjIT6gAWUeiOo 6lLr8Iv57ZQNEgXXKpdmy7HDwwaa9mpsFffJIAeNHKvYABx+rKGco75fRLhMFkUGIpyd vB64pHWtSaJJd6MxEjbPa14RUPwiX/8JoFbgP6lNf6bbnP5fD4hHZoh4pZp8aPZZkdKA f0aw== X-Gm-Message-State: APjAAAVDPGvhsPSdtOv2liGAeq1zMo6QXCSmRcVeP7A0xaRojq+szOPp kETiJQz03agWgClEweLrLqP53amSBuDeAw== X-Google-Smtp-Source: APXvYqxk075aXgTP2MAuanrCiWLoasT+NBNLSRsKy2dc4+EdR0l2XsAYc/BqA3nslMJ0toWi7udCRg== X-Received: by 2002:a63:181:: with SMTP id 123mr3083806pgb.36.1578455245445; Tue, 07 Jan 2020 19:47:25 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 37/41] tcg: Search includes from the project root source directory Date: Wed, 8 Jan 2020 14:45:19 +1100 Message-Id: <20200108034523.17349-38-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::536 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: peter.maydell@linaro.org, Stefan Weil , Alistair Francis , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 We currently search both the root and the tcg/ directories for tcg files: $ git grep '#include "tcg/' | wc -l 28 $ git grep '#include "tcg[^/]' | wc -l 94 To simplify the preprocessor search path, unify by expliciting the tcg/ directory. Patch created mechanically by running: $ for x in \ tcg.h tcg-mo.h tcg-op.h tcg-opc.h \ tcg-op-gvec.h tcg-gvec-desc.h; do \ sed -i "s,#include \"$x\",#include \"tcg/$x\"," \ $(git grep -l "#include \"$x\""); \ done Acked-by: David Gibson (ppc parts) Reviewed-by: Paolo Bonzini Reviewed-by: Alistair Francis Reviewed-by: Stefan Weil Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200101112303.20724-2-philmd@redhat.com> Signed-off-by: Richard Henderson --- include/exec/cpu_ldst.h | 2 +- tcg/i386/tcg-target.h | 2 +- tcg/tcg-op.h | 2 +- tcg/tcg.h | 4 ++-- accel/tcg/cpu-exec.c | 2 +- accel/tcg/tcg-runtime-gvec.c | 2 +- accel/tcg/tcg-runtime.c | 2 +- accel/tcg/translate-all.c | 2 +- accel/tcg/user-exec.c | 2 +- bsd-user/main.c | 2 +- cpus.c | 2 +- exec.c | 2 +- linux-user/main.c | 2 +- linux-user/syscall.c | 2 +- target/alpha/translate.c | 2 +- target/arm/helper-a64.c | 2 +- target/arm/sve_helper.c | 2 +- target/arm/translate-a64.c | 4 ++-- target/arm/translate-sve.c | 6 +++--- target/arm/translate.c | 4 ++-- target/cris/translate.c | 2 +- target/hppa/translate.c | 2 +- target/i386/mem_helper.c | 2 +- target/i386/translate.c | 2 +- target/lm32/translate.c | 2 +- target/m68k/translate.c | 2 +- target/microblaze/translate.c | 2 +- target/mips/translate.c | 2 +- target/moxie/translate.c | 2 +- target/nios2/translate.c | 2 +- target/openrisc/translate.c | 2 +- target/ppc/mem_helper.c | 2 +- target/ppc/translate.c | 4 ++-- target/riscv/cpu_helper.c | 2 +- target/riscv/translate.c | 2 +- target/s390x/mem_helper.c | 2 +- target/s390x/translate.c | 4 ++-- target/sh4/translate.c | 2 +- target/sparc/ldst_helper.c | 2 +- target/sparc/translate.c | 2 +- target/tilegx/translate.c | 2 +- target/tricore/translate.c | 2 +- target/unicore32/translate.c | 2 +- target/xtensa/translate.c | 2 +- tcg/optimize.c | 2 +- tcg/tcg-common.c | 2 +- tcg/tcg-op-gvec.c | 8 ++++---- tcg/tcg-op-vec.c | 6 +++--- tcg/tcg-op.c | 6 +++--- tcg/tcg.c | 2 +- tcg/tci.c | 2 +- 51 files changed, 65 insertions(+), 65 deletions(-) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 62f38d5a22..a46116167c 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -214,7 +214,7 @@ static inline void cpu_stq_mmuidx_ra(CPUArchState *env,= abi_ptr addr, #else =20 /* Needed for TCG_OVERSIZED_GUEST */ -#include "tcg.h" +#include "tcg/tcg.h" =20 static inline target_ulong tlb_addr_write(const CPUTLBEntry *entry) { diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h index 928e8b87bb..bfb3f5f6e9 100644 --- a/tcg/i386/tcg-target.h +++ b/tcg/i386/tcg-target.h @@ -223,7 +223,7 @@ static inline void tb_target_set_jmp_target(uintptr_t t= c_ptr, * The x86 has a pretty strong memory ordering which only really * allows for some stores to be re-ordered after loads. */ -#include "tcg-mo.h" +#include "tcg/tcg-mo.h" =20 #define TCG_TARGET_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD) =20 diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h index 4af272daa5..230db6e022 100644 --- a/tcg/tcg-op.h +++ b/tcg/tcg-op.h @@ -25,7 +25,7 @@ #ifndef TCG_TCG_OP_H #define TCG_TCG_OP_H =20 -#include "tcg.h" +#include "tcg/tcg.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" =20 diff --git a/tcg/tcg.h b/tcg/tcg.h index 3b4f79301c..54e5446880 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -31,7 +31,7 @@ #include "qemu/bitops.h" #include "qemu/plugin.h" #include "qemu/queue.h" -#include "tcg-mo.h" +#include "tcg/tcg-mo.h" #include "tcg-target.h" #include "qemu/int128.h" =20 @@ -211,7 +211,7 @@ typedef uint64_t TCGRegSet; =20 typedef enum TCGOpcode { #define DEF(name, oargs, iargs, cargs, flags) INDEX_op_ ## name, -#include "tcg-opc.h" +#include "tcg/tcg-opc.h" #undef DEF NB_OPS, } TCGOpcode; diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 62068d10c3..2560c90eec 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -23,7 +23,7 @@ #include "trace.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg.h" +#include "tcg/tcg.h" #include "qemu/atomic.h" #include "sysemu/qtest.h" #include "qemu/timer.h" diff --git a/accel/tcg/tcg-runtime-gvec.c b/accel/tcg/tcg-runtime-gvec.c index 51cb29ca79..5b1902d591 100644 --- a/accel/tcg/tcg-runtime-gvec.c +++ b/accel/tcg/tcg-runtime-gvec.c @@ -21,7 +21,7 @@ #include "qemu/host-utils.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "tcg-gvec-desc.h" +#include "tcg/tcg-gvec-desc.h" =20 =20 /* Virtually all hosts support 16-byte vectors. Those that don't can emul= ate diff --git a/accel/tcg/tcg-runtime.c b/accel/tcg/tcg-runtime.c index 4ab2cf7f75..446465a09a 100644 --- a/accel/tcg/tcg-runtime.c +++ b/accel/tcg/tcg-runtime.c @@ -30,7 +30,7 @@ #include "exec/tb-lookup.h" #include "disas/disas.h" #include "exec/log.h" -#include "tcg.h" +#include "tcg/tcg.h" =20 /* 32-bit helpers */ =20 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 7749c3dda5..1e9b2b6a62 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -25,7 +25,7 @@ #include "trace.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg.h" +#include "tcg/tcg.h" #if defined(CONFIG_USER_ONLY) #include "qemu.h" #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 79da4219bb..4be78eb9b3 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -20,7 +20,7 @@ #include "cpu.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg.h" +#include "tcg/tcg.h" #include "qemu/bitops.h" #include "exec/cpu_ldst.h" #include "translate-all.h" diff --git a/bsd-user/main.c b/bsd-user/main.c index 7f4e3cd627..770c2b267a 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -33,7 +33,7 @@ #include "qemu/module.h" #include "cpu.h" #include "exec/exec-all.h" -#include "tcg.h" +#include "tcg/tcg.h" #include "qemu/timer.h" #include "qemu/envlist.h" #include "exec/log.h" diff --git a/cpus.c b/cpus.c index b472378b70..18f56572fa 100644 --- a/cpus.c +++ b/cpus.c @@ -53,7 +53,7 @@ #include "qemu/bitmap.h" #include "qemu/seqlock.h" #include "qemu/guest-random.h" -#include "tcg.h" +#include "tcg/tcg.h" #include "hw/nmi.h" #include "sysemu/replay.h" #include "sysemu/runstate.h" diff --git a/exec.c b/exec.c index d4b769d0d4..0f6b087f57 100644 --- a/exec.c +++ b/exec.c @@ -25,7 +25,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "exec/target_page.h" -#include "tcg.h" +#include "tcg/tcg.h" #include "hw/qdev-core.h" #include "hw/qdev-properties.h" #if !defined(CONFIG_USER_ONLY) diff --git a/linux-user/main.c b/linux-user/main.c index 8718d03ee2..fba833aac9 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -37,7 +37,7 @@ #include "qemu/plugin.h" #include "cpu.h" #include "exec/exec-all.h" -#include "tcg.h" +#include "tcg/tcg.h" #include "qemu/timer.h" #include "qemu/envlist.h" #include "qemu/guest-random.h" diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 34825f15bf..249e4b95fc 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -115,7 +115,7 @@ #include "user/syscall-trace.h" #include "qapi/error.h" #include "fd-trans.h" -#include "tcg.h" +#include "tcg/tcg.h" =20 #ifndef CLONE_IO #define CLONE_IO 0x80000000 /* Clone io context */ diff --git a/target/alpha/translate.c b/target/alpha/translate.c index f7f1ed0f41..8870284f57 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -23,7 +23,7 @@ #include "disas/disas.h" #include "qemu/host-utils.h" #include "exec/exec-all.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index b4cd680fc4..36aa6badfd 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -31,7 +31,7 @@ #include "exec/cpu_ldst.h" #include "qemu/int128.h" #include "qemu/atomic128.h" -#include "tcg.h" +#include "tcg/tcg.h" #include "fpu/softfloat.h" #include /* For crc32 */ =20 diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index 83cc7f5bb5..fdfa652094 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -25,7 +25,7 @@ #include "exec/helper-proto.h" #include "tcg/tcg-gvec-desc.h" #include "fpu/softfloat.h" -#include "tcg.h" +#include "tcg/tcg.h" =20 =20 /* Note that vector data is stored in host-endian 64-bit chunks, diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index d4bebbe629..a1d4dce4fa 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -20,8 +20,8 @@ =20 #include "cpu.h" #include "exec/exec-all.h" -#include "tcg-op.h" -#include "tcg-op-gvec.h" +#include "tcg/tcg-op.h" +#include "tcg/tcg-op-gvec.h" #include "qemu/log.h" #include "arm_ldst.h" #include "translate.h" diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 5d7edd0907..b35bad245e 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -20,9 +20,9 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" -#include "tcg-op.h" -#include "tcg-op-gvec.h" -#include "tcg-gvec-desc.h" +#include "tcg/tcg-op.h" +#include "tcg/tcg-op-gvec.h" +#include "tcg/tcg-gvec-desc.h" #include "qemu/log.h" #include "arm_ldst.h" #include "translate.h" diff --git a/target/arm/translate.c b/target/arm/translate.c index 2b6c1f91bf..39821d040b 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -24,8 +24,8 @@ #include "internals.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg-op.h" -#include "tcg-op-gvec.h" +#include "tcg/tcg-op.h" +#include "tcg/tcg-op-gvec.h" #include "qemu/log.h" #include "qemu/bitops.h" #include "arm_ldst.h" diff --git a/target/cris/translate.c b/target/cris/translate.c index cb57516a44..aaa46b5bca 100644 --- a/target/cris/translate.c +++ b/target/cris/translate.c @@ -27,7 +27,7 @@ #include "cpu.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "exec/helper-proto.h" #include "mmu.h" #include "exec/cpu_ldst.h" diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 2f8d407a82..f25927aeca 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -22,7 +22,7 @@ #include "disas/disas.h" #include "qemu/host-utils.h" #include "exec/exec-all.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" diff --git a/target/i386/mem_helper.c b/target/i386/mem_helper.c index d50d4b0c40..acf41f8885 100644 --- a/target/i386/mem_helper.c +++ b/target/i386/mem_helper.c @@ -24,7 +24,7 @@ #include "exec/cpu_ldst.h" #include "qemu/int128.h" #include "qemu/atomic128.h" -#include "tcg.h" +#include "tcg/tcg.h" =20 void helper_cmpxchg8b_unlocked(CPUX86State *env, target_ulong a0) { diff --git a/target/i386/translate.c b/target/i386/translate.c index 7c99ef1385..d9af8f4078 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -22,7 +22,7 @@ #include "cpu.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "exec/cpu_ldst.h" #include "exec/translator.h" =20 diff --git a/target/lm32/translate.c b/target/lm32/translate.c index 73db9654d6..e583d52d03 100644 --- a/target/lm32/translate.c +++ b/target/lm32/translate.c @@ -23,7 +23,7 @@ #include "exec/helper-proto.h" #include "exec/exec-all.h" #include "exec/translator.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "qemu/qemu-print.h" =20 #include "exec/cpu_ldst.h" diff --git a/target/m68k/translate.c b/target/m68k/translate.c index fcdb7bc8e4..31b743717e 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -22,7 +22,7 @@ #include "cpu.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "qemu/log.h" #include "qemu/qemu-print.h" #include "exec/cpu_ldst.h" diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 525115b041..37a844db99 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -22,7 +22,7 @@ #include "cpu.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "exec/helper-proto.h" #include "microblaze-decode.h" #include "exec/cpu_ldst.h" diff --git a/target/mips/translate.c b/target/mips/translate.c index 4bff585bd6..efe75e6be0 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -26,7 +26,7 @@ #include "internal.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "exec/cpu_ldst.h" #include "hw/mips/cpudevs.h" =20 diff --git a/target/moxie/translate.c b/target/moxie/translate.c index c87e9ec2b1..d5fb27dfb8 100644 --- a/target/moxie/translate.c +++ b/target/moxie/translate.c @@ -26,7 +26,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "disas/disas.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "exec/cpu_ldst.h" #include "qemu/qemu-print.h" =20 diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 82107bf270..6c34cd3193 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -23,7 +23,7 @@ =20 #include "qemu/osdep.h" #include "cpu.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "exec/exec-all.h" #include "disas/disas.h" #include "exec/helper-proto.h" diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 8dd28d6cf1..52323a16df 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -22,7 +22,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "disas/disas.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "qemu/log.h" #include "qemu/bitops.h" #include "qemu/qemu-print.h" diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c index 56855f2381..e8e2a8ac2a 100644 --- a/target/ppc/mem_helper.c +++ b/target/ppc/mem_helper.c @@ -25,7 +25,7 @@ #include "exec/helper-proto.h" #include "helper_regs.h" #include "exec/cpu_ldst.h" -#include "tcg.h" +#include "tcg/tcg.h" #include "internal.h" #include "qemu/atomic128.h" =20 diff --git a/target/ppc/translate.c b/target/ppc/translate.c index f5fe5d0611..9dcf8dc261 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -23,8 +23,8 @@ #include "internal.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg-op.h" -#include "tcg-op-gvec.h" +#include "tcg/tcg-op.h" +#include "tcg/tcg-op-gvec.h" #include "qemu/host-utils.h" #include "qemu/main-loop.h" #include "exec/cpu_ldst.h" diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 767c8762ac..85403da9c8 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -22,7 +22,7 @@ #include "qemu/main-loop.h" #include "cpu.h" #include "exec/exec-all.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "trace.h" =20 int riscv_cpu_mmu_index(CPURISCVState *env, bool ifetch) diff --git a/target/riscv/translate.c b/target/riscv/translate.c index ab6a891dc3..56b1b1fe7b 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "disas/disas.h" #include "exec/cpu_ldst.h" #include "exec/exec-all.h" diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 428bde4c54..a237dec757 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -27,7 +27,7 @@ #include "exec/cpu_ldst.h" #include "qemu/int128.h" #include "qemu/atomic128.h" -#include "tcg.h" +#include "tcg/tcg.h" =20 #if !defined(CONFIG_USER_ONLY) #include "hw/s390x/storage-keys.h" diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 4292bb0dd0..b764ec3140 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -33,8 +33,8 @@ #include "internal.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg-op.h" -#include "tcg-op-gvec.h" +#include "tcg/tcg-op.h" +#include "tcg/tcg-op-gvec.h" #include "qemu/log.h" #include "qemu/host-utils.h" #include "exec/cpu_ldst.h" diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 922785e225..6192d83e8c 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -23,7 +23,7 @@ #include "cpu.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c index 7345827a96..e91cfdecd3 100644 --- a/target/sparc/ldst_helper.c +++ b/target/sparc/ldst_helper.c @@ -19,7 +19,7 @@ =20 #include "qemu/osdep.h" #include "cpu.h" -#include "tcg.h" +#include "tcg/tcg.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" #include "exec/cpu_ldst.h" diff --git a/target/sparc/translate.c b/target/sparc/translate.c index edc23a7c40..9416a551cf 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -24,7 +24,7 @@ #include "disas/disas.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "exec/cpu_ldst.h" =20 #include "exec/helper-gen.h" diff --git a/target/tilegx/translate.c b/target/tilegx/translate.c index abce7e1c75..65f1c91f4f 100644 --- a/target/tilegx/translate.c +++ b/target/tilegx/translate.c @@ -24,7 +24,7 @@ #include "exec/log.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "exec/cpu_ldst.h" #include "linux-user/syscall_defs.h" =20 diff --git a/target/tricore/translate.c b/target/tricore/translate.c index c574638c9f..609d75ae8a 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -22,7 +22,7 @@ #include "cpu.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "exec/cpu_ldst.h" #include "qemu/qemu-print.h" =20 diff --git a/target/unicore32/translate.c b/target/unicore32/translate.c index 0f6891b8aa..d4b06df672 100644 --- a/target/unicore32/translate.c +++ b/target/unicore32/translate.c @@ -13,7 +13,7 @@ #include "cpu.h" #include "disas/disas.h" #include "exec/exec-all.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "qemu/log.h" #include "exec/cpu_ldst.h" #include "exec/translator.h" diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index e6d910786c..8aa972cafd 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -33,7 +33,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "disas/disas.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" #include "qemu/log.h" #include "qemu/qemu-print.h" #include "exec/cpu_ldst.h" diff --git a/tcg/optimize.c b/tcg/optimize.c index f7f4e873c9..53aa8e5329 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -24,7 +24,7 @@ */ =20 #include "qemu/osdep.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" =20 #define CASE_OP_32_64(x) \ glue(glue(case INDEX_op_, x), _i32): \ diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c index 97305a3efc..7e1992e79e 100644 --- a/tcg/tcg-common.c +++ b/tcg/tcg-common.c @@ -32,7 +32,7 @@ uintptr_t tci_tb_ptr; TCGOpDef tcg_op_defs[] =3D { #define DEF(s, oargs, iargs, cargs, flags) \ { #s, oargs, iargs, cargs, iargs + oargs + cargs, flags }, -#include "tcg-opc.h" +#include "tcg/tcg-opc.h" #undef DEF }; const size_t tcg_op_defs_max =3D ARRAY_SIZE(tcg_op_defs); diff --git a/tcg/tcg-op-gvec.c b/tcg/tcg-op-gvec.c index 5c95ecd51c..41b4a3c661 100644 --- a/tcg/tcg-op-gvec.c +++ b/tcg/tcg-op-gvec.c @@ -18,11 +18,11 @@ */ =20 #include "qemu/osdep.h" -#include "tcg.h" -#include "tcg-op.h" -#include "tcg-op-gvec.h" +#include "tcg/tcg.h" +#include "tcg/tcg-op.h" +#include "tcg/tcg-op-gvec.h" #include "qemu/main-loop.h" -#include "tcg-gvec-desc.h" +#include "tcg/tcg-gvec-desc.h" =20 #define MAX_UNROLL 4 =20 diff --git a/tcg/tcg-op-vec.c b/tcg/tcg-op-vec.c index 6714991bf4..b6937e8d64 100644 --- a/tcg/tcg-op-vec.c +++ b/tcg/tcg-op-vec.c @@ -19,9 +19,9 @@ =20 #include "qemu/osdep.h" #include "cpu.h" -#include "tcg.h" -#include "tcg-op.h" -#include "tcg-mo.h" +#include "tcg/tcg.h" +#include "tcg/tcg-op.h" +#include "tcg/tcg-mo.h" =20 /* Reduce the number of ifdefs below. This assumes that all uses of TCGV_HIGH and TCGV_LOW are properly protected by a conditional that diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index c245126f98..7d782002e3 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -25,9 +25,9 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" -#include "tcg.h" -#include "tcg-op.h" -#include "tcg-mo.h" +#include "tcg/tcg.h" +#include "tcg/tcg-op.h" +#include "tcg/tcg-mo.h" #include "trace-tcg.h" #include "trace/mem.h" #include "exec/plugin-gen.h" diff --git a/tcg/tcg.c b/tcg/tcg.c index 4f616ba38b..dd4b3d7684 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -48,7 +48,7 @@ #include "hw/boards.h" #endif =20 -#include "tcg-op.h" +#include "tcg/tcg-op.h" =20 #if UINTPTR_MAX =3D=3D UINT32_MAX # define ELF_CLASS ELFCLASS32 diff --git a/tcg/tci.c b/tcg/tci.c index a6208653e8..46fe9ce63f 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -30,7 +30,7 @@ #include "qemu-common.h" #include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */ #include "exec/cpu_ldst.h" -#include "tcg-op.h" +#include "tcg/tcg-op.h" =20 /* Marker for missing code. */ #define TODO() \ --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456435; cv=none; d=zohomail.com; s=zohoarc; b=NoK0RcwuTj9YVLu9N/HDXFc1cIrGRQWql3uR1xUhWZdwbiT1WnodyjA/i7axGepYYsMvFgOvQeC7fH/XFxedW/QkCGcTwWLBj4UGl0dqGaY/OgvCaSk2LJfc940AiAapwe2+p49wN93g5bokoSCejVOzu8V0F8TdQa2EmvakiYA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456435; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D8hKczSKbWr4VDH3O7NTZ9vbM3X/bEg8unP2mqvKXWg=; b=QkncReSpHAmRkno1zVI8gSg+7ilYWtwFepV5k39FArz9wirkEHFVOM7PpR2x7IQNtTclamsbX2BicjYcgkTROu71lByfx0uXjJ6Dp/f5w/GEuOTpBwHswsv3Y//eGLo18i5UxtCUH8k3qG7FoACFl1dBVMxqxGEW3f7cL4i+GEQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456435002681.475540692504; Tue, 7 Jan 2020 20:07:15 -0800 (PST) Received: from localhost ([::1]:35588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2cj-0007ur-1q for importer@patchew.org; Tue, 07 Jan 2020 23:07:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50381) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Jg-0005ku-Eb for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Je-0004Oo-TX for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:32 -0500 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:43710) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Je-0004O5-NW for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:30 -0500 Received: by mail-pg1-x52a.google.com with SMTP id k197so858875pga.10 for ; Tue, 07 Jan 2020 19:47:30 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.47.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:47:28 -0800 (PST) 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=D8hKczSKbWr4VDH3O7NTZ9vbM3X/bEg8unP2mqvKXWg=; b=smX5M6UyI1U/KS9LnQSYel/Gtajfol9WNGjMy2NXUcT8FXOkKHAhel5GiDCI8HhtIu TtlbV9Pb8ZE5Rst5Y38UMhRbmSHDcbYdKkM5stgFUqSPYi47BnrmHumpeACpBQk1GQPX HDWw9qW0hpkwGR338B4lCy4KlXoyoRToOy60joMBZRPuuZ+2SeXGKoP+5oKp4iUx4jIz TMi/hYIn/hgt1NdMIXKCqsa3o/N1A0/T1jzGNPqbx2VjnEK6PMfX0hBtPPuaeyjpo8Ps BHjTA6ek/CvLVIS1IkDwsWtj7Ov8c+a7VIfXVptFfteSqQ2dKFxSSDa4zA0HkzvMzF4Y xP/g== 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=D8hKczSKbWr4VDH3O7NTZ9vbM3X/bEg8unP2mqvKXWg=; b=gFaBRMNEtHlG6tbUIUDKUXiprB7W9/V1dZIxzKO8ZuAGHN/M6Z0cgfe5uaQixfBRb3 05PVlnZHtZ6GU5u6wbTYUq8CH3SQd1tQPQSE0FSZvUDCCQrNXn/Hr01hNjaXywrqN1eC 3YPa667NujUrr3cEeg3tBKxAeB3fmdlN4GptsuM/i6GsGJBaavxNDxxQA0DWCMhoIc2m pz1/etSea9dgPTz/n3y/y7EB8Dzp62qIa8V4HynQOsAoYnORl7+saRe+LApc2Ik/ZPgS ipoth+zmUFFIwrO0fJnr7MbQDxngmec08HFgFWVa8zoTSJVA3xTm6hwj/xUNjQOPYHSX JaLg== X-Gm-Message-State: APjAAAXcde1Jo5zD8L9F7uZK/k2AvFBg/+xHmFAqWJF97uq/MaLC9JIO OtBsajB72unZBk/3XDhU0Bl9ZNDKpv/onw== X-Google-Smtp-Source: APXvYqyIfoStfxH3fFQXeVDw9uFcxlOtstgeRfM5TwubMtrbDohHLY5Qk1sNaU1EHkpt8S8u0lPNgg== X-Received: by 2002:a63:1e47:: with SMTP id p7mr3006810pgm.339.1578455249366; Tue, 07 Jan 2020 19:47:29 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 38/41] tcg: Search includes in the parent source directory Date: Wed, 8 Jan 2020 14:45:20 +1100 Message-Id: <20200108034523.17349-39-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::52a 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: peter.maydell@linaro.org, Stefan Weil , Alistair Francis , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 All the *.inc.c files included by tcg/$TARGET/tcg-target.inc.c are in tcg/, their parent directory. To simplify the preprocessor search path, include the relative parent path: '..'. Patch created mechanically by running: $ for x in tcg-pool.inc.c tcg-ldst.inc.c; do \ sed -i "s,#include \"$x\",#include \"../$x\"," \ $(git grep -l "#include \"$x\""); \ done Acked-by: David Gibson (ppc parts) Reviewed-by: Paolo Bonzini Reviewed-by: Alistair Francis Reviewed-by: Stefan Weil Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200101112303.20724-3-philmd@redhat.com> Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.inc.c | 4 ++-- tcg/arm/tcg-target.inc.c | 4 ++-- tcg/i386/tcg-target.inc.c | 4 ++-- tcg/mips/tcg-target.inc.c | 2 +- tcg/ppc/tcg-target.inc.c | 4 ++-- tcg/riscv/tcg-target.inc.c | 4 ++-- tcg/s390/tcg-target.inc.c | 4 ++-- tcg/sparc/tcg-target.inc.c | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c index 3f921015d3..843fd0ca69 100644 --- a/tcg/aarch64/tcg-target.inc.c +++ b/tcg/aarch64/tcg-target.inc.c @@ -10,7 +10,7 @@ * See the COPYING file in the top-level directory for details. */ =20 -#include "tcg-pool.inc.c" +#include "../tcg-pool.inc.c" #include "qemu/bitops.h" =20 /* We're going to re-use TCGType in setting of the SF bit, which controls @@ -1541,7 +1541,7 @@ static void tcg_out_cltz(TCGContext *s, TCGType ext, = TCGReg d, } =20 #ifdef CONFIG_SOFTMMU -#include "tcg-ldst.inc.c" +#include "../tcg-ldst.inc.c" =20 /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * TCGMemOpIdx oi, uintptr_t ra) diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c index 94d80d79d1..fffb6611e2 100644 --- a/tcg/arm/tcg-target.inc.c +++ b/tcg/arm/tcg-target.inc.c @@ -23,7 +23,7 @@ */ =20 #include "elf.h" -#include "tcg-pool.inc.c" +#include "../tcg-pool.inc.c" =20 int arm_arch =3D __ARM_ARCH; =20 @@ -1131,7 +1131,7 @@ static TCGCond tcg_out_cmp2(TCGContext *s, const TCGA= rg *args, } =20 #ifdef CONFIG_SOFTMMU -#include "tcg-ldst.inc.c" +#include "../tcg-ldst.inc.c" =20 /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * int mmu_idx, uintptr_t ra) diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c index 9d8ed974e0..cdedcb2b25 100644 --- a/tcg/i386/tcg-target.inc.c +++ b/tcg/i386/tcg-target.inc.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ =20 -#include "tcg-pool.inc.c" +#include "../tcg-pool.inc.c" =20 #ifdef CONFIG_DEBUG_TCG static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] =3D { @@ -1647,7 +1647,7 @@ static void tcg_out_nopn(TCGContext *s, int n) } =20 #if defined(CONFIG_SOFTMMU) -#include "tcg-ldst.inc.c" +#include "../tcg-ldst.inc.c" =20 /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * int mmu_idx, uintptr_t ra) diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c index 5442167045..1da663ce84 100644 --- a/tcg/mips/tcg-target.inc.c +++ b/tcg/mips/tcg-target.inc.c @@ -1107,7 +1107,7 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit= *arg) } =20 #if defined(CONFIG_SOFTMMU) -#include "tcg-ldst.inc.c" +#include "../tcg-ldst.inc.c" =20 static void * const qemu_ld_helpers[16] =3D { [MO_UB] =3D helper_ret_ldub_mmu, diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c index d308d69aba..ee1f9227c1 100644 --- a/tcg/ppc/tcg-target.inc.c +++ b/tcg/ppc/tcg-target.inc.c @@ -23,7 +23,7 @@ */ =20 #include "elf.h" -#include "tcg-pool.inc.c" +#include "../tcg-pool.inc.c" =20 #if defined _CALL_DARWIN || defined __APPLE__ #define TCG_TARGET_CALL_DARWIN @@ -1845,7 +1845,7 @@ static const uint32_t qemu_exts_opc[4] =3D { }; =20 #if defined (CONFIG_SOFTMMU) -#include "tcg-ldst.inc.c" +#include "../tcg-ldst.inc.c" =20 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, * int mmu_idx, uintptr_t ra) diff --git a/tcg/riscv/tcg-target.inc.c b/tcg/riscv/tcg-target.inc.c index 7018509693..2bc0ba71f2 100644 --- a/tcg/riscv/tcg-target.inc.c +++ b/tcg/riscv/tcg-target.inc.c @@ -27,7 +27,7 @@ * THE SOFTWARE. */ =20 -#include "tcg-pool.inc.c" +#include "../tcg-pool.inc.c" =20 #ifdef CONFIG_DEBUG_TCG static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] =3D { @@ -921,7 +921,7 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0) */ =20 #if defined(CONFIG_SOFTMMU) -#include "tcg-ldst.inc.c" +#include "../tcg-ldst.inc.c" =20 /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * TCGMemOpIdx oi, uintptr_t ra) diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c index 8aaa4cebe8..b07e9ff7d6 100644 --- a/tcg/s390/tcg-target.inc.c +++ b/tcg/s390/tcg-target.inc.c @@ -29,7 +29,7 @@ #error "unsupported code generation mode" #endif =20 -#include "tcg-pool.inc.c" +#include "../tcg-pool.inc.c" #include "elf.h" =20 /* ??? The translation blocks produced by TCG are generally small enough to @@ -1536,7 +1536,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, Mem= Op opc, TCGReg data, } =20 #if defined(CONFIG_SOFTMMU) -#include "tcg-ldst.inc.c" +#include "../tcg-ldst.inc.c" =20 /* We're expecting to use a 20-bit negative offset on the tlb memory ops. = */ QEMU_BUILD_BUG_ON(TLB_MASK_TABLE_OFS(0) > 0); diff --git a/tcg/sparc/tcg-target.inc.c b/tcg/sparc/tcg-target.inc.c index d7986cda5c..65fddb310d 100644 --- a/tcg/sparc/tcg-target.inc.c +++ b/tcg/sparc/tcg-target.inc.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ =20 -#include "tcg-pool.inc.c" +#include "../tcg-pool.inc.c" =20 #ifdef CONFIG_DEBUG_TCG static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] =3D { --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456744; cv=none; d=zohomail.com; s=zohoarc; b=EmnkW3LLI118R7JGYGym9CBgDJ1Ug+pX21aPDDG5FVoPDlbq34cZd631//gF5KUxPhVRRfMh7DgP+RlPFlWqJfOzOUJfDQij41hY/znpF7fhocdPAaLhmmcmImlsnkf14kmQJwHg2isTRgUhVRqXuya8fQMYqB2Cu+cyVcxSuME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456744; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RzXBbhxl96ISJyXRfF2leNwAZhzfRVDaPz7xNTcibJE=; b=N13qUHVmetLSwcAEoaR8Hs8GnT/ihwp+ZGVS/Ftas1OuZIb17sstIZ8INzKeBpRNR4C8a3EX0AIv4BTkS3GRGrlJmbxR4jAxVOgHBw0Ah5PU3rV4VYIn6Vl9GOdPg1m+Ze/4YBs0rkTh/d272UBHT25S4aXDlwSlmqsT7YodVdk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456744090335.9656036371199; Tue, 7 Jan 2020 20:12:24 -0800 (PST) Received: from localhost ([::1]:35752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2hi-0007yP-R6 for importer@patchew.org; Tue, 07 Jan 2020 23:12:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50430) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Jj-0005mQ-AA for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Ji-0004Rx-6B for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:35 -0500 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]:37213) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Ji-0004RB-0r for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:34 -0500 Received: by mail-pg1-x52d.google.com with SMTP id q127so874516pga.4 for ; Tue, 07 Jan 2020 19:47:33 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.47.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:47:32 -0800 (PST) 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=RzXBbhxl96ISJyXRfF2leNwAZhzfRVDaPz7xNTcibJE=; b=TAqoz4P2xKcAp0SrGhlNYnU9NaPsMDw/CvWocI21QsElPumrYluW8Sy9e3369osFSR oYi4NbxnrYHARPpT/cm7nOyJwucpBeGBL53VzUrWmu22N4vRgcp7h627sADyzqpq3lFS fxpddnkjWgfd3t2b9SGhOkHE0udFhvx+vtx2vdPPt6sgFpH28+NaGiFb2mkT/K3wLe2y 2s0SCOncROGulijX2Z258H7ps8AEHZ0Ku2wJf/wKUg4R56ojKJCdNgwFf9NiGTFDiL51 N3Q3yEL8i1TA95Ux+KnvSsDrwchUGha/M9K+yGYFdeF1SVVCYPLmpdZlhJFOM6UIiRNH c7IA== 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=RzXBbhxl96ISJyXRfF2leNwAZhzfRVDaPz7xNTcibJE=; b=bz2mQmSHsQ7cxTIS4ElUkqoAzfNIL73uwHGaWL2QNL0VgfA9LlnKXFoQUH1Zla+fjW mDdnBEUTEbpFDr+kMS0Nwe/g8w/CNux8591ZGOg4JrKXOo9a091an4mqEFSu6lnCmqQP +kcn0dpR+G+DXeWvB+AMkquIFPpfkadHrwT4j44XwMyCVN4XCMC+aVIsc+ppFnXklDBi gl0mQGY8P5vZ+RbOnELEWwkdzt3NHHC9clKI7EexjQUVTeVXm1OeP8iGtatDRXEAOKO1 /ONHelTbokHDXuveiqa2O6r4wb9HLBYY6tAu4+NByNtK6FVUdLWnGUt7Hg9c1rNvehu/ +ZGw== X-Gm-Message-State: APjAAAUMCr8I22XKUBf9j8svd8ea15n9VHfZohqCYMpYl7MI0jbE9yV6 Lga6n7e9FS6i+T/HUShDG3H5Fvzd62+tzw== X-Google-Smtp-Source: APXvYqyJIjSL+0r/DNG2izx6PHeVU9XntEhoZXADTcp7EHNO/Uq23qcb9hEq586osUMk/YcVT12XsQ== X-Received: by 2002:a63:d108:: with SMTP id k8mr3055415pgg.434.1578455252611; Tue, 07 Jan 2020 19:47:32 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 39/41] tcg: Move TCG headers to include/tcg/ Date: Wed, 8 Jan 2020 14:45:21 +1100 Message-Id: <20200108034523.17349-40-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::52d 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: peter.maydell@linaro.org, Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Paolo Bonzini Reviewed-by: Alistair Francis Reviewed-by: Stefan Weil Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200101112303.20724-4-philmd@redhat.com> Signed-off-by: Richard Henderson --- {tcg =3D> include/tcg}/tcg-gvec-desc.h | 0 {tcg =3D> include/tcg}/tcg-mo.h | 0 {tcg =3D> include/tcg}/tcg-op-gvec.h | 0 {tcg =3D> include/tcg}/tcg-op.h | 0 {tcg =3D> include/tcg}/tcg-opc.h | 0 {tcg =3D> include/tcg}/tcg.h | 0 MAINTAINERS | 1 + 7 files changed, 1 insertion(+) rename {tcg =3D> include/tcg}/tcg-gvec-desc.h (100%) rename {tcg =3D> include/tcg}/tcg-mo.h (100%) rename {tcg =3D> include/tcg}/tcg-op-gvec.h (100%) rename {tcg =3D> include/tcg}/tcg-op.h (100%) rename {tcg =3D> include/tcg}/tcg-opc.h (100%) rename {tcg =3D> include/tcg}/tcg.h (100%) diff --git a/tcg/tcg-gvec-desc.h b/include/tcg/tcg-gvec-desc.h similarity index 100% rename from tcg/tcg-gvec-desc.h rename to include/tcg/tcg-gvec-desc.h diff --git a/tcg/tcg-mo.h b/include/tcg/tcg-mo.h similarity index 100% rename from tcg/tcg-mo.h rename to include/tcg/tcg-mo.h diff --git a/tcg/tcg-op-gvec.h b/include/tcg/tcg-op-gvec.h similarity index 100% rename from tcg/tcg-op-gvec.h rename to include/tcg/tcg-op-gvec.h diff --git a/tcg/tcg-op.h b/include/tcg/tcg-op.h similarity index 100% rename from tcg/tcg-op.h rename to include/tcg/tcg-op.h diff --git a/tcg/tcg-opc.h b/include/tcg/tcg-opc.h similarity index 100% rename from tcg/tcg-opc.h rename to include/tcg/tcg-opc.h diff --git a/tcg/tcg.h b/include/tcg/tcg.h similarity index 100% rename from tcg/tcg.h rename to include/tcg/tcg.h diff --git a/MAINTAINERS b/MAINTAINERS index cd2dc137a3..1c6919c455 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2386,6 +2386,7 @@ Common TCG code M: Richard Henderson S: Maintained F: tcg/ +F: include/tcg/ =20 TCG Plugins M: Alex Benn=C3=A9e --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456830; cv=none; d=zohomail.com; s=zohoarc; b=OH1ISuNZAwEoZOomIfWXnaI3oNNy02iB/tl33Ml08Vh6qH0CO6H9mFCoEbeGcd+wBbEvO/dn7FEJbk3OpnLlr0aHIr5R4X6pU5ifuXycBHSRSaWA+nDYx0D7q4XQW26ornYW6uGAlYm1dzoTNy/1teoK9beUu89tnsBVQApAmzg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456830; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QkZbjvbQ7GHATNZxrRi8m/ZcWvz3612eqG76lAaVpag=; b=mGsG1vrWLp7rRICC/0x0A9c9ZMdtRr6mw3KxXrgwcDUbwAzklWjwlXRUh7W3IudKI7RxGGF9KiAVw5PysBZhAgUSnRGFJzVz11U3C2DfmdiUm93IOqPEa3GkeoJ2egQZUWyyBzUfVQlZt5zn+BvFSi84ZuU43SmLn2k5Q3ZEC8k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15784568300341015.0851604485373; Tue, 7 Jan 2020 20:13:50 -0800 (PST) Received: from localhost ([::1]:35778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2j6-0001IV-S9 for importer@patchew.org; Tue, 07 Jan 2020 23:13:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50478) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Jn-0005pm-H9 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Jl-0004VK-GP for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:39 -0500 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]:33382) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Jl-0004UL-8D for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:37 -0500 Received: by mail-pg1-x535.google.com with SMTP id 6so886823pgk.0 for ; Tue, 07 Jan 2020 19:47:37 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.47.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:47:35 -0800 (PST) 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=QkZbjvbQ7GHATNZxrRi8m/ZcWvz3612eqG76lAaVpag=; b=uMmRWWlS8ZYozLcGMBRq9ker+HNKWyIZN7SKeDh0mwZsHbKn4DXN0MwjU4yxXGgJQ9 u515BVzjk9lhGnfrwtBATZTTlmysqV8mcv6fksMQXudS0ONYjXfTv88B4Mkcvj3bO+iR ioOySVND+gdZTgvEV6l2oLKCmFv+jir0Cv7i237nF2MBjA1ejkLEu3emT5ZQGnhYGhw8 qBPGJF3JxTehh6rfsIAdaigwPYjuwdhosf2laCNxseeFYDQa24zLqouQaMsovqA6zaQi JyTzWIx9gcha8dfCJAcGv12b5m+9HjMapLACJBUQOT4P0qgMGhM5G5sq+BXQH0IU0NLT bgIw== 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=QkZbjvbQ7GHATNZxrRi8m/ZcWvz3612eqG76lAaVpag=; b=JsYnmsO08ghsQMRL9p/FYYEASgI5AAuYkEkFaLsf6+o4D64RRYBz6anvR9I2kiw3kC Zrj8gWt9/4DBjQ6CIlpIpk6FQi2SDWUXdENteyEwjBR6t+cLZBCxxIrJ1PILXw0g0dgv RkWo+7Z5keP7YALuR9+JMLx3Cei/0BEkGfajQxsj8ovSG4rRLdpLhEXnNzgi+EFUCzMs 9PqSiOpqLWOLQTqkGFIE5XfDRQpWntgd9K5Lk6rYh6mdinMl+l+Y9GGEBaHz4FiFqEsO 6HfMSp+JDoXj3S1C3ZwGxOxqn7ES2FCt8Gte59rAVFy0PqwogPSMqqpmw1usFxX5QCMN ukmg== X-Gm-Message-State: APjAAAU3beA9OVpBaz9UoBNpYuq8EFRyaBHVCEJdEjAVDiNNsxWVU29r kb+qiZOAkYRAlVqnG3LXc90qGyadpFIO0w== X-Google-Smtp-Source: APXvYqxcxP5PJcVSpfLC6zWqo9sj7tpROMMxeczPpwRmPT1hIWikS7LPxm1nRcO3pQItrl2I5MoQZg== X-Received: by 2002:a62:7a43:: with SMTP id v64mr2737150pfc.243.1578455256065; Tue, 07 Jan 2020 19:47:36 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 40/41] configure: Remove tcg/ from the preprocessor include search list Date: Wed, 8 Jan 2020 14:45:22 +1100 Message-Id: <20200108034523.17349-41-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::535 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: peter.maydell@linaro.org, Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 All tcg includes are relative to the repository root directory, we can safely remove the tcg/ directory from the include search path list. Reviewed-by: Paolo Bonzini Reviewed-by: Alistair Francis Reviewed-by: Stefan Weil Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200101112303.20724-5-philmd@redhat.com> Signed-off-by: Richard Henderson --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 94a4b1c848..cac36a9e08 100755 --- a/configure +++ b/configure @@ -7386,7 +7386,6 @@ elif test "$ARCH" =3D "riscv32" || test "$ARCH" =3D "= riscv64" ; then else QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES" fi -QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg $QEMU_INCLUDES" =20 echo "TOOLS=3D$tools" >> $config_host_mak echo "ROMS=3D$roms" >> $config_host_mak --=20 2.20.1 From nobody Tue May 7 15:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578456458; cv=none; d=zohomail.com; s=zohoarc; b=hHNivjN7cful9LzdPoIQAmdlC245ajrEtHXFN1jTkCxxbCEatqHndSq4UA+MzvqGzZ7xNwr9fGXqUbk6+iADy2x4PyPG8Buv9YoeimyWYhTX2SsC2odS1o+fq28klFGevATAJnQEFef3GLx0Kl03Y5j4ny9+Rf2nhMhKkyv8s/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578456458; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6n04cMrSwYKJN+WltOGUDVYoZYjbN1VCm/ZSKjIjSXg=; b=SYzcbqCycs5W2KGtbAxxFwfh1Q1c5h6yVlevrcOA4YKUxt+lzlzkahEFSuHyg2ftI3Ah2k9h8HF8PgOPHJgFgcJCKZdejZaNPSord/3zYfU9fc7uR19klLjKISOu3qE1AmyLTtnVc5tr+WceWqMrZ3efRuoCq4lgFpKrBhkO+S4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578456458181525.6985231979229; Tue, 7 Jan 2020 20:07:38 -0800 (PST) Received: from localhost ([::1]:35598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2d6-0008Vj-LV for importer@patchew.org; Tue, 07 Jan 2020 23:07:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50517) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2Jp-0005sj-LA for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2Jo-0004YD-BK for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:41 -0500 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:44339) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2Jo-0004XU-4K for qemu-devel@nongnu.org; Tue, 07 Jan 2020 22:47:40 -0500 Received: by mail-pg1-x534.google.com with SMTP id x7so855185pgl.11 for ; Tue, 07 Jan 2020 19:47:40 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f23sm1198433pgj.76.2020.01.07.19.47.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 19:47:38 -0800 (PST) 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=6n04cMrSwYKJN+WltOGUDVYoZYjbN1VCm/ZSKjIjSXg=; b=HkG3FRq7bdqt/MxvnAH2rcDApBL0sz4ExqPTg627ih4IpBcpVgQ8qV9OfQf4eO7o6C 3Cp5uThxEfAMbwocG74A6hou3+2OofRO0wKaMWRlNMp4SzZqJHA6Q7Hfv7RWq8HNbGZM WrQTE4YCOIAGb9v3Rtd6ULE5Pja33tOqdMqlFQjT+hdLGV80QAGBLZqSoFW3mzSztXeW InmeGUDaEvbd2Y9TLH8nzaeplqCbZNfiaQMyZHDSs3QTUb8hTKCbpErm9nSATNVs7iXL 0nqPx8ENIMML7vrkjV/7F1/lDazbOFzMkGXndSVZTlFqFGksOQRm1Yoy8BaM5aAgP4ez OvLA== 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=6n04cMrSwYKJN+WltOGUDVYoZYjbN1VCm/ZSKjIjSXg=; b=pt84Zomq5P6TvYHVVO0TDuaqgOrzx/lmVt8CVAY787W914pDhix7SLk+7N1c8YJXR6 IJCRHfsuDb+NkvUqw1DAEdwMmSrFGzrum0hdAbiRvxdmhLSSrtPItd68bYyiOI/+XIFu oqHoQ9GUMALf6WOudbmewFu12FB9eD53tlT/dWjHRoHs2bhXMFnDlMinsrBE1PQoYUXt gySptHlCv/xr7ZJz8MtD3Bpns3BrK3rov10sIbl6M2cIE5gjqkaaumX/fqBwzgWUWv1z EyIzAIWn3kHldxpN0W8brDmgatc7NenOOrczdIh7Fd/WRe+5UmhbSaQ/V0PoUwMe8tbP y1tQ== X-Gm-Message-State: APjAAAWkj5toGiXQHg1h4X25p71nnfGikuG90ZH/NUDV+o9EqJ0ealsx 4QNevQiRuhfZAfmLpKbjwwNshhI5lA7ZMA== X-Google-Smtp-Source: APXvYqyYmoq2OwzPG2UadwgumkGZ/rc9sUHJm5gENVjXKnE6JClxv0DTApy69QisZRR9aZKvxwJ60Q== X-Received: by 2002:aa7:8246:: with SMTP id e6mr2932738pfn.102.1578455259030; Tue, 07 Jan 2020 19:47:39 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 41/41] MAINTAINERS: Replace Claudio Fontana for tcg/aarch64 Date: Wed, 8 Jan 2020 14:45:23 +1100 Message-Id: <20200108034523.17349-42-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108034523.17349-1-richard.henderson@linaro.org> References: <20200108034523.17349-1-richard.henderson@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: 2607:f8b0:4864:20::534 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: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Claudio's Huawei address has been defunct for quite a while. In https://lists.gnu.org/archive/html/qemu-devel/2019-05/msg06872.html he asked for his personal address to be removed as well. I will take over officially. Cc: Claudio Fontana Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 1c6919c455..dcb46db5e5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2396,8 +2396,7 @@ F: plugins/ F: tests/plugin =20 AArch64 TCG target -M: Claudio Fontana -M: Claudio Fontana +M: Richard Henderson S: Maintained L: qemu-arm@nongnu.org F: tcg/aarch64/ --=20 2.20.1