changeset 555325cbf464 in /z/repo/gem5 details: http://repo.gem5.org/gem5?cmd=changeset;node=555325cbf464 description: 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. diffstat: src/arch/arm/kvm/arm_cpu.cc | 4 ++-- src/arch/arm/kvm/armv8_cpu.cc | 2 +- src/arch/arm/kvm/armv8_cpu.hh | 2 +- src/arch/arm/kvm/base_cpu.cc | 4 ++-- src/arch/arm/kvm/gic.hh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diffs (64 lines): diff -r 524c44cf8278 -r 555325cbf464 src/arch/arm/kvm/arm_cpu.cc --- a/src/arch/arm/kvm/arm_cpu.cc Thu Oct 29 08:48:20 2015 -0400 +++ b/src/arch/arm/kvm/arm_cpu.cc Thu Oct 29 08:48:23 2015 -0400 @@ -270,8 +270,8 @@ 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 -r 524c44cf8278 -r 555325cbf464 src/arch/arm/kvm/armv8_cpu.cc --- a/src/arch/arm/kvm/armv8_cpu.cc Thu Oct 29 08:48:20 2015 -0400 +++ b/src/arch/arm/kvm/armv8_cpu.cc Thu Oct 29 08:48:23 2015 -0400 @@ -123,7 +123,7 @@ } void -ArmV8KvmCPU::dump() +ArmV8KvmCPU::dump() const { inform("Integer registers:\n"); inform(" PC: %s\n", getAndFormatOneReg(INT_REG(regs.pc))); diff -r 524c44cf8278 -r 555325cbf464 src/arch/arm/kvm/armv8_cpu.hh --- a/src/arch/arm/kvm/armv8_cpu.hh Thu Oct 29 08:48:20 2015 -0400 +++ b/src/arch/arm/kvm/armv8_cpu.hh Thu Oct 29 08:48:23 2015 -0400 @@ -83,7 +83,7 @@ ArmV8KvmCPU(ArmV8KvmCPUParams *params); virtual ~ArmV8KvmCPU(); - void dump() override; + void dump() const override; protected: void updateKvmState() override; diff -r 524c44cf8278 -r 555325cbf464 src/arch/arm/kvm/base_cpu.cc --- a/src/arch/arm/kvm/base_cpu.cc Thu Oct 29 08:48:20 2015 -0400 +++ b/src/arch/arm/kvm/base_cpu.cc Thu Oct 29 08:48:23 2015 -0400 @@ -86,8 +86,8 @@ 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 -r 524c44cf8278 -r 555325cbf464 src/arch/arm/kvm/gic.hh --- a/src/arch/arm/kvm/gic.hh Thu Oct 29 08:48:20 2015 -0400 +++ b/src/arch/arm/kvm/gic.hh Thu Oct 29 08:48:23 2015 -0400 @@ -80,7 +80,7 @@ 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; } _______________________________________________ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev