MSVC fixes

Author: Stovent

src/CDI/common/types.hpp

@@ -53,10 +53,6 @@ struct InternalRegister
     uint32_t address;
     uint32_t value;
     std::string disassembledValue;
-
-    InternalRegister(std::string_view name, uint32_t address, uint32_t value, std::string_view disassembledValue)
-        : name(name), address(address), value(value), disassembledValue(disassembledValue)
-    {}
 };
 
 struct RAMBank

src/CDI/cores/MCD212/Registers.cpp

@@ -119,7 +119,7 @@ std::vector<InternalRegister> MCD212::GetControlRegisters() const
 
     for(size_t i = 0; i < m_renderer.m_cursorPatterns.size(); i++)
         registers.emplace_back("Cursor Pattern " + std::to_string(i), CursorPattern + 0x80, m_renderer.m_cursorPatterns[i], "");
-    for(size_t i = 0; i < m_renderer.m_matteControl.size(); i++)
+    for(uint32_t i = 0; i < m_renderer.m_matteControl.size(); i++)
         registers.emplace_back("Region Control " + std::to_string(i), RegionControl + 0x80 + i, m_renderer.m_matteControl[i], "");
 
     registers.emplace_back("Backdrop Color",                    BackdropColor              + 0x80, m_renderer.m_backdropColor, "");

src/CDI/cores/SCC68070/InstructionSet.cpp

@@ -2284,14 +2284,14 @@ uint16_t SCC68070::ROXm()
     {
         const uint16_t msb = data & 0x8000;
         data <<= 1;
-        data |= GetX();
+        data |= static_cast<uint16_t>(GetX());
         SetXC(msb);
     }
     else // Right
     {
         const uint16_t lsb = data & 1;
         data >>= 1;
-        data |= GetX() << 15;
+        data |= static_cast<uint16_t>(GetX()) << 15;
         SetXC(lsb);
     }
 
@@ -2338,7 +2338,7 @@ uint16_t SCC68070::ROXr()
         {
             const uint32_t msb = data & msbMask;
             data <<= 1;
-            data |= GetX();
+            data |= static_cast<uint32_t>(GetX());
             SetXC(msb);
         }
     }
@@ -2348,7 +2348,7 @@ uint16_t SCC68070::ROXr()
         {
             const uint32_t lsb = data & 1;
             data >>= 1;
-            data |= GetX() << msbShift;
+            data |= static_cast<uint32_t>(GetX()) << msbShift;
             SetXC(lsb);
         }
     }

src/CDI/cores/SCC68070/SCC68070.cpp

@@ -358,37 +358,37 @@ void SCC68070::DumpCPURegisters()
 void SCC68070::SetS(const bool S)
 {
     SR &= 0b1101'1111'1111'1111;
-    SR |= S << 13;
+    SR |= static_cast<uint16_t>(S) << 13;
 }
 
 void SCC68070::SetX(const bool X)
 {
     SR &= 0b1111'1111'1110'1111;
-    SR |= X << 4;
+    SR |= static_cast<uint16_t>(X) << 4;
 }
 
 void SCC68070::SetN(const bool N)
 {
     SR &= 0b1111'1111'1111'0111;
-    SR |= N << 3;
+    SR |= static_cast<uint16_t>(N) << 3;
 }
 
 void SCC68070::SetZ(const bool Z)
 {
     SR &= 0b1111'1111'1111'1011;
-    SR |= Z << 2;
+    SR |= static_cast<uint16_t>(Z) << 2;
 }
 
 void SCC68070::SetV(const bool V)
 {
     SR &= 0b1111'1111'1111'1101;
-    SR |= V << 1;
+    SR |= static_cast<uint16_t>(V) << 1;
 }
 
 void SCC68070::SetC(const bool C)
 {
     SR &= 0b1111'1111'1111'1110;
-    SR |= C;
+    SR |= static_cast<uint16_t>(C);
 }
 
 void SCC68070::SetXC(const bool XC)

tests/testRenderer.cpp

@@ -190,7 +190,7 @@ static constexpr void configureTwoMattes(Video::Renderer& renderer) noexcept
     renderer.m_matteControl[7] = makeCommand(0b0110, false, 63, 8); // ICF B 63, ignored.
 }
 
-static constexpr void configureCLUT(Video::Renderer& renderer) noexcept
+static void configureCLUT(Video::Renderer& renderer) noexcept
 {
     renderer.m_backdropColor = 0b1001; // Blue.
     renderer.m_codingMethod[PLANEA] = ICM(CLUT7);
@@ -283,7 +283,7 @@ TEST_CASE("Matte", "[Video]")
             std::array<Video::Pixel, 768> array{
                 HIDDEN_RED, HIDDEN_RED, RED, RED,
             };
-            std::fill(array.data() + 4, array.end(), RED);
+            std::fill(array.begin() + 4, array.end(), RED);
             return array;
         }();
         constexpr std::array<Video::Pixel, 768> EXPECTED_B = [] () {