summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2005-02-11 17:54:42 -0500
committerKevin Lim <ktlim@umich.edu>2005-02-11 17:54:42 -0500
commit79e83cea971bf346a5b0d6e88541e502a614c777 (patch)
treee1561f7044a4b3ee79a960d57451716af53387b5 /cpu
parentc4d0ebd25cc5f0657b99543ff2df30d1a86f3ad5 (diff)
parent10ee909fbd895b588bf01021af98e81a3ae40fc0 (diff)
downloadgem5-79e83cea971bf346a5b0d6e88541e502a614c777.tar.xz
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5 --HG-- extra : convert_revision : 11832134b169aa827a1d03c96ef89edddf4b3dab
Diffstat (limited to 'cpu')
-rw-r--r--cpu/base_cpu.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/cpu/base_cpu.cc b/cpu/base_cpu.cc
index 19261e97b..d653baa29 100644
--- a/cpu/base_cpu.cc
+++ b/cpu/base_cpu.cc
@@ -26,13 +26,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <iostream>
#include <string>
#include <sstream>
-#include <iostream>
#include "base/cprintf.hh"
#include "base/loader/symtab.hh"
#include "base/misc.hh"
+#include "base/output.hh"
#include "cpu/base_cpu.hh"
#include "cpu/exec_context.hh"
#include "sim/param.hh"
@@ -142,8 +143,7 @@ BaseCPU::BaseCPU(const string &_name, int _number_of_threads, bool _def_reg,
functionTracingEnabled = false;
if (_function_trace) {
- std::string filename = csprintf("ftrace.%s", name());
- functionTraceStream = makeOutputStream(filename);
+ functionTraceStream = simout.find(csprintf("ftrace.%s", name()));
currentFunctionStart = currentFunctionEnd = 0;
functionEntryTick = _function_trace_start;
@@ -167,11 +167,8 @@ BaseCPU::enableFunctionTrace()
BaseCPU::~BaseCPU()
{
- if (functionTracingEnabled)
- closeOutputStream(functionTraceStream);
}
-
void
BaseCPU::init()
{