diff --git a/LR35902/fusetest_LR35902/fusetest_LR35902.vcxproj b/LR35902/fusetest_LR35902/fusetest_LR35902.vcxproj index 18c4541..2bd229f 100644 --- a/LR35902/fusetest_LR35902/fusetest_LR35902.vcxproj +++ b/LR35902/fusetest_LR35902/fusetest_LR35902.vcxproj @@ -71,19 +71,19 @@ false - ..\inc;..\..\inc;C:\Libraries\boost_1_63_0;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) true - ..\inc;..\..\inc;C:\Libraries\boost_1_63_0;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) true - ..\inc;..\..\inc;C:\Libraries\boost_1_63_0;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) false - ..\inc;..\..\inc;C:\Libraries\boost_1_63_0;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) diff --git a/M6502/inc/mos6502.h b/M6502/inc/mos6502.h index b9885a1..12e7964 100644 --- a/M6502/inc/mos6502.h +++ b/M6502/inc/mos6502.h @@ -74,8 +74,8 @@ namespace EightBit { void getWord(uint16_t offset, register16_t& output); void getWord(const register16_t& offset, register16_t& output); - virtual void push(uint8_t value) override; - virtual uint8_t pop() override; + virtual void push(uint8_t value) final; + virtual uint8_t pop() final; void interrupt(uint16_t vector); diff --git a/M6502/src/M6502.vcxproj b/M6502/src/M6502.vcxproj index 3c03ba7..3d44f35 100644 --- a/M6502/src/M6502.vcxproj +++ b/M6502/src/M6502.vcxproj @@ -28,26 +28,26 @@ StaticLibrary true - v140 + v141 Unicode StaticLibrary false - v140 + v141 true Unicode StaticLibrary true - v140 + v141 Unicode StaticLibrary false - v140 + v141 true Unicode @@ -70,16 +70,16 @@ - ..\inc;..\..\inc;C:\Libraries\boost_1_63_0;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_63_0;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_63_0;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) - ..\inc;..\..\inc;C:\Libraries\boost_1_63_0;$(IncludePath) + ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) diff --git a/M6502/test_M6502/test_M6502.vcxproj b/M6502/test_M6502/test_M6502.vcxproj index be29969..42036fa 100644 --- a/M6502/test_M6502/test_M6502.vcxproj +++ b/M6502/test_M6502/test_M6502.vcxproj @@ -70,24 +70,24 @@ - ..\inc;..\..\inc;C:\Libraries\boost_1_63_0;$(IncludePath) - C:\Libraries\boost_1_63_0\lib64-msvc-14.0;$(LibraryPath) + ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + C:\Libraries\boost_1_65_1\lib64-msvc-14.1;$(LibraryPath) false true - ..\inc;..\..\inc;C:\Libraries\boost_1_63_0;$(IncludePath) - C:\Libraries\boost_1_63_0\lib32-msvc-14.0;$(LibraryPath) + ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + C:\Libraries\boost_1_65_1\lib32-msvc-14.1;$(LibraryPath) true - ..\inc;..\..\inc;C:\Libraries\boost_1_63_0;$(IncludePath) - C:\Libraries\boost_1_63_0\lib64-msvc-14.0;$(LibraryPath) + ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + C:\Libraries\boost_1_65_1\lib64-msvc-14.1;$(LibraryPath) false - ..\inc;..\..\inc;C:\Libraries\boost_1_63_0;$(IncludePath) - C:\Libraries\boost_1_63_0\lib32-msvc-14.0;$(LibraryPath) + ..\inc;..\..\inc;C:\Libraries\boost_1_65_1;$(IncludePath) + C:\Libraries\boost_1_65_1\lib32-msvc-14.1;$(LibraryPath) diff --git a/inc/InputOutput.h b/inc/InputOutput.h index 6696d5f..3fb9747 100644 --- a/inc/InputOutput.h +++ b/inc/InputOutput.h @@ -8,6 +8,8 @@ namespace EightBit { class InputOutput { public: + InputOutput() = default; + uint8_t read(uint8_t port) { return readInputPort(port); } void write(uint8_t port, uint8_t value) { return writeOutputPort(port, value); } diff --git a/inc/IntelProcessor.h b/inc/IntelProcessor.h index 85cc663..8626abd 100644 --- a/inc/IntelProcessor.h +++ b/inc/IntelProcessor.h @@ -124,8 +124,8 @@ namespace EightBit { return m_halfCarryTableSub[index & Mask3]; } - virtual void push(uint8_t value); - virtual uint8_t pop(); + virtual void push(uint8_t value) final; + virtual uint8_t pop() final; //