Ensure palette consistency across emulators and improve breakpoint handling during resets.

Author: gulrak

src/cadmium.cpp

@@ -2227,6 +2227,8 @@ void main()
                 SetNextWidth(60);
                 if (Button("Ok")) {
                     _defaultPalette = _colorPalette;
+                    setPalette(_defaultPalette);
+                    _chipEmu->setPalette(_defaultPalette);
                     _selectedColor = nullptr;
                     _colorSelectOpen = false;
                 }
@@ -2941,9 +2943,25 @@ void main()
         reloadRom();
         updateBehaviorSelects();
         resetStats();
+        // ensure palette has enough colors, else fill up
         if (_properties->palette().empty() || _properties->palette().size() != _chipEmu->getMaxColors()) {
-            _colorPalette = _defaultPalette;
-            _colorPalette.colors.resize(_chipEmu->getMaxColors());
+            _colorPalette = _properties->palette();
+            size_t currentSize = _colorPalette.colors.size();
+            size_t targetSize = _chipEmu->getMaxColors();
+            if (currentSize < targetSize) {
+                _colorPalette.colors.reserve(targetSize);
+                for (size_t i = currentSize; i < targetSize; ++i) {
+                    if (i < _defaultPalette.colors.size()) {
+                        _colorPalette.colors.push_back(_defaultPalette.colors[i]);
+                    }
+                    else {
+                        _colorPalette.colors.push_back(emu::Palette::Color{0});
+                    }
+                }
+            }
+            else if (currentSize > targetSize) {
+                _colorPalette.colors.resize(targetSize);
+            }
             _properties->palette() = _colorPalette;
             _chipEmu->setPalette(_colorPalette);
         }

src/emuhostex.cpp

@@ -227,9 +227,6 @@ void EmuHostEx::updateEmulatorOptions(const Properties& properties)
         _previousProperties = properties;
         _chipEmu = create(*_properties, _chipEmu.get());
         if (_chipEmu) {
-            if (_chipEmu->getMaxColors() != _properties->palette().colors.size()) {
-                _properties->palette().colors.clear();
-            }
             if(_chipEmu->getScreen())
                 (void)_chipEmu->getScreen();
             whenEmuChanged(*_chipEmu);

src/emulation/chip8generic.cpp

@@ -528,6 +528,7 @@ bool Chip8GenericEmulator::updateProperties(Properties& props, Property& changed
 void Chip8GenericEmulator::setPalette(const Palette& palette)
 {
     _screen.setPalette(palette);
+    _screenNeedsUpdate = true;
 }
 
 int Chip8GenericEmulator::getMaxColors() const

src/emulation/chip8generic.hpp

@@ -321,6 +321,7 @@ class Chip8GenericEmulator : public Chip8GenericBase
         _screenNeedsUpdate = true;
     }
 
+    /*
     bool handleDisplayWait()
     {
         if (_cpuState == eWAIT) {
@@ -330,6 +331,7 @@ class Chip8GenericEmulator : public Chip8GenericBase
             //if(_options.optExtendedVBlank
         }
     }
+    */
 
     template<uint16_t quirks>
     void opDxyn_displayWait(uint16_t opcode)

src/emulation/chip8strict.cpp

@@ -108,6 +108,7 @@ GenericCpu::StackContent Chip8StrictEmulator::stack() const
 void Chip8StrictEmulator::setPalette(const Palette& palette)
 {
     _screen.setPalette(palette);
+    _screenNeedsUpdate = true;
 }
 
 }

src/emulation/hardware/genericcpu.hpp

@@ -76,6 +76,9 @@ class GenericCpu
     virtual ~GenericCpu() = default;
     void reset(bool cold = true)
     {
+        for(auto& [addr, bpi] : _breakpoints) {
+            bpi.numHits = 0;
+        }
         initExpressionist();
         handleReset(cold);
     }

src/knownfiles.ipp

@@ -123,6 +123,7 @@ static KnownRomInfo g_knownRoms[] = {
     {"3450e0d92e0bbf8e9d3065fd088cd6dfa5f9441d"_sha1, "chip-8", "Octo Bird (Cody Hoover, 2016)",nullptr, nullptr},
     {"346f2760ca55bb6d45b1f255fe4960a7d244191e"_sha1, "vip-chip-8", "Bingo (Andrew Modla)",nullptr, nullptr},
     {"35158696bd94ea22ef34e899fff1f15f7154d4fd"_sha1, "chip-8", "Craps (Camerlo Cortez, 1978)",nullptr, nullptr},
+    {"36363ecdd850dd1a099e272fae6d9b786c2a7d36"_sha1, "xo-chip", "Raycaster (A-KouZ1, 2018)",R"({"instructionsPerFrame":200000,"palette":{"border":"#000000","colors":["#000000","#555555","#aaaaaa","#ffffff"],"signal":"#888888"}})", nullptr},
     {"3643118e2e237deab98151b742f34caf9533dc05"_sha1, "chip-8", "Mandelbrot Program (A-KouZ1, 2018)",nullptr, nullptr},
     {"39970ccfd3a3f00180d53464d4fd7862193eaf0f"_sha1, "chip-8", "Octo: A Chip 8 Story (SystemLogoff, 2015-10-29)",R"({"instructionsPerFrame":7,"palette":{"border":"#222222","colors":["#111111","#eeeeee"],"signal":"#ffff00"}})", nullptr},
     {"3a840c33442ad9e912df1fa2aa61833bf571af34"_sha1, "chip-8", "Private Eye (TCNJ S.572.37)",nullptr, nullptr},