summaryrefslogtreecommitdiff
path: root/src/mem
diff options
context:
space:
mode:
Diffstat (limited to 'src/mem')
-rw-r--r--src/mem/ruby/common/Address.cc4
-rw-r--r--src/mem/ruby/common/TypeDefines.hh2
-rw-r--r--src/mem/ruby/profiler/Profiler.cc8
-rw-r--r--src/mem/ruby/profiler/Profiler.hh8
4 files changed, 10 insertions, 12 deletions
diff --git a/src/mem/ruby/common/Address.cc b/src/mem/ruby/common/Address.cc
index cc87f4ece..d3f678863 100644
--- 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 9596b07b5..b031a62d3 100644
--- 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 b6982aca9..e84eea727 100644
--- 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 58043dfaf..c83c4e37a 100644
--- 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;