misc: Remove redundant compiler-specific defines

[gem5.git] / src / dev / mips / malta_cchip.cc

diff --git a/src/dev/mips/malta_cchip.cc b/src/dev/mips/malta_cchip.cc
index 26597766523fb3061c1607ff803e7a893e5079a9..34f79b65b14faf8c29db6c91756f45d694c2638e 100755 (executable)
--- a/src/dev/mips/malta_cchip.cc
+++ b/src/dev/mips/malta_cchip.cc
@@ -37,10 +37,11 @@
 #include <string>
 #include <vector>
 
-#include "arch/mips/mips_core_specific.hh"
 #include "base/trace.hh"
+#include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
 #include "cpu/thread_context.hh"
+#include "debug/Malta.hh"
 #include "dev/mips/malta.hh"
 #include "dev/mips/malta_cchip.hh"
 #include "dev/mips/maltareg.h"
@@ -54,11 +55,10 @@ using namespace std;
 using namespace TheISA;
 
 MaltaCChip::MaltaCChip(Params *p)
-    : BasicPioDevice(p), malta(p->malta)
+    : BasicPioDevice(p, 0xfffffff), malta(p->malta)
 {
-                warn("MaltaCCHIP::MaltaCChip() not implemented.");
+    warn("MaltaCCHIP::MaltaCChip() not implemented.");
 
-    pioSize = 0xfffffff;
     //Put back pointer in malta
     malta->cchip = this;
 
@@ -78,7 +78,6 @@ MaltaCChip::read(PacketPtr pkt)
     Addr regnum = (pkt->getAddr() - pioAddr) >> 6;
     Addr daddr = (pkt->getAddr() - pioAddr);
 
-    pkt->allocate();
     switch (pkt->getSize()) {
 
       case sizeof(uint64_t):
@@ -502,7 +501,7 @@ MaltaCChip::clearIntr(uint32_t interrupt)
 
 
 void
-MaltaCChip::serialize(std::ostream &os)
+MaltaCChip::serialize(CheckpointOut &cp) const
 {
    // SERIALIZE_ARRAY(dim, Malta::Max_CPUs);
     //SERIALIZE_ARRAY(dir, Malta::Max_CPUs);
@@ -512,7 +511,7 @@ MaltaCChip::serialize(std::ostream &os)
 }
 
 void
-MaltaCChip::unserialize(Checkpoint *cp, const std::string &section)
+MaltaCChip::unserialize(CheckpointIn &cp)
 {
     //UNSERIALIZE_ARRAY(dim, Malta::Max_CPUs);
     //UNSERIALIZE_ARRAY(dir, Malta::Max_CPUs);