diff --git a/src/common/SoundSDL2.cxx b/src/common/SoundSDL2.cxx index 750832c0b..c39aa7d86 100644 --- a/src/common/SoundSDL2.cxx +++ b/src/common/SoundSDL2.cxx @@ -40,7 +40,10 @@ SoundSDL2::SoundSDL2(OSystem& osystem, AudioSettings& audioSettings) myIsInitializedFlag(false), myVolume(100), myVolumeFactor(0xffff), + myDevice(0), + myEmulationTiming(nullptr), myCurrentFragment(nullptr), + myUnderrun(false), myAudioSettings(audioSettings) { myOSystem.logMessage("SoundSDL2::SoundSDL2 started ...", 2); diff --git a/src/emucore/EmulationWorker.cxx b/src/emucore/EmulationWorker.cxx index 0ccdc77c5..337184a79 100644 --- a/src/emucore/EmulationWorker.cxx +++ b/src/emucore/EmulationWorker.cxx @@ -24,7 +24,15 @@ using namespace std::chrono; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -EmulationWorker::EmulationWorker() : myPendingSignal(Signal::none), myState(State::initializing) +EmulationWorker::EmulationWorker() + : myPendingSignal(Signal::none), + myState(State::initializing), + myTia(nullptr), + myCyclesPerSecond(0), + myMaxCycles(0), + myMinCycles(0), + myDispatchResult(nullptr), + myTotalCycles(0) { std::mutex mutex; std::unique_lock lock(mutex); diff --git a/src/emucore/M6502.cxx b/src/emucore/M6502.cxx index d1b2cea3b..48ee7fee0 100644 --- a/src/emucore/M6502.cxx +++ b/src/emucore/M6502.cxx @@ -59,6 +59,7 @@ M6502::M6502(const Settings& settings) icycles(0), myNumberOfDistinctAccesses(0), myLastAddress(0), + myLastBreakCycle(ULLONG_MAX), myLastPeekAddress(0), myLastPokeAddress(0), myLastPeekBaseAddress(0), diff --git a/src/emucore/tia/TIA.cxx b/src/emucore/tia/TIA.cxx index 3f04698db..071e13d99 100644 --- a/src/emucore/tia/TIA.cxx +++ b/src/emucore/tia/TIA.cxx @@ -144,7 +144,7 @@ void TIA::reset() myHstate = HState::blank; myCollisionMask = 0; myLinesSinceChange = 0; - myCollisionUpdateRequired = false; + myCollisionUpdateRequired = myCollisionUpdateScheduled = false; myColorLossEnabled = myColorLossActive = false; myColorHBlank = 0; myLastCycle = 0; diff --git a/src/emucore/tia/TIA.hxx b/src/emucore/tia/TIA.hxx index 41a7191ce..50bf080b6 100644 --- a/src/emucore/tia/TIA.hxx +++ b/src/emucore/tia/TIA.hxx @@ -746,6 +746,11 @@ class TIA : public Device */ bool myCollisionUpdateRequired; + /** + * Force schedule a collision update + */ + bool myCollisionUpdateScheduled; + /** * The collision latches are represented by 15 bits in a bitfield. */ @@ -829,9 +834,6 @@ class TIA : public Device bool myEnableJitter; uInt8 myJitterFactor; - // Force schedule a collision update - bool myCollisionUpdateScheduled; - #ifdef DEBUGGER_SUPPORT // The arrays containing information about every byte of TIA // indicating whether and how (RW) it is used.