summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2013-01-07 13:05:39 -0500
committerAndreas Hansson <andreas.hansson@arm.com>2013-01-07 13:05:39 -0500
commit9364d35b8bce516459be09bb13891600921e9e6e (patch)
treef6db92857eacf36badca9e79c721d2822fc7c1d9 /src
parent406891c62a4948ddee3c83a18b5d1453b159953d (diff)
downloadgem5-9364d35b8bce516459be09bb13891600921e9e6e.tar.xz
dev: Do not serialize timer parameters
This patch removes the intNum and clock from the serialized scalars as these are set by the Python parameters and should not be part of the checkpoint.
Diffstat (limited to 'src')
-rw-r--r--src/dev/arm/timer_sp804.cc5
-rw-r--r--src/dev/arm/timer_sp804.hh4
2 files changed, 2 insertions, 7 deletions
diff --git a/src/dev/arm/timer_sp804.cc b/src/dev/arm/timer_sp804.cc
index 407f35b60..af0227ec4 100644
--- a/src/dev/arm/timer_sp804.cc
+++ b/src/dev/arm/timer_sp804.cc
@@ -224,8 +224,6 @@ void
Sp804::Timer::serialize(std::ostream &os)
{
DPRINTF(Checkpoint, "Serializing Arm Sp804\n");
- SERIALIZE_SCALAR(intNum);
- SERIALIZE_SCALAR(clock);
uint32_t control_serial = control;
SERIALIZE_SCALAR(control_serial);
@@ -249,9 +247,6 @@ Sp804::Timer::unserialize(Checkpoint *cp, const std::string &section)
{
DPRINTF(Checkpoint, "Unserializing Arm Sp804\n");
- UNSERIALIZE_SCALAR(intNum);
- UNSERIALIZE_SCALAR(clock);
-
uint32_t control_serial;
UNSERIALIZE_SCALAR(control_serial);
control = control_serial;
diff --git a/src/dev/arm/timer_sp804.hh b/src/dev/arm/timer_sp804.hh
index 9f137001d..745cb95e3 100644
--- a/src/dev/arm/timer_sp804.hh
+++ b/src/dev/arm/timer_sp804.hh
@@ -83,10 +83,10 @@ class Sp804 : public AmbaDevice
Sp804 *parent;
/** Number of interrupt to cause/clear */
- uint32_t intNum;
+ const uint32_t intNum;
/** Number of ticks in a clock input */
- Tick clock;
+ const Tick clock;
/** Control register as specified above */
CTRL control;