From patchwork Thu Mar 3 20:46:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 547815 Delivered-To: patch@linaro.org Received: by 2002:ac0:f585:0:0:0:0:0 with SMTP id s5csp970181imq; Thu, 3 Mar 2022 12:51:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyw4HEH434bk+cyd0sjE5JzAvQAyCirRBzWeAxSxreCfwGH8u0EYByZBPie8ugxr4l89DV0 X-Received: by 2002:a81:6dd1:0:b0:2dc:56d1:1dae with SMTP id i200-20020a816dd1000000b002dc56d11daemr1611625ywc.479.1646340687477; Thu, 03 Mar 2022 12:51:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646340687; cv=none; d=google.com; s=arc-20160816; b=Zg6qRpOWDPgIFEBLDxdHmfYvmW+Bln62KHZRBiWk1hg4ry6jWOofGBpg+4DCls/zMG DNKB+z16EGsn2UuU30L7Mf+imEfrozeDjYTfVlLsfPcJ0NFICNnGfVXP8cBwHBQeRyI9 rCwArZ4hYgKioFORl21QTiFCVZKOKErcEvSWYBgqwiYGajty4xncDuTdULqdE2WQwSAN Fpzss6FIY/DmxdEv1K8YMAhIlkZqZECdrOghVTfutc6iEdoACDx83R5zcsczM0oaROGg TnHjyURWUySlbcYNg1m5I5lFs9AM7trec51ZIBskZ7ik1PeMmfIT1N8mohv/Gk7Vi7pI bP+A== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=DgijVqHZRbMJcToV5HUeYKBRNb+4RK7lyL5hmphZYzc=; b=MSAjhGJchbN9C2p5Fk6iSTJLa/EqQ4inIBVCEvf0k70+vg8XMGz7yF+yQBKuwlFa0R AYaRV9FVqvJKvt5hxMBp0UB2TnoX0C/IqTE41YsmKEubzOHQ9Q5xYGvZsRBtPwk5LnAF ymDj5T1crTUFnRVmAT5CcZmJudCtUpkd9Q8GunSEJoRhwF29GRpEmJ2IsVORYgVLjCg/ cX05p8pv7r7oMDqF50MnnxcILQk3L/8aEBN2yAlpzdOPYOKrj2IrSmnJYDYGHVKWnCyJ W6G8aOb17b2PEZqXmXIWwE6/d7xkliBUHjBOLIOut+C3DvsQsYn0yWb3VgbNjfAkMG1h ZwuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JoFEt+d6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bh14-20020a05690c038e00b002db695e7888si3058472ywb.403.2022.03.03.12.51.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Mar 2022 12:51:27 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JoFEt+d6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPsQ2-00029w-WE for patch@linaro.org; Thu, 03 Mar 2022 15:51:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPsLc-0001em-43 for qemu-devel@nongnu.org; Thu, 03 Mar 2022 15:46:52 -0500 Received: from [2607:f8b0:4864:20::102b] (port=41775 helo=mail-pj1-x102b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPsLY-0000xg-0R for qemu-devel@nongnu.org; Thu, 03 Mar 2022 15:46:51 -0500 Received: by mail-pj1-x102b.google.com with SMTP id ev16-20020a17090aead000b001bc3835fea8so6186030pjb.0 for ; Thu, 03 Mar 2022 12:46: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=DgijVqHZRbMJcToV5HUeYKBRNb+4RK7lyL5hmphZYzc=; b=JoFEt+d6pD0PEVsJ98GD1Wkg9yjs6dkfN4pVsHO+aHPI7C+VkyggTlCzUhrLaoB6K1 ccg5L60/4zgDFmh+pxcwYcaNi8BorW4Irl2MDAKwfg25cJ6/aU3Ny3tqqvPfldw1z6fe g1NhgLGQ97vS9kC8P1AGqNgOdtiT3oQ6q8fx/E0s5mgtT1eKTi1jae+TN1bbNeC7Qky9 Q5AsmRMzcNVH6MG5sgvHUuPOwbbfDjYT1e5+uUYdLvtaXkoeKCMOmVKjERNEupGpbo2J Jkf8vYxyIBAF5gfNjqRCTTsyehp9hHC36K/GuN4m85O2DNyMy6gRh0qS8jsCm49OwzN4 H4tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DgijVqHZRbMJcToV5HUeYKBRNb+4RK7lyL5hmphZYzc=; b=iDf9Kf3+MCqOV1OtHrJCh5rFMpCNIZNyTlDMIfcJFehnLapdsu/QYWCfDUUtl9IxM2 lbDjr5+e+Eq17wlqirOMdP3GstsfkqTMvzYKXBNDbDqpIaUi6bRTjdGXc7+o48Jr2EH+ Horb5dLc27cQyeXlfOVAUrBaxIkCuo7SYAaxVo6RW+B+Y4cIi5K8WfpYz3jzuZ4OTzeZ QWjyIWs5B77AZ7etYgJLW61ktLxfbKkuEtloAV0yuJxrGYkRf6jw5g1B4Db05aEJ8YLp nzlY/EoGyNDGCwShndWHViCty/aefyP0Jq4CN77ePWeFqv85SMlK+UVflEbbxcoOUzlR JdpQ== X-Gm-Message-State: AOAM531cfTTwWMHJ0+NjiXUGHHS4DbDZWhpRyeeXJhjHXVmxosNKaUuI lWZRuNts5DOqFsUPrr9A4J4LjJ5+ISLD1Q== X-Received: by 2002:a17:902:b488:b0:14e:fcef:7f0b with SMTP id y8-20020a170902b48800b0014efcef7f0bmr39154247plr.28.1646340391709; Thu, 03 Mar 2022 12:46:31 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-119c-490c-a4ee-08e8.res6.spectrum.com. [2603:800c:1201:c600:119c:490c:a4ee:8e8]) by smtp.gmail.com with ESMTPSA id d16-20020a17090ad99000b001bcbc4247a0sm2901211pjv.57.2022.03.03.12.46.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 12:46:31 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 3/7] target/nios2: Only build mmu.c for system mode Date: Thu, 3 Mar 2022 10:46:20 -1000 Message-Id: <20220303204624.468786-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220303204624.468786-1-richard.henderson@linaro.org> References: <20220303204624.468786-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102b (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can thus remove an ifdef covering the entire file. Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/nios2/mmu.c | 3 --- target/nios2/meson.build | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/target/nios2/mmu.c b/target/nios2/mmu.c index 306370f675..437fad09b7 100644 --- a/target/nios2/mmu.c +++ b/target/nios2/mmu.c @@ -25,7 +25,6 @@ #include "mmu.h" #include "trace/trace-target_nios2.h" -#if !defined(CONFIG_USER_ONLY) /* rw - 0 = read, 1 = write, 2 = fetch. */ unsigned int mmu_translate(CPUNios2State *env, @@ -217,5 +216,3 @@ void dump_mmu(CPUNios2State *env) (entry->data & CR_TLBACC_X) ? 'X' : '-'); } } - -#endif /* !CONFIG_USER_ONLY */ diff --git a/target/nios2/meson.build b/target/nios2/meson.build index e643917db1..62b384702d 100644 --- a/target/nios2/meson.build +++ b/target/nios2/meson.build @@ -2,14 +2,13 @@ nios2_ss = ss.source_set() nios2_ss.add(files( 'cpu.c', 'helper.c', - 'mmu.c', 'nios2-semi.c', 'op_helper.c', 'translate.c', )) nios2_softmmu_ss = ss.source_set() -nios2_softmmu_ss.add(files('monitor.c')) +nios2_softmmu_ss.add(files('monitor.c', 'mmu.c')) target_arch += {'nios2': nios2_ss} target_softmmu_arch += {'nios2': nios2_softmmu_ss}