Merge branch 'main' of https://github.com/Martian-Technologies/Connection-Machine

Author: ItchyTrack

src/backend/container/block/blockDefs.h

@@ -33,7 +33,7 @@ enum BlockType : std::uint16_t {
 	CUSTOM, // placeholder for custom blocks in parsed circuit
 };
 
-inline std::string blocktype_to_string(const BlockType blockType) {
+inline std::string blocktype_to_string(const BlockType blockType) /* GCOVR_EXCL_FUNCTION */ {
 	switch (blockType) {
 	case BlockType::NONE: return "NONE";
 	case BlockType::AND: return "AND";
@@ -64,7 +64,7 @@ inline std::string blocktype_to_string(const BlockType blockType) {
 
 template <>
 struct fmt::formatter<BlockType> : fmt::formatter<std::string> {
-	auto format(BlockType blockType, format_context& ctx) const { return formatter<std::string>::format(blocktype_to_string(blockType), ctx); }
+	auto format(BlockType blockType, format_context& ctx) const /* GCOVR_EXCL_FUNCTION */ { return formatter<std::string>::format(blocktype_to_string(blockType), ctx); }
 };
 
 #endif /* blockDefs_h */

src/backend/evaluator/evaluator.cpp

@@ -1613,7 +1613,9 @@ nlohmann::json Evaluator::dumpState() const /* GCOVR_EXCL_FUNCTION */ {
 		stateJson["circuitNodeToBlockTypeMap"][circuitNode.toString()] = blocktype_to_string(blockType);
 	}
 
-
-
 	return stateJson;
 }
+
+void Evaluator::resetStates() {
+	evalSimulator->resetStates();
+}

src/backend/evaluator/evaluator.h

@@ -88,7 +88,7 @@ class Evaluator {
 	inline evaluator_id_t getEvaluatorId() const { return evaluatorId; }
 	std::string getEvaluatorName() const;
 
-	void reset();
+	void resetStates();
 	void setPause(bool pause) { evalConfig.setRunning(!pause); }
 	bool isPause() const { return !evalConfig.isRunning(); }
 	void addSprint(unsigned int nTicks) { evalConfig.addSprint(nTicks); }

src/backend/evaluator/layers/layer2_evalSimulator.h

@@ -13,6 +13,9 @@ class EvalSimulator {
 		BlockDataManager& blockDataManager
 	) :
 		gateSubstituter(evalConfig, middleIdProvider, dirtySimulatorIds, dirtyMiddleIds, blockDataManager) {}
+	inline void resetStates() {
+		gateSubstituter.resetStates();
+	}
 	inline SimPauseGuard beginEdit() {
 		return gateSubstituter.beginEdit();
 	}

src/backend/evaluator/layers/layer3_gateSubstituter.h

@@ -113,6 +113,8 @@ class GateSubstituter {
 		middleIdProvider(middleIdProvider),
 		blockDataManager(blockDataManager) {}
 
+	void resetStates() { replacer.resetStates(); }
+
 	void addGate(SimPauseGuard& pauseGuard, const BlockType blockType, const middle_id_t gateId) {
 #ifdef TRACY_PROFILER
 		ZoneScoped;

src/backend/evaluator/layers/layer4_replacer.h

@@ -24,6 +24,8 @@ class Replacer {
 		middleIdProvider(middleIdProvider),
 		blockDataManager(blockDataManager) {}
 
+	void resetStates() { busInterfacePassthrough.resetStates(); }
+
 	void addGate(SimPauseGuard& pauseGuard, const BlockType blockType, const middle_id_t gateId) {
 #ifdef TRACY_PROFILER
 		ZoneScoped;