From a81c969529d3a1645b490fcde93d231ec997b7ba Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
Date: Tue, 21 Aug 2012 05:49:43 -0400
Subject: [PATCH] CPU: Remove overloaded function_trace_start parameter

This patch removes the overloading of the parameter, which seems both
redundant, and possibly incorrect.

The inorder CPU is particularly interesting as it uses a different
name for the parameter, and never make any use of it internally.
---
 src/cpu/BaseCPU.py              | 2 +-
 src/cpu/CheckerCPU.py           | 2 --
 src/cpu/inorder/InOrderCPU.py   | 3 +--
 src/cpu/o3/O3Checker.py         | 2 --
 src/cpu/ozone/OzoneCPU.py       | 3 ---
 src/cpu/ozone/OzoneChecker.py   | 2 --
 src/cpu/ozone/SimpleOzoneCPU.py | 3 ---
 7 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/cpu/BaseCPU.py b/src/cpu/BaseCPU.py
index 8c658b196..a4ad2fe5a 100644
--- a/src/cpu/BaseCPU.py
+++ b/src/cpu/BaseCPU.py
@@ -82,7 +82,7 @@ class BaseCPU(MemObject):
     numThreads = Param.Unsigned(1, "number of HW thread contexts")
 
     function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")
+    function_trace_start = Param.Tick(0, "Tick to start function trace")
 
     checker = Param.BaseCPU(NULL, "checker CPU")
 
diff --git a/src/cpu/CheckerCPU.py b/src/cpu/CheckerCPU.py
index c144c4678..a6b5da5d7 100644
--- a/src/cpu/CheckerCPU.py
+++ b/src/cpu/CheckerCPU.py
@@ -37,5 +37,3 @@ class CheckerCPU(BaseCPU):
         "Update the checker with the main CPU's state on an error")
     warnOnlyOnLoadError = Param.Bool(True,
         "If a load result is incorrect, only print a warning and do not exit")
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")
diff --git a/src/cpu/inorder/InOrderCPU.py b/src/cpu/inorder/InOrderCPU.py
index 2dcd51d45..416b18dd3 100644
--- a/src/cpu/inorder/InOrderCPU.py
+++ b/src/cpu/inorder/InOrderCPU.py
@@ -62,8 +62,7 @@ class InOrderCPU(BaseCPU):
     RASSize = Param.Unsigned(16, "RAS size")
 
     instShiftAmt = Param.Unsigned(2, "Number of bits to shift instructions by")
-    functionTrace = Param.Bool(False, "Enable function trace")
-    functionTraceStart = Param.Tick(0, "Cycle to start function trace")
+
     stageTracing = Param.Bool(False, "Enable tracing of each stage in CPU")
 
     multLatency = Param.Unsigned(1, "Latency for Multiply Operations")
diff --git a/src/cpu/o3/O3Checker.py b/src/cpu/o3/O3Checker.py
index d53e5e527..5021b5ea7 100644
--- a/src/cpu/o3/O3Checker.py
+++ b/src/cpu/o3/O3Checker.py
@@ -36,5 +36,3 @@ class O3Checker(BaseCPU):
         "Update the checker with the main CPU's state on an error")
     warnOnlyOnLoadError = Param.Bool(True,
         "If a load result is incorrect, only print a warning and do not exit")
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")
diff --git a/src/cpu/ozone/OzoneCPU.py b/src/cpu/ozone/OzoneCPU.py
index b4f37220c..298a99d51 100644
--- a/src/cpu/ozone/OzoneCPU.py
+++ b/src/cpu/ozone/OzoneCPU.py
@@ -113,9 +113,6 @@ class DerivOzoneCPU(BaseCPU):
 
     instShiftAmt = Param.Unsigned("Number of bits to shift instructions by")
 
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")
-
     # If the CheckerCPU is brought back to useability in the OzoneCPU, create a
     # function here called addCheckerCpu() to create a non-NULL Checker and
     # connect its TLBs (if needed)
diff --git a/src/cpu/ozone/OzoneChecker.py b/src/cpu/ozone/OzoneChecker.py
index bbe46db18..9134612d0 100644
--- a/src/cpu/ozone/OzoneChecker.py
+++ b/src/cpu/ozone/OzoneChecker.py
@@ -36,5 +36,3 @@ class OzoneChecker(BaseCPU):
         "Update the checker with the main CPU's state on an error")
     warnOnlyOnLoadError = Param.Bool(False,
         "If a load result is incorrect, only print a warning and do not exit")
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")
diff --git a/src/cpu/ozone/SimpleOzoneCPU.py b/src/cpu/ozone/SimpleOzoneCPU.py
index d79418b27..ae122413d 100644
--- a/src/cpu/ozone/SimpleOzoneCPU.py
+++ b/src/cpu/ozone/SimpleOzoneCPU.py
@@ -109,6 +109,3 @@ class SimpleOzoneCPU(BaseCPU):
     numROBEntries = Param.Unsigned("Number of reorder buffer entries")
 
     instShiftAmt = Param.Unsigned("Number of bits to shift instructions by")
-
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")
-- 
2.30.2