Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/kernel --HG-- extra : convert_revision : 9ee9b8550b5761fa400df83caf268bd1c8ddc7ed
This commit is contained in:
commit
4bbe8c1058
|
@ -341,7 +341,7 @@ format_string(std::ostream &out, const T &data, Format &fmt)
|
|||
{ _format_string(out, data, fmt); }
|
||||
|
||||
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); }
|
||||
|
||||
#endif // __CPRINTF_FORMATS_HH__
|
||||
|
|
|
@ -364,32 +364,32 @@ SimpleCPU::read(Addr addr, T &data, unsigned flags)
|
|||
|
||||
template
|
||||
Fault
|
||||
SimpleCPU::read(Addr addr, uint64_t& data, unsigned flags);
|
||||
SimpleCPU::read(Addr addr, uint64_t &data, unsigned flags);
|
||||
|
||||
template
|
||||
Fault
|
||||
SimpleCPU::read(Addr addr, uint32_t& data, unsigned flags);
|
||||
SimpleCPU::read(Addr addr, uint32_t &data, unsigned flags);
|
||||
|
||||
template
|
||||
Fault
|
||||
SimpleCPU::read(Addr addr, uint16_t& data, unsigned flags);
|
||||
SimpleCPU::read(Addr addr, uint16_t &data, unsigned flags);
|
||||
|
||||
template
|
||||
Fault
|
||||
SimpleCPU::read(Addr addr, uint8_t& data, unsigned flags);
|
||||
SimpleCPU::read(Addr addr, uint8_t &data, unsigned flags);
|
||||
|
||||
#endif //DOXYGEN_SHOULD_SKIP_THIS
|
||||
|
||||
template<>
|
||||
Fault
|
||||
SimpleCPU::read(Addr addr, double& data, unsigned flags)
|
||||
SimpleCPU::read(Addr addr, double &data, unsigned flags)
|
||||
{
|
||||
return read(addr, *(uint64_t*)&data, flags);
|
||||
}
|
||||
|
||||
template<>
|
||||
Fault
|
||||
SimpleCPU::read(Addr addr, float& data, unsigned flags)
|
||||
SimpleCPU::read(Addr addr, float &data, unsigned flags)
|
||||
{
|
||||
return read(addr, *(uint32_t*)&data, flags);
|
||||
}
|
||||
|
@ -397,7 +397,7 @@ SimpleCPU::read(Addr addr, float& data, unsigned flags)
|
|||
|
||||
template<>
|
||||
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);
|
||||
}
|
||||
|
|
|
@ -187,7 +187,7 @@ class Globals : public Serializable
|
|||
{
|
||||
public:
|
||||
string name() const;
|
||||
void serialize(ostream& os);
|
||||
void serialize(ostream &os);
|
||||
void unserialize(Checkpoint *cp);
|
||||
};
|
||||
|
||||
|
@ -201,7 +201,7 @@ Globals::name() const
|
|||
}
|
||||
|
||||
void
|
||||
Globals::serialize(ostream& os)
|
||||
Globals::serialize(ostream &os)
|
||||
{
|
||||
nameOut(os);
|
||||
SERIALIZE_SCALAR(curTick);
|
||||
|
|
|
@ -103,8 +103,8 @@ objParamIn(Checkpoint *cp, const std::string §ion,
|
|||
class Serializable
|
||||
{
|
||||
protected:
|
||||
void nameOut(std::ostream& os);
|
||||
void nameOut(std::ostream& os, const std::string &_name);
|
||||
void nameOut(std::ostream &os);
|
||||
void nameOut(std::ostream &os, const std::string &_name);
|
||||
|
||||
public:
|
||||
Serializable() {}
|
||||
|
@ -113,7 +113,7 @@ class Serializable
|
|||
// manditory virtual function, so objects must provide names
|
||||
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) {}
|
||||
|
||||
static Serializable *create(Checkpoint *cp,
|
||||
|
|
Loading…
Reference in a new issue