From 9c4809b9abf2b504ee5cf68c037e8b7ccad39771 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiago=20M=C3=BCck?= Date: Tue, 18 Aug 2020 16:12:53 -0500 Subject: [PATCH] mem-ruby: intToTick helper MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I76635228223e9a83eef94a25d166d091315a5e96 Signed-off-by: Tiago Mück Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41156 Reviewed-by: Jason Lowe-Power Reviewed-by: Matt Sinclair Maintainer: Jason Lowe-Power Maintainer: Matt Sinclair Tested-by: kokoro --- src/mem/ruby/protocol/RubySlicc_Util.sm | 14 +++++++++++++- src/mem/ruby/slicc_interface/RubySlicc_Util.hh | 4 +++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/mem/ruby/protocol/RubySlicc_Util.sm b/src/mem/ruby/protocol/RubySlicc_Util.sm index 70648ec6e..3079f20f2 100644 --- a/src/mem/ruby/protocol/RubySlicc_Util.sm +++ b/src/mem/ruby/protocol/RubySlicc_Util.sm @@ -1,5 +1,16 @@ - /* + * Copyright (c) 2021 ARM Limited + * All rights reserved + * + * The license below extends only to copyright in the software and shall + * not be construed as granting a license to any other intellectual + * property including but not limited to intellectual property relating + * to a hardware implementation of the functionality of the software + * licensed hereunder. You may use the software subject to the license + * terms below provided that you ensure that this notice is replicated + * unmodified and in its entirety in all distributions of the software, + * modified or unmodified, in source code or in binary form. + * * Copyright (c) 1999-2005 Mark D. Hill and David A. Wood * All rights reserved. * @@ -33,6 +44,7 @@ void error(std::string msg); void assert(bool condition); Cycles zero_time(); Cycles intToCycles(int c); +Tick intToTick(int c); NodeID intToID(int nodenum); int IDToInt(NodeID id); int addressToInt(Addr addr); diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh index f7f8a013d..187f5fe07 100644 --- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh +++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 ARM Limited + * Copyright (c) 2020-2021 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -62,6 +62,8 @@ inline Cycles zero_time() { return Cycles(0); } inline Cycles intToCycles(int c) { return Cycles(c); } +inline Tick intToTick(int c) { return c; } + inline NodeID intToID(int nodenum) { -- 2.30.2