changeset 5a9019db4a08 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=5a9019db4a08
description:
arm: Add missing explicit overrides for ARM devices
Make clang >= 3.5 happy when compiling build/ARM/gem5.opt on OSX.
diffstat:
src/dev/arm/energy_ctrl.hh | 8 ++++----
src/dev/arm/flash_device.hh | 13 +++++++------
src/dev/arm/gic_pl390.hh | 14 +++++++-------
src/dev/arm/kmi.hh | 8 ++++----
src/dev/arm/pl111.hh | 6 +++---
src/dev/arm/rtc_pl031.hh | 4 ++--
src/dev/arm/timer_cpulocal.hh | 4 ++--
src/dev/arm/timer_sp804.hh | 4 ++--
src/dev/arm/ufs_device.hh | 8 ++++----
src/dev/arm/vgic.hh | 6 +++---
10 files changed, 38 insertions(+), 37 deletions(-)
diffs (259 lines):
diff -r 3a4d1b5cd05c -r 5a9019db4a08 src/dev/arm/energy_ctrl.hh
--- a/src/dev/arm/energy_ctrl.hh Wed Oct 14 13:32:28 2015 -0400
+++ b/src/dev/arm/energy_ctrl.hh Fri Oct 23 09:51:11 2015 -0400
@@ -124,19 +124,19 @@
* @param pkt Packet describing this request
* @return number of ticks it took to complete
*/
- virtual Tick read(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
/**
* Write command sent to the device
* @param pkt Packet describing this request
* @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 unserialize(CheckpointIn &cp) override;
- void startup();
- void init();
+ void startup() override;
+ void init() override;
private:
DVFSHandler *dvfsHandler;
diff -r 3a4d1b5cd05c -r 5a9019db4a08 src/dev/arm/flash_device.hh
--- a/src/dev/arm/flash_device.hh Wed Oct 14 13:32:28 2015 -0400
+++ b/src/dev/arm/flash_device.hh Fri Oct 23 09:51:11 2015 -0400
@@ -107,18 +107,19 @@
};
/** 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);
}
- virtual void readMemory(uint64_t address, uint32_t amount,
- Callback *event)
+ void readMemory(uint64_t address, uint32_t amount,
+ Callback *event) override
{
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);
}
@@ -146,7 +147,7 @@
bool getUnknownPages(uint32_t index);
/**Stats register function*/
- void regStats();
+ void regStats() override;
/** Disk sizes in bytes */
uint64_t diskSize;
diff -r 3a4d1b5cd05c -r 5a9019db4a08 src/dev/arm/gic_pl390.hh
--- a/src/dev/arm/gic_pl390.hh Wed Oct 14 13:32:28 2015 -0400
+++ b/src/dev/arm/gic_pl390.hh Fri Oct 23 09:51:11 2015 -0400
@@ -260,17 +260,17 @@
/** Return the address ranges used by the Gic
* 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
* readDistributor() or readCpu()
*/
- virtual Tick read(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
/** A PIO read to the device, immediately split up into
* writeDistributor() or writeCpu()
*/
- virtual Tick write(PacketPtr pkt);
+ Tick write(PacketPtr pkt) override;
/** @} */
/** @{ */
@@ -278,18 +278,18 @@
* Depending on the configuration, the gic will pass this interrupt
* on through to a CPU.
* @param number number of interrupt to send */
- void sendInt(uint32_t number);
+ void sendInt(uint32_t number) override;
/** 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
* Depending on the configuration, the gic may de-assert it's cpu line
* @param number number of interrupt to send */
- void clearInt(uint32_t number);
+ void clearInt(uint32_t number) override;
/** Clear a (level-sensitive) PPI */
- void clearPPInt(uint32_t num, uint32_t cpu);
+ void clearPPInt(uint32_t num, uint32_t cpu) override;
/** @} */
/** @{ */
diff -r 3a4d1b5cd05c -r 5a9019db4a08 src/dev/arm/kmi.hh
--- a/src/dev/arm/kmi.hh Wed Oct 14 13:32:28 2015 -0400
+++ b/src/dev/arm/kmi.hh Fri Oct 23 09:51:11 2015 -0400
@@ -151,11 +151,11 @@
Pl050(const Params *p);
- virtual Tick read(PacketPtr pkt);
- virtual Tick write(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
+ Tick write(PacketPtr pkt) override;
- virtual void mouseAt(uint16_t x, uint16_t y, uint8_t buttons);
- virtual void keyPress(uint32_t key, bool down);
+ void mouseAt(uint16_t x, uint16_t y, uint8_t buttons) override;
+ void keyPress(uint32_t key, bool down) override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
diff -r 3a4d1b5cd05c -r 5a9019db4a08 src/dev/arm/pl111.hh
--- a/src/dev/arm/pl111.hh Wed Oct 14 13:32:28 2015 -0400
+++ b/src/dev/arm/pl111.hh Fri Oct 23 09:51:11 2015 -0400
@@ -368,8 +368,8 @@
Pl111(const Params *p);
~Pl111();
- virtual Tick read(PacketPtr pkt);
- virtual Tick write(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
+ Tick write(PacketPtr pkt) override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
@@ -379,7 +379,7 @@
*
* @return a list of non-overlapping address ranges
*/
- AddrRangeList getAddrRanges() const;
+ AddrRangeList getAddrRanges() const override;
};
#endif
diff -r 3a4d1b5cd05c -r 5a9019db4a08 src/dev/arm/rtc_pl031.hh
--- a/src/dev/arm/rtc_pl031.hh Wed Oct 14 13:32:28 2015 -0400
+++ b/src/dev/arm/rtc_pl031.hh Fri Oct 23 09:51:11 2015 -0400
@@ -116,14 +116,14 @@
* @param pkt The memory request.
* @param data Where to put the data.
*/
- virtual Tick read(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
/**
* Handle writes to the device
* @param pkt The memory request.
* @param data the data
*/
- virtual Tick write(PacketPtr pkt);
+ Tick write(PacketPtr pkt) override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
diff -r 3a4d1b5cd05c -r 5a9019db4a08 src/dev/arm/timer_cpulocal.hh
--- a/src/dev/arm/timer_cpulocal.hh Wed Oct 14 13:32:28 2015 -0400
+++ b/src/dev/arm/timer_cpulocal.hh Fri Oct 23 09:51:11 2015 -0400
@@ -177,14 +177,14 @@
* @param pkt The memory request.
* @return Returns latency of device read
*/
- virtual Tick read(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
/**
* Handle a write to the device.
* @param pkt The memory request.
* @return Returns latency of device write
*/
- virtual Tick write(PacketPtr pkt);
+ Tick write(PacketPtr pkt) override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
diff -r 3a4d1b5cd05c -r 5a9019db4a08 src/dev/arm/timer_sp804.hh
--- a/src/dev/arm/timer_sp804.hh Wed Oct 14 13:32:28 2015 -0400
+++ b/src/dev/arm/timer_sp804.hh Fri Oct 23 09:51:11 2015 -0400
@@ -150,14 +150,14 @@
* @param pkt The memory request.
* @param data Where to put the data.
*/
- virtual Tick read(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
/**
* All writes are simply ignored.
* @param pkt The memory request.
* @param data the data
*/
- virtual Tick write(PacketPtr pkt);
+ Tick write(PacketPtr pkt) override;
void serialize(CheckpointOut &cp) const override;
diff -r 3a4d1b5cd05c -r 5a9019db4a08 src/dev/arm/ufs_device.hh
--- a/src/dev/arm/ufs_device.hh Wed Oct 14 13:32:28 2015 -0400
+++ b/src/dev/arm/ufs_device.hh Fri Oct 23 09:51:11 2015 -0400
@@ -823,13 +823,13 @@
/**
* Address range functions
*/
- AddrRangeList getAddrRanges() const;
+ AddrRangeList getAddrRanges() const override;
/**
* register access functions
*/
- Tick read(PacketPtr pkt);
- Tick write(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
+ Tick write(PacketPtr pkt) override;
// end of access functions
/**
@@ -988,7 +988,7 @@
void readGarbage();
/**register statistics*/
- void regStats();
+ void regStats() override;
/**
* Host controller information
diff -r 3a4d1b5cd05c -r 5a9019db4a08 src/dev/arm/vgic.hh
--- a/src/dev/arm/vgic.hh Wed Oct 14 13:32:28 2015 -0400
+++ b/src/dev/arm/vgic.hh Fri Oct 23 09:51:11 2015 -0400
@@ -207,10 +207,10 @@
}
VGic(const Params *p);
- virtual AddrRangeList getAddrRanges() const;
+ AddrRangeList getAddrRanges() const override;
- virtual Tick read(PacketPtr pkt);
- virtual Tick write(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
+ Tick write(PacketPtr pkt) override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
