From patchwork Thu Dec 7 10:54:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 751065 Delivered-To: patch@linaro.org Received: by 2002:adf:a499:0:b0:333:3a04:f257 with SMTP id g25csp354423wrb; Thu, 7 Dec 2023 02:55:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IFWMVomdBJi8g3736CYr3J/Pr86oElQFgIcSqlGamDFPm+9kWeTNhIloEAcEFmipxkV028p X-Received: by 2002:a05:622a:203:b0:423:bac7:f50e with SMTP id b3-20020a05622a020300b00423bac7f50emr2627637qtx.46.1701946548853; Thu, 07 Dec 2023 02:55:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701946548; cv=none; d=google.com; s=arc-20160816; b=ObYUm2Neme2SqJdM7z7k2tlOmPo8/T9egPOzZcWZbIPLFm0uT6TCK41Mj2E1qbSrOJ krFmWy+o0Z2Kv/1DJY7UoEA5A7VMHExJ4G1B54IQysAxM4FKmQjbEYm7Uyiq7OwIwef/ dJQXCC/5zDHJF4Bg23IqQ3SCQgDOvbPOHBJDGPWiNwhD/cs1a9rAbS2ebw4snAzLje0A JqFUAogaUfttYevtWF0p1A7OEl9+wLloU4eWIQJ8mrKMR3kIwJHcuKpClmEk2PBBWHgH d40ZH/piuD4dEvwRqvikDGa2RNIvPmtzd6p7joo92CfWAnHVZ5NTWTCk/ndBlZ22ZbY1 wd4Q== 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=uDpYvaGqiktp3pFhh53LjdujAGzRbMJnxoWS82qu+NI=; fh=ZXDWg7hKG7Hj19AbRuutTLw+Zvn/B9RsGUUw/YagpFI=; b=h2U7eyzqtVY95TYAx9F9yLtQU7NL3/lnxPXMcHwkcxk9j/7k0GfHbAwpVUpc3j7PdL voNcHjR6r9tjNQA/r2lN4VZdAEyYAN5241DHeSMfisE1RWjBlPge+b+jGVT9OYRYJt5j kALwa3x5LPCeavEFtekhAUIaXW1hRQYMKFKmwjV8nWd39z8P+5nZXPu+Gz+7OFcTkl/z pvdjGOhWvQ4uyn2qNXS7fpyMFLRvaa33h5bET+Ev6zem9x3gWAgRxsjJNPgbswSZIB5L lEh/PKUg3pAXdN90RxArd/Gj448JltmUVsSpf1oFtncFFqwYSW/cAOj6gWH2dY/+GGFi Wytg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DwrIrN6t; 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 b8-20020ac84f08000000b004254883439dsi974167qte.685.2023.12.07.02.55.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Dec 2023 02:55:48 -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=DwrIrN6t; 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] 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) 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-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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é --- 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" -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',