From 14edc6013d8d62782d58536214c669e12c64da37 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Sat, 14 Apr 2012 05:46:59 -0400 Subject: Ruby: Use MasterPort base-class pointers where possible This patch simplifies future patches by changing the pointer type used in a number of the Ruby testers to use MasterPort instead of using a derived CpuPort class. There is no reason for using the more specialised pointers, and there is no longer a need to do any casting. With the latest changes to the tester, organising ports as readers and writes, things got a bit more complicated, and the "type" now had to be removed to be able to fall back to using MasterPort rather than CpuPort. --- src/cpu/testers/directedtest/InvalidateGenerator.cc | 8 +++----- src/cpu/testers/directedtest/RubyDirectedTester.hh | 2 +- src/cpu/testers/directedtest/SeriesRequestGenerator.cc | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src/cpu/testers/directedtest') diff --git a/src/cpu/testers/directedtest/InvalidateGenerator.cc b/src/cpu/testers/directedtest/InvalidateGenerator.cc index 4c248ea05..a89853061 100644 --- a/src/cpu/testers/directedtest/InvalidateGenerator.cc +++ b/src/cpu/testers/directedtest/InvalidateGenerator.cc @@ -52,7 +52,7 @@ InvalidateGenerator::~InvalidateGenerator() bool InvalidateGenerator::initiate() { - RubyDirectedTester::CpuPort* port; + MasterPort* port; Request::Flags flags; PacketPtr pkt; Packet::Command cmd; @@ -66,14 +66,12 @@ InvalidateGenerator::initiate() if (m_status == InvalidateGeneratorStatus_Load_Waiting) { DPRINTF(DirectedTest, "initiating read\n"); cmd = MemCmd::ReadReq; - port = safe_cast(m_directed_tester-> - getCpuPort(m_active_read_node)); + port = m_directed_tester->getCpuPort(m_active_read_node); pkt = new Packet(req, cmd); } else if (m_status == InvalidateGeneratorStatus_Inv_Waiting) { DPRINTF(DirectedTest, "initiating invalidating write\n"); cmd = MemCmd::WriteReq; - port = safe_cast(m_directed_tester-> - getCpuPort(m_active_inv_node)); + port = m_directed_tester->getCpuPort(m_active_inv_node); pkt = new Packet(req, cmd); } else { panic("initiate was unexpectedly called\n"); diff --git a/src/cpu/testers/directedtest/RubyDirectedTester.hh b/src/cpu/testers/directedtest/RubyDirectedTester.hh index 0965fb786..bd0b52a90 100644 --- a/src/cpu/testers/directedtest/RubyDirectedTester.hh +++ b/src/cpu/testers/directedtest/RubyDirectedTester.hh @@ -113,7 +113,7 @@ class RubyDirectedTester : public MemObject RubyDirectedTester& operator=(const RubyDirectedTester& obj); uint64 m_requests_completed; - std::vector ports; + std::vector ports; uint64 m_requests_to_complete; DirectedGenerator* generator; }; diff --git a/src/cpu/testers/directedtest/SeriesRequestGenerator.cc b/src/cpu/testers/directedtest/SeriesRequestGenerator.cc index 92dc46f85..b8c42b67d 100644 --- a/src/cpu/testers/directedtest/SeriesRequestGenerator.cc +++ b/src/cpu/testers/directedtest/SeriesRequestGenerator.cc @@ -52,9 +52,7 @@ SeriesRequestGenerator::initiate() DPRINTF(DirectedTest, "initiating request\n"); assert(m_status == SeriesRequestGeneratorStatus_Thinking); - RubyDirectedTester::CpuPort* port = - safe_cast(m_directed_tester-> - getCpuPort(m_active_node)); + MasterPort* port = m_directed_tester->getCpuPort(m_active_node); Request::Flags flags; -- cgit v1.2.3