From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Mon, 11 Feb 2013 03:43:07 +0000 (-0600)
Subject: ruby: convert block size, memory size to unsigned
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=221d39284e2b5b220ab72f3999db7f9d42c68a60;p=gem5.git

ruby: convert block size, memory size to unsigned
---

diff --git a/src/mem/ruby/system/RubySystem.py b/src/mem/ruby/system/RubySystem.py
index b1f625723..ba261cc36 100644
--- a/src/mem/ruby/system/RubySystem.py
+++ b/src/mem/ruby/system/RubySystem.py
@@ -37,7 +37,7 @@ class RubySystem(ClockedObject):
     randomization = Param.Bool(False,
         "insert random delays on message enqueue times");
     clock = '1GHz'
-    block_size_bytes = Param.Int(64,
+    block_size_bytes = Param.UInt32(64,
         "default cache block size; must be a power of two");
     mem_size = Param.MemorySize("total memory size of the system");
     stats_filename = Param.String("ruby.stats",
diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc
index d2c7d357b..ab441560c 100644
--- a/src/mem/ruby/system/System.cc
+++ b/src/mem/ruby/system/System.cc
@@ -46,10 +46,10 @@ using namespace std;
 
 int RubySystem::m_random_seed;
 bool RubySystem::m_randomization;
-int RubySystem::m_block_size_bytes;
-int RubySystem::m_block_size_bits;
-uint64 RubySystem::m_memory_size_bytes;
-int RubySystem::m_memory_size_bits;
+uint32_t RubySystem::m_block_size_bytes;
+uint32_t RubySystem::m_block_size_bits;
+uint64_t RubySystem::m_memory_size_bytes;
+uint32_t RubySystem::m_memory_size_bits;
 
 RubySystem::RubySystem(const Params *p)
     : ClockedObject(p)
diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh
index 24ec02111..f07303cf4 100644
--- a/src/mem/ruby/system/System.hh
+++ b/src/mem/ruby/system/System.hh
@@ -75,10 +75,10 @@ class RubySystem : public ClockedObject
     // config accessors
     static int getRandomSeed() { return m_random_seed; }
     static int getRandomization() { return m_randomization; }
-    static int getBlockSizeBytes() { return m_block_size_bytes; }
-    static int getBlockSizeBits() { return m_block_size_bits; }
-    static uint64 getMemorySizeBytes() { return m_memory_size_bytes; }
-    static int getMemorySizeBits() { return m_memory_size_bits; }
+    static uint32_t getBlockSizeBytes() { return m_block_size_bytes; }
+    static uint32_t getBlockSizeBits() { return m_block_size_bits; }
+    static uint64_t getMemorySizeBytes() { return m_memory_size_bytes; }
+    static uint32_t getMemorySizeBits() { return m_memory_size_bits; }
     Cycles getTime() const { return curCycle(); }
 
     // Public Methods
@@ -147,10 +147,10 @@ class RubySystem : public ClockedObject
     // configuration parameters
     static int m_random_seed;
     static bool m_randomization;
-    static int m_block_size_bytes;
-    static int m_block_size_bits;
-    static uint64 m_memory_size_bytes;
-    static int m_memory_size_bits;
+    static uint32_t m_block_size_bytes;
+    static uint32_t m_block_size_bits;
+    static uint64_t m_memory_size_bytes;
+    static uint32_t m_memory_size_bits;
 
     Network* m_network_ptr;
     std::vector<MemoryControl *> m_memory_controller_vec;