Ayaz Akram has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/37396 )
Change subject: misc: move Ticked class to cpu/minor
......................................................................
misc: move Ticked class to cpu/minor
Since, Ticked is used only by MinorCPU,
this change moves Ticked to src/cpu/minor.
Change-Id: I902a01c23a55a6dc11eba6e4964d3dff395b9c07
---
M src/cpu/minor/SConscript
M src/cpu/minor/pipeline.hh
M src/cpu/minor/stats.hh
R src/cpu/minor/ticked.cc
R src/cpu/minor/ticked.hh
M src/sim/SConscript
D src/sim/Ticked.py
7 files changed, 4 insertions(+), 46 deletions(-)
diff --git a/src/cpu/minor/SConscript b/src/cpu/minor/SConscript
index 75cc940..c3c1293 100644
--- a/src/cpu/minor/SConscript
+++ b/src/cpu/minor/SConscript
@@ -56,6 +56,7 @@
Source('pipeline.cc')
Source('scoreboard.cc')
Source('stats.cc')
+ Source('ticked.cc')
DebugFlag('MinorCPU', 'Minor CPU-level events')
DebugFlag('MinorExecute', 'Minor Execute stage')
diff --git a/src/cpu/minor/pipeline.hh b/src/cpu/minor/pipeline.hh
index b275f02..d38620e 100644
--- a/src/cpu/minor/pipeline.hh
+++ b/src/cpu/minor/pipeline.hh
@@ -52,7 +52,7 @@
#include "cpu/minor/fetch1.hh"
#include "cpu/minor/fetch2.hh"
#include "params/MinorCPU.hh"
-#include "sim/ticked_object.hh"
+#include "cpu/minor/ticked.hh"
namespace Minor
{
diff --git a/src/cpu/minor/stats.hh b/src/cpu/minor/stats.hh
index 3ee678a..965f2f8 100644
--- a/src/cpu/minor/stats.hh
+++ b/src/cpu/minor/stats.hh
@@ -46,7 +46,7 @@
#include "base/statistics.hh"
#include "cpu/base.hh"
-#include "sim/ticked_object.hh"
+#include "cpu/minor/ticked.hh"
namespace Minor
{
diff --git a/src/sim/ticked.cc b/src/cpu/minor/ticked.cc
similarity index 98%
rename from src/sim/ticked.cc
rename to src/cpu/minor/ticked.cc
index 11dfc70..0448a16 100644
--- a/src/sim/ticked.cc
+++ b/src/cpu/minor/ticked.cc
@@ -35,7 +35,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sim/ticked.hh"
+#include "cpu/minor/ticked.hh"
#include "params/Ticked.hh"
#include "sim/clocked_object.hh"
diff --git a/src/sim/ticked.hh b/src/cpu/minor/ticked.hh
similarity index 100%
rename from src/sim/ticked.hh
rename to src/cpu/minor/ticked.hh
diff --git a/src/sim/SConscript b/src/sim/SConscript
index fcde7ee..9e7ea6e 100644
--- a/src/sim/SConscript
+++ b/src/sim/SConscript
@@ -29,7 +29,6 @@
Import('*')
SimObject('ClockedObject.py')
-SimObject('Ticked.py')
SimObject('Workload.py')
SimObject('Root.py')
SimObject('ClockDomain.py')
@@ -67,7 +66,6 @@
Source('sim_events.cc')
Source('sim_object.cc')
Source('sub_system.cc')
-Source('ticked.cc')
Source('simulate.cc')
Source('stat_control.cc')
Source('stat_register.cc', add_tags='python')
diff --git a/src/sim/Ticked.py b/src/sim/Ticked.py
deleted file mode 100644
index 5161b9c..0000000
--- a/src/sim/Ticked.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (c) 2014 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.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from m5.objects.ClockedObject import ClockedObject
-
-class TickedObject(ClockedObject):
- type = 'Ticked'
- abstract = True
- cxx_header = "sim/ticked.hh"
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37396
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I902a01c23a55a6dc11eba6e4964d3dff395b9c07
Gerrit-Change-Number: 37396
Gerrit-PatchSet: 1
Gerrit-Owner: Ayaz Akram <yazak...@ucdavis.edu>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
