From patchwork Sun Feb 27 18:21:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 546441 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp2124538imf; Sun, 27 Feb 2022 10:22:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJzyuSeVzX5UsV8nSwPStQGNQC9zHweOGFU4RaghZJw3TOBLGOQHKV1k70pRL4x8i31q8oUP X-Received: by 2002:a81:f0c:0:b0:2d6:83ab:7605 with SMTP id 12-20020a810f0c000000b002d683ab7605mr16741785ywp.150.1645986150416; Sun, 27 Feb 2022 10:22:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645986150; cv=none; d=google.com; s=arc-20160816; b=WB5gO8X0z75Shg7UvnK4L1OGveuhMggqbYnXwSfac74LSLkXOI2V7VAsjREWOussRD G6l4QvkRZqm+Nr0VQL9mznrrx+shBPoPf+7KPHaT8/bhD2nPe3lVaqJXwDZ2+tifPAa4 55YBpgCjUxfqYQ7LX/ZP1leM0TgQY27Is5mH4aGfY1PLfEpMM7V3gB/YLFsa/FTESt2L zO5GXr8IP+zpHhPmHoLrcJ0Q9sONkuC5yKdeGQuaf32S7w7UY9FBl2Dy29hb6HzlQsf6 yjqQcxl3MvjyIo3bR97dIxVddSbbtkwQpSkYod2o8i+jP9sNxWlHKjsRkVVBGJ8imK2C ngbg== 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=J7e/u37TYv9IPJn4rjMKxL8Ql7HntkOG8MpKKjdYqdw=; b=TQ6HvH/3Pt6vfoGTuhocll5lMzlNZ3GmxAFM0Rk0aLLTtMcUjRUP/FH+U0yGP2x1eI o4KIcpXEEk1x1VG1GGUr0BaWWkTEV7dRrdf1D1eGgJ6xbkkkwrkL5yC5ACTguMYMs+At g16Iee87XocE1KY3KF9h/cAeQxaitufVs4TXc1H38AZTdVxuFqPysMra2pC9UDnMr3xe eCROjo+l8A8PLh4EnH1FFRpcXWkachEX4T6cOkmKEpMqzMp938X/G9caUDiStlh4Ro5x z05i92O26Oaf+4PCYKE4xPyDMzODsTSlIlEuoTAdzYX3g4qHbdfbF/lnsfwEOfozT03u Zt2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rTZ88MCk; 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 u11-20020a81db0b000000b002d7af572512si7725988ywm.317.2022.02.27.10.22.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 Feb 2022 10:22:30 -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=rTZ88MCk; 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]:51262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOOBh-0002g2-S9 for patch@linaro.org; Sun, 27 Feb 2022 13:22:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOOAr-0002cO-12 for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:37 -0500 Received: from [2607:f8b0:4864:20::102e] (port=54028 helo=mail-pj1-x102e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOOAp-0007nl-3T for qemu-devel@nongnu.org; Sun, 27 Feb 2022 13:21:36 -0500 Received: by mail-pj1-x102e.google.com with SMTP id bx5so9198994pjb.3 for ; Sun, 27 Feb 2022 10:21:34 -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=J7e/u37TYv9IPJn4rjMKxL8Ql7HntkOG8MpKKjdYqdw=; b=rTZ88MCkNO/ftTZDXO/mXy2bILQk/iQZ+4uSCaWOvNU0nEXO/UkxlnKub391wHjnpa mqA2VLMZHJlgiGQO4lSWdcyVnI9CFdQwteIit1gURjc6X2VRLv0265TIC2Ko6MyGLPFk pJrFRjKkWNMt5+PMefB8WSxlsvMAOsZlpQITKEjmTNkNOcqOR4JJId0JL+dbl+1DRHAM KSToYIxM0atvDvRGZfHuHoQNI/MDymv51WW9ETG2OKyHDS+sJ6MjYhc5+k3MW8ZopVIt 8o/qAzqwNi6BNTMrztvNRKrl/AJWdgadbuzwo/vYzkvq705TgGoY3pAuwL24G56eAiEY RF8w== 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=J7e/u37TYv9IPJn4rjMKxL8Ql7HntkOG8MpKKjdYqdw=; b=eFBzP4/GRWEemf6goosNmvf1FBDBXrEem3pT8Iwamwcgcs7tB98rlnqGUEfKzp8uDt hY2KWUlD5n4f/qtdtHE7JG7nOGleqcoV/gtIIDbqOoGgmnXSKdvr3/0x4xRaHUHUYO0x KL0eIupmopmXVPbYJ9wsBUdzLCZ1DfmOJ9jq0/isy2BDLBiVmLL0KpImQJdmzsH1yONG unkqHaGYBLyAdlcgNOorINOBYHKSZFjj7PIBkrKL7KNe6G0DD8swPkwt+VtXpdJuI2QL asuSkt2ba2buIF4K5iQeSTyhEKAvU8lJnUue51WItHgUYMtZpq4OiLkVvZY8ZwTa5wZB 7B4A== X-Gm-Message-State: AOAM530+q/ujaoe3A6H5uzPR5eYVKjXimyocZoHkDAhx8vvvMQRtJ3Ea d6aGSelTih3DeBD6r33ZFl2YDQsAmk2A3g== X-Received: by 2002:a17:902:744a:b0:14f:a63b:577d with SMTP id e10-20020a170902744a00b0014fa63b577dmr17109488plt.86.1645986093854; Sun, 27 Feb 2022 10:21:33 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-23be-43d9-7006-705a.res6.spectrum.com. [2603:800c:1201:c600:23be:43d9:7006:705a]) by smtp.gmail.com with ESMTPSA id t41-20020a056a0013a900b004e167af0c0dsm10776252pfg.89.2022.02.27.10.21.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Feb 2022 10:21:33 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/7] target/nios2: Only build mmu.c for system mode Date: Sun, 27 Feb 2022 08:21:21 -1000 Message-Id: <20220227182125.21809-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220227182125.21809-1-richard.henderson@linaro.org> References: <20220227182125.21809-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102e (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.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: amir.gonnen@neuroblade.ai Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can thus remove an ifdef covering the entire file. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- 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}