diff options
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/x86/interrupts.hh | 16 | ||||
| -rw-r--r-- | src/arch/x86/tlb.hh | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/arch/x86/interrupts.hh b/src/arch/x86/interrupts.hh index b1bdbf10f..26699b01e 100644 --- a/src/arch/x86/interrupts.hh +++ b/src/arch/x86/interrupts.hh @@ -212,15 +212,15 @@ class Interrupts : public BasicPioDevice, IntDevice /* * Initialize this object by registering it with the IO APIC. */ - void init(); + void init() override; /* * Functions to interact with the interrupt port from IntDevice. */ - Tick read(PacketPtr pkt); - Tick write(PacketPtr pkt); - Tick recvMessage(PacketPtr pkt); - Tick recvResponse(PacketPtr pkt); + Tick read(PacketPtr pkt) override; + Tick write(PacketPtr pkt) override; + Tick recvMessage(PacketPtr pkt) override; + Tick recvResponse(PacketPtr pkt) override; bool triggerTimerInterrupt() @@ -231,10 +231,10 @@ class Interrupts : public BasicPioDevice, IntDevice return entry.periodic; } - AddrRangeList getIntAddrRange() const; + AddrRangeList getIntAddrRange() const override; BaseMasterPort &getMasterPort(const std::string &if_name, - PortID idx = InvalidPortID) + PortID idx = InvalidPortID) override { if (if_name == "int_master") { return intMasterPort; @@ -243,7 +243,7 @@ class Interrupts : public BasicPioDevice, IntDevice } BaseSlavePort &getSlavePort(const std::string &if_name, - PortID idx = InvalidPortID) + PortID idx = InvalidPortID) override { if (if_name == "int_slave") { return intSlavePort; diff --git a/src/arch/x86/tlb.hh b/src/arch/x86/tlb.hh index 6e3eb2eee..53f61dcbc 100644 --- a/src/arch/x86/tlb.hh +++ b/src/arch/x86/tlb.hh @@ -74,7 +74,7 @@ namespace X86ISA typedef X86TLBParams Params; TLB(const Params *p); - void takeOverFrom(BaseTLB *otlb) {} + void takeOverFrom(BaseTLB *otlb) override {} TlbEntry *lookup(Addr va, bool update_lru = true); @@ -89,11 +89,11 @@ namespace X86ISA public: Walker *getWalker(); - void flushAll(); + void flushAll() override; void flushNonGlobal(); - void demapPage(Addr va, uint64_t asn); + void demapPage(Addr va, uint64_t asn) override; protected: uint32_t size; @@ -161,7 +161,7 @@ namespace X86ISA * * @return A pointer to the walker master port */ - virtual BaseMasterPort *getMasterPort(); + BaseMasterPort *getMasterPort() override; }; } |