From 47ef6e876d174b82d75325fb5d97b44478f47864 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Fri, 23 Dec 2016 22:18:06 +0100
Subject: [PATCH] some minor changes to the interruptible processor.

---
 src/main/dig/processor/IntrExample.dig        | 590 ++++++++++++++++++
 src/main/dig/processor/ProcessorIntr.dig      | 587 ++++++-----------
 .../digital/integration/TestExamples.java     |   2 +-
 3 files changed, 791 insertions(+), 388 deletions(-)
 create mode 100644 src/main/dig/processor/IntrExample.dig

diff --git a/src/main/dig/processor/IntrExample.dig b/src/main/dig/processor/IntrExample.dig
new file mode 100644
index 000000000..761a9d7bd
--- /dev/null
+++ b/src/main/dig/processor/IntrExample.dig
@@ -0,0 +1,590 @@
+<?xml version="1.0" encoding="utf-8"?>
+<circuit>
+  <version>1</version>
+  <attributes>
+    <entry>
+      <string>Description</string>
+      <string>Einfacher Prozessor, der an die MIPS-Architektur 
+angelehnt ist. Es handelt sich um eine Harvard 
+Single-Cycle CPU. Er verfügt über einen Interrupt 
+Controller, der gesteuert durch einen Zähler, alle
+2048 Zyklen einen Interrupt auslöst, und dabei die
+feste Adresse 0x1000 anspringt.
+An dieser Adresse muss sich die ISR befinden.</string>
+    </entry>
+  </attributes>
+  <visualElements>
+    <visualElement>
+      <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/Terminal.dig</elementName>
+      <elementAttributes/>
+      <pos x="1240" y="500"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>ioW</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1220" y="560"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>D</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1220" y="500"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>A</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1220" y="520"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>C</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1220" y="540"/>
+    </visualElement>
+    <visualElement>
+      <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/GPO.dig</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="1180" y="680"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="1"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>ioW</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1120" y="660"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="1"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>D</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1180" y="660"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="1"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>A</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1160" y="660"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="1"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>C</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1140" y="660"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="1340" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="1300" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="1260" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="1220" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="1180" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="1140" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="1100" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="1060" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="1020" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="980" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="940" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="900" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="860" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="820" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="780" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>LED</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+      </elementAttributes>
+      <pos x="740" y="820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/ProcessorIntr.dig</elementName>
+      <elementAttributes/>
+      <pos x="1000" y="500"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>D</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1080" y="520"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>A</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1080" y="500"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>ioW</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1080" y="560"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>ioR</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1080" y="540"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Clock</elementName>
+      <elementAttributes>
+        <entry>
+          <string>runRealTime</string>
+          <boolean>true</boolean>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>C</string>
+        </entry>
+        <entry>
+          <string>Frequency</string>
+          <int>500000</int>
+        </entry>
+      </elementAttributes>
+      <pos x="820" y="640"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>C</string>
+        </entry>
+      </elementAttributes>
+      <pos x="980" y="500"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>C</string>
+        </entry>
+      </elementAttributes>
+      <pos x="840" y="640"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Counter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Bits</string>
+          <int>11</int>
+        </entry>
+      </elementAttributes>
+      <pos x="860" y="520"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>C</string>
+        </entry>
+      </elementAttributes>
+      <pos x="840" y="520"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Ground</elementName>
+      <elementAttributes/>
+      <pos x="840" y="560"/>
+    </visualElement>
+  </visualElements>
+  <wires>
+    <wire>
+      <p1 x="1340" y="820"/>
+      <p2 x="1180" y="740"/>
+    </wire>
+    <wire>
+      <p1 x="1160" y="740"/>
+      <p2 x="1300" y="820"/>
+    </wire>
+    <wire>
+      <p1 x="1140" y="740"/>
+      <p2 x="1260" y="820"/>
+    </wire>
+    <wire>
+      <p1 x="1220" y="820"/>
+      <p2 x="1120" y="740"/>
+    </wire>
+    <wire>
+      <p1 x="1100" y="740"/>
+      <p2 x="1180" y="820"/>
+    </wire>
+    <wire>
+      <p1 x="1140" y="820"/>
+      <p2 x="1080" y="740"/>
+    </wire>
+    <wire>
+      <p1 x="1060" y="820"/>
+      <p2 x="1040" y="740"/>
+    </wire>
+    <wire>
+      <p1 x="980" y="820"/>
+      <p2 x="1000" y="740"/>
+    </wire>
+    <wire>
+      <p1 x="980" y="740"/>
+      <p2 x="940" y="820"/>
+    </wire>
+    <wire>
+      <p1 x="900" y="820"/>
+      <p2 x="960" y="740"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="820"/>
+      <p2 x="920" y="740"/>
+    </wire>
+    <wire>
+      <p1 x="880" y="740"/>
+      <p2 x="740" y="820"/>
+    </wire>
+    <wire>
+      <p1 x="900" y="740"/>
+      <p2 x="780" y="820"/>
+    </wire>
+    <wire>
+      <p1 x="940" y="740"/>
+      <p2 x="860" y="820"/>
+    </wire>
+    <wire>
+      <p1 x="1060" y="740"/>
+      <p2 x="1100" y="820"/>
+    </wire>
+    <wire>
+      <p1 x="1060" y="560"/>
+      <p2 x="1080" y="560"/>
+    </wire>
+    <wire>
+      <p1 x="1220" y="560"/>
+      <p2 x="1240" y="560"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="640"/>
+      <p2 x="840" y="640"/>
+    </wire>
+    <wire>
+      <p1 x="1220" y="500"/>
+      <p2 x="1240" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="1060" y="500"/>
+      <p2 x="1080" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="980" y="500"/>
+      <p2 x="1000" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="1220" y="520"/>
+      <p2 x="1240" y="520"/>
+    </wire>
+    <wire>
+      <p1 x="1060" y="520"/>
+      <p2 x="1080" y="520"/>
+    </wire>
+    <wire>
+      <p1 x="840" y="520"/>
+      <p2 x="860" y="520"/>
+    </wire>
+    <wire>
+      <p1 x="960" y="520"/>
+      <p2 x="1000" y="520"/>
+    </wire>
+    <wire>
+      <p1 x="1220" y="540"/>
+      <p2 x="1240" y="540"/>
+    </wire>
+    <wire>
+      <p1 x="1060" y="540"/>
+      <p2 x="1080" y="540"/>
+    </wire>
+    <wire>
+      <p1 x="840" y="540"/>
+      <p2 x="860" y="540"/>
+    </wire>
+    <wire>
+      <p1 x="920" y="540"/>
+      <p2 x="960" y="540"/>
+    </wire>
+    <wire>
+      <p1 x="1120" y="660"/>
+      <p2 x="1120" y="680"/>
+    </wire>
+    <wire>
+      <p1 x="960" y="520"/>
+      <p2 x="960" y="540"/>
+    </wire>
+    <wire>
+      <p1 x="1140" y="660"/>
+      <p2 x="1140" y="680"/>
+    </wire>
+    <wire>
+      <p1 x="840" y="540"/>
+      <p2 x="840" y="560"/>
+    </wire>
+    <wire>
+      <p1 x="1160" y="660"/>
+      <p2 x="1160" y="680"/>
+    </wire>
+    <wire>
+      <p1 x="1180" y="660"/>
+      <p2 x="1180" y="680"/>
+    </wire>
+    <wire>
+      <p1 x="1020" y="740"/>
+      <p2 x="1020" y="820"/>
+    </wire>
+  </wires>
+  <measurementOrdering>
+    <string>Clock</string>
+    <string>Carry</string>
+    <string>Zero</string>
+    <string>Neg</string>
+    <string>PC</string>
+    <string>R0</string>
+    <string>R1</string>
+    <string>R2</string>
+    <string>R3</string>
+    <string>R4</string>
+    <string>R5</string>
+    <string>R6</string>
+    <string>R7</string>
+    <string>R8</string>
+    <string>R9</string>
+    <string>R10</string>
+    <string>R11</string>
+    <string>R12</string>
+    <string>BP</string>
+    <string>SP</string>
+    <string>RA</string>
+  </measurementOrdering>
+</circuit>
\ No newline at end of file
diff --git a/src/main/dig/processor/ProcessorIntr.dig b/src/main/dig/processor/ProcessorIntr.dig
index 2b4ca85cf..11d703a1c 100644
--- a/src/main/dig/processor/ProcessorIntr.dig
+++ b/src/main/dig/processor/ProcessorIntr.dig
@@ -7,9 +7,9 @@
       <string>Einfacher Prozessor, der an die MIPS-Architektur 
 angelehnt ist. Es handelt sich um eine Harvard 
 Single-Cycle CPU. Er verfügt über einen Interrupt 
-Controller, der gesteuert durch einen Zähler, alle
-2048 Zyklen einen Interrupt auslöst, und dabei die
-feste Adresse 0x1000 anspringt.
+Controller: Eine steigende Flanke am Eingang intr 
+wird ein Interrupt ausgelöst. Dabei wird die feste 
+Adresse 0x1000 angesprungen.
 An dieser Adresse muss sich die ISR befinden.</string>
     </entry>
   </attributes>
@@ -17,7 +17,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
     <visualElement>
       <elementName>Register.dig</elementName>
       <elementAttributes/>
-      <pos x="640" y="120"/>
+      <pos x="660" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>Multiplexer</elementName>
@@ -306,7 +306,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
           <int>500000</int>
         </entry>
       </elementAttributes>
-      <pos x="540" y="20"/>
+      <pos x="1040" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Driver</elementName>
@@ -576,7 +576,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
           <string>WE</string>
         </entry>
       </elementAttributes>
-      <pos x="620" y="200"/>
+      <pos x="640" y="200"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -724,7 +724,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
           <string>C</string>
         </entry>
       </elementAttributes>
-      <pos x="560" y="20"/>
+      <pos x="1060" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -766,7 +766,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
           <string>C</string>
         </entry>
       </elementAttributes>
-      <pos x="620" y="140"/>
+      <pos x="640" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -926,20 +926,6 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <elementAttributes/>
       <pos x="360" y="120"/>
     </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>D</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1400" y="80"/>
-    </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
@@ -960,247 +946,6 @@ An dieser Adresse muss sich die ISR befinden.</string>
       </elementAttributes>
       <pos x="1160" y="340"/>
     </visualElement>
-    <visualElement>
-      <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/Terminal.dig</elementName>
-      <elementAttributes/>
-      <pos x="1340" y="640"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>ioW</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1320" y="700"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>D</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1320" y="640"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>A</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1320" y="660"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>C</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1320" y="680"/>
-    </visualElement>
-    <visualElement>
-      <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/GPO.dig</elementName>
-      <elementAttributes/>
-      <pos x="1340" y="280"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>ioW</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1320" y="340"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>D</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1320" y="280"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>A</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1320" y="300"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>C</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1320" y="320"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="120"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="160"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="240"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="280"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="320"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="360"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="400"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="440"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="480"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="520"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="560"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="600"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="640"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="680"/>
-    </visualElement>
-    <visualElement>
-      <elementName>LED</elementName>
-      <elementAttributes/>
-      <pos x="1480" y="720"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Counter</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Bits</string>
-          <int>11</int>
-        </entry>
-      </elementAttributes>
-      <pos x="960" y="660"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>C</string>
-        </entry>
-      </elementAttributes>
-      <pos x="940" y="660"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Ground</elementName>
-      <elementAttributes/>
-      <pos x="940" y="700"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>A</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1280" y="80"/>
-    </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
@@ -1283,72 +1028,168 @@ An dieser Adresse muss sich die ISR befinden.</string>
       </elementAttributes>
       <pos x="620" y="580"/>
     </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Adressbus</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>A</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+      </elementAttributes>
+      <pos x="1320" y="640"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Datenbus</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>D</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+      </elementAttributes>
+      <pos x="1320" y="580"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>io Read</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>ioR</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1320" y="680"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>ioW</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1300" y="720"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>ioR</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1300" y="680"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>io Write</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>ioW</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1320" y="720"/>
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Interrupt Eingang. Geht diese Leitung auf high wird ein
+Interrupt ausgelöst. Die ISR muss sich an Adresse 
+0x1000 befinden.</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>intr</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1040" y="660"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>D</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1400" y="80"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>A</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1280" y="80"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>D</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1300" y="580"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>A</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1300" y="640"/>
+    </visualElement>
   </visualElements>
   <wires>
-    <wire>
-      <p1 x="1480" y="120"/>
-      <p2 x="1400" y="280"/>
-    </wire>
-    <wire>
-      <p1 x="1400" y="300"/>
-      <p2 x="1480" y="160"/>
-    </wire>
-    <wire>
-      <p1 x="1400" y="320"/>
-      <p2 x="1480" y="200"/>
-    </wire>
-    <wire>
-      <p1 x="1480" y="240"/>
-      <p2 x="1400" y="340"/>
-    </wire>
-    <wire>
-      <p1 x="1400" y="360"/>
-      <p2 x="1480" y="280"/>
-    </wire>
-    <wire>
-      <p1 x="1480" y="320"/>
-      <p2 x="1400" y="380"/>
-    </wire>
-    <wire>
-      <p1 x="1480" y="400"/>
-      <p2 x="1400" y="420"/>
-    </wire>
-    <wire>
-      <p1 x="1480" y="480"/>
-      <p2 x="1400" y="460"/>
-    </wire>
-    <wire>
-      <p1 x="1400" y="480"/>
-      <p2 x="1480" y="520"/>
-    </wire>
-    <wire>
-      <p1 x="1480" y="560"/>
-      <p2 x="1400" y="500"/>
-    </wire>
-    <wire>
-      <p1 x="1480" y="640"/>
-      <p2 x="1400" y="540"/>
-    </wire>
-    <wire>
-      <p1 x="1400" y="580"/>
-      <p2 x="1480" y="720"/>
-    </wire>
-    <wire>
-      <p1 x="1400" y="560"/>
-      <p2 x="1480" y="680"/>
-    </wire>
-    <wire>
-      <p1 x="1400" y="520"/>
-      <p2 x="1480" y="600"/>
-    </wire>
-    <wire>
-      <p1 x="1400" y="400"/>
-      <p2 x="1480" y="360"/>
-    </wire>
-    <wire>
-      <p1 x="1320" y="640"/>
-      <p2 x="1340" y="640"/>
-    </wire>
     <wire>
       <p1 x="600" y="0"/>
       <p2 x="800" y="0"/>
@@ -1366,8 +1207,8 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="1160" y="320"/>
     </wire>
     <wire>
-      <p1 x="1320" y="320"/>
-      <p2 x="1340" y="320"/>
+      <p1 x="1300" y="640"/>
+      <p2 x="1320" y="640"/>
     </wire>
     <wire>
       <p1 x="920" y="580"/>
@@ -1377,6 +1218,10 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p1 x="760" y="580"/>
       <p2 x="840" y="580"/>
     </wire>
+    <wire>
+      <p1 x="1300" y="580"/>
+      <p2 x="1320" y="580"/>
+    </wire>
     <wire>
       <p1 x="320" y="260"/>
       <p2 x="480" y="260"/>
@@ -1406,8 +1251,8 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="1080" y="200"/>
     </wire>
     <wire>
-      <p1 x="620" y="200"/>
-      <p2 x="640" y="200"/>
+      <p1 x="640" y="200"/>
+      <p2 x="660" y="200"/>
     </wire>
     <wire>
       <p1 x="1320" y="200"/>
@@ -1442,7 +1287,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="1080" y="140"/>
     </wire>
     <wire>
-      <p1 x="740" y="140"/>
+      <p1 x="760" y="140"/>
       <p2 x="800" y="140"/>
     </wire>
     <wire>
@@ -1450,8 +1295,8 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="360" y="140"/>
     </wire>
     <wire>
-      <p1 x="620" y="140"/>
-      <p2 x="640" y="140"/>
+      <p1 x="640" y="140"/>
+      <p2 x="660" y="140"/>
     </wire>
     <wire>
       <p1 x="460" y="140"/>
@@ -1494,29 +1339,25 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="940" y="400"/>
     </wire>
     <wire>
-      <p1 x="1320" y="660"/>
-      <p2 x="1340" y="660"/>
+      <p1 x="1300" y="720"/>
+      <p2 x="1320" y="720"/>
     </wire>
     <wire>
-      <p1 x="940" y="660"/>
-      <p2 x="960" y="660"/>
-    </wire>
-    <wire>
-      <p1 x="1320" y="340"/>
-      <p2 x="1340" y="340"/>
+      <p1 x="1040" y="720"/>
+      <p2 x="1060" y="720"/>
     </wire>
     <wire>
       <p1 x="1140" y="340"/>
       <p2 x="1160" y="340"/>
     </wire>
-    <wire>
-      <p1 x="540" y="20"/>
-      <p2 x="560" y="20"/>
-    </wire>
     <wire>
       <p1 x="340" y="20"/>
       <p2 x="360" y="20"/>
     </wire>
+    <wire>
+      <p1 x="1040" y="660"/>
+      <p2 x="1060" y="660"/>
+    </wire>
     <wire>
       <p1 x="760" y="600"/>
       <p2 x="840" y="600"/>
@@ -1525,10 +1366,6 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p1 x="1060" y="600"/>
       <p2 x="1080" y="600"/>
     </wire>
-    <wire>
-      <p1 x="1320" y="280"/>
-      <p2 x="1340" y="280"/>
-    </wire>
     <wire>
       <p1 x="1140" y="280"/>
       <p2 x="1160" y="280"/>
@@ -1587,7 +1424,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
     </wire>
     <wire>
       <p1 x="540" y="160"/>
-      <p2 x="640" y="160"/>
+      <p2 x="660" y="160"/>
     </wire>
     <wire>
       <p1 x="1000" y="420"/>
@@ -1597,6 +1434,10 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p1 x="1140" y="420"/>
       <p2 x="1240" y="420"/>
     </wire>
+    <wire>
+      <p1 x="1300" y="680"/>
+      <p2 x="1320" y="680"/>
+    </wire>
     <wire>
       <p1 x="360" y="40"/>
       <p2 x="380" y="40"/>
@@ -1609,18 +1450,6 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p1 x="1260" y="40"/>
       <p2 x="1280" y="40"/>
     </wire>
-    <wire>
-      <p1 x="940" y="680"/>
-      <p2 x="960" y="680"/>
-    </wire>
-    <wire>
-      <p1 x="1320" y="680"/>
-      <p2 x="1340" y="680"/>
-    </wire>
-    <wire>
-      <p1 x="1020" y="680"/>
-      <p2 x="1040" y="680"/>
-    </wire>
     <wire>
       <p1 x="1140" y="360"/>
       <p2 x="1160" y="360"/>
@@ -1630,13 +1459,9 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="1020" y="360"/>
     </wire>
     <wire>
-      <p1 x="1040" y="620"/>
+      <p1 x="1060" y="620"/>
       <p2 x="1080" y="620"/>
     </wire>
-    <wire>
-      <p1 x="1320" y="300"/>
-      <p2 x="1340" y="300"/>
-    </wire>
     <wire>
       <p1 x="1140" y="300"/>
       <p2 x="1160" y="300"/>
@@ -1687,16 +1512,12 @@ An dieser Adresse muss sich die ISR befinden.</string>
     </wire>
     <wire>
       <p1 x="560" y="180"/>
-      <p2 x="640" y="180"/>
+      <p2 x="660" y="180"/>
     </wire>
     <wire>
       <p1 x="340" y="180"/>
       <p2 x="360" y="180"/>
     </wire>
-    <wire>
-      <p1 x="1400" y="440"/>
-      <p2 x="1480" y="440"/>
-    </wire>
     <wire>
       <p1 x="1000" y="440"/>
       <p2 x="1080" y="440"/>
@@ -1714,7 +1535,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="600" y="120"/>
     </wire>
     <wire>
-      <p1 x="740" y="120"/>
+      <p1 x="760" y="120"/>
       <p2 x="840" y="120"/>
     </wire>
     <wire>
@@ -1731,11 +1552,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
     </wire>
     <wire>
       <p1 x="600" y="120"/>
-      <p2 x="640" y="120"/>
-    </wire>
-    <wire>
-      <p1 x="1320" y="700"/>
-      <p2 x="1340" y="700"/>
+      <p2 x="660" y="120"/>
     </wire>
     <wire>
       <p1 x="1000" y="380"/>
@@ -1801,10 +1618,6 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p1 x="400" y="680"/>
       <p2 x="400" y="700"/>
     </wire>
-    <wire>
-      <p1 x="1040" y="620"/>
-      <p2 x="1040" y="680"/>
-    </wire>
     <wire>
       <p1 x="340" y="20"/>
       <p2 x="340" y="40"/>
@@ -1889,6 +1702,10 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p1 x="800" y="160"/>
       <p2 x="800" y="460"/>
     </wire>
+    <wire>
+      <p1 x="1060" y="620"/>
+      <p2 x="1060" y="660"/>
+    </wire>
     <wire>
       <p1 x="1060" y="200"/>
       <p2 x="1060" y="380"/>
@@ -1905,10 +1722,6 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p1 x="360" y="680"/>
       <p2 x="360" y="700"/>
     </wire>
-    <wire>
-      <p1 x="940" y="680"/>
-      <p2 x="940" y="700"/>
-    </wire>
     <wire>
       <p1 x="1260" y="160"/>
       <p2 x="1260" y="440"/>
diff --git a/src/test/java/de/neemann/digital/integration/TestExamples.java b/src/test/java/de/neemann/digital/integration/TestExamples.java
index 06ac9c56c..8b5ffd0d0 100644
--- a/src/test/java/de/neemann/digital/integration/TestExamples.java
+++ b/src/test/java/de/neemann/digital/integration/TestExamples.java
@@ -28,7 +28,7 @@ public class TestExamples extends TestCase {
      */
     public void testDistExamples() throws Exception {
         File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig");
-        assertEquals(93, new FileScanner(this::check).scan(examples));
+        assertEquals(94, new FileScanner(this::check).scan(examples));
         assertEquals(43, testCasesInFiles);
     }