Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG-- extra : convert_revision : 2f3653bbd0ab20308dcff5db176dc926402e9ad7
This commit is contained in:
commit
f2af9be29e
4 changed files with 13 additions and 13 deletions
|
@ -341,7 +341,7 @@ format_string(std::ostream &out, const T &data, Format &fmt)
|
||||||
{ _format_string(out, data, fmt); }
|
{ _format_string(out, data, fmt); }
|
||||||
|
|
||||||
inline void
|
inline void
|
||||||
format_string(std::ostream &out, const std::stringstream& data, Format &fmt)
|
format_string(std::ostream &out, const std::stringstream &data, Format &fmt)
|
||||||
{ _format_string(out, data.str(), fmt); }
|
{ _format_string(out, data.str(), fmt); }
|
||||||
|
|
||||||
#endif // __CPRINTF_FORMATS_HH__
|
#endif // __CPRINTF_FORMATS_HH__
|
||||||
|
|
|
@ -364,32 +364,32 @@ SimpleCPU::read(Addr addr, T &data, unsigned flags)
|
||||||
|
|
||||||
template
|
template
|
||||||
Fault
|
Fault
|
||||||
SimpleCPU::read(Addr addr, uint64_t& data, unsigned flags);
|
SimpleCPU::read(Addr addr, uint64_t &data, unsigned flags);
|
||||||
|
|
||||||
template
|
template
|
||||||
Fault
|
Fault
|
||||||
SimpleCPU::read(Addr addr, uint32_t& data, unsigned flags);
|
SimpleCPU::read(Addr addr, uint32_t &data, unsigned flags);
|
||||||
|
|
||||||
template
|
template
|
||||||
Fault
|
Fault
|
||||||
SimpleCPU::read(Addr addr, uint16_t& data, unsigned flags);
|
SimpleCPU::read(Addr addr, uint16_t &data, unsigned flags);
|
||||||
|
|
||||||
template
|
template
|
||||||
Fault
|
Fault
|
||||||
SimpleCPU::read(Addr addr, uint8_t& data, unsigned flags);
|
SimpleCPU::read(Addr addr, uint8_t &data, unsigned flags);
|
||||||
|
|
||||||
#endif //DOXYGEN_SHOULD_SKIP_THIS
|
#endif //DOXYGEN_SHOULD_SKIP_THIS
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
Fault
|
Fault
|
||||||
SimpleCPU::read(Addr addr, double& data, unsigned flags)
|
SimpleCPU::read(Addr addr, double &data, unsigned flags)
|
||||||
{
|
{
|
||||||
return read(addr, *(uint64_t*)&data, flags);
|
return read(addr, *(uint64_t*)&data, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
Fault
|
Fault
|
||||||
SimpleCPU::read(Addr addr, float& data, unsigned flags)
|
SimpleCPU::read(Addr addr, float &data, unsigned flags)
|
||||||
{
|
{
|
||||||
return read(addr, *(uint32_t*)&data, flags);
|
return read(addr, *(uint32_t*)&data, flags);
|
||||||
}
|
}
|
||||||
|
@ -397,7 +397,7 @@ SimpleCPU::read(Addr addr, float& data, unsigned flags)
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
Fault
|
Fault
|
||||||
SimpleCPU::read(Addr addr, int32_t& data, unsigned flags)
|
SimpleCPU::read(Addr addr, int32_t &data, unsigned flags)
|
||||||
{
|
{
|
||||||
return read(addr, (uint32_t&)data, flags);
|
return read(addr, (uint32_t&)data, flags);
|
||||||
}
|
}
|
||||||
|
|
|
@ -187,7 +187,7 @@ class Globals : public Serializable
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
string name() const;
|
string name() const;
|
||||||
void serialize(ostream& os);
|
void serialize(ostream &os);
|
||||||
void unserialize(Checkpoint *cp);
|
void unserialize(Checkpoint *cp);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -201,7 +201,7 @@ Globals::name() const
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
Globals::serialize(ostream& os)
|
Globals::serialize(ostream &os)
|
||||||
{
|
{
|
||||||
nameOut(os);
|
nameOut(os);
|
||||||
SERIALIZE_SCALAR(curTick);
|
SERIALIZE_SCALAR(curTick);
|
||||||
|
|
|
@ -103,8 +103,8 @@ objParamIn(Checkpoint *cp, const std::string §ion,
|
||||||
class Serializable
|
class Serializable
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
void nameOut(std::ostream& os);
|
void nameOut(std::ostream &os);
|
||||||
void nameOut(std::ostream& os, const std::string &_name);
|
void nameOut(std::ostream &os, const std::string &_name);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Serializable() {}
|
Serializable() {}
|
||||||
|
@ -113,7 +113,7 @@ class Serializable
|
||||||
// manditory virtual function, so objects must provide names
|
// manditory virtual function, so objects must provide names
|
||||||
virtual std::string name() const = 0;
|
virtual std::string name() const = 0;
|
||||||
|
|
||||||
virtual void serialize(std::ostream& os) {}
|
virtual void serialize(std::ostream &os) {}
|
||||||
virtual void unserialize(Checkpoint *cp, const std::string §ion) {}
|
virtual void unserialize(Checkpoint *cp, const std::string §ion) {}
|
||||||
|
|
||||||
static Serializable *create(Checkpoint *cp,
|
static Serializable *create(Checkpoint *cp,
|
||||||
|
|
Loading…
Reference in a new issue