From patchwork Tue Jun 28 04:54:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 585544 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5036:0:0:0:0 with SMTP id e22csp507249mab; Tue, 28 Jun 2022 00:25:03 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uj/G+fnd+udphash4IbMU3jAa+F3Xr2pGC9OZj0tbpblUg9zw+9epVZTfMlX+KfyDRR0Wf X-Received: by 2002:a05:620a:248b:b0:6af:4f9b:b0b3 with SMTP id i11-20020a05620a248b00b006af4f9bb0b3mr1718402qkn.408.1656401103060; Tue, 28 Jun 2022 00:25:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656401103; cv=none; d=google.com; s=arc-20160816; b=HZZpcLXF61wDq1E8/pqZSa0bUzsgYOMHJHqE8QdNwyWrXeAFhvMLNMtt7gZonxSrpp +6njIOtgXpWiM7n6tSqnetUKPOnDa76OOpJpmPEuGoXrVi897pGO1zdU6Fo0FmHS45jR Xw+G0FADJ88THPnHLN9UlvGByyQOl3hYRHZDnjQESeCVe4pO8Ks+J5AdBWGal59UX88j 6RjJ/khaWXMdwt4P72h8N1GELcpGBpW4GtSV2D7iecO4uKOiWy7UwITN8JFIHA6gPzPp D6/qn9CHODLlgoDl34IxgpqMceMhWpYOKF/QCX8s7MWbh5M4GBZ+kPmIfkHBYMfpYg2x /IHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=lp6xOv80VDFzS9xxN19WiasmRSXfzVX2i/YL5INbRnk=; b=jViHjRLboMOWd2kFM1+0Vs9vNt1YPir/OIwC6zdPJ5n8HOpsP55AqKO8+Yj4t2ZHLX pQWVA3ic28VimU7TmBjkmYDptUtQ0o5tfElkY4Y6mDilTTW5WxgypVqbqUdhOfXuuVzy TzC80zWYdQ2qOh5+WmCTQh1dxudwuy1SzQmKnEyB9C8M915EzY/Kv5+bOiFdvSYHnh7m SSqWaWlb7jwIfJcl7LcIV7sPn784FZTdAj5fiKhI/nSdd+dYmctYQgbQVkVQ3RYa2qN0 sD1Ml6BrGTOqWtAsL9r8nxOXmQmaXlrdgspbMnAs/tz++yNG9isckaZRCvGY9SpL2Ygp aOKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a5GrIpal; 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 21-20020ac85755000000b00304da33ef29si7110897qtx.314.2022.06.28.00.25.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Jun 2022 00:25:03 -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=a5GrIpal; 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]:40258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o65ao-0006CT-B6 for patch@linaro.org; Tue, 28 Jun 2022 03:25:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o63K8-0002g1-L7 for qemu-devel@nongnu.org; Tue, 28 Jun 2022 00:59:40 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:37685) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o63K6-0000b7-65 for qemu-devel@nongnu.org; Tue, 28 Jun 2022 00:59:39 -0400 Received: by mail-pj1-x102c.google.com with SMTP id w19-20020a17090a8a1300b001ec79064d8dso14659316pjn.2 for ; Mon, 27 Jun 2022 21:59:37 -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=lp6xOv80VDFzS9xxN19WiasmRSXfzVX2i/YL5INbRnk=; b=a5GrIpalYDaQk+Uok6mZnjYvJJsgtxHZKiE3IC3ZgPXHNW1mgXguWDo05VL3k4su1x 0BilF4u1GY6N2ILosi/+PTaA7Lzy2nGLHxjEnKubGlyzxZcQEuGaYjFuZQNK5MNC3Y7J g8KMomRhLPl1iHiXTyMNIF23tu0Fc3Hn918jVLisOFyFc34IGUB7UmfXL2aE25d9Jc9w mKiKykP9rv70B6rfO3z7732nz051dBxXGHZdTuDrAOgDjHJ5qFOcx3MtnkoQsO61FM+5 JTJNha3J+0iHM1EbJBPNng1/hdI1kVJVTFtVgf4bZiTd0In4i2uSDw/xLk5PGHldCqa8 Ebig== 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=lp6xOv80VDFzS9xxN19WiasmRSXfzVX2i/YL5INbRnk=; b=fkavQf0QTADY7L1xjw2a6dtiWjS5tBoQysooPToK6wn761AlTfGeEtOpbgj0JcHivH fZOBUlhS3qSjaV6P3i36gtG5oYFjo0wRD/a91DzweI4r56BWdSmvjVawfhTkcvXZsxDH 8IjLKvcLjp1376yyZ0NeKyf2oKfBn5G60HeIfOWaKpi6VZXK5O6sU35z/wBXlanDzMKY 822z1PVdiBuZQ9ultKcTC3by+9IFORW0/Ta7E9Ig+DfrnuQcm20RPq2JrJBfFSm1l/Of ZaYmCgegX5if1VOvJ76Z2iNp4njP+4QiEqxSriV6akMBkCgcEt8XmwDE8xJ8eZArslVF hyjg== X-Gm-Message-State: AJIora9msDFuBXr7qSvj0z0NJDIjKu9XXFyAC1enxGocPBJImEGg/ZXy 51WXsxtLYyOrWqiVzSoT0zOvyR3d8i6Zzw== X-Received: by 2002:a17:90b:3ec6:b0:1ec:ac25:ce6f with SMTP id rm6-20020a17090b3ec600b001ecac25ce6fmr24619521pjb.203.1656392376219; Mon, 27 Jun 2022 21:59:36 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id y7-20020aa78f27000000b00522c0a75c39sm8259686pfr.196.2022.06.27.21.59.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 21:59:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Peter Maydell , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Subject: [PULL 60/60] target/nios2: Move nios2-semi.c to nios2_softmmu_ss Date: Tue, 28 Jun 2022 10:24:03 +0530 Message-Id: <20220628045403.508716-61-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220628045403.508716-1-richard.henderson@linaro.org> References: <20220628045403.508716-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102c.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Semihosting is not enabled for nios2-linux-user. Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/nios2/nios2-semi.c | 5 ----- target/nios2/meson.build | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c index bdf8849689..55061bb2dc 100644 --- a/target/nios2/nios2-semi.c +++ b/target/nios2/nios2-semi.c @@ -22,14 +22,9 @@ */ #include "qemu/osdep.h" - #include "cpu.h" #include "exec/gdbstub.h" -#if defined(CONFIG_USER_ONLY) -#include "qemu.h" -#else #include "semihosting/softmmu-uaccess.h" -#endif #include "qemu/log.h" #define HOSTED_EXIT 0 diff --git a/target/nios2/meson.build b/target/nios2/meson.build index 2bd60ba306..c6e2243cc3 100644 --- a/target/nios2/meson.build +++ b/target/nios2/meson.build @@ -1,7 +1,6 @@ nios2_ss = ss.source_set() nios2_ss.add(files( 'cpu.c', - 'nios2-semi.c', 'op_helper.c', 'translate.c', )) @@ -10,7 +9,8 @@ nios2_softmmu_ss = ss.source_set() nios2_softmmu_ss.add(files( 'helper.c', 'monitor.c', - 'mmu.c' + 'mmu.c', + 'nios2-semi.c', )) target_arch += {'nios2': nios2_ss}