loopback computer

1 files changed, 8 insertions, 8 deletions

diff --git a/src/2019/day5/aoc.cpp b/src/2019/day5/aoc.cpp
index cf2f65c..8a33a4c 100644
--- a/src/2019/day5/aoc.cpp
+++ b/src/2019/day5/aoc.cpp
@@ -84,17 +84,17 @@ static size_t opt8(std::vector<int>& codes, std::vector<int>& outputs, size_t i,
 }
 
 typedef size_t (*opt_f)(std::vector<int>&, std::vector<int>&, size_t, int, int);
-static void run(size_t i, std::vector<int>& codes, std::vector<int>& outputs, interrupt_f f) {
+static void run(size_t i, std::vector<int>& codes, std::vector<int>& outputs, interrupt_f f, void* p) {
   // printf("execute %d at %zu\n", codes[i], i);
   static opt_f opts[] = {opt1, opt2, opt3, opt4, opt5, opt6, opt7, opt8};
   if (codes[i] != 99) {
     int m1{0}, m2{0};
     int m = mode(codes[i], &m1, &m2);
     int x = opts[m - 1](codes, outputs, i, m1, m2);
-    if (f == nullptr) {
-      run(x, codes, outputs, f);
-    } else {
-      f(x, outputs);
+
+    bool stop = f != nullptr && f(x, outputs, p);
+    if (!stop) {
+      run(x, codes, outputs, f, p);
     }
   }
 }
@@ -112,12 +112,12 @@ void set_computer(int* i) {
 
 int run_computer(std::vector<int> codes) {
   std::vector<int> outputs;
-  run(0, codes, outputs, nullptr);
+  run(0, codes, outputs, nullptr, nullptr);
   return outputs[outputs.size() - 1];
 }
 
-void run_computer(size_t i, std::vector<int> codes, std::vector<int>& outputs, interrupt_f f) {
-  run(i, codes, outputs, f);
+void run_computer(size_t i, std::vector<int>& codes, std::vector<int>& outputs, interrupt_f f, void* p) {
+  run(i, codes, outputs, f, p);
 }
 
 std::pair<int, int> day5(line_view file) {