From 4133238d8a11399e9c70dc48d8594957205ea9e7 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 30 Jan 2023 21:59:30 +0800 Subject: [PATCH] emulation: ticktimer: fix higher bits of ticktimer The ticktimer wasn't properly adjusting the upper bits, meaning delays of more than 42 days did not function properly. This was discovered as part of the libstd tests. Signed-off-by: Sean Cross --- emulation/peripherals/ticktimer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emulation/peripherals/ticktimer.cs b/emulation/peripherals/ticktimer.cs index 854ec55af..b504e8877 100644 --- a/emulation/peripherals/ticktimer.cs +++ b/emulation/peripherals/ticktimer.cs @@ -100,7 +100,7 @@ namespace Antmicro.Renode.Peripherals.Timers.Betrusted Registers.MsleepTarget1.Define32(this) .WithValueField(0, 32, name: "MsleepTarget1", writeCallback: (_, value) => { - this.msleepTarget = (this.msleepTarget & 0x00000000ffffffff) | (value << 32); + this.msleepTarget = (this.msleepTarget & 0x00000000ffffffff) | (((ulong)value) << 32); this.Log(LogLevel.Noisy, "Setting MsleepTarget1: {0}, sleep target now: {1}", value, this.msleepTarget); }, valueProviderCallback: _ => @@ -142,7 +142,7 @@ namespace Antmicro.Renode.Peripherals.Timers.Betrusted public bool paused; public long tickValue; - ulong msleepTarget; + public ulong msleepTarget; public GPIO IRQ { get; private set; } private enum Registers