From 2d4cd542c1c0a96d8d28c56bde6f9eb36da120e5 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Sat, 6 May 2023 23:21:08 -0700
Subject: [PATCH] Backport SimMemTrace: non-chronological trace error

---
 src/main/resources/csrc/SimMemTrace.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/csrc/SimMemTrace.cc b/src/main/resources/csrc/SimMemTrace.cc
index 0b6635d..08540bc 100644
--- a/src/main/resources/csrc/SimMemTrace.cc
+++ b/src/main/resources/csrc/SimMemTrace.cc
@@ -111,8 +111,8 @@ MemTraceLine MemTraceReader::read_trace_at(const long cycle, const int lane_id,
   // It should always be guaranteed that we consumed all of the past lines, and
   // the next line is in the future.
   if (line.cycle < cycle) {
-    printf("cycle=%ld, some lines are left in past Fatal", cycle);
-    assert(false && "some trace lines are left unread in the past");
+    long fileline = read_pos - std::cbegin(trace_buf) + 1;
+    error(fileline, "some trace lines are left unread in the past");
     return MemTraceLine{};
   }