From 22c04190c607b9360d9a23548f8a54e83cf0e74a Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Mon, 12 Oct 2015 04:07:59 -0400 Subject: 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. --- src/dev/x86/cmos.hh | 4 ++-- src/dev/x86/i8042.hh | 10 ++++------ src/dev/x86/i82094aa.hh | 6 +++--- src/dev/x86/i8237.hh | 4 ++-- src/dev/x86/i8254.hh | 4 ++-- src/dev/x86/i8259.hh | 4 ++-- src/dev/x86/speaker.hh | 4 ++-- 7 files changed, 17 insertions(+), 19 deletions(-) (limited to 'src/dev/x86') diff --git a/src/dev/x86/cmos.hh b/src/dev/x86/cmos.hh index f0234da54..63a6d6a68 100644 --- a/src/dev/x86/cmos.hh +++ b/src/dev/x86/cmos.hh @@ -84,8 +84,8 @@ class Cmos : public BasicPioDevice virtual void startup(); - 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; }; } // namespace X86ISA diff --git a/src/dev/x86/i8042.hh b/src/dev/x86/i8042.hh index fd32b4c53..bddbe9b27 100644 --- a/src/dev/x86/i8042.hh +++ b/src/dev/x86/i8042.hh @@ -120,10 +120,8 @@ class PS2Mouse : public PS2Device bool processData(uint8_t data); - void serialize(const std::string &base, - CheckpointOut &cp) const M5_ATTR_OVERRIDE; - void unserialize(const std::string &base, - CheckpointIn &cp) M5_ATTR_OVERRIDE; + void serialize(const std::string &base, CheckpointOut &cp) const override; + void unserialize(const std::string &base, CheckpointIn &cp) override; }; class PS2Keyboard : public PS2Device @@ -249,8 +247,8 @@ class I8042 : public BasicPioDevice 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; }; } // namespace X86ISA diff --git a/src/dev/x86/i82094aa.hh b/src/dev/x86/i82094aa.hh index d047a49da..36986d2c4 100644 --- a/src/dev/x86/i82094aa.hh +++ b/src/dev/x86/i82094aa.hh @@ -105,14 +105,14 @@ class I82094AA : public BasicPioDevice, public IntDevice BaseMasterPort &getMasterPort(const std::string &if_name, PortID idx = InvalidPortID); - Tick recvResponse(PacketPtr pkt) M5_ATTR_OVERRIDE; + Tick recvResponse(PacketPtr pkt) override; void signalInterrupt(int line); void raiseInterruptPin(int number); void lowerInterruptPin(int number); - 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; }; } // namespace X86ISA diff --git a/src/dev/x86/i8237.hh b/src/dev/x86/i8237.hh index 481983b8e..49c1fd924 100644 --- a/src/dev/x86/i8237.hh +++ b/src/dev/x86/i8237.hh @@ -59,8 +59,8 @@ class I8237 : public BasicPioDevice 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; }; } // namespace X86ISA diff --git a/src/dev/x86/i8254.hh b/src/dev/x86/i8254.hh index c4f04bd42..86d4f0323 100644 --- a/src/dev/x86/i8254.hh +++ b/src/dev/x86/i8254.hh @@ -109,8 +109,8 @@ class I8254 : public BasicPioDevice pit.writeControl(val); } - 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; virtual void startup(); diff --git a/src/dev/x86/i8259.hh b/src/dev/x86/i8259.hh index 567ad7a32..0b2cee01c 100644 --- a/src/dev/x86/i8259.hh +++ b/src/dev/x86/i8259.hh @@ -109,8 +109,8 @@ class I8259 : public BasicPioDevice, public IntDevice void lowerInterruptPin(int number); int getVector(); - 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; }; } // namespace X86ISA diff --git a/src/dev/x86/speaker.hh b/src/dev/x86/speaker.hh index 3c879060f..9f1656370 100644 --- a/src/dev/x86/speaker.hh +++ b/src/dev/x86/speaker.hh @@ -73,8 +73,8 @@ class Speaker : public BasicPioDevice 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; }; } // namespace X86ISA -- cgit v1.2.3