Synchronize to 0be4ab0 of 'jcmoyer/Nuked-SC55'

Co-authored-by: J.C. Moyer <jcmoyer32@gmail.com>

Author: 2 people

.github/workflows/build.yml

@@ -47,12 +47,12 @@ jobs:
       VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           submodules: true
 
       - name: Install CMake
-        uses: lukka/get-cmake@latest
+        uses: lukka/get-cmake@v4
         with:
           cmakeVersion: ~3.31.0
           ninjaVersion: latest

src/nuked-sc55/backend/bounded_ordered_bitset.h

@@ -0,0 +1,134 @@
+#pragma once
+
+#include <bit>
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+
+// Implements an ordered set of integers backed by a single word. This is
+// functionally equivalent to std::set<unsigned_type>, but flat and
+// non-allocating. The tradeoff is that this type only supports values in the
+// range 0..63. It is intended to be used with small, contiguous enumerations
+// like MCU_Interrupt_Source.
+//
+// Example usage:
+//
+// BoundedOrderedBitSet<6> s;
+// s.Include(5);
+// s.Include(0);
+// s.Include(2);
+// for (auto val : s)
+//     printf("%d\n", val);
+//
+// ==> prints 0, 2, 5
+
+template <size_t Bits>
+struct BitsToType;
+
+template <size_t Bits>
+    requires(0 < Bits && Bits <= 8)
+struct BitsToType<Bits>
+{
+    using Type = uint8_t;
+};
+
+template <size_t Bits>
+    requires(8 < Bits && Bits <= 16)
+struct BitsToType<Bits>
+{
+    using Type = uint16_t;
+};
+
+template <size_t Bits>
+    requires(16 < Bits && Bits <= 32)
+struct BitsToType<Bits>
+{
+    using Type = uint32_t;
+};
+
+template <size_t Bits>
+    requires(32 < Bits && Bits <= 64)
+struct BitsToType<Bits>
+{
+    using Type = uint64_t;
+};
+
+// Bits: number of bits in the set. The range of elements is 0..Bits - 1.
+// AccessType: the type to access bits through. May be an enum.
+template <size_t Bits, typename AccessType = typename BitsToType<Bits>::Type>
+struct BoundedOrderedBitSet
+{
+public:
+    using UnderlyingType = typename BitsToType<Bits>::Type;
+
+    int Size() const
+    {
+        return std::popcount(m_set);
+    }
+
+    void Include(const AccessType& item)
+    {
+        assert(item < Bits);
+        m_set |= static_cast<UnderlyingType>(1 << item);
+    }
+
+    void Exclude(const AccessType& item)
+    {
+        assert(item < Bits);
+        m_set &= static_cast<UnderlyingType>(~(1 << item));
+    }
+
+    bool Contains(const AccessType& item) const
+    {
+        assert(item < Bits);
+        return m_set & (1 << item);
+    }
+
+    class Iterator
+    {
+    public:
+        Iterator& operator++()
+        {
+            m_state &= m_state - 1;
+            return *this;
+        }
+
+        AccessType operator*() const
+        {
+            return static_cast<AccessType>(std::countr_zero(m_state));
+        }
+
+        bool operator==(const Iterator& rhs) const
+        {
+            return m_state == rhs.m_state;
+        }
+
+        bool operator!=(const Iterator& rhs) const
+        {
+            return !(*this == rhs);
+        }
+
+    private:
+        Iterator(UnderlyingType state)
+            : m_state(state)
+        {
+        }
+
+        UnderlyingType m_state;
+
+        friend BoundedOrderedBitSet<Bits, AccessType>;
+    };
+
+    Iterator begin() const
+    {
+        return Iterator{m_set};
+    }
+
+    Iterator end() const
+    {
+        return Iterator{0};
+    }
+
+private:
+    UnderlyingType m_set = 0;
+};

src/nuked-sc55/backend/emu.cpp

@@ -251,7 +251,7 @@ bool Emulator::LoadRom(RomLocation location, std::span<const uint8_t> source)
             //fprintf(stderr, "FATAL: %s requires a power-of-2 size\n", ToCString(location));
             return false;
         }
-        GetMCU().rom2_mask = (int)source.size() - 1;
+        GetMCU().rom2_mask = (uint32_t)source.size() - 1;
     }
 
     std::copy(source.begin(), source.end(), buffer.begin());

src/nuked-sc55/backend/lcd.cpp

@@ -38,7 +38,7 @@
 #include "lcd_font.h"
 #include <cstring>
 
-void LCD_Enable(lcd_t& lcd, uint32_t enable)
+void LCD_Enable(lcd_t& lcd, bool enable)
 {
     lcd.enable = enable;
 }
@@ -306,7 +306,7 @@ void LCD_FontRenderLR(lcd_t& lcd, uint8_t* LCD_CG, uint8_t ch)
         f = &lcd_font[ch - 16][0];
     else
         f = &LCD_CG[(ch & 7) * 8];
-    int col;
+    uint32_t col;
     if (f[0] & 1)
     {
         col = lcd.color1;

src/nuked-sc55/backend/lcd.h

@@ -77,7 +77,7 @@ struct lcd_t {
     uint8_t LCD_CG[64]{};
 
     // updated by MCU via LCD_Enable
-    std::atomic<uint8_t> enable = 0;
+    std::atomic<bool> enable = false;
 
     uint32_t buffer[lcd_height_max][lcd_width_max]{};
 
@@ -91,5 +91,5 @@ void LCD_Init(lcd_t& lcd, mcu_t& mcu);
 bool LCD_Start(lcd_t& lcd);
 void LCD_Stop(lcd_t& lcd);
 void LCD_Write(lcd_t& lcd, uint32_t address, uint8_t data);
-void LCD_Enable(lcd_t& lcd, uint32_t enable);
+void LCD_Enable(lcd_t& lcd, bool enable);
 void LCD_Render(lcd_t& lcd);