From patchwork Tue Apr 26 18:18:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 566074 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp3845950map; Tue, 26 Apr 2022 11:38:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9TZPSPFM2j7JoTyG3FrmawjR73UGxWSIStqzjZ9G0pKQgxji2oVK5dlj/nElqorKMXtGE X-Received: by 2002:a5b:a0c:0:b0:633:6489:7e3a with SMTP id k12-20020a5b0a0c000000b0063364897e3amr23264101ybq.71.1650998315819; Tue, 26 Apr 2022 11:38:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650998315; cv=none; d=google.com; s=arc-20160816; b=JjMYEApglgPomuu+BaFsnW7Qag9MdbnT2g6FiWzmHrK4+GyZkjX/+ST7R9Gs6VGVyg PgbsZxJPqVhpyT8GOtovpx8g9Sub7AsMcLiu8T7aAnEWiCbVoNasYkFbf1TcZTmCKEQq tC3A1joKVOZJ8IIVMVe33NoQTeKg3hxI755MHdnXQHQPHJzYIoolSY393/IPFUirqLML ZffKeIfXKJJcLeggmy3NRcHu7nJI+2ipKrh2zfkEHqx9Sy4g1rHPn5lX0Gyj93KTydes Hp806E8LWsP2/F6xJKP/gJTA9E2BvOunNF9i3kwj9VCFmJ0CcbWWGleGqyEo9MVC1ErR x79A== 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=aSCpXgZFYrLKFx9z48EM2Iny/HfNa5ePJRFMiB+lNrQ=; b=S+8FymB2OEO69pS0ezmjzAQA+VC+IDXD4Rpl6hAg+sKlGVEqr5NT5HxjG0fXqF6N3R hFR0Mn5Jh1oAjQht5oOybuPNOe6FfbKRJSoFaC9L3FvFbABmDcl69gVZI10a06+XQFnK AEL33ZrGsvx04Uy3aluTyUWtM+4Ynb/oN1is2Us7LFY74PsN0os4qRVGF7Jf0iiN0wax SuMX6LxWboN0R9hsYA4zzddWzY25CQGL13HTAEQ/PvXScVj/IDc88Jsi7LXMLAsVbC7f /Rfz91zOxvn+LhEDUWA0bZENM60BEV1iFSJyFUPat6m7/lnE7+LAwOBEz+pTBUVH4vTb 6WFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N+u9E1lw; 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 n84-20020a255957000000b00645d369d4aasi11074682ybb.130.2022.04.26.11.38.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Apr 2022 11:38:35 -0700 (PDT) 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=N+u9E1lw; 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]:54190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njQ55-0004UJ-Bs for patch@linaro.org; Tue, 26 Apr 2022 14:38:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njPmW-0002Uj-DB for qemu-devel@nongnu.org; Tue, 26 Apr 2022 14:19:24 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:35670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njPmU-0004Ld-1n for qemu-devel@nongnu.org; Tue, 26 Apr 2022 14:19:24 -0400 Received: by mail-pf1-x434.google.com with SMTP id t13so5055946pfg.2 for ; Tue, 26 Apr 2022 11:19:19 -0700 (PDT) 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=aSCpXgZFYrLKFx9z48EM2Iny/HfNa5ePJRFMiB+lNrQ=; b=N+u9E1lwGhGsj2Xfdj9bGCMiknWs5MzgJDR78Xjee3FC6OaOyqejTzICzEjpWiaCqq /uRu76GMnMCt4R95M03z7Sy4fr5iNCGUkORSS4W8r1gCgZdDORG4p5U/IDtT9Emns83I fOFC3wqc4nfsJ318lbq470NkPenXmOneLCKdgYVGx1fpMYVRKTRN/Q3gM44w5x6MhUlg m0iChju+7Y4wiQBAwJRFhbAZqP2/Pvx4rCG04mn7MMVCBA0FHHCeM9NBxfxG3dhzL7px Ul8yLKDnCn247iGWZjWv6CjZpyFw55W8mdjzpSyd8L9F9ByiBDd3qT+3Gi3ZcLZsBkdN 9IKQ== 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=aSCpXgZFYrLKFx9z48EM2Iny/HfNa5ePJRFMiB+lNrQ=; b=7wPLStG3BuGvIeRBeMqZTDHONCDueF3DnOv/NMf1uENtjM3spC6IVdh/ZJy7xrojp9 p8O3GeCVz7aknVnh7bfi0N/pAKlSLDW4T4S51xMJXuFmTkRxclVE8mBxNnV+LzB/ug9I 8BbgPpZTYUiyjmMDORftC5+aXLwtqAf7Pqz1g44HqiObH9/w3GP6Xwzp9e+O94JwapOv Ke2v8mxl3ILYF+RpjfB9uCdKiFnqTCrGZXDde5xctoVoNAHdo9vC52/ppQ8Ipuu5G2R4 nDRHjGhtZtHeIADCzvwTQzZghugT9A6bRNdG2DNat0evsWVi7enyd29pu+I+DUo/5B6g v0sw== X-Gm-Message-State: AOAM530IDamvzvUFzqkxoaUDRQ59Vb9YpXqOEibgOUpEmXOLgFouNCop P27LXJS7vDOElXSSJ6MkKP9U1KyQK6EoSQ== X-Received: by 2002:aa7:8890:0:b0:50a:9b3d:bfa5 with SMTP id z16-20020aa78890000000b0050a9b3dbfa5mr25997728pfe.48.1650997158227; Tue, 26 Apr 2022 11:19:18 -0700 (PDT) Received: from stoup.. (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id j7-20020a056a00130700b004b9f7cd94a4sm16482827pfu.56.2022.04.26.11.19.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 11:19:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 11/68] target/nios2: Build helper.c for system only Date: Tue, 26 Apr 2022 11:18:10 -0700 Message-Id: <20220426181907.103691-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220426181907.103691-1-richard.henderson@linaro.org> References: <20220426181907.103691-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Remove the #ifdef !defined(CONFIG_USER_ONLY) that surrounds the whole file, and move helper.c to nios2_softmmu_ss. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Message-Id: <20220421151735.31996-12-richard.henderson@linaro.org> --- target/nios2/helper.c | 3 +-- target/nios2/meson.build | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/target/nios2/helper.c b/target/nios2/helper.c index 55b8fb0bcb..04a8831443 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -28,7 +28,7 @@ #include "exec/helper-proto.h" #include "semihosting/semihost.h" -#if !defined(CONFIG_USER_ONLY) + void nios2_cpu_do_interrupt(CPUState *cs) { Nios2CPU *cpu = NIOS2_CPU(cs); @@ -292,4 +292,3 @@ bool nios2_cpu_tlb_fill(CPUState *cs, vaddr address, int size, env->regs[CR_BADADDR] = address; cpu_loop_exit_restore(cs, retaddr); } -#endif /* !CONFIG_USER_ONLY */ diff --git a/target/nios2/meson.build b/target/nios2/meson.build index 62b384702d..2bd60ba306 100644 --- a/target/nios2/meson.build +++ b/target/nios2/meson.build @@ -1,14 +1,17 @@ nios2_ss = ss.source_set() nios2_ss.add(files( 'cpu.c', - 'helper.c', 'nios2-semi.c', 'op_helper.c', 'translate.c', )) nios2_softmmu_ss = ss.source_set() -nios2_softmmu_ss.add(files('monitor.c', 'mmu.c')) +nios2_softmmu_ss.add(files( + 'helper.c', + 'monitor.c', + 'mmu.c' +)) target_arch += {'nios2': nios2_ss} target_softmmu_arch += {'nios2': nios2_softmmu_ss}