summaryrefslogtreecommitdiff
path: root/src/dev
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2016-02-23 03:27:20 -0500
committerAndreas Hansson <andreas.hansson@arm.com>2016-02-23 03:27:20 -0500
commit4619f0ee8bf2cd3f05f727b56c1e449b4bfecce1 (patch)
tree8a3a8f1938cce3fab1b897ba7fb32d45e481f2e1 /src/dev
parent5a88f0931fa1e222ed3ac3aff4046721c593ee3e (diff)
downloadgem5-4619f0ee8bf2cd3f05f727b56c1e449b4bfecce1.tar.xz
scons: Add missing override to appease clang
Make clang happy...again.
Diffstat (limited to 'src/dev')
-rwxr-xr-xsrc/dev/mips/malta.hh8
-rwxr-xr-xsrc/dev/mips/malta_cchip.hh4
-rwxr-xr-xsrc/dev/mips/malta_io.hh6
-rw-r--r--src/dev/sparc/dtod.hh4
-rw-r--r--src/dev/sparc/iob.hh6
-rw-r--r--src/dev/sparc/mm_disk.hh4
6 files changed, 16 insertions, 16 deletions
diff --git a/src/dev/mips/malta.hh b/src/dev/mips/malta.hh
index 205abce27..de2e8617c 100755
--- a/src/dev/mips/malta.hh
+++ b/src/dev/mips/malta.hh
@@ -87,22 +87,22 @@ class Malta : public Platform
/**
* Cause the cpu to post a serial interrupt to the CPU.
*/
- virtual void postConsoleInt();
+ void postConsoleInt() override;
/**
* Clear a posted CPU interrupt (id=55)
*/
- virtual void clearConsoleInt();
+ void clearConsoleInt() override;
/**
* Cause the chipset to post a cpi interrupt to the CPU.
*/
- virtual void postPciInt(int line);
+ void postPciInt(int line) override;
/**
* Clear a posted PCI->CPU interrupt
*/
- virtual void clearPciInt(int line);
+ void clearPciInt(int line) override;
virtual Addr pciToDma(Addr pciAddr) const;
diff --git a/src/dev/mips/malta_cchip.hh b/src/dev/mips/malta_cchip.hh
index 5f8baad81..150641878 100755
--- a/src/dev/mips/malta_cchip.hh
+++ b/src/dev/mips/malta_cchip.hh
@@ -94,9 +94,9 @@ class MaltaCChip : public BasicPioDevice
*/
MaltaCChip(Params *p);
- virtual Tick read(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
- virtual Tick write(PacketPtr pkt);
+ Tick write(PacketPtr pkt) override;
/**
* post an RTC interrupt to the CPU
diff --git a/src/dev/mips/malta_io.hh b/src/dev/mips/malta_io.hh
index f6fdfa53b..8b224a942 100755
--- a/src/dev/mips/malta_io.hh
+++ b/src/dev/mips/malta_io.hh
@@ -120,8 +120,8 @@ class MaltaIO : public BasicPioDevice
*/
MaltaIO(const Params *p);
- virtual Tick read(PacketPtr pkt);
- virtual Tick write(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
+ Tick write(PacketPtr pkt) override;
/** Post an Interrupt to the CPU */
@@ -136,7 +136,7 @@ class MaltaIO : public BasicPioDevice
/**
* Start running.
*/
- virtual void startup();
+ void startup() override;
};
diff --git a/src/dev/sparc/dtod.hh b/src/dev/sparc/dtod.hh
index 98208a992..1fcc70a3b 100644
--- a/src/dev/sparc/dtod.hh
+++ b/src/dev/sparc/dtod.hh
@@ -60,8 +60,8 @@ class DumbTOD : public BasicPioDevice
return dynamic_cast<const Params *>(_params);
}
- 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;
diff --git a/src/dev/sparc/iob.hh b/src/dev/sparc/iob.hh
index 1de625eba..d62c8e671 100644
--- a/src/dev/sparc/iob.hh
+++ b/src/dev/sparc/iob.hh
@@ -132,14 +132,14 @@ class Iob : public PioDevice
return dynamic_cast<const Params *>(_params);
}
- virtual Tick read(PacketPtr pkt);
- virtual Tick write(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
+ Tick write(PacketPtr pkt) override;
void generateIpi(Type type, int cpu_id, int vector);
void receiveDeviceInterrupt(DeviceId devid);
bool receiveJBusInterrupt(int cpu_id, int source, uint64_t d0,
uint64_t d1);
- AddrRangeList getAddrRanges() const;
+ AddrRangeList getAddrRanges() const override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
diff --git a/src/dev/sparc/mm_disk.hh b/src/dev/sparc/mm_disk.hh
index 2d551fe3f..8572d5329 100644
--- a/src/dev/sparc/mm_disk.hh
+++ b/src/dev/sparc/mm_disk.hh
@@ -58,8 +58,8 @@ class MmDisk : public BasicPioDevice
return dynamic_cast<const Params *>(_params);
}
- 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;
};