cpu: Apply the ARM TLB rework to the O3 checker CPU.

[gem5.git] / src / mem / CommMonitor.py

diff --git a/src/mem/CommMonitor.py b/src/mem/CommMonitor.py
index a87b0478725c9d7d2bd705f857426b24d8c9f081..d6324372255946ebf40f66b22702d81f44830c5a 100644 (file)
--- a/src/mem/CommMonitor.py
+++ b/src/mem/CommMonitor.py
@@ -38,12 +38,12 @@
 
 from m5.params import *
 from m5.proxy import *
-from MemObject import MemObject
-from System import System
+from m5.objects.System import System
+from m5.SimObject import SimObject
 
 # The communication monitor will most typically be used in combination
 # with periodic dumping and resetting of stats using schedStatEvent
-class CommMonitor(MemObject):
+class CommMonitor(SimObject):
     type = 'CommMonitor'
     cxx_header = "mem/comm_monitor.hh"
 
@@ -53,16 +53,6 @@ class CommMonitor(MemObject):
     master = MasterPort("Master port")
     slave = SlavePort("Slave port")
 
-    # Boolean to enable or disable the trace. Writes to an a file named based on
-    # SimObject hierarchy.
-    trace_enable = Param.Bool(False, "Enable trace capture")
-
-    # Boolean to compress the trace or not.
-    trace_compress = Param.Bool(True, "Enable trace compression")
-
-    # packet trace output file, disabled by default
-    trace_file = Param.String("", "Packet trace output file")
-
     # control the sample period window length of this monitor
     sample_period = Param.Clock("1ms", "Sample period for histograms")
 
@@ -110,6 +100,3 @@ class CommMonitor(MemObject):
     read_addr_mask = Param.Addr(MaxAddr, "Address mask for read address")
     write_addr_mask = Param.Addr(MaxAddr, "Address mask for write address")
     disable_addr_dists = Param.Bool(True, "Disable address distributions")
-
-    # optional stack distance calculator
-    stack_dist_calc = Param.StackDistCalc(NULL, "Stack distance calculator")