RubyTester.cc (13784:1941dc118243) RubyTester.cc (13892:0182a0601f66)
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

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

45#include "base/trace.hh"
46#include "cpu/testers/rubytest/Check.hh"
47#include "debug/RubyTest.hh"
48#include "mem/ruby/common/SubBlock.hh"
49#include "sim/sim_exit.hh"
50#include "sim/system.hh"
51
52RubyTester::RubyTester(const Params *p)
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

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

45#include "base/trace.hh"
46#include "cpu/testers/rubytest/Check.hh"
47#include "debug/RubyTest.hh"
48#include "mem/ruby/common/SubBlock.hh"
49#include "sim/sim_exit.hh"
50#include "sim/system.hh"
51
52RubyTester::RubyTester(const Params *p)
53 : MemObject(p),
53 : ClockedObject(p),
54 checkStartEvent([this]{ wakeup(); }, "RubyTester tick",
55 false, Event::CPU_Tick_Pri),
56 _masterId(p->system->getMasterId(this)),
57 m_checkTable_ptr(nullptr),
58 m_num_cpus(p->num_cpus),
59 m_checks_to_complete(p->checks_to_complete),
60 m_deadlock_threshold(p->deadlock_threshold),
61 m_num_writers(0),

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

129}
130
131Port &
132RubyTester::getPort(const std::string &if_name, PortID idx)
133{
134 if (if_name != "cpuInstPort" && if_name != "cpuInstDataPort" &&
135 if_name != "cpuDataPort") {
136 // pass it along to our super class
54 checkStartEvent([this]{ wakeup(); }, "RubyTester tick",
55 false, Event::CPU_Tick_Pri),
56 _masterId(p->system->getMasterId(this)),
57 m_checkTable_ptr(nullptr),
58 m_num_cpus(p->num_cpus),
59 m_checks_to_complete(p->checks_to_complete),
60 m_deadlock_threshold(p->deadlock_threshold),
61 m_num_writers(0),

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

129}
130
131Port &
132RubyTester::getPort(const std::string &if_name, PortID idx)
133{
134 if (if_name != "cpuInstPort" && if_name != "cpuInstDataPort" &&
135 if_name != "cpuDataPort") {
136 // pass it along to our super class
137 return MemObject::getPort(if_name, idx);
137 return ClockedObject::getPort(if_name, idx);
138 } else {
139 if (if_name == "cpuInstPort") {
140 if (idx > m_num_inst_only_ports) {
141 panic("RubyTester::getPort: unknown inst port %d\n",
142 idx);
143 }
144 //
145 // inst ports map to the lowest readPort elements

--- 141 unchanged lines hidden --- 		138 } else {
139 if (if_name == "cpuInstPort") {
140 if (idx > m_num_inst_only_ports) {
141 panic("RubyTester::getPort: unknown inst port %d\n",
142 idx);
143 }
144 //
145 // inst ports map to the lowest readPort elements

--- 141 unchanged lines hidden ---