summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2004-02-05 02:53:03 -0500
committerNathan Binkert <binkertn@umich.edu>2004-02-05 02:53:03 -0500
commit4bbe8c1058df973be0bff485d2765a54d149f130 (patch)
tree093fb18b600e4c08acee142830799c303426579e
parentdaa579fc0f3aca4e042068862b022095734b41d9 (diff)
parent98948b2e572d10faf1ac91f977837cf2e8a903c3 (diff)
downloadgem5-4bbe8c1058df973be0bff485d2765a54d149f130.tar.xz
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/kernel --HG-- extra : convert_revision : 9ee9b8550b5761fa400df83caf268bd1c8ddc7ed
-rw-r--r--base/cprintf_formats.hh2
-rw-r--r--cpu/simple_cpu/simple_cpu.cc14
-rw-r--r--sim/serialize.cc4
-rw-r--r--sim/serialize.hh6
4 files changed, 13 insertions, 13 deletions
diff --git a/base/cprintf_formats.hh b/base/cprintf_formats.hh
index c3e01c935..d8a8a552b 100644
--- a/base/cprintf_formats.hh
+++ b/base/cprintf_formats.hh
@@ -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__
diff --git a/cpu/simple_cpu/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc
index 2e4dff280..efbe66020 100644
--- a/cpu/simple_cpu/simple_cpu.cc
+++ b/cpu/simple_cpu/simple_cpu.cc
@@ -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);
}
diff --git a/sim/serialize.cc b/sim/serialize.cc
index 180cc38a0..ba5a99afd 100644
--- a/sim/serialize.cc
+++ b/sim/serialize.cc
@@ -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);
diff --git a/sim/serialize.hh b/sim/serialize.hh
index 9ab2fa833..e561604bf 100644
--- a/sim/serialize.hh
+++ b/sim/serialize.hh
@@ -103,8 +103,8 @@ objParamIn(Checkpoint *cp, const std::string &section,
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 &section) {}
static Serializable *create(Checkpoint *cp,