summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/alpha/alpha_memory.cc8
-rw-r--r--dev/alpha_console.cc68
-rw-r--r--sim/eventq.cc2
-rw-r--r--sim/serialize.hh4
4 files changed, 41 insertions, 41 deletions
diff --git a/arch/alpha/alpha_memory.cc b/arch/alpha/alpha_memory.cc
index 2aad41cea..b95916105 100644
--- a/arch/alpha/alpha_memory.cc
+++ b/arch/alpha/alpha_memory.cc
@@ -194,8 +194,8 @@ AlphaTlb::flushAddr(Addr vaddr, uint8_t asn)
void
AlphaTlb::serialize(ostream &os)
{
- SERIALIZE_MEMBER(size);
- SERIALIZE_MEMBER(nlu);
+ SERIALIZE_SCALAR(size);
+ SERIALIZE_SCALAR(nlu);
// should just add serialize/unserialize methods to AlphaPTE
#if 0
@@ -243,8 +243,8 @@ AlphaTlb::serialize(ostream &os)
void
AlphaTlb::unserialize(const IniFile *db, const string &section)
{
- UNSERIALIZE_MEMBER(size);
- UNSERIALIZE_MEMBER(nlu);
+ UNSERIALIZE_SCALAR(size);
+ UNSERIALIZE_SCALAR(nlu);
#if 0
string data;
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc
index 9bf74bce4..969b1e4c3 100644
--- a/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@ -168,45 +168,45 @@ AlphaConsole::write(MemReqPtr req, const uint8_t *data)
void
AlphaAccess::serialize(ostream &os)
{
- SERIALIZE_MEMBER(last_offset);
- SERIALIZE_MEMBER(version);
- SERIALIZE_MEMBER(numCPUs);
- SERIALIZE_MEMBER(mem_size);
- SERIALIZE_MEMBER(cpuClock);
- SERIALIZE_MEMBER(intrClockFrequency);
- SERIALIZE_MEMBER(kernStart);
- SERIALIZE_MEMBER(kernEnd);
- SERIALIZE_MEMBER(entryPoint);
- SERIALIZE_MEMBER(diskUnit);
- SERIALIZE_MEMBER(diskCount);
- SERIALIZE_MEMBER(diskPAddr);
- SERIALIZE_MEMBER(diskBlock);
- SERIALIZE_MEMBER(diskOperation);
- SERIALIZE_MEMBER(outputChar);
- SERIALIZE_MEMBER(bootStrapImpure);
- SERIALIZE_MEMBER(bootStrapCPU);
+ SERIALIZE_SCALAR(last_offset);
+ SERIALIZE_SCALAR(version);
+ SERIALIZE_SCALAR(numCPUs);
+ SERIALIZE_SCALAR(mem_size);
+ SERIALIZE_SCALAR(cpuClock);
+ SERIALIZE_SCALAR(intrClockFrequency);
+ SERIALIZE_SCALAR(kernStart);
+ SERIALIZE_SCALAR(kernEnd);
+ SERIALIZE_SCALAR(entryPoint);
+ SERIALIZE_SCALAR(diskUnit);
+ SERIALIZE_SCALAR(diskCount);
+ SERIALIZE_SCALAR(diskPAddr);
+ SERIALIZE_SCALAR(diskBlock);
+ SERIALIZE_SCALAR(diskOperation);
+ SERIALIZE_SCALAR(outputChar);
+ SERIALIZE_SCALAR(bootStrapImpure);
+ SERIALIZE_SCALAR(bootStrapCPU);
}
void
AlphaAccess::unserialize(const IniFile *db, const std::string &section)
{
- UNSERIALIZE_MEMBER(last_offset);
- UNSERIALIZE_MEMBER(version);
- UNSERIALIZE_MEMBER(numCPUs);
- UNSERIALIZE_MEMBER(mem_size);
- UNSERIALIZE_MEMBER(cpuClock);
- UNSERIALIZE_MEMBER(intrClockFrequency);
- UNSERIALIZE_MEMBER(kernStart);
- UNSERIALIZE_MEMBER(kernEnd);
- UNSERIALIZE_MEMBER(entryPoint);
- UNSERIALIZE_MEMBER(diskUnit);
- UNSERIALIZE_MEMBER(diskCount);
- UNSERIALIZE_MEMBER(diskPAddr);
- UNSERIALIZE_MEMBER(diskBlock);
- UNSERIALIZE_MEMBER(diskOperation);
- UNSERIALIZE_MEMBER(outputChar);
- UNSERIALIZE_MEMBER(bootStrapImpure);
- UNSERIALIZE_MEMBER(bootStrapCPU);
+ UNSERIALIZE_SCALAR(last_offset);
+ UNSERIALIZE_SCALAR(version);
+ UNSERIALIZE_SCALAR(numCPUs);
+ UNSERIALIZE_SCALAR(mem_size);
+ UNSERIALIZE_SCALAR(cpuClock);
+ UNSERIALIZE_SCALAR(intrClockFrequency);
+ UNSERIALIZE_SCALAR(kernStart);
+ UNSERIALIZE_SCALAR(kernEnd);
+ UNSERIALIZE_SCALAR(entryPoint);
+ UNSERIALIZE_SCALAR(diskUnit);
+ UNSERIALIZE_SCALAR(diskCount);
+ UNSERIALIZE_SCALAR(diskPAddr);
+ UNSERIALIZE_SCALAR(diskBlock);
+ UNSERIALIZE_SCALAR(diskOperation);
+ UNSERIALIZE_SCALAR(outputChar);
+ UNSERIALIZE_SCALAR(bootStrapImpure);
+ UNSERIALIZE_SCALAR(bootStrapCPU);
}
void
diff --git a/sim/eventq.cc b/sim/eventq.cc
index 7285f63e8..7138d8688 100644
--- a/sim/eventq.cc
+++ b/sim/eventq.cc
@@ -150,7 +150,7 @@ EventQueue::serialize(ostream &os)
event = event->next;
}
nameOut(os, "Serialized");
- SERIALIZE_MEMBER(objects);
+ SERIALIZE_SCALAR(objects);
#endif
}
diff --git a/sim/serialize.hh b/sim/serialize.hh
index 668e654b7..9c321b897 100644
--- a/sim/serialize.hh
+++ b/sim/serialize.hh
@@ -62,9 +62,9 @@ void arrayParamIn(const IniFile *db, const std::string &section,
// These macros are streamlined to use in serialize/unserialize
// functions. It's assumed that serialize() has a parameter 'os' for
// the ostream, and unserialize() has parameters 'db' and 'section'.
-#define SERIALIZE_MEMBER(member) paramOut(os, #member, member)
+#define SERIALIZE_SCALAR(scalar) paramOut(os, #scalar, scalar)
-#define UNSERIALIZE_MEMBER(member) paramIn(db, section, #member, member)
+#define UNSERIALIZE_SCALAR(scalar) paramIn(db, section, #scalar, scalar)
#define SERIALIZE_ARRAY(member, size) \
arrayParamOut(os, #member, member, size)