From c14e6cfc4e84ba198ef6ec2f9cae2b3eda15813c Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Mon, 15 Oct 2012 17:27:16 -0500 Subject: [PATCH] ruby: remove AbstractMemOrCache The only place where this abstract class is in use is the memory controller, which it self is an abstract class. Does not seem useful at all. --- src/mem/ruby/system/AbstractMemOrCache.hh | 56 ----------------------- src/mem/ruby/system/MemoryControl.hh | 4 +- src/mem/ruby/system/RubyMemoryControl.hh | 1 - 3 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 src/mem/ruby/system/AbstractMemOrCache.hh diff --git a/src/mem/ruby/system/AbstractMemOrCache.hh b/src/mem/ruby/system/AbstractMemOrCache.hh deleted file mode 100644 index 3f3fb6fa0..000000000 --- a/src/mem/ruby/system/AbstractMemOrCache.hh +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2008 Mark D. Hill and David A. Wood - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __MEM_RUBY_SYSTEM_ABSTRACTMEMORCACHE_HH__ -#define __MEM_RUBY_SYSTEM_ABSTRACTMEMORCACHE_HH__ - -#include - -#include "mem/ruby/slicc_interface/Message.hh" - -class Consumer; -class MemoryNode; - -class AbstractMemOrCache -{ - public: - virtual ~AbstractMemOrCache() {}; - virtual void setConsumer(Consumer* consumer_ptr) = 0; - virtual Consumer* getConsumer() = 0; - - virtual void enqueue (const MsgPtr& message, int latency) = 0; - virtual void enqueueMemRef (MemoryNode& memRef) = 0; - virtual void dequeue () = 0; - virtual const Message* peek () = 0; - virtual bool isReady () = 0; - virtual MemoryNode peekNode () = 0; - virtual bool areNSlotsAvailable (int n) = 0; - virtual void print (std::ostream& out) const = 0; -}; - -#endif // __MEM_RUBY_SYSTEM_ABSTRACTMEMORCACHE_HH__ diff --git a/src/mem/ruby/system/MemoryControl.hh b/src/mem/ruby/system/MemoryControl.hh index b7de06c5e..7bdc14cfc 100644 --- a/src/mem/ruby/system/MemoryControl.hh +++ b/src/mem/ruby/system/MemoryControl.hh @@ -39,7 +39,6 @@ #include "mem/ruby/common/Consumer.hh" #include "mem/ruby/profiler/MemCntrlProfiler.hh" #include "mem/ruby/slicc_interface/Message.hh" -#include "mem/ruby/system/AbstractMemOrCache.hh" #include "mem/ruby/system/MemoryNode.hh" #include "mem/ruby/system/System.hh" #include "params/MemoryControl.hh" @@ -49,8 +48,7 @@ class Consumer; -class MemoryControl : - public ClockedObject, public Consumer, public AbstractMemOrCache +class MemoryControl : public ClockedObject, public Consumer { public: typedef MemoryControlParams Params; diff --git a/src/mem/ruby/system/RubyMemoryControl.hh b/src/mem/ruby/system/RubyMemoryControl.hh index de0da56b5..98636e408 100644 --- a/src/mem/ruby/system/RubyMemoryControl.hh +++ b/src/mem/ruby/system/RubyMemoryControl.hh @@ -40,7 +40,6 @@ #include "mem/ruby/common/Global.hh" #include "mem/ruby/profiler/MemCntrlProfiler.hh" #include "mem/ruby/slicc_interface/Message.hh" -#include "mem/ruby/system/AbstractMemOrCache.hh" #include "mem/ruby/system/MemoryControl.hh" #include "mem/ruby/system/MemoryNode.hh" #include "mem/ruby/system/System.hh" -- 2.30.2