misc: Remove redundant compiler-specific defines

This patch moves away from using M5_ATTR_OVERRIDE and the m5::hashmap
(and similar) abstractions, as these are no longer needed with gcc 4.7
and clang 3.1 as minimum compiler versions.

15 files changed, 76 insertions, 76 deletions

diff --git a/src/dev/arm/energy_ctrl.hh b/src/dev/arm/energy_ctrl.hh
index a1a362879..3b9f8883f 100644
--- a/src/dev/arm/energy_ctrl.hh
+++ b/src/dev/arm/energy_ctrl.hh
@@ -132,8 +132,8 @@ class EnergyCtrl : public BasicPioDevice
      */
     virtual Tick write(PacketPtr pkt);
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
     void startup();
     void init();
diff --git a/src/dev/arm/flash_device.hh b/src/dev/arm/flash_device.hh
index 891217cbf..9dfb22a72 100644
--- a/src/dev/arm/flash_device.hh
+++ b/src/dev/arm/flash_device.hh
@@ -62,11 +62,11 @@ class FlashDevice : public AbstractNVM
     ~FlashDevice();
 
     /** Checkpoint functions*/
-    DrainState drain() M5_ATTR_OVERRIDE;
+    DrainState drain() override;
     void checkDrain();
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
   private:
     /** Defines the possible actions to the flash*/
diff --git a/src/dev/arm/generic_timer.hh b/src/dev/arm/generic_timer.hh
index 97823f05f..c606f1e60 100644
--- a/src/dev/arm/generic_timer.hh
+++ b/src/dev/arm/generic_timer.hh
@@ -93,8 +93,8 @@ class SystemCounter : public Serializable
     void setKernelControl(uint32_t val) { _regCntkctl = val; }
     uint32_t getKernelControl() { return _regCntkctl; }
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
   private:
     // Disable copying
@@ -189,8 +189,8 @@ class ArchTimer : public Serializable
     /// Returns the value of the counter which this timer relies on.
     uint64_t value() const;
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
   private:
     // Disable copying
@@ -202,8 +202,8 @@ class GenericTimer : public SimObject
   public:
     GenericTimer(GenericTimerParams *p);
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
   public:
     void setMiscReg(int misc_reg, unsigned cpu, ArmISA::MiscReg val);
@@ -262,10 +262,10 @@ class GenericTimerISA : public ArmISA::BaseISADevice
     GenericTimerISA(GenericTimer &_parent, unsigned _cpu)
         : parent(_parent), cpu(_cpu) {}
 
-    void setMiscReg(int misc_reg, ArmISA::MiscReg val) M5_ATTR_OVERRIDE {
+    void setMiscReg(int misc_reg, ArmISA::MiscReg val) override {
         parent.setMiscReg(misc_reg, cpu, val);
     }
-    ArmISA::MiscReg readMiscReg(int misc_reg) M5_ATTR_OVERRIDE {
+    ArmISA::MiscReg readMiscReg(int misc_reg) override {
         return parent.readMiscReg(misc_reg, cpu);
     }
 
@@ -279,13 +279,13 @@ class GenericTimerMem : public PioDevice
   public:
     GenericTimerMem(GenericTimerMemParams *p);
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
   public: // PioDevice
-    AddrRangeList getAddrRanges() const M5_ATTR_OVERRIDE { return addrRanges; }
-    Tick read(PacketPtr pkt) M5_ATTR_OVERRIDE;
-    Tick write(PacketPtr pkt) M5_ATTR_OVERRIDE;
+    AddrRangeList getAddrRanges() const override { return addrRanges; }
+    Tick read(PacketPtr pkt) override;
+    Tick write(PacketPtr pkt) override;
 
   protected:
     uint64_t ctrlRead(Addr addr, size_t size) const;
diff --git a/src/dev/arm/gic_pl390.hh b/src/dev/arm/gic_pl390.hh
index 17946145f..71ea2e761 100644
--- a/src/dev/arm/gic_pl390.hh
+++ b/src/dev/arm/gic_pl390.hh
@@ -300,8 +300,8 @@ class Pl390 : public BaseGic
     void driveIrqEn(bool state);
     /** @} */
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
   protected:
     /** Handle a read to the distributor poriton of the GIC
diff --git a/src/dev/arm/gpu_nomali.hh b/src/dev/arm/gpu_nomali.hh
index bc687c264..4e4f9dbcb 100644
--- a/src/dev/arm/gpu_nomali.hh
+++ b/src/dev/arm/gpu_nomali.hh
@@ -55,13 +55,13 @@ class NoMaliGpu : public PioDevice
     virtual ~NoMaliGpu();
 
   public: /* Checkpointing */
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
   public: /* IO device interfaces */
-    Tick read(PacketPtr pkt) M5_ATTR_OVERRIDE;
-    Tick write(PacketPtr pkt) M5_ATTR_OVERRIDE;
-    AddrRangeList getAddrRanges() const M5_ATTR_OVERRIDE;
+    Tick read(PacketPtr pkt) override;
+    Tick write(PacketPtr pkt) override;
+    AddrRangeList getAddrRanges() const override;
 
   private:
     /**
diff --git a/src/dev/arm/hdlcd.hh b/src/dev/arm/hdlcd.hh
index cb47b8522..3ce12a24d 100644
--- a/src/dev/arm/hdlcd.hh
+++ b/src/dev/arm/hdlcd.hh
@@ -95,18 +95,18 @@ class HDLcd: public AmbaDmaDevice
     HDLcd(const HDLcdParams *p);
     ~HDLcd();
 
-    void regStats() M5_ATTR_OVERRIDE;
+    void regStats() override;
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
-    void drainResume() M5_ATTR_OVERRIDE;
+    void drainResume() override;
 
   public: // IO device interface
-    Tick read(PacketPtr pkt) M5_ATTR_OVERRIDE;
-    Tick write(PacketPtr pkt) M5_ATTR_OVERRIDE;
+    Tick read(PacketPtr pkt) override;
+    Tick write(PacketPtr pkt) override;
 
-    AddrRangeList getAddrRanges() const M5_ATTR_OVERRIDE { return addrRanges; }
+    AddrRangeList getAddrRanges() const override { return addrRanges; }
 
   protected: // Parameters
     VncInput *vnc;
@@ -328,16 +328,16 @@ class HDLcd: public AmbaDmaDevice
         void dumpSettings();
 
       protected:
-        bool nextPixel(Pixel &p) M5_ATTR_OVERRIDE { return parent.pxlNext(p); }
+        bool nextPixel(Pixel &p) override { return parent.pxlNext(p); }
 
-        void onVSyncBegin() M5_ATTR_OVERRIDE { return parent.pxlVSyncBegin(); }
-        void onVSyncEnd() M5_ATTR_OVERRIDE { return parent.pxlVSyncEnd(); }
+        void onVSyncBegin() override { return parent.pxlVSyncBegin(); }
+        void onVSyncEnd() override { return parent.pxlVSyncEnd(); }
 
-        void onUnderrun(unsigned x, unsigned y) M5_ATTR_OVERRIDE {
+        void onUnderrun(unsigned x, unsigned y) override {
             parent.pxlUnderrun();
         }
 
-        void onFrameDone() M5_ATTR_OVERRIDE { parent.pxlFrameDone(); }
+        void onFrameDone() override { parent.pxlFrameDone(); }
 
       protected:
         HDLcd &parent;
@@ -366,12 +366,12 @@ class HDLcd: public AmbaDmaDevice
         void abortFrame();
         void dumpSettings();
 
-        void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-        void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+        void serialize(CheckpointOut &cp) const override;
+        void unserialize(CheckpointIn &cp) override;
 
       protected:
-        void onEndOfBlock() M5_ATTR_OVERRIDE;
-        void onIdle() M5_ATTR_OVERRIDE;
+        void onEndOfBlock() override;
+        void onIdle() override;
 
         HDLcd &parent;
         const size_t lineSize;
diff --git a/src/dev/arm/kmi.hh b/src/dev/arm/kmi.hh
index 9b30b3c15..e5c58f7d7 100644
--- a/src/dev/arm/kmi.hh
+++ b/src/dev/arm/kmi.hh
@@ -157,8 +157,8 @@ class Pl050 : public AmbaIntDevice, public VncKeyboard, public VncMouse
     virtual void mouseAt(uint16_t x, uint16_t y, uint8_t buttons);
     virtual void keyPress(uint32_t key, bool down);
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 };
 
 #endif // __DEV_ARM_PL050_HH__
diff --git a/src/dev/arm/pl011.hh b/src/dev/arm/pl011.hh
index b0f7d576d..936dd81ed 100644
--- a/src/dev/arm/pl011.hh
+++ b/src/dev/arm/pl011.hh
@@ -60,15 +60,15 @@ class Pl011 : public Uart, public AmbaDevice
   public:
     Pl011(const Pl011Params *p);
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
   public: // PioDevice
-    Tick read(PacketPtr pkt) M5_ATTR_OVERRIDE;
-    Tick write(PacketPtr pkt) M5_ATTR_OVERRIDE;
+    Tick read(PacketPtr pkt) override;
+    Tick write(PacketPtr pkt) override;
 
   public: // Uart
-    void dataAvailable() M5_ATTR_OVERRIDE;
+    void dataAvailable() override;
 
 
   protected: // Interrupt handling
diff --git a/src/dev/arm/pl111.hh b/src/dev/arm/pl111.hh
index 08d9147a4..d22c0883e 100644
--- a/src/dev/arm/pl111.hh
+++ b/src/dev/arm/pl111.hh
@@ -371,8 +371,8 @@ class Pl111: public AmbaDmaDevice
     virtual Tick read(PacketPtr pkt);
     virtual Tick write(PacketPtr pkt);
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
     /**
      * Determine the address ranges that this device responds to.
diff --git a/src/dev/arm/rtc_pl031.hh b/src/dev/arm/rtc_pl031.hh
index 406857e70..8c8fa1538 100644
--- a/src/dev/arm/rtc_pl031.hh
+++ b/src/dev/arm/rtc_pl031.hh
@@ -125,8 +125,8 @@ class PL031 : public AmbaIntDevice
      */
     virtual Tick write(PacketPtr pkt);
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 };
 
 
diff --git a/src/dev/arm/rv_ctrl.hh b/src/dev/arm/rv_ctrl.hh
index 905fe14d9..1a55025a8 100644
--- a/src/dev/arm/rv_ctrl.hh
+++ b/src/dev/arm/rv_ctrl.hh
@@ -171,17 +171,17 @@ class RealViewCtrl : public BasicPioDevice
      * @param pkt The memory request.
      * @param data Where to put the data.
      */
-    Tick read(PacketPtr pkt) M5_ATTR_OVERRIDE;
+    Tick read(PacketPtr pkt) override;
 
     /**
      * All writes are simply ignored.
      * @param pkt The memory request.
      * @param data the data
      */
-    Tick write(PacketPtr pkt) M5_ATTR_OVERRIDE;
+    Tick write(PacketPtr pkt) override;
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
   public:
     void registerDevice(DeviceFunc func, uint8_t site, uint8_t pos,
@@ -206,14 +206,14 @@ class RealViewOsc
     RealViewOsc(RealViewOscParams *p);
     virtual ~RealViewOsc() {};
 
-    void startup() M5_ATTR_OVERRIDE;
+    void startup() override;
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
   public: // RealViewCtrl::Device interface
-    uint32_t read() const M5_ATTR_OVERRIDE;
-    void write(uint32_t freq) M5_ATTR_OVERRIDE;
+    uint32_t read() const override;
+    void write(uint32_t freq) override;
 
   protected:
     void clockPeriod(Tick clock_period);
diff --git a/src/dev/arm/timer_cpulocal.hh b/src/dev/arm/timer_cpulocal.hh
index 73a2d4493..56bb359d9 100644
--- a/src/dev/arm/timer_cpulocal.hh
+++ b/src/dev/arm/timer_cpulocal.hh
@@ -145,8 +145,8 @@ class CpuLocalTimer : public BasicPioDevice
         /** Handle write for a single timer */
         void write(PacketPtr pkt, Addr daddr);
 
-        void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-        void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+        void serialize(CheckpointOut &cp) const override;
+        void unserialize(CheckpointIn &cp) override;
 
         friend class CpuLocalTimer;
     };
@@ -186,8 +186,8 @@ class CpuLocalTimer : public BasicPioDevice
      */
     virtual Tick write(PacketPtr pkt);
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_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 c5b3bb633..73e27ca34 100644
--- a/src/dev/arm/timer_sp804.hh
+++ b/src/dev/arm/timer_sp804.hh
@@ -121,8 +121,8 @@ class Sp804 : public AmbaPioDevice
         /** Handle write for a single timer */
         void write(PacketPtr pkt, Addr daddr);
 
-        void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-        void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+        void serialize(CheckpointOut &cp) const override;
+        void unserialize(CheckpointIn &cp) override;
     };
 
     /** Pointer to the GIC for causing an interrupt */
@@ -160,8 +160,8 @@ class Sp804 : public AmbaPioDevice
     virtual Tick write(PacketPtr pkt);
 
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 };
 
 
diff --git a/src/dev/arm/ufs_device.hh b/src/dev/arm/ufs_device.hh
index 716b1bdcb..8789cf575 100644
--- a/src/dev/arm/ufs_device.hh
+++ b/src/dev/arm/ufs_device.hh
@@ -173,10 +173,10 @@ class UFSHostDevice : public DmaDevice
 
     UFSHostDevice(const UFSHostDeviceParams* p);
 
-    DrainState drain() M5_ATTR_OVERRIDE;
+    DrainState drain() override;
     void checkDrain();
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
   private:
     /**
diff --git a/src/dev/arm/vgic.hh b/src/dev/arm/vgic.hh
index d44afd7a9..b365f0cf3 100644
--- a/src/dev/arm/vgic.hh
+++ b/src/dev/arm/vgic.hh
@@ -192,8 +192,8 @@ class VGic : public PioDevice
         uint8_t VMBP;
         uint8_t VMPriMask;
 
-        void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-        void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+        void serialize(CheckpointOut &cp) const override;
+        void unserialize(CheckpointIn &cp) override;
     };
 
     struct std::array<vcpuIntData, VGIC_CPU_MAX>  vcpuData;
@@ -212,8 +212,8 @@ class VGic : public PioDevice
     virtual Tick read(PacketPtr pkt);
     virtual Tick write(PacketPtr pkt);
 
-    void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
-    void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+    void serialize(CheckpointOut &cp) const override;
+    void unserialize(CheckpointIn &cp) override;
 
   private:
     Tick readVCpu(PacketPtr pkt);