changeset 5377550e1e15 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=5377550e1e15
description:
ruby: structures: coorect #ifndef macros in header files
diffstat:
src/mem/ruby/structures/AbstractReplacementPolicy.hh | 6 +++---
src/mem/ruby/structures/BankedArray.hh | 4 ++--
src/mem/ruby/structures/CacheMemory.hh | 6 +++---
src/mem/ruby/structures/DirectoryMemory.hh | 6 +++---
src/mem/ruby/structures/LRUPolicy.hh | 6 +++---
src/mem/ruby/structures/MemoryControl.hh | 6 +++---
src/mem/ruby/structures/MemoryNode.hh | 6 +++---
src/mem/ruby/structures/MemoryVector.hh | 6 +++---
src/mem/ruby/structures/PerfectCacheMemory.hh | 6 +++---
src/mem/ruby/structures/PersistentTable.hh | 6 +++---
src/mem/ruby/structures/PseudoLRUPolicy.hh | 6 +++---
src/mem/ruby/structures/RubyMemoryControl.hh | 6 +++---
src/mem/ruby/structures/SparseMemory.hh | 6 +++---
src/mem/ruby/structures/TBETable.hh | 6 +++---
src/mem/ruby/structures/TimerTable.hh | 6 +++---
src/mem/ruby/structures/WireBuffer.hh | 6 +++---
16 files changed, 47 insertions(+), 47 deletions(-)
diffs (truncated from 314 to 300 lines):
diff -r 1e3497e20cd4 -r 5377550e1e15
src/mem/ruby/structures/AbstractReplacementPolicy.hh
--- a/src/mem/ruby/structures/AbstractReplacementPolicy.hh Sat Oct 11
15:02:22 2014 -0500
+++ b/src/mem/ruby/structures/AbstractReplacementPolicy.hh Sat Oct 11
15:02:22 2014 -0500
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__
-#define __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_ABSTRACTREPLACEMENTPOLICY_HH__
+#define __MEM_RUBY_STRUCTURES_ABSTRACTREPLACEMENTPOLICY_HH__
#include "base/types.hh"
@@ -86,4 +86,4 @@
return m_last_ref_ptr[set][way];
}
-#endif // __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__
+#endif // __MEM_RUBY_STRUCTURES_ABSTRACTREPLACEMENTPOLICY_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15 src/mem/ruby/structures/BankedArray.hh
--- a/src/mem/ruby/structures/BankedArray.hh Sat Oct 11 15:02:22 2014 -0500
+++ b/src/mem/ruby/structures/BankedArray.hh Sat Oct 11 15:02:22 2014 -0500
@@ -29,8 +29,8 @@
*
*/
-#ifndef __MEM_RUBY_SYSTEM_BANKEDARRAY_HH__
-#define __MEM_RUBY_SYSTEM_BANKEDARRAY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_BANKEDARRAY_HH__
+#define __MEM_RUBY_STRUCTURES_BANKEDARRAY_HH__
#include <vector>
diff -r 1e3497e20cd4 -r 5377550e1e15 src/mem/ruby/structures/CacheMemory.hh
--- a/src/mem/ruby/structures/CacheMemory.hh Sat Oct 11 15:02:22 2014 -0500
+++ b/src/mem/ruby/structures/CacheMemory.hh Sat Oct 11 15:02:22 2014 -0500
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_CACHEMEMORY_HH__
-#define __MEM_RUBY_SYSTEM_CACHEMEMORY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_CACHEMEMORY_HH__
+#define __MEM_RUBY_STRUCTURES_CACHEMEMORY_HH__
#include <string>
#include <vector>
@@ -170,4 +170,4 @@
std::ostream& operator<<(std::ostream& out, const CacheMemory& obj);
-#endif // __MEM_RUBY_SYSTEM_CACHEMEMORY_HH__
+#endif // __MEM_RUBY_STRUCTURES_CACHEMEMORY_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15 src/mem/ruby/structures/DirectoryMemory.hh
--- a/src/mem/ruby/structures/DirectoryMemory.hh Sat Oct 11 15:02:22
2014 -0500
+++ b/src/mem/ruby/structures/DirectoryMemory.hh Sat Oct 11 15:02:22
2014 -0500
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_DIRECTORYMEMORY_HH__
-#define __MEM_RUBY_SYSTEM_DIRECTORYMEMORY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_DIRECTORYMEMORY_HH__
+#define __MEM_RUBY_STRUCTURES_DIRECTORYMEMORY_HH__
#include <iostream>
#include <string>
@@ -101,4 +101,4 @@
return out;
}
-#endif // __MEM_RUBY_SYSTEM_DIRECTORYMEMORY_HH__
+#endif // __MEM_RUBY_STRUCTURES_DIRECTORYMEMORY_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15 src/mem/ruby/structures/LRUPolicy.hh
--- a/src/mem/ruby/structures/LRUPolicy.hh Sat Oct 11 15:02:22 2014 -0500
+++ b/src/mem/ruby/structures/LRUPolicy.hh Sat Oct 11 15:02:22 2014 -0500
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_LRUPOLICY_HH__
-#define __MEM_RUBY_SYSTEM_LRUPOLICY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_LRUPOLICY_HH__
+#define __MEM_RUBY_STRUCTURES_LRUPOLICY_HH__
#include "mem/ruby/structures/AbstractReplacementPolicy.hh"
@@ -92,4 +92,4 @@
return smallest_index;
}
-#endif // __MEM_RUBY_SYSTEM_LRUPOLICY_HH__
+#endif // __MEM_RUBY_STRUCTURES_LRUPOLICY_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15 src/mem/ruby/structures/MemoryControl.hh
--- a/src/mem/ruby/structures/MemoryControl.hh Sat Oct 11 15:02:22 2014 -0500
+++ b/src/mem/ruby/structures/MemoryControl.hh Sat Oct 11 15:02:22 2014 -0500
@@ -27,8 +27,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_ABSTRACT_MEMORY_CONTROL_HH__
-#define __MEM_RUBY_SYSTEM_ABSTRACT_MEMORY_CONTROL_HH__
+#ifndef __MEM_RUBY_STRUCTURES_ABSTRACT_MEMORY_CONTROL_HH__
+#define __MEM_RUBY_STRUCTURES_ABSTRACT_MEMORY_CONTROL_HH__
#include <iostream>
#include <list>
@@ -111,4 +111,4 @@
MemCntrlEvent m_event;
};
-#endif // __MEM_RUBY_SYSTEM_ABSTRACT_MEMORY_CONTROL_HH__
+#endif // __MEM_RUBY_STRUCTURES_ABSTRACT_MEMORY_CONTROL_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15 src/mem/ruby/structures/MemoryNode.hh
--- a/src/mem/ruby/structures/MemoryNode.hh Sat Oct 11 15:02:22 2014 -0500
+++ b/src/mem/ruby/structures/MemoryNode.hh Sat Oct 11 15:02:22 2014 -0500
@@ -35,8 +35,8 @@
* message is enqueued to be sent back to the directory.
*/
-#ifndef __MEM_RUBY_SYSTEM_MEMORYNODE_HH__
-#define __MEM_RUBY_SYSTEM_MEMORYNODE_HH__
+#ifndef __MEM_RUBY_STRUCTURES_MEMORYNODE_HH__
+#define __MEM_RUBY_STRUCTURES_MEMORYNODE_HH__
#include <iostream>
@@ -89,4 +89,4 @@
return out;
}
-#endif // __MEM_RUBY_SYSTEM_MEMORYNODE_HH__
+#endif // __MEM_RUBY_STRUCTURES_MEMORYNODE_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15 src/mem/ruby/structures/MemoryVector.hh
--- a/src/mem/ruby/structures/MemoryVector.hh Sat Oct 11 15:02:22 2014 -0500
+++ b/src/mem/ruby/structures/MemoryVector.hh Sat Oct 11 15:02:22 2014 -0500
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_MEMORYVECTOR_HH__
-#define __MEM_RUBY_SYSTEM_MEMORYVECTOR_HH__
+#ifndef __MEM_RUBY_STRUCTURES_MEMORYVECTOR_HH__
+#define __MEM_RUBY_STRUCTURES_MEMORYVECTOR_HH__
#include "base/trace.hh"
#include "debug/RubyCacheTrace.hh"
@@ -234,4 +234,4 @@
}
}
-#endif // __MEM_RUBY_SYSTEM_MEMORYVECTOR_HH__
+#endif // __MEM_RUBY_STRUCTURES_MEMORYVECTOR_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15
src/mem/ruby/structures/PerfectCacheMemory.hh
--- a/src/mem/ruby/structures/PerfectCacheMemory.hh Sat Oct 11 15:02:22
2014 -0500
+++ b/src/mem/ruby/structures/PerfectCacheMemory.hh Sat Oct 11 15:02:22
2014 -0500
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_PERFECTCACHEMEMORY_HH__
-#define __MEM_RUBY_SYSTEM_PERFECTCACHEMEMORY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_PERFECTCACHEMEMORY_HH__
+#define __MEM_RUBY_STRUCTURES_PERFECTCACHEMEMORY_HH__
#include "base/hashmap.hh"
#include "mem/protocol/AccessPermission.hh"
@@ -189,4 +189,4 @@
{
}
-#endif // __MEM_RUBY_SYSTEM_PERFECTCACHEMEMORY_HH__
+#endif // __MEM_RUBY_STRUCTURES_PERFECTCACHEMEMORY_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15 src/mem/ruby/structures/PersistentTable.hh
--- a/src/mem/ruby/structures/PersistentTable.hh Sat Oct 11 15:02:22
2014 -0500
+++ b/src/mem/ruby/structures/PersistentTable.hh Sat Oct 11 15:02:22
2014 -0500
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_PERSISTENTTABLE_HH__
-#define __MEM_RUBY_SYSTEM_PERSISTENTTABLE_HH__
+#ifndef __MEM_RUBY_STRUCTURES_PERSISTENTTABLE_HH__
+#define __MEM_RUBY_STRUCTURES_PERSISTENTTABLE_HH__
#include <iostream>
@@ -97,4 +97,4 @@
return out;
}
-#endif // __MEM_RUBY_SYSTEM_PERSISTENTTABLE_HH__
+#endif // __MEM_RUBY_STRUCTURES_PERSISTENTTABLE_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15 src/mem/ruby/structures/PseudoLRUPolicy.hh
--- a/src/mem/ruby/structures/PseudoLRUPolicy.hh Sat Oct 11 15:02:22
2014 -0500
+++ b/src/mem/ruby/structures/PseudoLRUPolicy.hh Sat Oct 11 15:02:22
2014 -0500
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_PSEUDOLRUPOLICY_HH__
-#define __MEM_RUBY_SYSTEM_PSEUDOLRUPOLICY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_PSEUDOLRUPOLICY_HH__
+#define __MEM_RUBY_STRUCTURES_PSEUDOLRUPOLICY_HH__
#include "mem/ruby/structures/AbstractReplacementPolicy.hh"
@@ -134,4 +134,4 @@
return (index > (m_assoc - 1)) ? m_assoc - 1 : index;
}
-#endif // __MEM_RUBY_SYSTEM_PSEUDOLRUPOLICY_HH__
+#endif // __MEM_RUBY_STRUCTURES_PSEUDOLRUPOLICY_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15
src/mem/ruby/structures/RubyMemoryControl.hh
--- a/src/mem/ruby/structures/RubyMemoryControl.hh Sat Oct 11 15:02:22
2014 -0500
+++ b/src/mem/ruby/structures/RubyMemoryControl.hh Sat Oct 11 15:02:22
2014 -0500
@@ -27,8 +27,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_MEMORY_CONTROL_HH__
-#define __MEM_RUBY_SYSTEM_MEMORY_CONTROL_HH__
+#ifndef __MEM_RUBY_STRUCTURES_MEMORY_CONTROL_HH__
+#define __MEM_RUBY_STRUCTURES_MEMORY_CONTROL_HH__
#include <iostream>
#include <list>
@@ -169,4 +169,4 @@
std::ostream& operator<<(std::ostream& out, const RubyMemoryControl& obj);
-#endif // __MEM_RUBY_SYSTEM_MEMORY_CONTROL_HH__
+#endif // __MEM_RUBY_STRUCTURES_MEMORY_CONTROL_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15 src/mem/ruby/structures/SparseMemory.hh
--- a/src/mem/ruby/structures/SparseMemory.hh Sat Oct 11 15:02:22 2014 -0500
+++ b/src/mem/ruby/structures/SparseMemory.hh Sat Oct 11 15:02:22 2014 -0500
@@ -27,8 +27,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_SPARSEMEMORY_HH__
-#define __MEM_RUBY_SYSTEM_SPARSEMEMORY_HH__
+#ifndef __MEM_RUBY_STRUCTURES_SPARSEMEMORY_HH__
+#define __MEM_RUBY_STRUCTURES_SPARSEMEMORY_HH__
#include <iostream>
#include <string>
@@ -95,4 +95,4 @@
Stats::Vector m_removes_per_level;
};
-#endif // __MEM_RUBY_SYSTEM_SPARSEMEMORY_HH__
+#endif // __MEM_RUBY_STRUCTURES_SPARSEMEMORY_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15 src/mem/ruby/structures/TBETable.hh
--- a/src/mem/ruby/structures/TBETable.hh Sat Oct 11 15:02:22 2014 -0500
+++ b/src/mem/ruby/structures/TBETable.hh Sat Oct 11 15:02:22 2014 -0500
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_TBETABLE_HH__
-#define __MEM_RUBY_SYSTEM_TBETABLE_HH__
+#ifndef __MEM_RUBY_STRUCTURES_TBETABLE_HH__
+#define __MEM_RUBY_STRUCTURES_TBETABLE_HH__
#include <iostream>
@@ -121,4 +121,4 @@
{
}
-#endif // __MEM_RUBY_SYSTEM_TBETABLE_HH__
+#endif // __MEM_RUBY_STRUCTURES_TBETABLE_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15 src/mem/ruby/structures/TimerTable.hh
--- a/src/mem/ruby/structures/TimerTable.hh Sat Oct 11 15:02:22 2014 -0500
+++ b/src/mem/ruby/structures/TimerTable.hh Sat Oct 11 15:02:22 2014 -0500
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_TIMERTABLE_HH__
-#define __MEM_RUBY_SYSTEM_TIMERTABLE_HH__
+#ifndef __MEM_RUBY_STRUCTURES_TIMERTABLE_HH__
+#define __MEM_RUBY_STRUCTURES_TIMERTABLE_HH__
#include <cassert>
#include <iostream>
@@ -104,4 +104,4 @@
return out;
}
-#endif // __MEM_RUBY_SYSTEM_TIMERTABLE_HH__
+#endif // __MEM_RUBY_STRUCTURES_TIMERTABLE_HH__
diff -r 1e3497e20cd4 -r 5377550e1e15 src/mem/ruby/structures/WireBuffer.hh
--- a/src/mem/ruby/structures/WireBuffer.hh Sat Oct 11 15:02:22 2014 -0500
+++ b/src/mem/ruby/structures/WireBuffer.hh Sat Oct 11 15:02:22 2014 -0500
@@ -29,8 +29,8 @@
*
*/
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
