ruby: eliminate typedef integer_t

diff --git a/src/mem/ruby/common/Address.cc b/src/mem/ruby/common/Address.cc
index cc87f4ece882e90a1e6a5d83558aa69f242f7e8b..d3f67886369d44d276b0f0a2861e6608601abcf8 100644 (file)
--- a/src/mem/ruby/common/Address.cc
+++ b/src/mem/ruby/common/Address.cc
@@ -55,10 +55,10 @@ Address::makeNextStrideAddress(int stride)
         + RubySystem::getBlockSizeBytes()*stride;
 }
 
-integer_t
+Index
 Address::memoryModuleIndex() const
 {
-    integer_t index =
+    Index index =
         bitSelect(RubySystem::getBlockSizeBits() +
                   RubySystem::getMemorySizeBits(), ADDRESS_WIDTH);
     assert (index >= 0);

diff --git a/src/mem/ruby/common/TypeDefines.hh b/src/mem/ruby/common/TypeDefines.hh
index 9596b07b53d473c9437a24cea8c61867eb36d40c..b031a62d385e427640c7b974175c58729e443eab 100644 (file)
--- a/src/mem/ruby/common/TypeDefines.hh
+++ b/src/mem/ruby/common/TypeDefines.hh
@@ -34,8 +34,6 @@ typedef unsigned long long uint64;
 
 typedef long long int64;
 
-typedef long long integer_t;
-
 typedef int64 Time;
 typedef uint64 physical_address_t;
 

diff --git a/src/mem/ruby/profiler/Profiler.cc b/src/mem/ruby/profiler/Profiler.cc
index b6982aca9d656ceaaca2decec2010df1e33d0b15..e84eea72784874b8f9c11683d652b442ec0930f0 100644 (file)
--- a/src/mem/ruby/profiler/Profiler.cc
+++ b/src/mem/ruby/profiler/Profiler.cc
@@ -109,7 +109,7 @@ Profiler::wakeup()
 {
     // FIXME - avoid the repeated code
 
-    vector<integer_t> perProcCycleCount(m_num_of_sequencers);
+    vector<int64_t> perProcCycleCount(m_num_of_sequencers);
 
     for (int i = 0; i < m_num_of_sequencers; i++) {
         perProcCycleCount[i] =
@@ -155,7 +155,7 @@ Profiler::setPeriodicStatsFile(const string& filename)
 }
 
 void
-Profiler::setPeriodicStatsInterval(integer_t period)
+Profiler::setPeriodicStatsInterval(int64_t period)
 {
     cout << "Recording periodic statistics every " << m_stats_period
          << " Ruby cycles" << endl;
@@ -223,7 +223,7 @@ Profiler::printStats(ostream& out, bool short_stats)
         out << endl;
     }
 
-    vector<integer_t> perProcCycleCount(m_num_of_sequencers);
+    vector<int64_t> perProcCycleCount(m_num_of_sequencers);
 
     for (int i = 0; i < m_num_of_sequencers; i++) {
         perProcCycleCount[i] =
@@ -419,7 +419,7 @@ Profiler::printResourceUsage(ostream& out) const
     out << "Resource Usage" << endl;
     out << "--------------" << endl;
 
-    integer_t pagesize = getpagesize(); // page size in bytes
+    int64_t pagesize = getpagesize(); // page size in bytes
     out << "page_size: " << pagesize << endl;
 
     rusage usage;

diff --git a/src/mem/ruby/profiler/Profiler.hh b/src/mem/ruby/profiler/Profiler.hh
index 58043dfaf60395b9ec6c3759173c201a7abb742d..c83c4e37ab379e5595c9bb269d430d31675462d1 100644 (file)
--- a/src/mem/ruby/profiler/Profiler.hh
+++ b/src/mem/ruby/profiler/Profiler.hh
@@ -79,7 +79,7 @@ class Profiler : public SimObject
     void wakeup();
 
     void setPeriodicStatsFile(const std::string& filename);
-    void setPeriodicStatsInterval(integer_t period);
+    void setPeriodicStatsInterval(int64_t period);
 
     void printStats(std::ostream& out, bool short_stats=false);
     void printShortStats(std::ostream& out) { printStats(out, true); }
@@ -182,13 +182,13 @@ class Profiler : public SimObject
     std::vector<int64> m_cycles_executed_at_start;
 
     std::ostream* m_periodic_output_file_ptr;
-    integer_t m_stats_period;
+    int64_t m_stats_period;
 
     Time m_ruby_start;
     time_t m_real_time_start_time;
 
-    std::vector<std::vector<integer_t> > m_busyControllerCount;
-    integer_t m_busyBankCount;
+    std::vector<std::vector<int64_t> > m_busyControllerCount;
+    int64_t m_busyBankCount;
     Histogram m_multicast_retry_histogram;
 
     Histogram m_filter_action_histogram;