derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,11 +78,11 @@ class Cmos : public BasicPioDevice
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;

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

@@ -118,7 +118,7 @@ class PS2Mouse : public PS2Device
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 @@ class PS2Keyboard : public PS2Device
};
public:
bool processData(uint8_t data);
bool processData(uint8_t data) override;
};
class I8042 : public BasicPioDevice
@@ -241,11 +241,11 @@ class I8042 : public BasicPioDevice
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;

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

@@ -92,24 +92,24 @@ class I82094AA : public BasicPioDevice, public IntDevice
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;

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)
{
}
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;

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

@@ -81,9 +81,9 @@ class I8254 : public BasicPioDevice
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 @@ class I8254 : public BasicPioDevice
void serialize(CheckpointOut &cp) const 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);
Tick read(PacketPtr pkt);
Tick write(PacketPtr pkt);
Tick read(PacketPtr pkt) override;
Tick write(PacketPtr pkt) override;
void
maskAll()
@@ -104,9 +104,9 @@ class I8259 : public BasicPioDevice, public IntDevice
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;

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 unserialize(CheckpointIn &cp) override;