diff options
Diffstat (limited to 'src/dev/alpha')
-rw-r--r-- | src/dev/alpha/backdoor.hh | 6 | ||||
-rw-r--r-- | src/dev/alpha/tsunami.hh | 18 | ||||
-rw-r--r-- | src/dev/alpha/tsunami_cchip.hh | 4 | ||||
-rw-r--r-- | src/dev/alpha/tsunami_io.hh | 6 | ||||
-rw-r--r-- | src/dev/alpha/tsunami_pchip.hh | 4 |
5 files changed, 19 insertions, 19 deletions
diff --git a/src/dev/alpha/backdoor.hh b/src/dev/alpha/backdoor.hh index 59d800863..7dd369aaf 100644 --- a/src/dev/alpha/backdoor.hh +++ b/src/dev/alpha/backdoor.hh @@ -107,13 +107,13 @@ class AlphaBackdoor : public BasicPioDevice return dynamic_cast<const Params *>(_params); } - virtual void startup(); + void startup() override; /** * memory mapped reads and writes */ - virtual Tick read(PacketPtr pkt); - virtual Tick write(PacketPtr pkt); + Tick read(PacketPtr pkt) override; + Tick write(PacketPtr pkt) override; /** * standard serialization routines for checkpointing diff --git a/src/dev/alpha/tsunami.hh b/src/dev/alpha/tsunami.hh index 9972ecc95..c43f0e023 100644 --- a/src/dev/alpha/tsunami.hh +++ b/src/dev/alpha/tsunami.hh @@ -80,7 +80,7 @@ class Tsunami : public Platform int intr_sum_type[Tsunami::Max_CPUs]; int ipi_pending[Tsunami::Max_CPUs]; - void init(); + void init() override; public: typedef TsunamiParams Params; @@ -89,40 +89,40 @@ class Tsunami : 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; + Addr pciToDma(Addr pciAddr) const override; /** * Calculate the configuration address given a bus/dev/func. */ - virtual Addr calcPciConfigAddr(int bus, int dev, int func); + Addr calcPciConfigAddr(int bus, int dev, int func) override; /** * Calculate the address for an IO location on the PCI bus. */ - virtual Addr calcPciIOAddr(Addr addr); + Addr calcPciIOAddr(Addr addr) override; /** * Calculate the address for a memory location on the PCI bus. */ - virtual Addr calcPciMemAddr(Addr addr); + Addr calcPciMemAddr(Addr addr) override; void serialize(CheckpointOut &cp) const override; void unserialize(CheckpointIn &cp) override; diff --git a/src/dev/alpha/tsunami_cchip.hh b/src/dev/alpha/tsunami_cchip.hh index 45834f9ea..b6ddd49bd 100644 --- a/src/dev/alpha/tsunami_cchip.hh +++ b/src/dev/alpha/tsunami_cchip.hh @@ -92,9 +92,9 @@ class TsunamiCChip : public BasicPioDevice return dynamic_cast<const Params *>(_params); } - 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/alpha/tsunami_io.hh b/src/dev/alpha/tsunami_io.hh index e1b05abe8..d7fac22e4 100644 --- a/src/dev/alpha/tsunami_io.hh +++ b/src/dev/alpha/tsunami_io.hh @@ -123,8 +123,8 @@ class TsunamiIO : 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; /** * Post an PIC interrupt to the CPU via the CChip @@ -144,7 +144,7 @@ class TsunamiIO : public BasicPioDevice /** * Start running. */ - virtual void startup(); + void startup() override; }; diff --git a/src/dev/alpha/tsunami_pchip.hh b/src/dev/alpha/tsunami_pchip.hh index e37292d57..68bd20e9a 100644 --- a/src/dev/alpha/tsunami_pchip.hh +++ b/src/dev/alpha/tsunami_pchip.hh @@ -86,8 +86,8 @@ class TsunamiPChip : public BasicPioDevice Addr calcIOAddr(Addr addr); Addr calcMemAddr(Addr addr); - 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; |