From nobody Tue Feb 10 09:57:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) client-ip=209.85.128.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602943437; cv=none; d=zohomail.com; s=zohoarc; b=PQFwTmHmd9byx9TK5c+bwVlPIOdd/oGDlqEFYnFOGe0vrk7RnX7A8l990ZpHyNjE8kJs/jkqF4FzxXTklWKZ2evK67rcMT15ZAXnykJnasWI8WUMWy15hs3M19zipd6hxt8HYzPPRoEPCqQ01mzx0v3t5AmhnAGfit19fzGaUfs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602943437; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aXyjLY13V+nekeG3vOBz5nLcikYdxrMvA83lBS/TJQg=; b=LkIQP7sjivQhg0G4hT4Z+vEPGZnccAlHPclIVfSvjXNyhzKZfrFWPg9PRBFRr8IGTvcfdDqSi3lff2KCwsvY+EOBTKrtlao9Z++2z9nPcBCMg30kqZnwIhGlDg7OXanwiEP7Lr878LqH0C3nwYqfzBzXWXUA9GuyST5kCO2rgTI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.zohomail.com with SMTPS id 1602943437745544.9824267861329; Sat, 17 Oct 2020 07:03:57 -0700 (PDT) Received: by mail-wm1-f67.google.com with SMTP id 13so6155490wmf.0 for ; Sat, 17 Oct 2020 07:03:57 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (117.red-83-52-172.dynamicip.rima-tde.net. [83.52.172.117]) by smtp.gmail.com with ESMTPSA id p9sm7542621wma.12.2020.10.17.07.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 07:03:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aXyjLY13V+nekeG3vOBz5nLcikYdxrMvA83lBS/TJQg=; b=uWEl5lH+/ghH1iLYgNFh7PkEInKgeOE/u4LGKtFZmNaJrd8m8/jIgfuNaQNQlXrciV qHejafDKTKRq426DLhcNAEcCwaZ2DEiNpKojFndGqu8kckHBsckqu3v+UZFaIp68UGMq 1wtNuAmVgps/ejYzU2UfEQzyuckzxDdrxtAy1Sit65yLVdF6haRsWMkPcdzgnvmtgqkg waMLAlgvwqinGT+YJefGdtfuVWLzJ6iSI6fMnvr5wpBLZYiDVMZRQrnM3/r+Csp6X1rf N+/fj02m9zCqC+sb4W7fcCiFxE7XwVnEdeU6r/Q7Ri0N4z7+RXdiA0FaKi9i0E3oR8qC f1Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=aXyjLY13V+nekeG3vOBz5nLcikYdxrMvA83lBS/TJQg=; b=Kgti0U+SGGH3fLQrO88wW9xp4K6tD9jbb5soQbvHY4NKVSeMxhEvdyrvv2MKOdnVhK xApbXFi0MW7cBiOJ152LcYQ07P6L+qeMl3JOdlh2EVgfxBrJ1ObrOSFX1e4qE4QqVhxR xRsnpnIpMpwLsCY77rGQthTjvzk1+6W9cqA0VdHt7uu+W55hUuGnvdBBE30Bwk80Ok1/ oE9d0vwX4Tq4mrrceIsXyAFYLx6QLSmfaXAWIM3pFHUN78sCkzZzW9A/BCBkYrPuDuDX q7OhNfjuVDZGwaj0QpMMKLHeAXrVYr77j9VQMUDUX/jFooIgIXkvVuTnSw8MFdtOCKFj jqGA== X-Gm-Message-State: AOAM531MuQWcm/0u955uOnHvSQQA2CsIgLUCyhQYbCYglkFk2NSIDwWz A4KxlocJtCsWKk2YVpKjRUo= X-Google-Smtp-Source: ABdhPJzwhW4mVi+f5x9wTnteifaIaWY7KcxpRoe6uMfIps/QYOVtdq/BcMmkU6mlXFvML8NSqsAC1A== X-Received: by 2002:a1c:7707:: with SMTP id t7mr9214439wmi.54.1602943435807; Sat, 17 Oct 2020 07:03:55 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Huacai Chen , Paul Burton , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic Subject: [PULL 15/44] target/mips/cp0_timer: Explicit unit in variable name Date: Sat, 17 Oct 2020 16:02:14 +0200 Message-Id: <20201017140243.1078718-16-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201017140243.1078718-1-f4bug@amsat.org> References: <20201017140243.1078718-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Name variables holding nanoseconds with the '_ns' suffix. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic Message-Id: <20201012095804.3335117-7-f4bug@amsat.org> --- target/mips/cp0_timer.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/target/mips/cp0_timer.c b/target/mips/cp0_timer.c index 9c38e9da1c8..5194c967ae3 100644 --- a/target/mips/cp0_timer.c +++ b/target/mips/cp0_timer.c @@ -32,13 +32,14 @@ /* MIPS R4K timer */ static void cpu_mips_timer_update(CPUMIPSState *env) { - uint64_t now, next; + uint64_t now_ns, next_ns; uint32_t wait; =20 - now =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - wait =3D env->CP0_Compare - env->CP0_Count - (uint32_t)(now / TIMER_PE= RIOD); - next =3D now + (uint64_t)wait * TIMER_PERIOD; - timer_mod(env->timer, next); + now_ns =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + wait =3D env->CP0_Compare - env->CP0_Count - + (uint32_t)(now_ns / TIMER_PERIOD); + next_ns =3D now_ns + (uint64_t)wait * TIMER_PERIOD; + timer_mod(env->timer, next_ns); } =20 /* Expire the timer. */ @@ -56,16 +57,16 @@ uint32_t cpu_mips_get_count(CPUMIPSState *env) if (env->CP0_Cause & (1 << CP0Ca_DC)) { return env->CP0_Count; } else { - uint64_t now; + uint64_t now_ns; =20 - now =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + now_ns =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); if (timer_pending(env->timer) - && timer_expired(env->timer, now)) { + && timer_expired(env->timer, now_ns)) { /* The timer has already expired. */ cpu_mips_timer_expire(env); } =20 - return env->CP0_Count + (uint32_t)(now / TIMER_PERIOD); + return env->CP0_Count + (uint32_t)(now_ns / TIMER_PERIOD); } } =20 --=20 2.26.2