comm_monitor.cc (10064:0267a9b58c8e) comm_monitor.cc (10129:eb34ae5204b8)
1/*
2 * Copyright (c) 2012-2013 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 41 unchanged lines hidden (view full) ---

50 : MemObject(params),
51 masterPort(name() + "-master", *this),
52 slavePort(name() + "-slave", *this),
53 samplePeriodicEvent(this),
54 samplePeriodTicks(params->sample_period),
55 readAddrMask(params->read_addr_mask),
56 writeAddrMask(params->write_addr_mask),
57 stats(params),
1/*
2 * Copyright (c) 2012-2013 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 41 unchanged lines hidden (view full) ---

50 : MemObject(params),
51 masterPort(name() + "-master", *this),
52 slavePort(name() + "-slave", *this),
53 samplePeriodicEvent(this),
54 samplePeriodTicks(params->sample_period),
55 readAddrMask(params->read_addr_mask),
56 writeAddrMask(params->write_addr_mask),
57 stats(params),
58 traceStream(NULL)
58 traceStream(NULL),
59 system(params->system)
59{
60 // If we are using a trace file, then open the file,
61 if (params->trace_file != "") {
62 // If the trace file is not specified as an absolute path,
63 // append the current simulation output directory
64 std::string filename = simout.resolve(params->trace_file);
65 traceStream = new ProtoOutputStream(filename);
66

--- 34 unchanged lines hidden (view full) ---

101}
102
103void
104CommMonitor::init()
105{
106 // make sure both sides of the monitor are connected
107 if (!slavePort.isConnected() || !masterPort.isConnected())
108 fatal("Communication monitor is not connected on both sides.\n");
60{
61 // If we are using a trace file, then open the file,
62 if (params->trace_file != "") {
63 // If the trace file is not specified as an absolute path,
64 // append the current simulation output directory
65 std::string filename = simout.resolve(params->trace_file);
66 traceStream = new ProtoOutputStream(filename);
67

--- 34 unchanged lines hidden (view full) ---

102}
103
104void
105CommMonitor::init()
106{
107 // make sure both sides of the monitor are connected
108 if (!slavePort.isConnected() || !masterPort.isConnected())
109 fatal("Communication monitor is not connected on both sides.\n");
110
111 if (traceStream != NULL) {
112 // Check the memory mode. We only record something when in
113 // timing mode. Warn accordingly.
114 if (!system->isTimingMode())
115 warn("%s: Not in timing mode. No trace will be recorded.", name());
116 }
109}
110
111BaseMasterPort&
112CommMonitor::getMasterPort(const std::string& if_name, PortID idx)
113{
114 if (if_name == "master") {
115 return masterPort;
116 } else {

--- 458 unchanged lines hidden --- 		117}
118
119BaseMasterPort&
120CommMonitor::getMasterPort(const std::string& if_name, PortID idx)
121{
122 if (if_name == "master") {
123 return masterPort;
124 } else {

--- 458 unchanged lines hidden ---