changeset 2324ed5fa9f4 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=2324ed5fa9f4
description:
x86: Add missing explicit overrides for X86 devices
Make clang >= 3.5 happy when compiling build/X86/gem5.opt on OSX.
diffstat:
src/arch/x86/interrupts.hh | 16 ++++++++--------
src/arch/x86/tlb.hh | 8 ++++----
src/dev/x86/cmos.hh | 6 +++---
src/dev/x86/i8042.hh | 10 +++++-----
src/dev/x86/i82094aa.hh | 16 ++++++++--------
src/dev/x86/i8237.hh | 4 ++--
src/dev/x86/i8254.hh | 6 +++---
src/dev/x86/i8259.hh | 10 +++++-----
src/dev/x86/speaker.hh | 4 ++--
src/mem/multi_level_page_table.hh | 12 ++++++------
10 files changed, 46 insertions(+), 46 deletions(-)
diffs (276 lines):
diff -r 5a9019db4a08 -r 2324ed5fa9f4 src/arch/x86/interrupts.hh
--- a/src/arch/x86/interrupts.hh Fri Oct 23 09:51:11 2015 -0400
+++ b/src/arch/x86/interrupts.hh Fri Oct 23 09:51:12 2015 -0400
@@ -212,15 +212,15 @@
/*
* 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 @@
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 @@
}
BaseSlavePort &getSlavePort(const std::string &if_name,
- PortID idx = InvalidPortID)
+ PortID idx = InvalidPortID) override
{
if (if_name == "int_slave") {
return intSlavePort;
diff -r 5a9019db4a08 -r 2324ed5fa9f4 src/arch/x86/tlb.hh
--- a/src/arch/x86/tlb.hh Fri Oct 23 09:51:11 2015 -0400
+++ b/src/arch/x86/tlb.hh Fri Oct 23 09:51:12 2015 -0400
@@ -74,7 +74,7 @@
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 @@
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 @@
*
* @return A pointer to the walker master port
*/
- virtual BaseMasterPort *getMasterPort();
+ BaseMasterPort *getMasterPort() override;
};
}
diff -r 5a9019db4a08 -r 2324ed5fa9f4 src/dev/x86/cmos.hh
--- a/src/dev/x86/cmos.hh Fri Oct 23 09:51:11 2015 -0400
+++ b/src/dev/x86/cmos.hh Fri Oct 23 09:51:12 2015 -0400
@@ -78,11 +78,11 @@
address = 0;
}
- Tick read(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
- Tick write(PacketPtr pkt);
+ Tick write(PacketPtr pkt) override;
- virtual void startup();
+ void startup() override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
diff -r 5a9019db4a08 -r 2324ed5fa9f4 src/dev/x86/i8042.hh
--- a/src/dev/x86/i8042.hh Fri Oct 23 09:51:11 2015 -0400
+++ b/src/dev/x86/i8042.hh Fri Oct 23 09:51:12 2015 -0400
@@ -118,7 +118,7 @@
PS2Mouse() : PS2Device(), status(0), resolution(4), sampleRate(100)
{}
- bool processData(uint8_t data);
+ bool processData(uint8_t data) override;
void serialize(const std::string &base, CheckpointOut &cp) const override;
void unserialize(const std::string &base, CheckpointIn &cp) override;
@@ -151,7 +151,7 @@
};
public:
- bool processData(uint8_t data);
+ bool processData(uint8_t data) override;
};
class I8042 : public BasicPioDevice
@@ -241,11 +241,11 @@
I8042(Params *p);
- AddrRangeList getAddrRanges() const;
+ AddrRangeList getAddrRanges() const override;
- Tick read(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
- Tick write(PacketPtr pkt);
+ Tick write(PacketPtr pkt) override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
diff -r 5a9019db4a08 -r 2324ed5fa9f4 src/dev/x86/i82094aa.hh
--- a/src/dev/x86/i82094aa.hh Fri Oct 23 09:51:11 2015 -0400
+++ b/src/dev/x86/i82094aa.hh Fri Oct 23 09:51:12 2015 -0400
@@ -92,24 +92,24 @@
I82094AA(Params *p);
- void init();
+ void init() override;
- Tick read(PacketPtr pkt);
- Tick write(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
+ Tick write(PacketPtr pkt) override;
- AddrRangeList getIntAddrRange() const;
+ AddrRangeList getIntAddrRange() const override;
void writeReg(uint8_t offset, uint32_t value);
uint32_t readReg(uint8_t offset);
BaseMasterPort &getMasterPort(const std::string &if_name,
- PortID idx = InvalidPortID);
+ PortID idx = InvalidPortID) override;
Tick recvResponse(PacketPtr pkt) override;
- void signalInterrupt(int line);
- void raiseInterruptPin(int number);
- void lowerInterruptPin(int number);
+ void signalInterrupt(int line) override;
+ void raiseInterruptPin(int number) override;
+ void lowerInterruptPin(int number) override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
diff -r 5a9019db4a08 -r 2324ed5fa9f4 src/dev/x86/i8237.hh
--- a/src/dev/x86/i8237.hh Fri Oct 23 09:51:11 2015 -0400
+++ b/src/dev/x86/i8237.hh Fri Oct 23 09:51:12 2015 -0400
@@ -55,9 +55,9 @@
I8237(Params *p) : BasicPioDevice(p, 16), latency(p->pio_latency),
maskReg(0)
{
}
- Tick read(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
- Tick write(PacketPtr pkt);
+ Tick write(PacketPtr pkt) override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
diff -r 5a9019db4a08 -r 2324ed5fa9f4 src/dev/x86/i8254.hh
--- a/src/dev/x86/i8254.hh Fri Oct 23 09:51:11 2015 -0400
+++ b/src/dev/x86/i8254.hh Fri Oct 23 09:51:12 2015 -0400
@@ -81,9 +81,9 @@
pit(p->name, this), intPin(p->int_pin)
{
}
- Tick read(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
- Tick write(PacketPtr pkt);
+ Tick write(PacketPtr pkt) override;
bool
outputHigh(unsigned int num)
@@ -112,7 +112,7 @@
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
- virtual void startup();
+ void startup() override;
};
diff -r 5a9019db4a08 -r 2324ed5fa9f4 src/dev/x86/i8259.hh
--- a/src/dev/x86/i8259.hh Fri Oct 23 09:51:11 2015 -0400
+++ b/src/dev/x86/i8259.hh Fri Oct 23 09:51:12 2015 -0400
@@ -89,8 +89,8 @@
I8259(Params * p);
- Tick read(PacketPtr pkt);
- Tick write(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
+ Tick write(PacketPtr pkt) override;
void
maskAll()
@@ -104,9 +104,9 @@
IMR = 0x00;
}
- void signalInterrupt(int line);
- void raiseInterruptPin(int number);
- void lowerInterruptPin(int number);
+ void signalInterrupt(int line) override;
+ void raiseInterruptPin(int number) override;
+ void lowerInterruptPin(int number) override;
int getVector();
void serialize(CheckpointOut &cp) const override;
diff -r 5a9019db4a08 -r 2324ed5fa9f4 src/dev/x86/speaker.hh
--- a/src/dev/x86/speaker.hh Fri Oct 23 09:51:11 2015 -0400
+++ b/src/dev/x86/speaker.hh Fri Oct 23 09:51:12 2015 -0400
@@ -69,9 +69,9 @@
{
}
- Tick read(PacketPtr pkt);
+ Tick read(PacketPtr pkt) override;
- Tick write(PacketPtr pkt);
+ Tick write(PacketPtr pkt) override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
diff -r 5a9019db4a08 -r 2324ed5fa9f4 src/mem/multi_level_page_table.hh
--- a/src/mem/multi_level_page_table.hh Fri Oct 23 09:51:11 2015 -0400
+++ b/src/mem/multi_level_page_table.hh Fri Oct 23 09:51:12 2015 -0400
@@ -145,14 +145,14 @@
System *_sys);
~MultiLevelPageTable();
- void initState(ThreadContext* tc);
+ void initState(ThreadContext* tc) override;
void map(Addr vaddr, Addr paddr, int64_t size,
- uint64_t flags = 0);
- void remap(Addr vaddr, int64_t size, Addr new_vaddr);
- void unmap(Addr vaddr, int64_t size);
- bool isUnmapped(Addr vaddr, int64_t size);
- bool lookup(Addr vaddr, TheISA::TlbEntry &entry);
+ uint64_t flags = 0) override;
+ void remap(Addr vaddr, int64_t size, Addr new_vaddr) override;
+ void unmap(Addr vaddr, int64_t size) override;
+ bool isUnmapped(Addr vaddr, int64_t size) override;
+ bool lookup(Addr vaddr, TheISA::TlbEntry &entry) override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
};
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
