diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2015-10-23 09:51:11 -0400 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2015-10-23 09:51:11 -0400 |
commit | fa32ad4941a80c85513b57a2fa43acb84212e5df (patch) | |
tree | 49ac00fefeb0ab365f9967da75820ba3cfeb44bf /src/dev/arm/flash_device.hh | |
parent | 2a1f49fae6f4399d976a551a1715709faf1b19da (diff) | |
download | gem5-fa32ad4941a80c85513b57a2fa43acb84212e5df.tar.xz |
arm: Add missing explicit overrides for ARM devices
Make clang >= 3.5 happy when compiling build/ARM/gem5.opt on OSX.
Diffstat (limited to 'src/dev/arm/flash_device.hh')
-rw-r--r-- | src/dev/arm/flash_device.hh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/dev/arm/flash_device.hh b/src/dev/arm/flash_device.hh index 9dfb22a72..307bc042c 100644 --- a/src/dev/arm/flash_device.hh +++ b/src/dev/arm/flash_device.hh @@ -107,18 +107,19 @@ class FlashDevice : public 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); } - 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 @@ class FlashDevice : public AbstractNVM bool getUnknownPages(uint32_t index); /**Stats register function*/ - void regStats(); + void regStats() override; /** Disk sizes in bytes */ uint64_t diskSize; |