arm: Add missing explicit overrides for ARM devices
Make clang >= 3.5 happy when compiling build/ARM/gem5.opt on OSX.
This commit is contained in:
parent
2a1f49fae6
commit
fa32ad4941
|
@ -124,19 +124,19 @@ class EnergyCtrl : public BasicPioDevice
|
||||||
* @param pkt Packet describing this request
|
* @param pkt Packet describing this request
|
||||||
* @return number of ticks it took to complete
|
* @return number of ticks it took to complete
|
||||||
*/
|
*/
|
||||||
virtual Tick read(PacketPtr pkt);
|
Tick read(PacketPtr pkt) override;
|
||||||
/**
|
/**
|
||||||
* Write command sent to the device
|
* Write command sent to the device
|
||||||
* @param pkt Packet describing this request
|
* @param pkt Packet describing this request
|
||||||
* @return number of ticks it took to complete
|
* @return number of ticks it took to complete
|
||||||
*/
|
*/
|
||||||
virtual Tick write(PacketPtr pkt);
|
Tick write(PacketPtr pkt) override;
|
||||||
|
|
||||||
void serialize(CheckpointOut &cp) const override;
|
void serialize(CheckpointOut &cp) const override;
|
||||||
void unserialize(CheckpointIn &cp) override;
|
void unserialize(CheckpointIn &cp) override;
|
||||||
|
|
||||||
void startup();
|
void startup() override;
|
||||||
void init();
|
void init() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DVFSHandler *dvfsHandler;
|
DVFSHandler *dvfsHandler;
|
||||||
|
|
|
@ -107,18 +107,19 @@ class FlashDevice : public AbstractNVM
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Device access functions Inherrited from AbstractNVM*/
|
/** Device access functions Inherrited from AbstractNVM*/
|
||||||
virtual void initializeMemory(uint64_t disk_size, uint32_t sector_size)
|
void initializeMemory(uint64_t disk_size, uint32_t sector_size) override
|
||||||
{
|
{
|
||||||
initializeFlash(disk_size, sector_size);
|
initializeFlash(disk_size, sector_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void readMemory(uint64_t address, uint32_t amount,
|
void readMemory(uint64_t address, uint32_t amount,
|
||||||
Callback *event)
|
Callback *event) override
|
||||||
{
|
{
|
||||||
accessDevice(address, amount, event, ActionRead);
|
accessDevice(address, amount, event, ActionRead);
|
||||||
}
|
}
|
||||||
virtual void writeMemory(uint64_t address, uint32_t amount,
|
|
||||||
Callback *event)
|
void writeMemory(uint64_t address, uint32_t amount,
|
||||||
|
Callback *event) override
|
||||||
{
|
{
|
||||||
accessDevice(address, amount, event, ActionWrite);
|
accessDevice(address, amount, event, ActionWrite);
|
||||||
}
|
}
|
||||||
|
@ -146,7 +147,7 @@ class FlashDevice : public AbstractNVM
|
||||||
bool getUnknownPages(uint32_t index);
|
bool getUnknownPages(uint32_t index);
|
||||||
|
|
||||||
/**Stats register function*/
|
/**Stats register function*/
|
||||||
void regStats();
|
void regStats() override;
|
||||||
|
|
||||||
/** Disk sizes in bytes */
|
/** Disk sizes in bytes */
|
||||||
uint64_t diskSize;
|
uint64_t diskSize;
|
||||||
|
|
|
@ -260,17 +260,17 @@ class Pl390 : public BaseGic
|
||||||
/** Return the address ranges used by the Gic
|
/** Return the address ranges used by the Gic
|
||||||
* This is the distributor address + all cpu addresses
|
* This is the distributor address + all cpu addresses
|
||||||
*/
|
*/
|
||||||
virtual AddrRangeList getAddrRanges() const;
|
AddrRangeList getAddrRanges() const override;
|
||||||
|
|
||||||
/** A PIO read to the device, immediately split up into
|
/** A PIO read to the device, immediately split up into
|
||||||
* readDistributor() or readCpu()
|
* readDistributor() or readCpu()
|
||||||
*/
|
*/
|
||||||
virtual Tick read(PacketPtr pkt);
|
Tick read(PacketPtr pkt) override;
|
||||||
|
|
||||||
/** A PIO read to the device, immediately split up into
|
/** A PIO read to the device, immediately split up into
|
||||||
* writeDistributor() or writeCpu()
|
* writeDistributor() or writeCpu()
|
||||||
*/
|
*/
|
||||||
virtual Tick write(PacketPtr pkt);
|
Tick write(PacketPtr pkt) override;
|
||||||
/** @} */
|
/** @} */
|
||||||
|
|
||||||
/** @{ */
|
/** @{ */
|
||||||
|
@ -278,18 +278,18 @@ class Pl390 : public BaseGic
|
||||||
* Depending on the configuration, the gic will pass this interrupt
|
* Depending on the configuration, the gic will pass this interrupt
|
||||||
* on through to a CPU.
|
* on through to a CPU.
|
||||||
* @param number number of interrupt to send */
|
* @param number number of interrupt to send */
|
||||||
void sendInt(uint32_t number);
|
void sendInt(uint32_t number) override;
|
||||||
|
|
||||||
/** Interface call for private peripheral interrupts */
|
/** Interface call for private peripheral interrupts */
|
||||||
void sendPPInt(uint32_t num, uint32_t cpu);
|
void sendPPInt(uint32_t num, uint32_t cpu) override;
|
||||||
|
|
||||||
/** Clear an interrupt from a device that is connected to the Gic
|
/** Clear an interrupt from a device that is connected to the Gic
|
||||||
* Depending on the configuration, the gic may de-assert it's cpu line
|
* Depending on the configuration, the gic may de-assert it's cpu line
|
||||||
* @param number number of interrupt to send */
|
* @param number number of interrupt to send */
|
||||||
void clearInt(uint32_t number);
|
void clearInt(uint32_t number) override;
|
||||||
|
|
||||||
/** Clear a (level-sensitive) PPI */
|
/** Clear a (level-sensitive) PPI */
|
||||||
void clearPPInt(uint32_t num, uint32_t cpu);
|
void clearPPInt(uint32_t num, uint32_t cpu) override;
|
||||||
/** @} */
|
/** @} */
|
||||||
|
|
||||||
/** @{ */
|
/** @{ */
|
||||||
|
|
|
@ -151,11 +151,11 @@ class Pl050 : public AmbaIntDevice, public VncKeyboard, public VncMouse
|
||||||
|
|
||||||
Pl050(const Params *p);
|
Pl050(const Params *p);
|
||||||
|
|
||||||
virtual Tick read(PacketPtr pkt);
|
Tick read(PacketPtr pkt) override;
|
||||||
virtual Tick write(PacketPtr pkt);
|
Tick write(PacketPtr pkt) override;
|
||||||
|
|
||||||
virtual void mouseAt(uint16_t x, uint16_t y, uint8_t buttons);
|
void mouseAt(uint16_t x, uint16_t y, uint8_t buttons) override;
|
||||||
virtual void keyPress(uint32_t key, bool down);
|
void keyPress(uint32_t key, bool down) override;
|
||||||
|
|
||||||
void serialize(CheckpointOut &cp) const override;
|
void serialize(CheckpointOut &cp) const override;
|
||||||
void unserialize(CheckpointIn &cp) override;
|
void unserialize(CheckpointIn &cp) override;
|
||||||
|
|
|
@ -368,8 +368,8 @@ class Pl111: public AmbaDmaDevice
|
||||||
Pl111(const Params *p);
|
Pl111(const Params *p);
|
||||||
~Pl111();
|
~Pl111();
|
||||||
|
|
||||||
virtual Tick read(PacketPtr pkt);
|
Tick read(PacketPtr pkt) override;
|
||||||
virtual Tick write(PacketPtr pkt);
|
Tick write(PacketPtr pkt) override;
|
||||||
|
|
||||||
void serialize(CheckpointOut &cp) const override;
|
void serialize(CheckpointOut &cp) const override;
|
||||||
void unserialize(CheckpointIn &cp) override;
|
void unserialize(CheckpointIn &cp) override;
|
||||||
|
@ -379,7 +379,7 @@ class Pl111: public AmbaDmaDevice
|
||||||
*
|
*
|
||||||
* @return a list of non-overlapping address ranges
|
* @return a list of non-overlapping address ranges
|
||||||
*/
|
*/
|
||||||
AddrRangeList getAddrRanges() const;
|
AddrRangeList getAddrRanges() const override;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -116,14 +116,14 @@ class PL031 : public AmbaIntDevice
|
||||||
* @param pkt The memory request.
|
* @param pkt The memory request.
|
||||||
* @param data Where to put the data.
|
* @param data Where to put the data.
|
||||||
*/
|
*/
|
||||||
virtual Tick read(PacketPtr pkt);
|
Tick read(PacketPtr pkt) override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle writes to the device
|
* Handle writes to the device
|
||||||
* @param pkt The memory request.
|
* @param pkt The memory request.
|
||||||
* @param data the data
|
* @param data the data
|
||||||
*/
|
*/
|
||||||
virtual Tick write(PacketPtr pkt);
|
Tick write(PacketPtr pkt) override;
|
||||||
|
|
||||||
void serialize(CheckpointOut &cp) const override;
|
void serialize(CheckpointOut &cp) const override;
|
||||||
void unserialize(CheckpointIn &cp) override;
|
void unserialize(CheckpointIn &cp) override;
|
||||||
|
|
|
@ -177,14 +177,14 @@ class CpuLocalTimer : public BasicPioDevice
|
||||||
* @param pkt The memory request.
|
* @param pkt The memory request.
|
||||||
* @return Returns latency of device read
|
* @return Returns latency of device read
|
||||||
*/
|
*/
|
||||||
virtual Tick read(PacketPtr pkt);
|
Tick read(PacketPtr pkt) override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle a write to the device.
|
* Handle a write to the device.
|
||||||
* @param pkt The memory request.
|
* @param pkt The memory request.
|
||||||
* @return Returns latency of device write
|
* @return Returns latency of device write
|
||||||
*/
|
*/
|
||||||
virtual Tick write(PacketPtr pkt);
|
Tick write(PacketPtr pkt) override;
|
||||||
|
|
||||||
void serialize(CheckpointOut &cp) const override;
|
void serialize(CheckpointOut &cp) const override;
|
||||||
void unserialize(CheckpointIn &cp) override;
|
void unserialize(CheckpointIn &cp) override;
|
||||||
|
|
|
@ -150,14 +150,14 @@ class Sp804 : public AmbaPioDevice
|
||||||
* @param pkt The memory request.
|
* @param pkt The memory request.
|
||||||
* @param data Where to put the data.
|
* @param data Where to put the data.
|
||||||
*/
|
*/
|
||||||
virtual Tick read(PacketPtr pkt);
|
Tick read(PacketPtr pkt) override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* All writes are simply ignored.
|
* All writes are simply ignored.
|
||||||
* @param pkt The memory request.
|
* @param pkt The memory request.
|
||||||
* @param data the data
|
* @param data the data
|
||||||
*/
|
*/
|
||||||
virtual Tick write(PacketPtr pkt);
|
Tick write(PacketPtr pkt) override;
|
||||||
|
|
||||||
|
|
||||||
void serialize(CheckpointOut &cp) const override;
|
void serialize(CheckpointOut &cp) const override;
|
||||||
|
|
|
@ -823,13 +823,13 @@ class UFSHostDevice : public DmaDevice
|
||||||
/**
|
/**
|
||||||
* Address range functions
|
* Address range functions
|
||||||
*/
|
*/
|
||||||
AddrRangeList getAddrRanges() const;
|
AddrRangeList getAddrRanges() const override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* register access functions
|
* register access functions
|
||||||
*/
|
*/
|
||||||
Tick read(PacketPtr pkt);
|
Tick read(PacketPtr pkt) override;
|
||||||
Tick write(PacketPtr pkt);
|
Tick write(PacketPtr pkt) override;
|
||||||
// end of access functions
|
// end of access functions
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -988,7 +988,7 @@ class UFSHostDevice : public DmaDevice
|
||||||
void readGarbage();
|
void readGarbage();
|
||||||
|
|
||||||
/**register statistics*/
|
/**register statistics*/
|
||||||
void regStats();
|
void regStats() override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Host controller information
|
* Host controller information
|
||||||
|
|
|
@ -207,10 +207,10 @@ class VGic : public PioDevice
|
||||||
}
|
}
|
||||||
VGic(const Params *p);
|
VGic(const Params *p);
|
||||||
|
|
||||||
virtual AddrRangeList getAddrRanges() const;
|
AddrRangeList getAddrRanges() const override;
|
||||||
|
|
||||||
virtual Tick read(PacketPtr pkt);
|
Tick read(PacketPtr pkt) override;
|
||||||
virtual Tick write(PacketPtr pkt);
|
Tick write(PacketPtr pkt) override;
|
||||||
|
|
||||||
void serialize(CheckpointOut &cp) const override;
|
void serialize(CheckpointOut &cp) const override;
|
||||||
void unserialize(CheckpointIn &cp) override;
|
void unserialize(CheckpointIn &cp) override;
|
||||||
|
|
Loading…
Reference in a new issue