From 917edeb7ecfc3335b1be9bc1ef23b7122405b1fb Mon Sep 17 00:00:00 2001
From: Theofilos Augoustis <theofilos.augoustis@gmail.com>
Date: Thu, 13 Nov 2025 14:43:02 +0000
Subject: Move matching functionality out of event (cannot rely on entire
 program state to match)

---
 src/focaccia/deterministic.py | 12 ------------
 src/focaccia/native/tracer.py | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/focaccia/deterministic.py b/src/focaccia/deterministic.py
index e7914a3..4d52086 100644
--- a/src/focaccia/deterministic.py
+++ b/src/focaccia/deterministic.py
@@ -214,18 +214,6 @@ class Event:
         self.mem_writes = memory_writes
         self.event_type = event_type
 
-    def match(self, pc: int, target: ReadableProgramState) -> bool:
-        # TODO: match the rest of the state to be sure
-        if self.pc == pc:
-            for reg, value in self.registers.items():
-                if value == self.pc:
-                    continue
-                if target.read_register(reg) != value:
-                    print(f'Failed match for {reg}: {hex(value)} != {hex(target.read_register(reg))}')
-                    return False
-            return True
-        return False
-
     def __repr__(self) -> str:
         reg_repr = f'{self.event_type} event\n'
         for reg, value in self.registers.items():
diff --git a/src/focaccia/native/tracer.py b/src/focaccia/native/tracer.py
index 9dbc32a..47ac7e2 100644
--- a/src/focaccia/native/tracer.py
+++ b/src/focaccia/native/tracer.py
@@ -12,6 +12,7 @@ from focaccia.trace import Trace, TraceEnvironment
 from focaccia.miasm_util import MiasmSymbolResolver
 from focaccia.snapshot import ReadableProgramState, RegisterAccessError
 from focaccia.symbolic import SymbolicTransform, DisassemblyContext, run_instruction
+from focaccia.deterministic import Event
 
 from .lldb_target import LLDBConcreteTarget, LLDBLocalTarget, LLDBRemoteTarget
 
@@ -26,6 +27,18 @@ logging.getLogger('asmblock').setLevel(logging.CRITICAL)
 class ValidationError(Exception):
     pass
 
+def match_event(event: Event, pc: int, target: ReadableProgramState) -> bool:
+    # TODO: match the rest of the state to be sure
+    if event.pc == pc:
+        for reg, value in event.registers.items():
+            if value == event.pc:
+                continue
+            if target.read_register(reg) != value:
+                print(f'Failed match for {reg}: {hex(value)} != {hex(target.read_register(reg))}')
+                return False
+        return True
+    return False
+
 class SpeculativeTracer(ReadableProgramState):
     def __init__(self, target: LLDBConcreteTarget):
         super().__init__(target.arch)
@@ -216,7 +229,7 @@ class SymbolicTracer:
     def is_stepping_instr(self, pc: int, instruction: Instruction) -> bool:
         if self.nondet_events:
             pc = pc + instruction.length # detlog reports next pc for each event
-            if self.next_event and self.nondet_events[self.next_event].match(pc, self.target):
+            if self.next_event and match_event(self.nondet_events[self.next_event], pc, self.target):
                 debug('Current instruction matches next event; stepping through it')
                 self.progress_event()
                 return True
-- 
cgit 1.4.1