From 1212e8d4f0e537237f2e148c43120ce813d94a5e Mon Sep 17 00:00:00 2001 From: Adrian Conlon Date: Sat, 25 Aug 2018 13:35:53 +0100 Subject: [PATCH] Tidy some processor virtual specifications. Signed-off-by: Adrian Conlon --- Intel8080/test/Board.h | 2 +- LR35902/fusetest_LR35902/FuseTestRunner.h | 2 +- LR35902/inc/GameBoyBus.h | 2 +- LR35902/inc/LR35902.h | 4 ++-- M6502/inc/mos6502.h | 2 +- M6502/test/Board.h | 2 +- Z80/fusetest_Z80/FuseTestRunner.h | 2 +- inc/BigEndianProcessor.h | 4 ++-- inc/LittleEndianProcessor.h | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Intel8080/test/Board.h b/Intel8080/test/Board.h index bbdbd08..381e50a 100644 --- a/Intel8080/test/Board.h +++ b/Intel8080/test/Board.h @@ -20,7 +20,7 @@ public: void initialise(); protected: - virtual uint8_t& reference(uint16_t address) { + virtual uint8_t& reference(uint16_t address) final { return m_ram.reference(address); } diff --git a/LR35902/fusetest_LR35902/FuseTestRunner.h b/LR35902/fusetest_LR35902/FuseTestRunner.h index f275f97..ccda3b4 100644 --- a/LR35902/fusetest_LR35902/FuseTestRunner.h +++ b/LR35902/fusetest_LR35902/FuseTestRunner.h @@ -37,7 +37,7 @@ namespace Fuse { EightBit::register16_t actual, EightBit::register16_t expected) const; protected: - virtual uint8_t& reference(uint16_t address) { + virtual uint8_t& reference(uint16_t address) final { return m_ram.reference(address); } diff --git a/LR35902/inc/GameBoyBus.h b/LR35902/inc/GameBoyBus.h index 3025717..3e2be9a 100644 --- a/LR35902/inc/GameBoyBus.h +++ b/LR35902/inc/GameBoyBus.h @@ -54,7 +54,7 @@ namespace EightBit { int runVerticalBlankLines(); protected: - virtual uint8_t& reference(uint16_t address); + virtual uint8_t& reference(uint16_t address) override; private: LR35902 m_cpu; diff --git a/LR35902/inc/LR35902.h b/LR35902/inc/LR35902.h index 3cae322..3f81d18 100644 --- a/LR35902/inc/LR35902.h +++ b/LR35902/inc/LR35902.h @@ -43,8 +43,8 @@ namespace EightBit { virtual int execute(uint8_t opcode) final; virtual int step() final; - virtual void handleRESET() override; - virtual void handleINT() override; + virtual void handleRESET() final; + virtual void handleINT() final; private: Bus& m_bus; diff --git a/M6502/inc/mos6502.h b/M6502/inc/mos6502.h index dd3c710..4139800 100644 --- a/M6502/inc/mos6502.h +++ b/M6502/inc/mos6502.h @@ -31,7 +31,7 @@ namespace EightBit { virtual int execute(uint8_t opcode) final; virtual int step() final; - virtual void powerOn() override; + virtual void powerOn() final; uint8_t& X() { return x; } uint8_t& Y() { return y; } diff --git a/M6502/test/Board.h b/M6502/test/Board.h index 679e8b1..6b49932 100644 --- a/M6502/test/Board.h +++ b/M6502/test/Board.h @@ -20,7 +20,7 @@ public: void initialise(); protected: - virtual uint8_t& reference(uint16_t address) { + virtual uint8_t& reference(uint16_t address) final { return m_ram.reference(address); } diff --git a/Z80/fusetest_Z80/FuseTestRunner.h b/Z80/fusetest_Z80/FuseTestRunner.h index 245a46c..1d1fe85 100644 --- a/Z80/fusetest_Z80/FuseTestRunner.h +++ b/Z80/fusetest_Z80/FuseTestRunner.h @@ -36,7 +36,7 @@ namespace Fuse { EightBit::register16_t actual, EightBit::register16_t expected) const; protected: - virtual uint8_t& reference(uint16_t address) { + virtual uint8_t& reference(uint16_t address) final { return m_ram.reference(address); } diff --git a/inc/BigEndianProcessor.h b/inc/BigEndianProcessor.h index 04ce54f..3deb641 100644 --- a/inc/BigEndianProcessor.h +++ b/inc/BigEndianProcessor.h @@ -10,14 +10,14 @@ namespace EightBit { BigEndianProcessor(Bus& memory) : Processor(memory) {} virtual ~BigEndianProcessor() = default; - virtual register16_t getWord() { + virtual register16_t getWord() override { const auto high = BUS().read(); ++BUS().ADDRESS(); const auto low = BUS().read(); return register16_t(low, high); } - virtual void setWord(const register16_t value) { + virtual void setWord(const register16_t value) override { BUS().write(value.high); ++BUS().ADDRESS(); BUS().write(value.low); diff --git a/inc/LittleEndianProcessor.h b/inc/LittleEndianProcessor.h index 87d224e..f56cf3c 100644 --- a/inc/LittleEndianProcessor.h +++ b/inc/LittleEndianProcessor.h @@ -10,14 +10,14 @@ namespace EightBit { LittleEndianProcessor(Bus& memory) : Processor(memory) {} virtual ~LittleEndianProcessor() = default; - virtual register16_t getWord() { + virtual register16_t getWord() override { const auto low = BUS().read(); ++BUS().ADDRESS(); const auto high = BUS().read(); return register16_t(low, high); } - virtual void setWord(const register16_t value) { + virtual void setWord(const register16_t value) override { BUS().write(value.low); ++BUS().ADDRESS(); BUS().write(value.high);