From c9ac85a045b142e28ec9ae06da63b62c446152ab Mon Sep 17 00:00:00 2001 From: whitequark Date: Tue, 7 Jul 2020 02:14:06 +0000 Subject: [PATCH] back.pysim: simplify. NFC. --- nmigen/back/pysim.py | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/nmigen/back/pysim.py b/nmigen/back/pysim.py index 89945eb..268d165 100644 --- a/nmigen/back/pysim.py +++ b/nmigen/back/pysim.py @@ -291,20 +291,6 @@ class _SimulatorState: return True - def start_waveform(self, waveform_writer): - if self.timestamp != 0.0: - raise ValueError("Cannot start writing waveforms after advancing simulation time") - if self.waveform_writer is not None: - raise ValueError("Already writing waveforms to {!r}" - .format(self.waveform_writer)) - self.waveform_writer = waveform_writer - - def finish_waveform(self): - if self.waveform_writer is None: - return - self.waveform_writer.close(self.timestamp) - self.waveform_writer = None - class _Emitter: def __init__(self): @@ -902,13 +888,21 @@ class _WaveformContextManager: def __enter__(self): try: - self._state.start_waveform(self._waveform_writer) + if self._state.timestamp != 0.0: + raise ValueError("Cannot start writing waveforms after advancing simulation time") + if self._state.waveform_writer is not None: + raise ValueError("Already writing waveforms to {!r}" + .format(self._state.waveform_writer)) + self._state.waveform_writer = self._waveform_writer except: self._waveform_writer.close(0) raise def __exit__(self, *args): - self._state.finish_waveform() + if self._state.waveform_writer is None: + return + self._state.waveform_writer.close(self._state.timestamp) + self._state.waveform_writer = None class Simulator: -- 2.30.2