From patchwork Mon Dec 17 15:01:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 154001 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2565834ljp; Mon, 17 Dec 2018 07:02:10 -0800 (PST) X-Google-Smtp-Source: AFSGD/WpJGRo7MdI/wsTf2Nmj3Ws7dc0PK57Cgzy9MCUdHqz7N/qXsoZ8RGs7RlejJgDHZd3U3bj X-Received: by 2002:ac8:1941:: with SMTP id g1mr13095411qtk.193.1545058929937; Mon, 17 Dec 2018 07:02:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545058929; cv=none; d=google.com; s=arc-20160816; b=nHUl4x1D5+UpTwqOR4ZGxtrHI7Ec2KhsA0R3/nou9a82Lb4/5PgjOXfkUhF/k5m57G icIyhc4XG7JhKf8aA6DmqABAMPxwFjUCCTWrHRpIssX9PsKmNgWy0PNNS0dni7VGeQA4 ti2ErcNwbCl1j2FFbI91lrUjZ27oU/KCnADe3YvZIqZ+DSeNNvaLvh/GmBjMcq9RiK5m lW5vMBdyQrZuCw0cIQg3Em1i+zEmwwq/xVFgmTcAH04JXd/9fEnLSORCa9swUHzHgU9l yt1ngSpd8UGFD22c+rswiWG66w0avcAX5yyKCQPUKPDTUVTZTPJbHFU0WtFoUuyspNSR QjdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=dVGI3fOevdL1RXuHEUXwLS5B/5VJZTrPvm9W6icQSjw=; b=XNExCi9LjzbTIEbdN9KPJ7rAAoEcAJDmkkuUKHfBXvXkMO80Am96anngA8bnd6pB77 JZSHPQ/UCNcZBntrzZdY/2iTRM05TimfYDDhKwMJmKkM21BjQDNRHhMcrdxeNqJaQwxZ KPdduZGAuXNeLlrKTR4gYiDrnaQWLQFAu7U/fEi/jofMhblYb1jtR/hlgWuCQ6UjkhHn VFz4EfzJyic/UWKoIb3Wm8ksFyjqJVcq9hdWZMBMF7v1JCK/dTKodL7mmyLHpntV2P2W dqq6Fq7X36rOpiodD20eYWHwC1la4RegVKYsZKtgQxBPi/3hOl+Dr5iZcdlCKWh6Munf onPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HRxTkDiC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r2si5153456qvn.10.2018.12.17.07.02.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 17 Dec 2018 07:02:09 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HRxTkDiC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47291 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYuPJ-0005dr-6k for patch@linaro.org; Mon, 17 Dec 2018 10:02:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYuOk-0005V9-T6 for qemu-devel@nongnu.org; Mon, 17 Dec 2018 10:01:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gYuOe-0006sB-3M for qemu-devel@nongnu.org; Mon, 17 Dec 2018 10:01:34 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:37514) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gYuOd-0006lV-Ob for qemu-devel@nongnu.org; Mon, 17 Dec 2018 10:01:27 -0500 Received: by mail-wm1-x343.google.com with SMTP id g67so12923383wmd.2 for ; Mon, 17 Dec 2018 07:01: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=dVGI3fOevdL1RXuHEUXwLS5B/5VJZTrPvm9W6icQSjw=; b=HRxTkDiC2jSYLC3LtE10py73V5F8OzKIfrYFxGYevhoBNTud6c6ZqVmhmbVsGAGX4y KDNhEcyruWBC2AUfhg1RLHZdzksu7DDnFaWNnby9F3tYAAbcZaKn9aayCR11Cg4dusR0 bjlioIr4psap7mmzogaAwE4cWK4PPqlh5Kazc= 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=dVGI3fOevdL1RXuHEUXwLS5B/5VJZTrPvm9W6icQSjw=; b=YWXTGZBzhmtwPlQ4ykz1FSdmTBAttLily/93QdfIP4slbQT4dZtpbaUmxZIR5BzyO0 pX6/qFYXCsxnsHuNN8/aZ1qrxNH2wLxrIZWFHyxd4QjLzJRvCBA73oozXWTJf+LWcH2D S8Cmgr5LqgPonx9QOxiLpFDDCvLNRTuCPw7R/Zu3iMQAejYZ3ZP6vMGk5+2osjQ9lATj vzT4y2VqCVxnN+eI8oJhZ72DHhrdSIY8cp7wbVb5cp1JeqGFl9NLQBq35nvBnwQTjNaT JRLSFzdN1A+Oiizq/ryk+cuH7DA2x7mQ7OQrTJTCLSEg3ROAGtenPIMGz3NsmBlJnKRU hh9Q== X-Gm-Message-State: AA+aEWbKmzxpr+lLaX/kn+Lq+oSW5J8FvRwFzwgc8H42pzNxgXat/PC8 JVqOqjyLZBqMEG3NG70e6vjndg== X-Received: by 2002:a1c:544f:: with SMTP id p15mr11822010wmi.37.1545058879632; Mon, 17 Dec 2018 07:01:19 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i192sm11683544wmg.7.2018.12.17.07.01.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Dec 2018 07:01:18 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A8A823E055E; Mon, 17 Dec 2018 15:01:16 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 17 Dec 2018 15:01:15 +0000 Message-Id: <20181217150116.10446-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181217150116.10446-1-alex.bennee@linaro.org> References: <20181217150116.10446-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v1 3/4] accel/tcg: use TLB helpers from softmmu.o X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Richard Henderson , cota@braap.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Crosthwaite Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- accel/tcg/Makefile.objs | 1 + accel/tcg/cputlb.c | 42 ----------------------------------------- 2 files changed, 1 insertion(+), 42 deletions(-) -- 2.17.1 diff --git a/accel/tcg/Makefile.objs b/accel/tcg/Makefile.objs index d381a02f34..6b0b96633d 100644 --- a/accel/tcg/Makefile.objs +++ b/accel/tcg/Makefile.objs @@ -1,5 +1,6 @@ obj-$(CONFIG_SOFTMMU) += tcg-all.o obj-$(CONFIG_SOFTMMU) += cputlb.o +obj-$(CONFIG_SOFTMMU) += softmmu.o obj-y += tcg-runtime.o tcg-runtime-gvec.o obj-y += cpu-exec.o cpu-exec-common.o translate-all.o obj-y += translator.o diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 3cae7335d0..ab07689d0e 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -983,28 +983,6 @@ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr, cpu_loop_exit_atomic(ENV_GET_CPU(env), retaddr); } -#ifdef TARGET_WORDS_BIGENDIAN -# define TGT_BE(X) (X) -# define TGT_LE(X) BSWAP(X) -#else -# define TGT_BE(X) BSWAP(X) -# define TGT_LE(X) (X) -#endif - -#define MMUSUFFIX _mmu - -#define DATA_SIZE 1 -#include "softmmu_template.h" - -#define DATA_SIZE 2 -#include "softmmu_template.h" - -#define DATA_SIZE 4 -#include "softmmu_template.h" - -#define DATA_SIZE 8 -#include "softmmu_template.h" - /* First set of helpers allows passing in of OI and RETADDR. This makes them callable from other helpers. */ @@ -1061,23 +1039,3 @@ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr, #define DATA_SIZE 8 #include "atomic_template.h" #endif - -/* Code access functions. */ - -#undef MMUSUFFIX -#define MMUSUFFIX _cmmu -#undef GETPC -#define GETPC() ((uintptr_t)0) -#define SOFTMMU_CODE_ACCESS - -#define DATA_SIZE 1 -#include "softmmu_template.h" - -#define DATA_SIZE 2 -#include "softmmu_template.h" - -#define DATA_SIZE 4 -#include "softmmu_template.h" - -#define DATA_SIZE 8 -#include "softmmu_template.h"