sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kvm, arm: Fix compilation errors due to API changes

Browse source 
The checkpoint changes, along with the SMT patches have changed a
number of APIs. Adapt the ArmKvmCPU accordingly.
This commit is contained in:
Victor Garcia 2015-10-29 08:48:23 -04:00
parent d8b7a652e1
commit 8427d05daa
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/arch/arm/kvm/arm_cpu.cc
View file

@ -270,8 +270,8 @@ ArmKvmCPU::startup()
Tick Tick
ArmKvmCPU::kvmRun(Tick ticks) ArmKvmCPU::kvmRun(Tick ticks)
{ {
bool simFIQ(interrupts->checkRaw(INT_FIQ)); bool simFIQ(interrupts[0]->checkRaw(INT_FIQ));
bool simIRQ(interrupts->checkRaw(INT_IRQ)); bool simIRQ(interrupts[0]->checkRaw(INT_IRQ));
if (fiqAsserted != simFIQ) { if (fiqAsserted != simFIQ) {
fiqAsserted = simFIQ; fiqAsserted = simFIQ;

2
src/arch/arm/kvm/armv8_cpu.cc
View file

@ -123,7 +123,7 @@ ArmV8KvmCPU::~ArmV8KvmCPU()
} }
void void
ArmV8KvmCPU::dump() ArmV8KvmCPU::dump() const
{ {
inform("Integer registers:\n"); inform("Integer registers:\n");
inform(" PC: %s\n", getAndFormatOneReg(INT_REG(regs.pc))); inform(" PC: %s\n", getAndFormatOneReg(INT_REG(regs.pc)));

2
src/arch/arm/kvm/armv8_cpu.hh
View file

@ -83,7 +83,7 @@ class ArmV8KvmCPU : public BaseArmKvmCPU
ArmV8KvmCPU(ArmV8KvmCPUParams *params); ArmV8KvmCPU(ArmV8KvmCPUParams *params);
virtual ~ArmV8KvmCPU(); virtual ~ArmV8KvmCPU();
void dump() override; void dump() const override;
protected: protected:
void updateKvmState() override; void updateKvmState() override;

4
src/arch/arm/kvm/base_cpu.cc
View file

@ -86,8 +86,8 @@ BaseArmKvmCPU::startup()
Tick Tick
BaseArmKvmCPU::kvmRun(Tick ticks) BaseArmKvmCPU::kvmRun(Tick ticks)
{ {
bool simFIQ(interrupts->checkRaw(INT_FIQ)); bool simFIQ(interrupts[0]->checkRaw(INT_FIQ));
bool simIRQ(interrupts->checkRaw(INT_IRQ)); bool simIRQ(interrupts[0]->checkRaw(INT_IRQ));
if (fiqAsserted != simFIQ) { if (fiqAsserted != simFIQ) {
fiqAsserted = simFIQ; fiqAsserted = simFIQ;

2
src/arch/arm/kvm/gic.hh
View file

@ -80,7 +80,7 @@ class KvmGic : public BaseGic
void drainResume() override { verifyMemoryMode(); } void drainResume() override { verifyMemoryMode(); }
void serialize(CheckpointOut &cp) const override; void serialize(CheckpointOut &cp) const override;
void unserialize(Checkpoint *cp, const std::string &sec) override; void unserialize(CheckpointIn &cp) override;
public: // PioDevice public: // PioDevice
AddrRangeList getAddrRanges() const { return addrRanges; } AddrRangeList getAddrRanges() const { return addrRanges; }