Starting to write a real memory subsystem for biggolf.

1 files changed, 9 insertions, 22 deletions

diff --git a/infra/arbiter.h b/infra/arbiter.h
index 79a9920..63ddbd6 100644
--- a/infra/arbiter.h
+++ b/infra/arbiter.h
@@ -3,53 +3,40 @@
 #include <array>
 #include <cassert>
 
+#include "infra/port.h"
 #include "infra/sim.h"
 
 namespace infra {
     template<typename T, unsigned int peers> struct priority_arbiter : public sim {
-        std::array<port<T>, peers> peerp;
+        std::array<port<T> *, peers> peerp;
         port<T> *outp = nullptr;
 
         void clock() {
             for (unsigned int i = 0; i < peers; ++i) {
-                if (outp->can_write() && peerp[i].can_read())
-                    outp->write(peerp[i].read());
+                if (outp->can_write() && peerp[i]->can_read())
+                    outp->write(peerp[i]->read());
             }
         }
     };
 
     template<typename T, unsigned int peers> struct round_robin_arbiter : public sim {
-        std::array<port<T>, peers> peerp;
+        std::array<port<T> *, peers> peerp;
         port<T> *outp = nullptr;
         unsigned int initial = 0;
 
         void clock() {
             bool initially_empty = outp->can_write();
             for (unsigned int i = initial; i < peers; ++i) {
-                if (outp->can_write() && peerp[i].can_read())
-                    outp->write(peerp[i].read());
+                if (outp->can_write() && peerp[i]->can_read())
+                    outp->write(peerp[i]->read());
             }
             for (unsigned int i = 0; i < initial; ++i) {
-                if (outp->can_write() && peerp[i].can_read())
-                    outp->write(peerp[i].read());
+                if (outp->can_write() && peerp[i]->can_read())
+                    outp->write(peerp[i]->read());
             }
             if (initially_empty && !outp->can_write())
                 if (++initial == peers)
                     initial = 0;
         }
     };
-
-    template<typename T, unsigned int peers> struct shared_bus : public sim {
-        std::array<port<T>, peers> peerp;
-        port<T> *outp = nullptr;
-
-        void clock() {
-            for (unsigned int i = 0; i < peers; ++i) {
-                if (peerp[i].can_read()) {
-                    assert(outp->can_write());
-                    outp->write(peerp[i].read());
-                }
-            }
-        }
-    };
 }