ruby: structures: coorect #ifndef macros in header files

This commit is contained in:
Nilay Vaish 2014-10-11 15:02:22 -05:00
parent 0f28d63272
commit e7f918d8cd
16 changed files with 47 additions and 47 deletions

View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__ #ifndef __MEM_RUBY_STRUCTURES_ABSTRACTREPLACEMENTPOLICY_HH__
#define __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__ #define __MEM_RUBY_STRUCTURES_ABSTRACTREPLACEMENTPOLICY_HH__
#include "base/types.hh" #include "base/types.hh"
@ -86,4 +86,4 @@ AbstractReplacementPolicy::getLastAccess(int64 set, int64 way)
return m_last_ref_ptr[set][way]; return m_last_ref_ptr[set][way];
} }
#endif // __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__ #endif // __MEM_RUBY_STRUCTURES_ABSTRACTREPLACEMENTPOLICY_HH__

View file

@ -29,8 +29,8 @@
* *
*/ */
#ifndef __MEM_RUBY_SYSTEM_BANKEDARRAY_HH__ #ifndef __MEM_RUBY_STRUCTURES_BANKEDARRAY_HH__
#define __MEM_RUBY_SYSTEM_BANKEDARRAY_HH__ #define __MEM_RUBY_STRUCTURES_BANKEDARRAY_HH__
#include <vector> #include <vector>

View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MEM_RUBY_SYSTEM_CACHEMEMORY_HH__ #ifndef __MEM_RUBY_STRUCTURES_CACHEMEMORY_HH__
#define __MEM_RUBY_SYSTEM_CACHEMEMORY_HH__ #define __MEM_RUBY_STRUCTURES_CACHEMEMORY_HH__
#include <string> #include <string>
#include <vector> #include <vector>
@ -170,4 +170,4 @@ class CacheMemory : public SimObject
std::ostream& operator<<(std::ostream& out, const CacheMemory& obj); std::ostream& operator<<(std::ostream& out, const CacheMemory& obj);
#endif // __MEM_RUBY_SYSTEM_CACHEMEMORY_HH__ #endif // __MEM_RUBY_STRUCTURES_CACHEMEMORY_HH__

View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MEM_RUBY_SYSTEM_DIRECTORYMEMORY_HH__ #ifndef __MEM_RUBY_STRUCTURES_DIRECTORYMEMORY_HH__
#define __MEM_RUBY_SYSTEM_DIRECTORYMEMORY_HH__ #define __MEM_RUBY_STRUCTURES_DIRECTORYMEMORY_HH__
#include <iostream> #include <iostream>
#include <string> #include <string>
@ -101,4 +101,4 @@ operator<<(std::ostream& out, const DirectoryMemory& obj)
return out; return out;
} }
#endif // __MEM_RUBY_SYSTEM_DIRECTORYMEMORY_HH__ #endif // __MEM_RUBY_STRUCTURES_DIRECTORYMEMORY_HH__

View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MEM_RUBY_SYSTEM_LRUPOLICY_HH__ #ifndef __MEM_RUBY_STRUCTURES_LRUPOLICY_HH__
#define __MEM_RUBY_SYSTEM_LRUPOLICY_HH__ #define __MEM_RUBY_STRUCTURES_LRUPOLICY_HH__
#include "mem/ruby/structures/AbstractReplacementPolicy.hh" #include "mem/ruby/structures/AbstractReplacementPolicy.hh"
@ -92,4 +92,4 @@ LRUPolicy::getVictim(int64 set) const
return smallest_index; return smallest_index;
} }
#endif // __MEM_RUBY_SYSTEM_LRUPOLICY_HH__ #endif // __MEM_RUBY_STRUCTURES_LRUPOLICY_HH__

View file

@ -27,8 +27,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MEM_RUBY_SYSTEM_ABSTRACT_MEMORY_CONTROL_HH__ #ifndef __MEM_RUBY_STRUCTURES_ABSTRACT_MEMORY_CONTROL_HH__
#define __MEM_RUBY_SYSTEM_ABSTRACT_MEMORY_CONTROL_HH__ #define __MEM_RUBY_STRUCTURES_ABSTRACT_MEMORY_CONTROL_HH__
#include <iostream> #include <iostream>
#include <list> #include <list>
@ -111,4 +111,4 @@ protected:
MemCntrlEvent m_event; MemCntrlEvent m_event;
}; };
#endif // __MEM_RUBY_SYSTEM_ABSTRACT_MEMORY_CONTROL_HH__ #endif // __MEM_RUBY_STRUCTURES_ABSTRACT_MEMORY_CONTROL_HH__

View file

@ -35,8 +35,8 @@
* message is enqueued to be sent back to the directory. * message is enqueued to be sent back to the directory.
*/ */
#ifndef __MEM_RUBY_SYSTEM_MEMORYNODE_HH__ #ifndef __MEM_RUBY_STRUCTURES_MEMORYNODE_HH__
#define __MEM_RUBY_SYSTEM_MEMORYNODE_HH__ #define __MEM_RUBY_STRUCTURES_MEMORYNODE_HH__
#include <iostream> #include <iostream>
@ -89,4 +89,4 @@ operator<<(std::ostream& out, const MemoryNode& obj)
return out; return out;
} }
#endif // __MEM_RUBY_SYSTEM_MEMORYNODE_HH__ #endif // __MEM_RUBY_STRUCTURES_MEMORYNODE_HH__

View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MEM_RUBY_SYSTEM_MEMORYVECTOR_HH__ #ifndef __MEM_RUBY_STRUCTURES_MEMORYVECTOR_HH__
#define __MEM_RUBY_SYSTEM_MEMORYVECTOR_HH__ #define __MEM_RUBY_STRUCTURES_MEMORYVECTOR_HH__
#include "base/trace.hh" #include "base/trace.hh"
#include "debug/RubyCacheTrace.hh" #include "debug/RubyCacheTrace.hh"
@ -234,4 +234,4 @@ MemoryVector::populatePages(uint8_t *raw_data)
} }
} }
#endif // __MEM_RUBY_SYSTEM_MEMORYVECTOR_HH__ #endif // __MEM_RUBY_STRUCTURES_MEMORYVECTOR_HH__

View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MEM_RUBY_SYSTEM_PERFECTCACHEMEMORY_HH__ #ifndef __MEM_RUBY_STRUCTURES_PERFECTCACHEMEMORY_HH__
#define __MEM_RUBY_SYSTEM_PERFECTCACHEMEMORY_HH__ #define __MEM_RUBY_STRUCTURES_PERFECTCACHEMEMORY_HH__
#include "base/hashmap.hh" #include "base/hashmap.hh"
#include "mem/protocol/AccessPermission.hh" #include "mem/protocol/AccessPermission.hh"
@ -189,4 +189,4 @@ PerfectCacheMemory<ENTRY>::print(std::ostream& out) const
{ {
} }
#endif // __MEM_RUBY_SYSTEM_PERFECTCACHEMEMORY_HH__ #endif // __MEM_RUBY_STRUCTURES_PERFECTCACHEMEMORY_HH__

View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MEM_RUBY_SYSTEM_PERSISTENTTABLE_HH__ #ifndef __MEM_RUBY_STRUCTURES_PERSISTENTTABLE_HH__
#define __MEM_RUBY_SYSTEM_PERSISTENTTABLE_HH__ #define __MEM_RUBY_STRUCTURES_PERSISTENTTABLE_HH__
#include <iostream> #include <iostream>
@ -97,4 +97,4 @@ operator<<(std::ostream& out, const PersistentTableEntry& obj)
return out; return out;
} }
#endif // __MEM_RUBY_SYSTEM_PERSISTENTTABLE_HH__ #endif // __MEM_RUBY_STRUCTURES_PERSISTENTTABLE_HH__

View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MEM_RUBY_SYSTEM_PSEUDOLRUPOLICY_HH__ #ifndef __MEM_RUBY_STRUCTURES_PSEUDOLRUPOLICY_HH__
#define __MEM_RUBY_SYSTEM_PSEUDOLRUPOLICY_HH__ #define __MEM_RUBY_STRUCTURES_PSEUDOLRUPOLICY_HH__
#include "mem/ruby/structures/AbstractReplacementPolicy.hh" #include "mem/ruby/structures/AbstractReplacementPolicy.hh"
@ -134,4 +134,4 @@ PseudoLRUPolicy::getVictim(int64 set) const
return (index > (m_assoc - 1)) ? m_assoc - 1 : index; return (index > (m_assoc - 1)) ? m_assoc - 1 : index;
} }
#endif // __MEM_RUBY_SYSTEM_PSEUDOLRUPOLICY_HH__ #endif // __MEM_RUBY_STRUCTURES_PSEUDOLRUPOLICY_HH__

View file

@ -27,8 +27,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MEM_RUBY_SYSTEM_MEMORY_CONTROL_HH__ #ifndef __MEM_RUBY_STRUCTURES_MEMORY_CONTROL_HH__
#define __MEM_RUBY_SYSTEM_MEMORY_CONTROL_HH__ #define __MEM_RUBY_STRUCTURES_MEMORY_CONTROL_HH__
#include <iostream> #include <iostream>
#include <list> #include <list>
@ -169,4 +169,4 @@ class RubyMemoryControl : public MemoryControl
std::ostream& operator<<(std::ostream& out, const RubyMemoryControl& obj); std::ostream& operator<<(std::ostream& out, const RubyMemoryControl& obj);
#endif // __MEM_RUBY_SYSTEM_MEMORY_CONTROL_HH__ #endif // __MEM_RUBY_STRUCTURES_MEMORY_CONTROL_HH__

View file

@ -27,8 +27,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MEM_RUBY_SYSTEM_SPARSEMEMORY_HH__ #ifndef __MEM_RUBY_STRUCTURES_SPARSEMEMORY_HH__
#define __MEM_RUBY_SYSTEM_SPARSEMEMORY_HH__ #define __MEM_RUBY_STRUCTURES_SPARSEMEMORY_HH__
#include <iostream> #include <iostream>
#include <string> #include <string>
@ -95,4 +95,4 @@ class SparseMemory
Stats::Vector m_removes_per_level; Stats::Vector m_removes_per_level;
}; };
#endif // __MEM_RUBY_SYSTEM_SPARSEMEMORY_HH__ #endif // __MEM_RUBY_STRUCTURES_SPARSEMEMORY_HH__

View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MEM_RUBY_SYSTEM_TBETABLE_HH__ #ifndef __MEM_RUBY_STRUCTURES_TBETABLE_HH__
#define __MEM_RUBY_SYSTEM_TBETABLE_HH__ #define __MEM_RUBY_STRUCTURES_TBETABLE_HH__
#include <iostream> #include <iostream>
@ -121,4 +121,4 @@ TBETable<ENTRY>::print(std::ostream& out) const
{ {
} }
#endif // __MEM_RUBY_SYSTEM_TBETABLE_HH__ #endif // __MEM_RUBY_STRUCTURES_TBETABLE_HH__

View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __MEM_RUBY_SYSTEM_TIMERTABLE_HH__ #ifndef __MEM_RUBY_STRUCTURES_TIMERTABLE_HH__
#define __MEM_RUBY_SYSTEM_TIMERTABLE_HH__ #define __MEM_RUBY_STRUCTURES_TIMERTABLE_HH__
#include <cassert> #include <cassert>
#include <iostream> #include <iostream>
@ -104,4 +104,4 @@ operator<<(std::ostream& out, const TimerTable& obj)
return out; return out;
} }
#endif // __MEM_RUBY_SYSTEM_TIMERTABLE_HH__ #endif // __MEM_RUBY_STRUCTURES_TIMERTABLE_HH__

View file

@ -29,8 +29,8 @@
* *
*/ */
#ifndef __MEM_RUBY_SYSTEM_WIREBUFFER_HH__ #ifndef __MEM_RUBY_STRUCTURES_WIREBUFFER_HH__
#define __MEM_RUBY_SYSTEM_WIREBUFFER_HH__ #define __MEM_RUBY_STRUCTURES_WIREBUFFER_HH__
#include <iostream> #include <iostream>
#include <string> #include <string>
@ -99,4 +99,4 @@ class WireBuffer : public SimObject
std::ostream& operator<<(std::ostream& out, const WireBuffer& obj); std::ostream& operator<<(std::ostream& out, const WireBuffer& obj);
#endif // __MEM_RUBY_SYSTEM_WireBuffer_HH__ #endif // __MEM_RUBY_STRUCTURES_WireBuffer_HH__