From 07984a2f8bf5eb9407085acd83cb2d81ed3892cf Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Wed, 17 Apr 2024 22:15:05 -0400
Subject: [PATCH] Resolve various warnings.

---
 InstructionSets/ARM/Executor.hpp                     |  6 +++---
 Machines/Acorn/Archimedes/Archimedes.cpp             | 12 +++++-------
 .../xcshareddata/xcschemes/Clock Signal.xcscheme     |  2 +-
 Storage/Disk/Track/PCMSegment.cpp                    |  7 +++++++
 Storage/Disk/Track/PCMSegment.hpp                    |  1 +
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/InstructionSets/ARM/Executor.hpp b/InstructionSets/ARM/Executor.hpp
index b867fe82c..20ccad951 100644
--- a/InstructionSets/ARM/Executor.hpp
+++ b/InstructionSets/ARM/Executor.hpp
@@ -42,7 +42,7 @@ struct NullStatusHandler {
 template <Model model, typename MemoryT, typename StatusObserverT = NullStatusHandler>
 struct Executor {
 	template <typename... Args>
-	Executor(StatusObserverT &observer, Args &&...args) : status_observer_(observer), bus(std::forward<Args>(args)...) {}
+	Executor(StatusObserverT &observer, Args &&...args) : bus(std::forward<Args>(args)...), status_observer_(observer) {}
 
 	template <typename... Args>
 	Executor(Args &&...args) : bus(std::forward<Args>(args)...) {}
@@ -327,7 +327,7 @@ struct Executor {
 			}
 		} else {
 			bool did_read;
-			uint32_t value;
+			uint32_t value = 0;
 
 			if constexpr (flags.transfer_byte()) {
 				uint8_t target;
@@ -480,7 +480,7 @@ struct Executor {
 			// undo the previous load.
 			struct {
 				uint32_t *target = nullptr;
-				uint32_t value;
+				uint32_t value = 0;
 			} last_replacement;
 
 			for(uint32_t c = 0; c < total; c++) {
diff --git a/Machines/Acorn/Archimedes/Archimedes.cpp b/Machines/Acorn/Archimedes/Archimedes.cpp
index e8e7f8895..b352ddb89 100644
--- a/Machines/Acorn/Archimedes/Archimedes.cpp
+++ b/Machines/Acorn/Archimedes/Archimedes.cpp
@@ -34,15 +34,13 @@
 #include <set>
 #include <vector>
 
-namespace {
-
-Log::Logger<Log::Source::Archimedes> logger;
-
-}
-
 namespace Archimedes {
 
 #ifndef NDEBUG
+namespace {
+Log::Logger<Log::Source::Archimedes> logger;
+}
+
 template <InstructionSet::ARM::Model model, typename Executor>
 struct HackyDebugger {
 	void notify(uint32_t address, uint32_t instruction, Executor &executor) {
@@ -452,7 +450,7 @@ class ConcreteMachine:
 		int video_divider_ = 1;
 
 		void tick_cpu() {
-			uint32_t instruction;
+			uint32_t instruction = 0;
 			if(!executor_.bus.read(executor_.pc(), instruction, executor_.registers().mode(), false)) {
 //				logger.info().append("Prefetch abort at %08x; last good was at %08x", executor_.pc(), last_pc);
 				executor_.prefetch_abort();
diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme
index 19b54b90e..474fa352e 100644
--- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme	
+++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme	
@@ -62,7 +62,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       enableASanStackUseAfterReturn = "YES"
diff --git a/Storage/Disk/Track/PCMSegment.cpp b/Storage/Disk/Track/PCMSegment.cpp
index d01859ea3..e75c8715e 100644
--- a/Storage/Disk/Track/PCMSegment.cpp
+++ b/Storage/Disk/Track/PCMSegment.cpp
@@ -31,14 +31,21 @@ PCMSegmentEventSource::PCMSegmentEventSource(const PCMSegment &segment) :
 }
 
 PCMSegmentEventSource::PCMSegmentEventSource(const PCMSegmentEventSource &original) {
+	*this = original;
+}
+
+PCMSegmentEventSource &PCMSegmentEventSource::operator =(const PCMSegmentEventSource &original) {
 	// share underlying data with the original
 	segment_ = original.segment_;
 
 	// load up the clock rate and set initial conditions
 	next_event_.length.clock_rate = segment_->length_of_a_bit.clock_rate;
 	reset();
+
+	return *this;
 }
 
+
 void PCMSegmentEventSource::reset() {
 	// start with the first bit to be considered the zeroth, and assume that it'll be
 	// flux transitions for the foreseeable
diff --git a/Storage/Disk/Track/PCMSegment.hpp b/Storage/Disk/Track/PCMSegment.hpp
index f4a13e0d5..44b605989 100644
--- a/Storage/Disk/Track/PCMSegment.hpp
+++ b/Storage/Disk/Track/PCMSegment.hpp
@@ -163,6 +163,7 @@ class PCMSegmentEventSource {
 			but a unique pointer into it.
 		*/
 		PCMSegmentEventSource(const PCMSegmentEventSource &);
+		PCMSegmentEventSource &operator =(const PCMSegmentEventSource &);
 
 		/*!
 			@returns the next event that will occur in this event stream.