From nobody Thu May 2 12:08:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=ispras.ru ARC-Seal: i=1; a=rsa-sha256; t=1617003786; cv=none; d=zohomail.com; s=zohoarc; b=fVQ92+7tXS5iCzhsReYYpa9C1fdvhO+MQ4ji0jMztuoV2Xt5rJr/rdP3Z2Gg9GbgNIXqhvS8o0cRtSISrLNRT68owkSFwK6CMe8XsSxeaRiUIMIISmuCNoPqBJCOIHKiXhnSGkf2ZNNplnCzoCdNHRf7TwZ/k0F7mVouJHkDMs8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617003786; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=BUGh4gY8b3SbnaYxcblZ3LAIhwCoz5IjH9TGrpgQ54E=; b=lO8oEP4irToCugakaYkXDts3ZpcEj0fFCXpfOnF9mFANnkRZn9N/4n/qlDhvEtBkGen/XRZvNdzsYJd2TaozXP5HpxUDvxqCsZGlBJGPInmsfScUOHluCEI4QzJoqjoCTFOB+DbMQmtSZ1hgUGYrPVmGZFYhbyn/1uJeQ8K9rF0= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161700378580233.78534749151288; Mon, 29 Mar 2021 00:43:05 -0700 (PDT) Received: from localhost ([::1]:33138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lQmYB-0004Bh-RV for importer@patchew.org; Mon, 29 Mar 2021 03:43:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQmXY-0003j1-0K for qemu-devel@nongnu.org; Mon, 29 Mar 2021 03:42:24 -0400 Received: from mail.ispras.ru ([83.149.199.84]:54436) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQmXV-0003RR-TP for qemu-devel@nongnu.org; Mon, 29 Mar 2021 03:42:23 -0400 Received: from [127.0.1.1] (unknown [62.118.151.149]) by mail.ispras.ru (Postfix) with ESMTPSA id A15C340755CC; Mon, 29 Mar 2021 07:42:10 +0000 (UTC) Subject: [PATCH] target/alpha: fix icount handling for timer instructions From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Mon, 29 Mar 2021 10:42:10 +0300 Message-ID: <161700373035.1135822.16451510827008616793.stgit@pasha-ThinkPad-X280> User-Agent: StGit/0.23 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=83.149.199.84; envelope-from=pavel.dovgalyuk@ispras.ru; helo=mail.ispras.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard.henderson@linaro.org, pavel.dovgalyuk@ispras.ru Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" This patch handles icount mode for timer read/write instructions, because it is required to call gen_io_start in such cases. Signed-off-by: Pavel Dovgalyuk Reviewed-by: Richard Henderson --- target/alpha/translate.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target/alpha/translate.c b/target/alpha/translate.c index a02b4e70b7..f454adea5e 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -1330,7 +1330,7 @@ static DisasJumpType gen_mfpr(DisasContext *ctx, TCGv= va, int regno) case 249: /* VMTIME */ helper =3D gen_helper_get_vmtime; do_helper: - if (icount_enabled()) { + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { gen_io_start(); helper(va); return DISAS_PC_STALE; @@ -1366,6 +1366,7 @@ static DisasJumpType gen_mfpr(DisasContext *ctx, TCGv= va, int regno) static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno) { int data; + DisasJumpType ret =3D DISAS_NEXT; =20 switch (regno) { case 255: @@ -1395,6 +1396,10 @@ static DisasJumpType gen_mtpr(DisasContext *ctx, TCG= v vb, int regno) =20 case 251: /* ALARM */ + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { + gen_io_start(); + ret =3D DISAS_PC_STALE; + } gen_helper_set_alarm(cpu_env, vb); break; =20 @@ -1434,7 +1439,7 @@ static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv= vb, int regno) break; } =20 - return DISAS_NEXT; + return ret; } #endif /* !USER_ONLY*/ =20