1 files changed, 11 insertions, 5 deletions

diff --git a/main.cpp b/main.cpp
index 46be782..62926a5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,7 @@
 #include <arpa/inet.h>
 #include <cstdint>
 #include <fmt/format.h>
+#include <fstream>
 #include <iostream>
 #include <optional>
 #include <utility>
@@ -60,13 +61,18 @@ int main(int argc, const char *argv[]) {
     checker checker(system);
 
     for (--argc, ++argv; argc; --argc, ++argv) {
-        auto program = programs.at(argv[0]);
-        if (auto err = load_program(checker, program))
-            return err;
+        if (auto program = programs.find(*argv); program != programs.end()) {
+            if (auto err = load_program(checker, program->second))
+                return err;
+        } else {
+            std::ifstream fh(*argv);
+            system.load_evt(fh);
+        }
     }
 
-    while (true) {
-        //std::cout << fmt::format("{:9} @{:04o} {:01o}:{:04o}:{:04o} TTO={:x}\n", system.time, checker.pc, checker.link, checker.acc, checker.mq, checker.ctlregs[TT_OUTPUT]);
+    while (!checker.done()) {
+//        if (!checker.ctlregs[HALTED])
+//            std::cout << fmt::format("\t{:9} {:04o}\n", system.time, checker.pc);
         checker.execute();
     }