Restructure a lot of the control registers

1 files changed, 10 insertions, 9 deletions

diff --git a/io/model.cpp b/io/model.cpp
index fcabbd2..fb9f62b 100644
--- a/io/model.cpp
+++ b/io/model.cpp
@@ -24,24 +24,25 @@ bool iomodel::interact(std::array<std::uint_fast32_t, NUM_CTLREGS> &ctlregs) {
     }
 
     bool interrupt = false;
-    if (ctlregs[TT_INT_ENABLE]) {
+    if (ctlregs[TT_FLAGS] & TTF_INT_ENABLE) {
         if (ctlregs[TT_BITS] & TTI_FLAG)
             interrupt = true;
-    }
-    if (ctlregs[TT_INT_ENABLE]) {
         if (ctlregs[TT_BITS] & TTO_FLAG)
             interrupt = true;
     }
-    ctlregs[INT_PENDING] = interrupt;
-    interrupt = interrupt && (ctlregs[INT_ENABLE] & 1);
+    if (interrupt)
+        ctlregs[FLAGS] |= FLAG_INT_REQUEST;
+    else
+        ctlregs[FLAGS] &= !FLAG_INT_REQUEST;
+    interrupt = interrupt && (ctlregs[FLAGS] & FLAG_INT_ENABLE);
 
     if (interrupt) {
-        ctlregs[DATA_INSTRUCTION_FIELD_SAVED] = ctlregs[DATA_INSTRUCTION_FIELD_BUFFER];
-        ctlregs[DATA_INSTRUCTION_FIELD_BUFFER] = 0;
+        ctlregs[FLAGS_SAVED] = ctlregs[FLAGS];
+        ctlregs[FLAGS] = 0;
         ctlregs[HALTED] = 0;
-        ctlregs[INT_ENABLE] = 0;
     } else {
-        ctlregs[INT_ENABLE] = (ctlregs[INT_ENABLE] >> 1) * 3;
+        if (ctlregs[FLAGS] & FLAG_INT_ENABLE_DELAY)
+            ctlregs[FLAGS] |= FLAG_INT_ENABLE;
     }
 
     return interrupt;