sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge zizzer.eecs.umich.edu:/bk/m5

Browse source 
into ziff.eecs.umich.edu:/z/binkertn/research/m5/kernel

--HG--
extra : convert_revision : 9ee9b8550b5761fa400df83caf268bd1c8ddc7ed
This commit is contained in:
Nathan Binkert 2004-02-05 02:53:03 -05:00
parent daa579fc0f 98948b2e57
commit 4bbe8c1058
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/cprintf_formats.hh
View file

@ -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__

14
cpu/simple_cpu/simple_cpu.cc
View file

@ -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);
} }

4
sim/serialize.cc
View file

@ -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);

6
sim/serialize.hh
View file

@ -103,8 +103,8 @@ objParamIn(Checkpoint *cp, const std::string &section,
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 &section) {} virtual void unserialize(Checkpoint *cp, const std::string &section) {}
static Serializable *create(Checkpoint *cp, static Serializable *create(Checkpoint *cp,