summaryrefslogtreecommitdiff
path: root/src/cpu/testers
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2011-03-19 18:34:37 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2011-03-19 18:34:37 -0500
commit2f4276448b82b2aa077ae257171b5cb04b7048f6 (patch)
tree7e5d6bdcf8b3028ac7aed6c889efb820b2db91d9 /src/cpu/testers
parentdd9083115ed3f1ee297c2ff7255fdd3fee276e7a (diff)
downloadgem5-2f4276448b82b2aa077ae257171b5cb04b7048f6.tar.xz
Ruby: Convert AccessModeType to RubyAccessMode
This patch converts AccessModeType to RubyAccessMode so that both the protocol dependent and independent code uses the same access mode.
Diffstat (limited to 'src/cpu/testers')
-rw-r--r--src/cpu/testers/rubytest/Check.cc2
-rw-r--r--src/cpu/testers/rubytest/Check.hh4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/testers/rubytest/Check.cc b/src/cpu/testers/rubytest/Check.cc
index a33351312..9eed7270b 100644
--- a/src/cpu/testers/rubytest/Check.cc
+++ b/src/cpu/testers/rubytest/Check.cc
@@ -44,7 +44,7 @@ Check::Check(const Address& address, const Address& pc,
pickInitiatingNode();
changeAddress(address);
m_pc = pc;
- m_access_mode = AccessModeType(random() % AccessModeType_NUM);
+ m_access_mode = RubyAccessMode(random() % RubyAccessMode_NUM);
m_store_count = 0;
}
diff --git a/src/cpu/testers/rubytest/Check.hh b/src/cpu/testers/rubytest/Check.hh
index 1ce795a21..d16c10f57 100644
--- a/src/cpu/testers/rubytest/Check.hh
+++ b/src/cpu/testers/rubytest/Check.hh
@@ -33,7 +33,7 @@
#include <iostream>
#include "cpu/testers/rubytest/RubyTester.hh"
-#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/RubyAccessMode.hh"
#include "mem/protocol/TesterStatus.hh"
#include "mem/ruby/common/Address.hh"
#include "mem/ruby/common/Global.hh"
@@ -73,7 +73,7 @@ class Check
NodeID m_initiatingNode;
Address m_address;
Address m_pc;
- AccessModeType m_access_mode;
+ RubyAccessMode m_access_mode;
int m_num_cpu_sequencers;
RubyTester* m_tester_ptr;
};