Support for more line formats in evt reader

2 files changed, 14 insertions, 15 deletions

diff --git a/io/model.cpp b/io/model.cpp
index d332908..741a885 100644
--- a/io/model.cpp
+++ b/io/model.cpp
@@ -51,10 +51,10 @@ bool iomodel::interact(std::uint64_t icount, std::array<std::uint_fast32_t, NUM_
 
 void iomodel::load_evt(std::istream &fh) {
     // File format:
-    //  +time                   advances time by relative increment
+    //  +icount                 advances icount by relative increment
     //  regname=value/mask      adds event that sets regname = (regname & ~mask) | value
     //  regname=value           adds event that sets regname = value
-    //  $x                      adds events that input the remaining line (excluding trailing whitespace) character-at-a-time with 1000 cycles between them
+    //  $x                      adds events that input the remaining line (excluding trailing whitespace) character-at-a-time with 1000 icounts between them
     // FIXME: add assertions
     // FIXME: add DMA
     for (std::string line; std::getline(fh, line); ) {
@@ -70,11 +70,11 @@ void iomodel::load_evt(std::istream &fh) {
             char *end = nullptr;
             auto step = std::strtoull(line.c_str(), &end, 0);
             assert(end && *end == '\0');
-            load_time += step;
+            load_icount += step;
         } else if (line[0] == '$') {
             for (unsigned int i = 1; i < line.size(); ++i) {
-                log.emplace(load_time, event(TT_BITS, (line[i] << 8) | TTI_FLAG, TTI_DATA | TTI_FLAG));
-                load_time += 1000;
+                log.emplace(load_icount, event(TT_BITS, (line[i] << 8) | TTI_FLAG, TTI_DATA | TTI_FLAG));
+                load_icount += 1000;
             }
         } else {
             auto eqpos = line.find('=');
@@ -94,17 +94,17 @@ void iomodel::load_evt(std::istream &fh) {
                 mask = std::strtoull(maskstr.c_str(), &end, 0);
                 assert(end && *end == '\0');
             }
-            log.emplace(load_time, event(reg, value, mask));
+            log.emplace(load_icount, event(reg, value, mask));
         }
     }
 }
 
 std::ostream & iomodel::write_evt(std::ostream &fh) {
-    std::uint64_t time = 0;
+    std::uint64_t icount = 0;
     for (const auto &e : log) {
-        if (e.first != time) {
-            fh << fmt::format("+{}\n", e.first - time);
-            time = e.first;
+        if (e.first != icount) {
+            fh << fmt::format("+{}\n", e.first - icount);
+            icount = e.first;
         }
         if (e.second.mask == ~(std::uint_fast32_t)0) {
             fh << fmt::format("{}=0x{:x}\n", ctlreg_names[e.second.reg], e.second.value);
diff --git a/io/model.h b/io/model.h
index be16283..16e7ca7 100644
--- a/io/model.h
+++ b/io/model.h
@@ -12,13 +12,12 @@ struct iomodel {
     static constexpr unsigned int TT_OUTPUT_DELAY = 10;
 
     event_log log;
-    std::uint64_t time = 0;
-    bool interact(std::array<std::uint_fast32_t, NUM_CTLREGS> &ctlregs);
-    bool done() {
-        return log.lower_bound(time) == log.end();
+    bool interact(std::uint64_t icount, std::array<std::uint_fast32_t, NUM_CTLREGS> &ctlregs, bool replay=false);
+    bool done(std::uint64_t icount) {
+        return log.lower_bound(icount) == log.end();
     }
 
-    std::uint64_t load_time = 0;
+    std::uint64_t load_icount = 0;
     void load_evt(std::istream &fh);
 
     std::ostream & write_evt(std::ostream &fh);