arm: Add missing explicit overrides for ARM devices

Make clang >= 3.5 happy when compiling build/ARM/gem5.opt on OSX.

diff --git a/src/dev/arm/energy_ctrl.hh b/src/dev/arm/energy_ctrl.hh
index 3b9f8883f031b28e5ea6eed0f516921684234952..ddfd8d7c7913f1cc0e568b90087a95b1d831e488 100644 (file)
--- a/src/dev/arm/energy_ctrl.hh
+++ b/src/dev/arm/energy_ctrl.hh
@@ -124,19 +124,19 @@ class EnergyCtrl : public BasicPioDevice
      * @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 --git a/src/dev/arm/flash_device.hh b/src/dev/arm/flash_device.hh
index 9dfb22a725347712821f8b28c68bda03417ea2c8..307bc042c0801639f0de52c345f0d7f3a7ce6149 100644 (file)
--- 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;

diff --git a/src/dev/arm/gic_pl390.hh b/src/dev/arm/gic_pl390.hh
index 71ea2e7614312b202e2c0d22072164fe73c03451..bc7bd8c8137e6d938061ce26e0d1be25fcc5f74d 100644 (file)
--- a/src/dev/arm/gic_pl390.hh
+++ b/src/dev/arm/gic_pl390.hh
@@ -260,17 +260,17 @@ class Pl390 : public BaseGic
     /** 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 @@ class Pl390 : public BaseGic
      * 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 --git a/src/dev/arm/kmi.hh b/src/dev/arm/kmi.hh
index e5c58f7d781239cf65d25e4036369a8b5455c25e..a321caf63754d35c2bf69569c5667f35ce3e77dd 100644 (file)
--- a/src/dev/arm/kmi.hh
+++ b/src/dev/arm/kmi.hh
@@ -151,11 +151,11 @@ class Pl050 : public AmbaIntDevice, public VncKeyboard, public VncMouse
 
     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 --git a/src/dev/arm/pl111.hh b/src/dev/arm/pl111.hh
index d22c0883eb1edc9fe23aa96200a633080ca51a90..a55e8b8c3fa4787d06c4a1d53b9d0e68d11388d3 100644 (file)
--- a/src/dev/arm/pl111.hh
+++ b/src/dev/arm/pl111.hh
@@ -368,8 +368,8 @@ class Pl111: public AmbaDmaDevice
     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 @@ class Pl111: public AmbaDmaDevice
      *
      * @return a list of non-overlapping address ranges
      */
-    AddrRangeList getAddrRanges() const;
+    AddrRangeList getAddrRanges() const override;
 };
 
 #endif

diff --git a/src/dev/arm/rtc_pl031.hh b/src/dev/arm/rtc_pl031.hh
index 8c8fa1538549ff448cfb5ff17a8f28ae0e0357de..d3f1295dde0c6211491dfcd3471ab79e90a10ec3 100644 (file)
--- a/src/dev/arm/rtc_pl031.hh
+++ b/src/dev/arm/rtc_pl031.hh
@@ -116,14 +116,14 @@ class PL031 : public AmbaIntDevice
      * @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 --git a/src/dev/arm/timer_cpulocal.hh b/src/dev/arm/timer_cpulocal.hh
index 56bb359d9550279c6d368f2f92e5d84b4f0bd0e1..fc52b3da0bc412e2d9a2a4b2466ce8b77f8b3f00 100644 (file)
--- a/src/dev/arm/timer_cpulocal.hh
+++ b/src/dev/arm/timer_cpulocal.hh
@@ -177,14 +177,14 @@ class CpuLocalTimer : public BasicPioDevice
      * @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 --git a/src/dev/arm/timer_sp804.hh b/src/dev/arm/timer_sp804.hh
index 73e27ca34054b514121c43329b6246b8094d29c1..fafbeba28e6e02b964342568353c11c483bc3b6c 100644 (file)
--- a/src/dev/arm/timer_sp804.hh
+++ b/src/dev/arm/timer_sp804.hh
@@ -150,14 +150,14 @@ class Sp804 : public AmbaPioDevice
      * @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 --git a/src/dev/arm/ufs_device.hh b/src/dev/arm/ufs_device.hh
index 8789cf575cf0552963c72b7d041d78c2b64fb6cc..b0be55777af76a60f2165e83c0bc5873a3d68c78 100644 (file)
--- a/src/dev/arm/ufs_device.hh
+++ b/src/dev/arm/ufs_device.hh
@@ -823,13 +823,13 @@ class UFSHostDevice : public DmaDevice
     /**
      * 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 @@ class UFSHostDevice : public DmaDevice
     void readGarbage();
 
     /**register statistics*/
-    void regStats();
+    void regStats() override;
 
     /**
      * Host controller information

diff --git a/src/dev/arm/vgic.hh b/src/dev/arm/vgic.hh
index b365f0cf3e010a11bf865db42d8b06c534d8df6f..8328673d59cca3320f6fd6633cdc65ffcbb4396a 100644 (file)
--- a/src/dev/arm/vgic.hh
+++ b/src/dev/arm/vgic.hh
@@ -207,10 +207,10 @@ class VGic : public PioDevice
     }
     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;