sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: Add missing explicit overrides for X86 devices

Browse source 
Make clang >= 3.5 happy when compiling build/X86/gem5.opt on OSX.
This commit is contained in:
Andreas Hansson 2015-10-23 09:51:12 -04:00
parent fa32ad4941
commit b48ed9b6c2
10 changed files with 46 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/arch/x86/interrupts.hh
View file

@ -212,15 +212,15 @@ class Interrupts : public BasicPioDevice, IntDevice
/* /*
* Initialize this object by registering it with the IO APIC. * Initialize this object by registering it with the IO APIC.
*/ */
void init(); void init() override;
/* /*
* Functions to interact with the interrupt port from IntDevice. * Functions to interact with the interrupt port from IntDevice.
*/ */
Tick read(PacketPtr pkt); Tick read(PacketPtr pkt) override;
Tick write(PacketPtr pkt); Tick write(PacketPtr pkt) override;
Tick recvMessage(PacketPtr pkt); Tick recvMessage(PacketPtr pkt) override;
Tick recvResponse(PacketPtr pkt); Tick recvResponse(PacketPtr pkt) override;
bool bool
triggerTimerInterrupt() triggerTimerInterrupt()
@ -231,10 +231,10 @@ class Interrupts : public BasicPioDevice, IntDevice
return entry.periodic; return entry.periodic;
} }
AddrRangeList getIntAddrRange() const; AddrRangeList getIntAddrRange() const override;
BaseMasterPort &getMasterPort(const std::string &if_name, BaseMasterPort &getMasterPort(const std::string &if_name,
PortID idx = InvalidPortID) PortID idx = InvalidPortID) override
{ {
if (if_name == "int_master") { if (if_name == "int_master") {
return intMasterPort; return intMasterPort;
@ -243,7 +243,7 @@ class Interrupts : public BasicPioDevice, IntDevice
} }
BaseSlavePort &getSlavePort(const std::string &if_name, BaseSlavePort &getSlavePort(const std::string &if_name,
PortID idx = InvalidPortID) PortID idx = InvalidPortID) override
{ {
if (if_name == "int_slave") { if (if_name == "int_slave") {
return intSlavePort; return intSlavePort;

8
src/arch/x86/tlb.hh
View file

@ -74,7 +74,7 @@ namespace X86ISA
typedef X86TLBParams Params; typedef X86TLBParams Params;
TLB(const Params *p); TLB(const Params *p);
void takeOverFrom(BaseTLB *otlb) {} void takeOverFrom(BaseTLB *otlb) override {}
TlbEntry *lookup(Addr va, bool update_lru = true); TlbEntry *lookup(Addr va, bool update_lru = true);
@ -89,11 +89,11 @@ namespace X86ISA
public: public:
Walker *getWalker(); Walker *getWalker();
void flushAll(); void flushAll() override;
void flushNonGlobal(); void flushNonGlobal();
void demapPage(Addr va, uint64_t asn); void demapPage(Addr va, uint64_t asn) override;
protected: protected:
uint32_t size; uint32_t size;
@ -161,7 +161,7 @@ namespace X86ISA
* *
* @return A pointer to the walker master port * @return A pointer to the walker master port
*/ */
virtual BaseMasterPort *getMasterPort(); BaseMasterPort *getMasterPort() override;
}; };
} }

6
src/dev/x86/cmos.hh
View file

@ -78,11 +78,11 @@ class Cmos : public BasicPioDevice
address = 0; 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 serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override; void unserialize(CheckpointIn &cp) override;

10
src/dev/x86/i8042.hh
View file

@ -118,7 +118,7 @@ class PS2Mouse : public PS2Device
PS2Mouse() : PS2Device(), status(0), resolution(4), sampleRate(100) 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 serialize(const std::string &base, CheckpointOut &cp) const override;
void unserialize(const std::string &base, CheckpointIn &cp) override; void unserialize(const std::string &base, CheckpointIn &cp) override;
@ -151,7 +151,7 @@ class PS2Keyboard : public PS2Device
}; };
public: public:
bool processData(uint8_t data); bool processData(uint8_t data) override;
}; };
class I8042 : public BasicPioDevice class I8042 : public BasicPioDevice
@ -241,11 +241,11 @@ class I8042 : public BasicPioDevice
I8042(Params *p); 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 serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override; void unserialize(CheckpointIn &cp) override;

16
src/dev/x86/i82094aa.hh
View file

@ -92,24 +92,24 @@ class I82094AA : public BasicPioDevice, public IntDevice
I82094AA(Params *p); I82094AA(Params *p);
void init(); void init() override;
Tick read(PacketPtr pkt); Tick read(PacketPtr pkt) override;
Tick write(PacketPtr pkt); Tick write(PacketPtr pkt) override;
AddrRangeList getIntAddrRange() const; AddrRangeList getIntAddrRange() const override;
void writeReg(uint8_t offset, uint32_t value); void writeReg(uint8_t offset, uint32_t value);
uint32_t readReg(uint8_t offset); uint32_t readReg(uint8_t offset);
BaseMasterPort &getMasterPort(const std::string &if_name, BaseMasterPort &getMasterPort(const std::string &if_name,
PortID idx = InvalidPortID); PortID idx = InvalidPortID) override;
Tick recvResponse(PacketPtr pkt) override; Tick recvResponse(PacketPtr pkt) override;
void signalInterrupt(int line); void signalInterrupt(int line) override;
void raiseInterruptPin(int number); void raiseInterruptPin(int number) override;
void lowerInterruptPin(int number); void lowerInterruptPin(int number) override;
void serialize(CheckpointOut &cp) const override; void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override; void unserialize(CheckpointIn &cp) override;

4
src/dev/x86/i8237.hh
View file

@ -55,9 +55,9 @@ class I8237 : public BasicPioDevice
I8237(Params *p) : BasicPioDevice(p, 16), latency(p->pio_latency), maskReg(0) 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 serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override; void unserialize(CheckpointIn &cp) override;

6
src/dev/x86/i8254.hh
View file

@ -81,9 +81,9 @@ class I8254 : public BasicPioDevice
pit(p->name, this), intPin(p->int_pin) 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 bool
outputHigh(unsigned int num) outputHigh(unsigned int num)
@ -112,7 +112,7 @@ class I8254 : public BasicPioDevice
void serialize(CheckpointOut &cp) const override; void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override; void unserialize(CheckpointIn &cp) override;
virtual void startup(); void startup() override;
}; };

10
src/dev/x86/i8259.hh
View file

@ -89,8 +89,8 @@ class I8259 : public BasicPioDevice, public IntDevice
I8259(Params * p); I8259(Params * p);
Tick read(PacketPtr pkt); Tick read(PacketPtr pkt) override;
Tick write(PacketPtr pkt); Tick write(PacketPtr pkt) override;
void void
maskAll() maskAll()
@ -104,9 +104,9 @@ class I8259 : public BasicPioDevice, public IntDevice
IMR = 0x00; IMR = 0x00;
} }
void signalInterrupt(int line); void signalInterrupt(int line) override;
void raiseInterruptPin(int number); void raiseInterruptPin(int number) override;
void lowerInterruptPin(int number); void lowerInterruptPin(int number) override;
int getVector(); int getVector();
void serialize(CheckpointOut &cp) const override; void serialize(CheckpointOut &cp) const override;

4
src/dev/x86/speaker.hh
View file

@ -69,9 +69,9 @@ class Speaker : public BasicPioDevice
{ {
} }
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 serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override; void unserialize(CheckpointIn &cp) override;

12
src/mem/multi_level_page_table.hh
View file

@ -145,14 +145,14 @@ public:
System *_sys); System *_sys);
~MultiLevelPageTable(); ~MultiLevelPageTable();
void initState(ThreadContext* tc); void initState(ThreadContext* tc) override;
void map(Addr vaddr, Addr paddr, int64_t size, void map(Addr vaddr, Addr paddr, int64_t size,
uint64_t flags = 0); uint64_t flags = 0) override;
void remap(Addr vaddr, int64_t size, Addr new_vaddr); void remap(Addr vaddr, int64_t size, Addr new_vaddr) override;
void unmap(Addr vaddr, int64_t size); void unmap(Addr vaddr, int64_t size) override;
bool isUnmapped(Addr vaddr, int64_t size); bool isUnmapped(Addr vaddr, int64_t size) override;
bool lookup(Addr vaddr, TheISA::TlbEntry &entry); bool lookup(Addr vaddr, TheISA::TlbEntry &entry) override;
void serialize(CheckpointOut &cp) const override; void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override; void unserialize(CheckpointIn &cp) override;
}; };