ISA: Fix compilation.

This commit is contained in:
Gabe Black 2009-10-17 01:13:41 -07:00
parent 28204b2a96
commit 010b13c937
5 changed files with 15 additions and 10 deletions

View file

@ -36,7 +36,7 @@ namespace AlphaISA
{ {
void void
ISA::serialize(std::ostream &os) ISA::serialize(EventManager *em, std::ostream &os)
{ {
SERIALIZE_SCALAR(fpcr); SERIALIZE_SCALAR(fpcr);
SERIALIZE_SCALAR(uniq); SERIALIZE_SCALAR(uniq);
@ -46,7 +46,7 @@ ISA::serialize(std::ostream &os)
} }
void void
ISA::unserialize(Checkpoint *cp, const std::string &section) ISA::unserialize(EventManager *em, Checkpoint *cp, const std::string &section)
{ {
UNSERIALIZE_SCALAR(fpcr); UNSERIALIZE_SCALAR(fpcr);
UNSERIALIZE_SCALAR(uniq); UNSERIALIZE_SCALAR(uniq);

View file

@ -83,8 +83,9 @@ namespace AlphaISA
intr_flag = 0; intr_flag = 0;
} }
void serialize(std::ostream &os); void serialize(EventManager *em, std::ostream &os);
void unserialize(Checkpoint *cp, const std::string &section); void unserialize(EventManager *em, Checkpoint *cp,
const std::string &section);
void reset(std::string core_name, ThreadID num_threads, void reset(std::string core_name, ThreadID num_threads,
unsigned num_vpes, BaseCPU *_cpu) unsigned num_vpes, BaseCPU *_cpu)

View file

@ -95,9 +95,10 @@ namespace ArmISA
return reg; return reg;
} }
void serialize(std::ostream &os) void serialize(EventManager *em, std::ostream &os)
{} {}
void unserialize(Checkpoint *cp, const std::string &section) void unserialize(EventManager *em, Checkpoint *cp,
const std::string &section)
{} {}
ISA() ISA()

View file

@ -172,8 +172,11 @@ namespace MipsISA
return reg; return reg;
} }
void serialize(std::ostream &os); void serialize(EventManager *em, std::ostream &os)
void unserialize(Checkpoint *cp, const std::string &section); {}
void unserialize(EventManager *em, Checkpoint *cp,
const std::string &section)
{}
}; };
} }

View file

@ -203,7 +203,7 @@ SimpleThread::serialize(ostream &os)
// //
// Now must serialize all the ISA dependent state // Now must serialize all the ISA dependent state
// //
isa.serialize(os); isa.serialize(cpu, os);
} }
@ -223,7 +223,7 @@ SimpleThread::unserialize(Checkpoint *cp, const std::string &section)
// //
// Now must unserialize all the ISA dependent state // Now must unserialize all the ISA dependent state
// //
isa.unserialize(cp, section); isa.unserialize(cpu, cp, section);
} }
#if FULL_SYSTEM #if FULL_SYSTEM