projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dev: Use shared_ptr for EthPacketData
[gem5.git]
/
src
/
dev
/
alpha
/
tsunami_io.cc
diff --git
a/src/dev/alpha/tsunami_io.cc
b/src/dev/alpha/tsunami_io.cc
index 9c88904e32921ddf1012c181b7e33975c5fd46fa..6586cd9809fcf920462003d7396392819f9dcb08 100644
(file)
--- a/
src/dev/alpha/tsunami_io.cc
+++ b/
src/dev/alpha/tsunami_io.cc
@@
-42,17
+42,23
@@
#include "base/time.hh"
#include "base/trace.hh"
#include "base/time.hh"
#include "base/trace.hh"
-#include "
dev/rtcreg.
h"
-#include "de
v/alpha/tsunami_cchip
.hh"
+#include "
config/the_isa.h
h"
+#include "de
bug/Tsunami
.hh"
#include "dev/alpha/tsunami.hh"
#include "dev/alpha/tsunami.hh"
+#include "dev/alpha/tsunami_cchip.hh"
#include "dev/alpha/tsunami_io.hh"
#include "dev/alpha/tsunamireg.h"
#include "dev/alpha/tsunami_io.hh"
#include "dev/alpha/tsunamireg.h"
+#include "dev/rtcreg.h"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "mem/port.hh"
#include "sim/system.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "mem/port.hh"
#include "sim/system.hh"
-using namespace std;
+// clang complains about std::set being overloaded with Packet::set if
+// we open up the entire namespace std
+using std::string;
+using std::ostream;
+
//Should this be AlphaISA?
using namespace TheISA;
//Should this be AlphaISA?
using namespace TheISA;
@@
-63,11
+69,9
@@
TsunamiIO::RTC::RTC(const string &n, const TsunamiIOParams *p)
}
TsunamiIO::TsunamiIO(const Params *p)
}
TsunamiIO::TsunamiIO(const Params *p)
- : BasicPioDevice(p), tsunami(p->tsunami),
+ : BasicPioDevice(p
, 0x100
), tsunami(p->tsunami),
pitimer(this, p->name + "pitimer"), rtc(p->name + ".rtc", p)
{
pitimer(this, p->name + "pitimer"), rtc(p->name + ".rtc", p)
{
- pioSize = 0x100;
-
// set the back pointer from tsunami to myself
tsunami->io = this;
// set the back pointer from tsunami to myself
tsunami->io = this;
@@
-79,7
+83,7
@@
TsunamiIO::TsunamiIO(const Params *p)
Tick
TsunamiIO::frequency() const
{
Tick
TsunamiIO::frequency() const
{
- return Clock::Frequency / params()->frequency;
+ return
Sim
Clock::Frequency / params()->frequency;
}
Tick
}
Tick