From b6c020fda707f3dd4dcf35215a8ea34e8436df16 Mon Sep 17 00:00:00 2001
From: Mathieu Tarral <mathieu.tarral@protonmail.com>
Date: Tue, 3 Mar 2026 14:18:48 +0100
Subject: [PATCH 1/2] haps: include exception number in stop reason debug
 output

---
 src/haps/mod.rs  | 8 ++++----
 src/state/mod.rs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/haps/mod.rs b/src/haps/mod.rs
index 5732f6d8..3ac47aba 100644
--- a/src/haps/mod.rs
+++ b/src/haps/mod.rs
@@ -427,9 +427,9 @@ impl Tsffs {
 
             let (exit_kind, iteration_count) = match kind {
                 SolutionKind::Timeout => (ExitKind::Timeout, IterationCount::Timeout),
-                SolutionKind::Exception | SolutionKind::Breakpoint | SolutionKind::Manual => {
-                    (ExitKind::Crash, IterationCount::Solution)
-                }
+                SolutionKind::Exception { .. }
+                | SolutionKind::Breakpoint
+                | SolutionKind::Manual => (ExitKind::Crash, IterationCount::Solution),
             };
 
             // Solution/timeout path: classify exit kind and increment corresponding counters.
@@ -547,7 +547,7 @@ impl Tsffs {
     pub fn on_exception(&mut self, _obj: *mut ConfObject, exception: i64) -> Result<()> {
         if self.all_exceptions_are_solutions || self.exceptions.contains(&exception) {
             self.stop_simulation(StopReason::Solution {
-                kind: SolutionKind::Exception,
+                kind: SolutionKind::Exception { number: exception },
             })?;
         }
         Ok(())
diff --git a/src/state/mod.rs b/src/state/mod.rs
index 80c3e91a..e3eb94b4 100644
--- a/src/state/mod.rs
+++ b/src/state/mod.rs
@@ -21,7 +21,7 @@ pub(crate) use policy::SnapshotRestorePolicy;
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub(crate) enum SolutionKind {
     Timeout,
-    Exception,
+    Exception { number: i64 },
     Breakpoint,
     Manual,
 }

From 6dfc450a1c544191feb138620f4c45953f78f8bd Mon Sep 17 00:00:00 2001
From: Mathieu Tarral <mathieu.tarral@protonmail.com>
Date: Tue, 3 Mar 2026 14:21:04 +0100
Subject: [PATCH 2/2] haps: include breakpoint number in stop reason debug
 output

---
 src/haps/mod.rs  | 4 ++--
 src/state/mod.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/haps/mod.rs b/src/haps/mod.rs
index 3ac47aba..9986201e 100644
--- a/src/haps/mod.rs
+++ b/src/haps/mod.rs
@@ -428,7 +428,7 @@ impl Tsffs {
             let (exit_kind, iteration_count) = match kind {
                 SolutionKind::Timeout => (ExitKind::Timeout, IterationCount::Timeout),
                 SolutionKind::Exception { .. }
-                | SolutionKind::Breakpoint
+                | SolutionKind::Breakpoint { .. }
                 | SolutionKind::Manual => (ExitKind::Crash, IterationCount::Solution),
             };
 
@@ -571,7 +571,7 @@ impl Tsffs {
             );
 
             self.stop_simulation(StopReason::Solution {
-                kind: SolutionKind::Breakpoint,
+                kind: SolutionKind::Breakpoint { number: breakpoint },
             })?;
         }
         Ok(())
diff --git a/src/state/mod.rs b/src/state/mod.rs
index e3eb94b4..627eb118 100644
--- a/src/state/mod.rs
+++ b/src/state/mod.rs
@@ -22,7 +22,7 @@ pub(crate) use policy::SnapshotRestorePolicy;
 pub(crate) enum SolutionKind {
     Timeout,
     Exception { number: i64 },
-    Breakpoint,
+    Breakpoint { number: i64 },
     Manual,
 }