summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Garcia <victor.garcia@arm.com>2015-10-29 08:48:23 -0400
committerVictor Garcia <victor.garcia@arm.com>2015-10-29 08:48:23 -0400
commit8427d05daa39d45598ff846fe4cf66b132b8cb78 (patch)
treee3441f8bca24f906cb11781185cfc7ecf6684655
parentd8b7a652e1c460ac5b3b935022d45eeb338f7665 (diff)
downloadgem5-8427d05daa39d45598ff846fe4cf66b132b8cb78.tar.xz
kvm, arm: Fix compilation errors due to API changes
The checkpoint changes, along with the SMT patches have changed a number of APIs. Adapt the ArmKvmCPU accordingly.
-rw-r--r--src/arch/arm/kvm/arm_cpu.cc4
-rw-r--r--src/arch/arm/kvm/armv8_cpu.cc2
-rw-r--r--src/arch/arm/kvm/armv8_cpu.hh2
-rw-r--r--src/arch/arm/kvm/base_cpu.cc4
-rw-r--r--src/arch/arm/kvm/gic.hh2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/arch/arm/kvm/arm_cpu.cc b/src/arch/arm/kvm/arm_cpu.cc
index cb5c4a2de..e3f12cb94 100644
--- a/src/arch/arm/kvm/arm_cpu.cc
+++ b/src/arch/arm/kvm/arm_cpu.cc
@@ -270,8 +270,8 @@ ArmKvmCPU::startup()
Tick
ArmKvmCPU::kvmRun(Tick ticks)
{
- bool simFIQ(interrupts->checkRaw(INT_FIQ));
- bool simIRQ(interrupts->checkRaw(INT_IRQ));
+ bool simFIQ(interrupts[0]->checkRaw(INT_FIQ));
+ bool simIRQ(interrupts[0]->checkRaw(INT_IRQ));
if (fiqAsserted != simFIQ) {
fiqAsserted = simFIQ;
diff --git a/src/arch/arm/kvm/armv8_cpu.cc b/src/arch/arm/kvm/armv8_cpu.cc
index 071d27dd0..e8a77b07b 100644
--- a/src/arch/arm/kvm/armv8_cpu.cc
+++ b/src/arch/arm/kvm/armv8_cpu.cc
@@ -123,7 +123,7 @@ ArmV8KvmCPU::~ArmV8KvmCPU()
}
void
-ArmV8KvmCPU::dump()
+ArmV8KvmCPU::dump() const
{
inform("Integer registers:\n");
inform(" PC: %s\n", getAndFormatOneReg(INT_REG(regs.pc)));
diff --git a/src/arch/arm/kvm/armv8_cpu.hh b/src/arch/arm/kvm/armv8_cpu.hh
index aee27a8a4..d3e390b4f 100644
--- a/src/arch/arm/kvm/armv8_cpu.hh
+++ b/src/arch/arm/kvm/armv8_cpu.hh
@@ -83,7 +83,7 @@ class ArmV8KvmCPU : public BaseArmKvmCPU
ArmV8KvmCPU(ArmV8KvmCPUParams *params);
virtual ~ArmV8KvmCPU();
- void dump() override;
+ void dump() const override;
protected:
void updateKvmState() override;
diff --git a/src/arch/arm/kvm/base_cpu.cc b/src/arch/arm/kvm/base_cpu.cc
index 61de16900..b802cd600 100644
--- a/src/arch/arm/kvm/base_cpu.cc
+++ b/src/arch/arm/kvm/base_cpu.cc
@@ -86,8 +86,8 @@ BaseArmKvmCPU::startup()
Tick
BaseArmKvmCPU::kvmRun(Tick ticks)
{
- bool simFIQ(interrupts->checkRaw(INT_FIQ));
- bool simIRQ(interrupts->checkRaw(INT_IRQ));
+ bool simFIQ(interrupts[0]->checkRaw(INT_FIQ));
+ bool simIRQ(interrupts[0]->checkRaw(INT_IRQ));
if (fiqAsserted != simFIQ) {
fiqAsserted = simFIQ;
diff --git a/src/arch/arm/kvm/gic.hh b/src/arch/arm/kvm/gic.hh
index f156caa6b..f6360858b 100644
--- a/src/arch/arm/kvm/gic.hh
+++ b/src/arch/arm/kvm/gic.hh
@@ -80,7 +80,7 @@ class KvmGic : public BaseGic
void drainResume() override { verifyMemoryMode(); }
void serialize(CheckpointOut &cp) const override;
- void unserialize(Checkpoint *cp, const std::string &sec) override;
+ void unserialize(CheckpointIn &cp) override;
public: // PioDevice
AddrRangeList getAddrRanges() const { return addrRanges; }