From 7acd6a57c8876c3c5498595d239978b048d28b19 Mon Sep 17 00:00:00 2001 From: Adrian Herrera Date: Mon, 28 Oct 2019 19:38:06 +0000 Subject: [PATCH] dev-arm: GenericTimer, freq as 32-bit value The System Counter frequency is now a 32-bit value. This is consistent with CNTFRQ and CNTFRQ_EL0 register sizes. Change-Id: I39886a3767adbe9c58887b8b6d5f30ebc6035bcc Reviewed-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22424 Reviewed-by: Giacomo Travaglini Maintainer: Giacomo Travaglini Tested-by: kokoro --- src/dev/arm/generic_timer.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dev/arm/generic_timer.hh b/src/dev/arm/generic_timer.hh index acd8b3960..9a7f162e7 100644 --- a/src/dev/arm/generic_timer.hh +++ b/src/dev/arm/generic_timer.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, 2017-2018 ARM Limited + * Copyright (c) 2013, 2015, 2017-2018, 2019 ARM Limited * All rights reserved. * * The license below extends only to copyright in the software and shall @@ -63,7 +63,7 @@ class SystemCounter : public Serializable { protected: /// Counter frequency (as specified by CNTFRQ). - uint64_t _freq; + uint32_t _freq; /// Cached copy of the counter period (inverse of the frequency). Tick _period; /// Tick when the counter was reset. @@ -86,7 +86,7 @@ class SystemCounter : public Serializable } /// Returns the counter frequency. - uint64_t freq() const { return _freq; } + uint32_t freq() const { return _freq; } /// Sets the counter frequency. /// @param freq frequency in Hz. void setFreq(uint32_t freq); -- 2.30.2