From nobody Wed Nov 27 00:39:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1701946549; cv=none; d=zohomail.com; s=zohoarc; b=RqbU/y10iqZcBT4dnr2JXg9cux49B6Vd9xKkRQrUp+PF5vS9WnIO39WPD74ySrDGF+7y7MV+EWJVbBz0ZsDoZFQ8LKqxHwZ56NJp7+RiVMtK6eM8NOGQV7MbVipk53d2HUXup4YxKKHzX+RIJG7cyuV6jIcZgquF9xmsCnhh2gE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1701946549; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uDpYvaGqiktp3pFhh53LjdujAGzRbMJnxoWS82qu+NI=; b=kxvEs3/fKEd1/b0H63TDJynh5abaCLgyWFHYoPupKHAB79ZBv5ceVKUs6eXT2qevPFvpnzE5fvyHMqMAvxQeLtlroYRnsp2s8p4MuEyupJiOOpRluyxV1JaeOL9uCNyKCtrdVuZfSuiSP9+VUo/mhirMv/mqcdn7uMf7vxhn+Bg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1701946549048688.7806886993309; Thu, 7 Dec 2023 02:55:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBC1h-0006Wq-Op; Thu, 07 Dec 2023 05:54:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBC1d-0006W2-Ms for qemu-devel@nongnu.org; Thu, 07 Dec 2023 05:54:37 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBC1c-00077E-0L for qemu-devel@nongnu.org; Thu, 07 Dec 2023 05:54:37 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-332c46d5988so780076f8f.1 for ; Thu, 07 Dec 2023 02:54:35 -0800 (PST) Received: from m1x-phil.lan ([176.187.202.111]) by smtp.gmail.com with ESMTPSA id r3-20020a5d52c3000000b00333483b468dsm1136211wrv.88.2023.12.07.02.54.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 07 Dec 2023 02:54:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701946474; x=1702551274; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uDpYvaGqiktp3pFhh53LjdujAGzRbMJnxoWS82qu+NI=; b=DwrIrN6tr1Bf6AOlgYX5ZmwfK3TGSRy9S33xQZ+Oh91XouiPPyY3pGSIcMfdn7tQ7D ZqAJArNV0rqd7oZkf1CX1dC/koF+i0Qf1yS1xQDjQ9Q5toCsBkmOjg6cdca0b1lmVN3X B09IfTpb7vIfNSNEF5rlXMTHuQReSyrvFhNizIVUSvR1eiLVQENoe3bDib2/JC9wMfQj j4qdseAS8l66+hKlh8L2qvns0Z3MJp+DRpbxi/eRZz7lDeo8bmddqklSaqTa8KlcaaMS N3ev0LeXvuPqLJlAqQFaL3Q5RamDehy6iEXHJ8LWoZP9+lxIzNq8po1eoxeDEpoh5ij6 h7Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701946474; x=1702551274; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uDpYvaGqiktp3pFhh53LjdujAGzRbMJnxoWS82qu+NI=; b=tpsOmdUoK0ie/h5zy5dWKSrNVDZ458UAOekAM/hNrdDN2x0svXM9SU4LDIvkD/lE0G 46R0J/v7typJ0m1Q6ljm5e+8ORX4l9JvJVCLumNGbkKPowCmhoFFKy2DsqOPFcpeZExn wh3UMf3eXBGzj+5nKcz6Tjt2tdQxLEWMTmFURyT9BnQvWkC25Rci0zObnyvQp7CFXuol lbMAfYYoLIUfxlofcnXT/YI0tJDnru45J+Ey8Vg28fzCcmQGJcOgObYNpNVz68/eATwD hMFQoyGq5lC07kOWcUxpjMhLRzJ/OsjIdvB04xD7elIeYgYJ2WUcER8lTBgR7A7jDHzO LS0w== X-Gm-Message-State: AOJu0YzyLe/jZ2YAfSN2giRLLq9SDiCxNj0t76CzsV9OowK3swwmoyUo M3e4nsjMFnnnZ/UGcf2mWz8OWCtpnZFPd/xBLTc= X-Google-Smtp-Source: AGHT+IFhRmHwbUnwOtLZNw0woWZcETXcTnZOByVrU60hf/sg2TCOnmw+TKHKabBFpLB3Q01+WXPhBQ== X-Received: by 2002:a5d:4b50:0:b0:333:49a8:73e7 with SMTP id w16-20020a5d4b50000000b0033349a873e7mr1483873wrs.89.1701946474272; Thu, 07 Dec 2023 02:54:34 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] target/alpha: Extract clk_helper.c from sys_helper.c Date: Thu, 7 Dec 2023 11:54:25 +0100 Message-ID: <20231207105426.49339-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231207105426.49339-1-philmd@linaro.org> References: <20231207105426.49339-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1701946550414100009 Except helper_load_pcc(), all helpers from sys_helper.c are system-emulation specific. In preparation of restricting sys_helper.c to system emulation, extract helper_load_pcc() to clk_helper.c. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/alpha/clk_helper.c | 32 ++++++++++++++++++++++++++++++++ target/alpha/sys_helper.c | 15 --------------- target/alpha/meson.build | 1 + 3 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 target/alpha/clk_helper.c diff --git a/target/alpha/clk_helper.c b/target/alpha/clk_helper.c new file mode 100644 index 0000000000..26ffc231cd --- /dev/null +++ b/target/alpha/clk_helper.c @@ -0,0 +1,32 @@ +/* + * QEMU Alpha clock helpers. + * + * Copyright (c) 2007 Jocelyn Mayer + * + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/timer.h" +#include "exec/helper-proto.h" +#include "cpu.h" + +uint64_t helper_load_pcc(CPUAlphaState *env) +{ +#ifndef CONFIG_USER_ONLY + /* + * In system mode we have access to a decent high-resolution clock. + * In order to make OS-level time accounting work with the RPCC, + * present it with a well-timed clock fixed at 250MHz. + */ + return (((uint64_t)env->pcc_ofs << 32) + | (uint32_t)(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) >> 2)); +#else + /* + * In user-mode, QEMU_CLOCK_VIRTUAL doesn't exist. Just pass through + * the host cpu clock ticks. Also, don't bother taking PCC_OFS into + * account. + */ + return (uint32_t)cpu_get_host_ticks(); +#endif +} diff --git a/target/alpha/sys_helper.c b/target/alpha/sys_helper.c index c83c92dd4c..98d9a0fff7 100644 --- a/target/alpha/sys_helper.c +++ b/target/alpha/sys_helper.c @@ -27,21 +27,6 @@ #include "qemu/timer.h" =20 =20 -uint64_t helper_load_pcc(CPUAlphaState *env) -{ -#ifndef CONFIG_USER_ONLY - /* In system mode we have access to a decent high-resolution clock. - In order to make OS-level time accounting work with the RPCC, - present it with a well-timed clock fixed at 250MHz. */ - return (((uint64_t)env->pcc_ofs << 32) - | (uint32_t)(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) >> 2)); -#else - /* In user-mode, QEMU_CLOCK_VIRTUAL doesn't exist. Just pass through = the host cpu - clock ticks. Also, don't bother taking PCC_OFS into account. */ - return (uint32_t)cpu_get_host_ticks(); -#endif -} - /* PALcode support special instructions */ #ifndef CONFIG_USER_ONLY void helper_tbia(CPUAlphaState *env) diff --git a/target/alpha/meson.build b/target/alpha/meson.build index d3502dd823..ea252c99a5 100644 --- a/target/alpha/meson.build +++ b/target/alpha/meson.build @@ -4,6 +4,7 @@ alpha_ss.add(files( 'fpu_helper.c', 'gdbstub.c', 'helper.c', + 'clk_helper.c', 'int_helper.c', 'mem_helper.c', 'sys_helper.c', --=20 2.41.0 From nobody Wed Nov 27 00:39:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1701946549; cv=none; d=zohomail.com; s=zohoarc; b=ClhiZkkXzSTL6I63CU5MqAibWQHKL1XD6A7ivNc3g/5NO/Md52OcWYS69fQiVeS+ibRD4o011cna33Wn0HdNCjSpv51ostSp5vV7eSMfZB/CX0bEkQ+yj2rxd3UxwIzY4AVPuX7EtOP5+CyDo3x9CLPiMJX+UwIL0X3if3+rXnE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1701946549; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pzHfNd+5ye/JZZWncMwC1J3XXil2LznVmX5p2wjtceY=; b=lCBWWyzvbJWrkKywnhliWMxgFjRaMQcqrzam9o45KdFBUofmZmJjQM6X3q/KTCAISu34ekDnWfaViODKPIFtvW9mqoneP8Ifnk9SR17fMrjInHwJ3BFtZ0bYofBytWvKoPzBXF1Sa93h2HwbIcw/YtoULzxxQX0HyMl83aAQcWs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1701946549139312.9356042739963; Thu, 7 Dec 2023 02:55:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBC1m-0006XR-Fg; Thu, 07 Dec 2023 05:54:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBC1j-0006Wz-Pv for qemu-devel@nongnu.org; Thu, 07 Dec 2023 05:54:44 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBC1i-000784-6g for qemu-devel@nongnu.org; Thu, 07 Dec 2023 05:54:43 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3332e351670so718068f8f.0 for ; Thu, 07 Dec 2023 02:54:41 -0800 (PST) Received: from m1x-phil.lan ([176.187.202.111]) by smtp.gmail.com with ESMTPSA id m12-20020a5d4a0c000000b003333a0da243sm1121730wrq.81.2023.12.07.02.54.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 07 Dec 2023 02:54:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701946480; x=1702551280; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pzHfNd+5ye/JZZWncMwC1J3XXil2LznVmX5p2wjtceY=; b=PLDMXR5J3ceAev10UkWnOYlAei/YBi1z7iOPkTO0FnSPl/ZLaEWVXw2GrqgyHGRf8/ zQEeTQOr/nmzxrR+aAhwzawRRmrvxevh4FnB9W61wsDz1ms5SD01kSKAdXFMpKFjeaaa 6K93ial56Sp1GHx43lzASnoHQSG1SJp/mhGrbzWaZ3cpK+RFyGieDB43jywiutkPaxwv oZA40Merptp+0151U/lDr+KGnKFXTh4Bc49N01dfouoTB7wu1nz6+ydbng0OfMsXm4yx ZwUIxNOxtPp9Pj65GMHynkoADIrYJUyB6gOO/vegE+/YPbY96NbKgK7jnkvt7PJM1Nir ixmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701946480; x=1702551280; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pzHfNd+5ye/JZZWncMwC1J3XXil2LznVmX5p2wjtceY=; b=hWMd5JkOUOp+KaAn34d5aUEM0jbRi/UFAqC9UXxtbWixm3uqsSSAaDX04UXcGkb8BU e6kshADMIJOOC6BKYlTjZlh6Ehz2og9LJpbBMPT8nZB82G+sQ3A4W61gdP7DBawnxL86 IBHZNSr4oup167dHQjmWLC54BwxH6hzoN98dvEif4iH0X9N+j6Es2NZW1Ss4jVrEK+dm ZNlmNLnvl5t9HgmObBmJBZofcwIxF/4k2vw74mnpiBuLU2HZUPYs1ti5y7a/a8v8e2j9 dtqrB8JYz6PQrsV3KP3BzRKDPoY9jCjG0x1y4jdZ99UaJYmUaaXI04u/KWpZcMZaxZK2 6ZXg== X-Gm-Message-State: AOJu0YzSxwXyhJXI5CeBb5q0X/SQwqowrH40HzR/slgg+7Bzu9saj1w7 C8MEo5hoMkbYMyLuj6D1htM8cYqA+TqjmcAYIP4= X-Google-Smtp-Source: AGHT+IHma8uKa7BIFYjivlRLJLdj6+Ldk6Mjada5KP63e1mOO1zT+EPnRd8Bz+vbZV1jnRzL6RKCJw== X-Received: by 2002:a5d:6306:0:b0:333:130d:4311 with SMTP id i6-20020a5d6306000000b00333130d4311mr777394wru.52.1701946480450; Thu, 07 Dec 2023 02:54:40 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] target/alpha: Only build sys_helper.c on system emulation Date: Thu, 7 Dec 2023 11:54:26 +0100 Message-ID: <20231207105426.49339-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231207105426.49339-1-philmd@linaro.org> References: <20231207105426.49339-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1701946550355100005 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/alpha/sys_helper.c | 3 --- target/alpha/meson.build | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/target/alpha/sys_helper.c b/target/alpha/sys_helper.c index 98d9a0fff7..768116ef32 100644 --- a/target/alpha/sys_helper.c +++ b/target/alpha/sys_helper.c @@ -28,7 +28,6 @@ =20 =20 /* PALcode support special instructions */ -#ifndef CONFIG_USER_ONLY void helper_tbia(CPUAlphaState *env) { tlb_flush(env_cpu(env)); @@ -74,5 +73,3 @@ void helper_set_alarm(CPUAlphaState *env, uint64_t expire) timer_del(cpu->alarm_timer); } } - -#endif /* CONFIG_USER_ONLY */ diff --git a/target/alpha/meson.build b/target/alpha/meson.build index ea252c99a5..7dbbd55717 100644 --- a/target/alpha/meson.build +++ b/target/alpha/meson.build @@ -7,13 +7,15 @@ alpha_ss.add(files( 'clk_helper.c', 'int_helper.c', 'mem_helper.c', - 'sys_helper.c', 'translate.c', 'vax_helper.c', )) =20 alpha_system_ss =3D ss.source_set() -alpha_system_ss.add(files('machine.c')) +alpha_system_ss.add(files( + 'machine.c', + 'sys_helper.c', +)) =20 target_arch +=3D {'alpha': alpha_ss} target_system_arch +=3D {'alpha': alpha_system_ss} --=20 2.41.0