From 73f27b03627595bd1739ad1c336e3b39e1cd43e4 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Wed, 21 Dec 2016 21:55:34 +0100
Subject: [PATCH] improved simpler interrupt controller

---
 src/main/dig/processor/Control.dig       |  89 ++-----
 src/main/dig/processor/Interrupt.dig     | 232 ++++-------------
 src/main/dig/processor/ProcessorIntr.dig | 314 +++++++++++++----------
 3 files changed, 257 insertions(+), 378 deletions(-)

diff --git a/src/main/dig/processor/Control.dig b/src/main/dig/processor/Control.dig
index b4876e7b7..3f7c38b92 100644
--- a/src/main/dig/processor/Control.dig
+++ b/src/main/dig/processor/Control.dig
@@ -91,72 +91,11 @@ realisiert, und nicht durch 24 einzelne Schaltnetze.</string>
         </entry>
         <entry>
           <string>Data</string>
-          <data>
-            <size>63</size>
-            <long>0</long>
-            <long>2097280</long>
-            <long>4195520</long>
-            <long>4211904</long>
-            <long>4196544</long>
-            <long>4212928</long>
-            <long>4197568</long>
-            <long>4198592</long>
-            <long>4199616</long>
-            <long>196</long>
-            <long>212</long>
-            <long>4195524</long>
-            <long>4195540</long>
-            <long>4211908</long>
-            <long>4211924</long>
-            <long>4196548</long>
-            <long>4196564</long>
-            <long>4212932</long>
-            <long>4212948</long>
-            <long>4197572</long>
-            <long>4197588</long>
-            <long>4198596</long>
-            <long>4198612</long>
-            <long>4199620</long>
-            <long>4199636</long>
-            <long>4205760</long>
-            <long>4205764</long>
-            <long>4205780</long>
-            <long>4196352</long>
-            <long>4196356</long>
-            <long>4196372</long>
-            <long>4200640</long>
-            <long>4201664</long>
-            <long>4217024</long>
-            <long>4218048</long>
-            <long>4202688</long>
-            <long>9408</long>
-            <long>10432</long>
-            <long>2098186</long>
-            <long>1673</long>
-            <long>2097158</long>
-            <long>2097182</long>
-            <long>133</long>
-            <long>149</long>
-            <long>2098182</long>
-            <long>1669</long>
-            <long>32792</long>
-            <long>65560</long>
-            <long>98328</long>
-            <long>163864</long>
-            <long>196632</long>
-            <long>229400</long>
-            <long>420</long>
-            <long>32</long>
-            <long>36</long>
-            <long>131096</long>
-            <long>2359300</long>
-            <long>2359324</long>
-            <long>2360328</long>
-            <long>524932</long>
-            <long>524948</long>
-            <long>525960</long>
-            <long>1048576</long>
-          </data>
+          <data size="64">0,200080,4004c0,4044c0,4008c0,4048c0,400cc0,4010c0,4014c0,c4,d4,4004c4,4004d4,4044c4,
+4044d4,4008c4,4008d4,4048c4,4048d4,400cc4,400cd4,4010c4,4010d4,4014c4,4014d4,402cc0,
+402cc4,402cd4,400800,400804,400814,4018c0,401cc0,4058c0,405cc0,4020c0,24c0,28c0,20040a,
+689,200006,20001e,85,95,200406,685,8018,10018,18018,28018,30018,38018,1a4,20,24,20018,
+240004,24001c,240408,80284,80294,80688,100000,800020</data>
         </entry>
         <entry>
           <string>lastDataFile</string>
@@ -436,6 +375,20 @@ realisiert, und nicht durch 24 einzelne Schaltnetze.</string>
       </elementAttributes>
       <pos x="580" y="220"/>
     </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>return from interrupt</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>reti</string>
+        </entry>
+      </elementAttributes>
+      <pos x="860" y="500"/>
+    </visualElement>
   </visualElements>
   <wires>
     <wire>
@@ -514,6 +467,10 @@ realisiert, und nicht durch 24 einzelne Schaltnetze.</string>
       <p1 x="620" y="340"/>
       <p2 x="860" y="340"/>
     </wire>
+    <wire>
+      <p1 x="620" y="500"/>
+      <p2 x="860" y="500"/>
+    </wire>
     <wire>
       <p1 x="620" y="280"/>
       <p2 x="680" y="280"/>
diff --git a/src/main/dig/processor/Interrupt.dig b/src/main/dig/processor/Interrupt.dig
index cfecdf566..8a004e1bc 100644
--- a/src/main/dig/processor/Interrupt.dig
+++ b/src/main/dig/processor/Interrupt.dig
@@ -4,74 +4,35 @@
   <attributes>
     <entry>
       <string>Description</string>
-      <string>Einfacher Interrupt-Controler.
-Wird ein Interrupt ausgelöst, wird der Controler
+      <string>Einfacher Interrupt-Controller.
+Wird ein Interrupt ausgelöst, wird der Controller
 gesperrt: Es können keine weiteren Interrupts
-ausgelöst werden. Am Ende der ISR kann über 
-den IO Port 1 die Return Address abgefragt 
-werden. Diese Abfrage gibt den 
-Interruptcontroller auch wieder frei, so dass 
-erneut Interrupts ausgelöst werden können.</string>
+ausgelöst werden. Erst der Eingang reti gibt den 
+Interrupt-Controller wieder frei.</string>
     </entry>
     <entry>
       <string>Width</string>
-      <int>4</int>
+      <int>5</int>
     </entry>
   </attributes>
   <visualElements>
-    <visualElement>
-      <elementName>In</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Description</string>
-          <string>Adresse</string>
-        </entry>
-        <entry>
-          <string>Label</string>
-          <string>A</string>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-        <entry>
-          <string>Default</string>
-          <int>1</int>
-        </entry>
-      </elementAttributes>
-      <pos x="220" y="340"/>
-    </visualElement>
     <visualElement>
       <elementName>Out</elementName>
       <elementAttributes>
         <entry>
           <string>Description</string>
-          <string>Datenbus</string>
+          <string>Return Address</string>
         </entry>
         <entry>
           <string>Label</string>
-          <string>D</string>
+          <string>retAddr</string>
         </entry>
         <entry>
           <string>Bits</string>
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="700" y="260"/>
-    </visualElement>
-    <visualElement>
-      <elementName>In</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Description</string>
-          <string>IO Read</string>
-        </entry>
-        <entry>
-          <string>Label</string>
-          <string>ioR</string>
-        </entry>
-      </elementAttributes>
-      <pos x="220" y="400"/>
+      <pos x="620" y="260"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -124,7 +85,7 @@ erneut Interrupts ausgelöst werden können.</string>
         </entry>
         <entry>
           <string>Label</string>
-          <string>intRet</string>
+          <string>retAddr</string>
         </entry>
         <entry>
           <string>Bits</string>
@@ -168,17 +129,7 @@ erneut Interrupts ausgelöst werden können.</string>
           <string>iEn</string>
         </entry>
       </elementAttributes>
-      <pos x="780" y="120"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Comparator</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-      </elementAttributes>
-      <pos x="340" y="340"/>
+      <pos x="680" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -195,35 +146,6 @@ Wenn gesetzt, wird Interrupt verhindert.</string>
       </elementAttributes>
       <pos x="220" y="140"/>
     </visualElement>
-    <visualElement>
-      <elementName>Const</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-      </elementAttributes>
-      <pos x="320" y="360"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Driver</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-        <entry>
-          <string>flipSelPos</string>
-          <boolean>true</boolean>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="260"/>
-    </visualElement>
-    <visualElement>
-      <elementName>And</elementName>
-      <elementAttributes/>
-      <pos x="500" y="360"/>
-    </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
@@ -269,40 +191,38 @@ Wenn gesetzt, wird Interrupt verhindert.</string>
       <elementAttributes>
         <entry>
           <string>Description</string>
-          <string>Interrupt Anforderung</string>
+          <string>return from interrupt</string>
+        </entry>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
         </entry>
         <entry>
           <string>Label</string>
-          <string>intr</string>
+          <string>reti</string>
         </entry>
       </elementAttributes>
-      <pos x="220" y="60"/>
+      <pos x="520" y="-20"/>
     </visualElement>
     <visualElement>
       <elementName>D_FF</elementName>
       <elementAttributes>
+        <entry>
+          <string>valueIsProbe</string>
+          <boolean>true</boolean>
+        </entry>
         <entry>
           <string>Label</string>
-          <string>Sync</string>
+          <string>iEn</string>
         </entry>
       </elementAttributes>
-      <pos x="680" y="120"/>
+      <pos x="580" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/Rising.dig</elementName>
       <elementAttributes/>
       <pos x="260" y="20"/>
     </visualElement>
-    <visualElement>
-      <elementName>D_FF</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-      </elementAttributes>
-      <pos x="600" y="60"/>
-    </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
@@ -327,20 +247,6 @@ Wenn gesetzt, wird Interrupt verhindert.</string>
       </elementAttributes>
       <pos x="480" y="260"/>
     </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="3"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>C</string>
-        </entry>
-      </elementAttributes>
-      <pos x="620" y="80"/>
-    </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
@@ -363,7 +269,21 @@ Wenn gesetzt, wird Interrupt verhindert.</string>
           <string>C</string>
         </entry>
       </elementAttributes>
-      <pos x="660" y="140"/>
+      <pos x="560" y="140"/>
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Interrupt Anforderung</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>intr</string>
+        </entry>
+      </elementAttributes>
+      <pos x="220" y="60"/>
     </visualElement>
   </visualElements>
   <wires>
@@ -395,10 +315,6 @@ Wenn gesetzt, wird Interrupt verhindert.</string>
       <p1 x="580" y="260"/>
       <p2 x="620" y="260"/>
     </wire>
-    <wire>
-      <p1 x="660" y="260"/>
-      <p2 x="700" y="260"/>
-    </wire>
     <wire>
       <p1 x="480" y="260"/>
       <p2 x="520" y="260"/>
@@ -407,14 +323,6 @@ Wenn gesetzt, wird Interrupt verhindert.</string>
       <p1 x="320" y="40"/>
       <p2 x="340" y="40"/>
     </wire>
-    <wire>
-      <p1 x="320" y="360"/>
-      <p2 x="340" y="360"/>
-    </wire>
-    <wire>
-      <p1 x="400" y="360"/>
-      <p2 x="500" y="360"/>
-    </wire>
     <wire>
       <p1 x="220" y="140"/>
       <p2 x="300" y="140"/>
@@ -424,12 +332,8 @@ Wenn gesetzt, wird Interrupt verhindert.</string>
       <p2 x="400" y="140"/>
     </wire>
     <wire>
-      <p1 x="660" y="140"/>
-      <p2 x="680" y="140"/>
-    </wire>
-    <wire>
-      <p1 x="600" y="300"/>
-      <p2 x="640" y="300"/>
+      <p1 x="560" y="140"/>
+      <p2 x="580" y="140"/>
     </wire>
     <wire>
       <p1 x="380" y="80"/>
@@ -439,17 +343,9 @@ Wenn gesetzt, wird Interrupt verhindert.</string>
       <p1 x="220" y="240"/>
       <p2 x="520" y="240"/>
     </wire>
-    <wire>
-      <p1 x="220" y="400"/>
-      <p2 x="500" y="400"/>
-    </wire>
     <wire>
       <p1 x="460" y="-20"/>
-      <p2 x="600" y="-20"/>
-    </wire>
-    <wire>
-      <p1 x="220" y="340"/>
-      <p2 x="340" y="340"/>
+      <p2 x="520" y="-20"/>
     </wire>
     <wire>
       <p1 x="240" y="20"/>
@@ -484,37 +380,33 @@ Wenn gesetzt, wird Interrupt verhindert.</string>
       <p2 x="400" y="120"/>
     </wire>
     <wire>
-      <p1 x="740" y="120"/>
-      <p2 x="760" y="120"/>
+      <p1 x="640" y="120"/>
+      <p2 x="660" y="120"/>
     </wire>
     <wire>
-      <p1 x="760" y="120"/>
-      <p2 x="780" y="120"/>
-    </wire>
-    <wire>
-      <p1 x="500" y="120"/>
+      <p1 x="660" y="120"/>
       <p2 x="680" y="120"/>
     </wire>
     <wire>
-      <p1 x="240" y="-60"/>
-      <p2 x="760" y="-60"/>
+      <p1 x="500" y="120"/>
+      <p2 x="580" y="120"/>
     </wire>
     <wire>
-      <p1 x="560" y="380"/>
-      <p2 x="600" y="380"/>
+      <p1 x="240" y="-60"/>
+      <p2 x="660" y="-60"/>
     </wire>
     <wire>
       <p1 x="220" y="60"/>
       <p2 x="260" y="60"/>
     </wire>
-    <wire>
-      <p1 x="640" y="280"/>
-      <p2 x="640" y="300"/>
-    </wire>
     <wire>
       <p1 x="240" y="-60"/>
       <p2 x="240" y="20"/>
     </wire>
+    <wire>
+      <p1 x="660" y="-60"/>
+      <p2 x="660" y="120"/>
+    </wire>
     <wire>
       <p1 x="500" y="20"/>
       <p2 x="500" y="120"/>
@@ -535,29 +427,9 @@ Wenn gesetzt, wird Interrupt verhindert.</string>
       <p1 x="340" y="40"/>
       <p2 x="340" y="100"/>
     </wire>
-    <wire>
-      <p1 x="600" y="60"/>
-      <p2 x="600" y="300"/>
-    </wire>
-    <wire>
-      <p1 x="600" y="-20"/>
-      <p2 x="600" y="0"/>
-    </wire>
-    <wire>
-      <p1 x="600" y="300"/>
-      <p2 x="600" y="380"/>
-    </wire>
-    <wire>
-      <p1 x="760" y="-60"/>
-      <p2 x="760" y="120"/>
-    </wire>
     <wire>
       <p1 x="380" y="0"/>
       <p2 x="380" y="80"/>
     </wire>
-    <wire>
-      <p1 x="620" y="60"/>
-      <p2 x="620" y="80"/>
-    </wire>
   </wires>
 </circuit>
\ No newline at end of file
diff --git a/src/main/dig/processor/ProcessorIntr.dig b/src/main/dig/processor/ProcessorIntr.dig
index 36fd5594f..a6400b434 100644
--- a/src/main/dig/processor/ProcessorIntr.dig
+++ b/src/main/dig/processor/ProcessorIntr.dig
@@ -169,7 +169,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
         </entry>
         <entry>
           <string>Data</string>
-          <data size="4131">99ab,1200,8015,68f0,8020,1200,73f0,8f8a,1200,8015,68f0,8020,1200,73f0,1831,203,8015,
+          <data size="4135">99ab,1200,8015,68f0,8020,1200,73f0,8f8a,1200,8015,68f0,8020,1200,73f0,1831,203,8015,
 68f0,140a,73f0,6feb,4800,4a00,8024,6820,4a00,8024,6820,4800,4a00,8024,6820,4a00,8024,
 6820,6a0f,210,281f,3c1a,6203,8030,1610,6e02,8037,1610,73f1,6a02,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -270,9 +270,9 @@ An dieser Adresse muss sich die ISR befinden.</string>
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,78c0,20e1,4cec,20e1,4ce0,7c00,5601,56c0,
-3cc0,6402,14c1,1400,735c,3c00,6407,3ec0,8000,3bc0,6408,1401,5210,6e05,40c0,3cc1,6402,
-1400,5210,520c,4e0e,18e1,4ece,18e1,720c,78c1,6a0c</data>
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,ffff,59e0,7800,20e1,20e1,4ce0,20e1,4ce1,
+7c00,5601,5610,3c10,6402,1411,1400,7351,3c00,6407,3e10,8000,3b10,6408,1401,5210,6e05,
+4010,3c11,6402,1400,5210,5201,4e1e,18e1,4e0e,18e2,7200,ffff,5b0e,7e00</data>
         </entry>
         <entry>
           <string>lastDataFile</string>
@@ -309,14 +309,14 @@ An dieser Adresse muss sich die ISR befinden.</string>
         </entry>
         <entry>
           <string>Label</string>
-          <string>Clock</string>
+          <string>C</string>
         </entry>
         <entry>
           <string>Frequency</string>
           <int>500000</int>
         </entry>
       </elementAttributes>
-      <pos x="440" y="20"/>
+      <pos x="540" y="20"/>
     </visualElement>
     <visualElement>
       <elementName>Driver</elementName>
@@ -734,7 +734,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
           <string>C</string>
         </entry>
       </elementAttributes>
-      <pos x="460" y="20"/>
+      <pos x="560" y="20"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -805,21 +805,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
     <visualElement>
       <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/Interrupt.dig</elementName>
       <elementAttributes/>
-      <pos x="1120" y="500"/>
-    </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="1100" y="520"/>
+      <pos x="1080" y="500"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -833,7 +819,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
           <string>C</string>
         </entry>
       </elementAttributes>
-      <pos x="1100" y="540"/>
+      <pos x="1060" y="500"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -847,7 +833,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
           <string>imm</string>
         </entry>
       </elementAttributes>
-      <pos x="1100" y="580"/>
+      <pos x="1060" y="540"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -861,7 +847,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
           <string>next</string>
         </entry>
       </elementAttributes>
-      <pos x="1100" y="560"/>
+      <pos x="1060" y="520"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -885,7 +871,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
           <string>iEn</string>
         </entry>
       </elementAttributes>
-      <pos x="1220" y="520"/>
+      <pos x="1200" y="520"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -913,7 +899,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
           <string>abs</string>
         </entry>
       </elementAttributes>
-      <pos x="1100" y="600"/>
+      <pos x="1060" y="560"/>
     </visualElement>
     <visualElement>
       <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/FlagsRW.dig</elementName>
@@ -974,16 +960,6 @@ An dieser Adresse muss sich die ISR befinden.</string>
       </elementAttributes>
       <pos x="1160" y="280"/>
     </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>D</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1220" y="500"/>
-    </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
@@ -994,20 +970,6 @@ An dieser Adresse muss sich die ISR befinden.</string>
       </elementAttributes>
       <pos x="1160" y="340"/>
     </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="1100" y="500"/>
-    </visualElement>
     <visualElement>
       <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/Terminal.dig</elementName>
       <elementAttributes/>
@@ -1218,7 +1180,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
           <int>11</int>
         </entry>
       </elementAttributes>
-      <pos x="980" y="660"/>
+      <pos x="960" y="660"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -1232,12 +1194,12 @@ An dieser Adresse muss sich die ISR befinden.</string>
           <string>C</string>
         </entry>
       </elementAttributes>
-      <pos x="960" y="660"/>
+      <pos x="940" y="660"/>
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="960" y="700"/>
+      <pos x="940" y="700"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -1249,6 +1211,78 @@ An dieser Adresse muss sich die ISR befinden.</string>
       </elementAttributes>
       <pos x="1280" y="80"/>
     </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>reti</string>
+        </entry>
+      </elementAttributes>
+      <pos x="320" y="700"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>retAddr</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1200" y="500"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>reti</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1060" y="600"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Multiplexer</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+      </elementAttributes>
+      <pos x="360" y="80"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>reti</string>
+        </entry>
+      </elementAttributes>
+      <pos x="360" y="20"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>retAddr</string>
+        </entry>
+      </elementAttributes>
+      <pos x="380" y="40"/>
+    </visualElement>
   </visualElements>
   <wires>
     <wire>
@@ -1315,10 +1349,6 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p1 x="1320" y="640"/>
       <p2 x="1340" y="640"/>
     </wire>
-    <wire>
-      <p1 x="1080" y="640"/>
-      <p2 x="1120" y="640"/>
-    </wire>
     <wire>
       <p1 x="600" y="0"/>
       <p2 x="800" y="0"/>
@@ -1340,12 +1370,12 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="1340" y="320"/>
     </wire>
     <wire>
-      <p1 x="760" y="580"/>
-      <p2 x="840" y="580"/>
+      <p1 x="920" y="580"/>
+      <p2 x="1080" y="580"/>
     </wire>
     <wire>
-      <p1 x="1100" y="580"/>
-      <p2 x="1120" y="580"/>
+      <p1 x="760" y="580"/>
+      <p2 x="840" y="580"/>
     </wire>
     <wire>
       <p1 x="320" y="260"/>
@@ -1360,12 +1390,12 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="840" y="520"/>
     </wire>
     <wire>
-      <p1 x="1100" y="520"/>
-      <p2 x="1120" y="520"/>
+      <p1 x="1060" y="520"/>
+      <p2 x="1080" y="520"/>
     </wire>
     <wire>
-      <p1 x="1200" y="520"/>
-      <p2 x="1220" y="520"/>
+      <p1 x="1180" y="520"/>
+      <p2 x="1200" y="520"/>
     </wire>
     <wire>
       <p1 x="1160" y="200"/>
@@ -1435,6 +1465,18 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p1 x="1240" y="140"/>
       <p2 x="1340" y="140"/>
     </wire>
+    <wire>
+      <p1 x="1400" y="80"/>
+      <p2 x="1420" y="80"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="80"/>
+      <p2 x="1240" y="80"/>
+    </wire>
+    <wire>
+      <p1 x="1240" y="80"/>
+      <p2 x="1280" y="80"/>
+    </wire>
     <wire>
       <p1 x="340" y="400"/>
       <p2 x="920" y="400"/>
@@ -1451,25 +1493,13 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p1 x="920" y="400"/>
       <p2 x="940" y="400"/>
     </wire>
-    <wire>
-      <p1 x="340" y="80"/>
-      <p2 x="1240" y="80"/>
-    </wire>
-    <wire>
-      <p1 x="1400" y="80"/>
-      <p2 x="1420" y="80"/>
-    </wire>
-    <wire>
-      <p1 x="1240" y="80"/>
-      <p2 x="1280" y="80"/>
-    </wire>
     <wire>
       <p1 x="1320" y="660"/>
       <p2 x="1340" y="660"/>
     </wire>
     <wire>
-      <p1 x="960" y="660"/>
-      <p2 x="980" y="660"/>
+      <p1 x="940" y="660"/>
+      <p2 x="960" y="660"/>
     </wire>
     <wire>
       <p1 x="1320" y="340"/>
@@ -1480,8 +1510,20 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="1160" y="340"/>
     </wire>
     <wire>
-      <p1 x="440" y="20"/>
-      <p2 x="460" y="20"/>
+      <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="760" y="600"/>
+      <p2 x="840" y="600"/>
+    </wire>
+    <wire>
+      <p1 x="1060" y="600"/>
+      <p2 x="1080" y="600"/>
     </wire>
     <wire>
       <p1 x="1320" y="280"/>
@@ -1492,16 +1534,8 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="1160" y="280"/>
     </wire>
     <wire>
-      <p1 x="1100" y="600"/>
-      <p2 x="1120" y="600"/>
-    </wire>
-    <wire>
-      <p1 x="760" y="600"/>
-      <p2 x="840" y="600"/>
-    </wire>
-    <wire>
-      <p1 x="1100" y="540"/>
-      <p2 x="1120" y="540"/>
+      <p1 x="1060" y="540"/>
+      <p2 x="1080" y="540"/>
     </wire>
     <wire>
       <p1 x="880" y="540"/>
@@ -1564,24 +1598,8 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="1240" y="420"/>
     </wire>
     <wire>
-      <p1 x="960" y="680"/>
-      <p2 x="980" y="680"/>
-    </wire>
-    <wire>
-      <p1 x="1320" y="680"/>
-      <p2 x="1340" y="680"/>
-    </wire>
-    <wire>
-      <p1 x="1040" y="680"/>
-      <p2 x="1080" y="680"/>
-    </wire>
-    <wire>
-      <p1 x="1140" y="360"/>
-      <p2 x="1160" y="360"/>
-    </wire>
-    <wire>
-      <p1 x="1000" y="360"/>
-      <p2 x="1020" y="360"/>
+      <p1 x="360" y="40"/>
+      <p2 x="380" y="40"/>
     </wire>
     <wire>
       <p1 x="820" y="40"/>
@@ -1591,6 +1609,30 @@ 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"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="360"/>
+      <p2 x="1020" y="360"/>
+    </wire>
+    <wire>
+      <p1 x="1040" y="620"/>
+      <p2 x="1080" y="620"/>
+    </wire>
     <wire>
       <p1 x="1320" y="300"/>
       <p2 x="1340" y="300"/>
@@ -1600,12 +1642,8 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="1160" y="300"/>
     </wire>
     <wire>
-      <p1 x="920" y="620"/>
-      <p2 x="1120" y="620"/>
-    </wire>
-    <wire>
-      <p1 x="1100" y="560"/>
-      <p2 x="1120" y="560"/>
+      <p1 x="1060" y="560"/>
+      <p2 x="1080" y="560"/>
     </wire>
     <wire>
       <p1 x="760" y="560"/>
@@ -1620,12 +1658,12 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="680" y="560"/>
     </wire>
     <wire>
-      <p1 x="1200" y="500"/>
-      <p2 x="1220" y="500"/>
+      <p1 x="1180" y="500"/>
+      <p2 x="1200" y="500"/>
     </wire>
     <wire>
-      <p1 x="1100" y="500"/>
-      <p2 x="1120" y="500"/>
+      <p1 x="1060" y="500"/>
+      <p2 x="1080" y="500"/>
     </wire>
     <wire>
       <p1 x="660" y="500"/>
@@ -1684,7 +1722,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="480" y="120"/>
     </wire>
     <wire>
-      <p1 x="340" y="120"/>
+      <p1 x="300" y="120"/>
       <p2 x="360" y="120"/>
     </wire>
     <wire>
@@ -1707,13 +1745,17 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p1 x="1140" y="380"/>
       <p2 x="1160" y="380"/>
     </wire>
+    <wire>
+      <p1 x="300" y="60"/>
+      <p2 x="320" y="60"/>
+    </wire>
     <wire>
       <p1 x="320" y="260"/>
       <p2 x="320" y="440"/>
     </wire>
     <wire>
-      <p1 x="960" y="680"/>
-      <p2 x="960" y="700"/>
+      <p1 x="320" y="680"/>
+      <p2 x="320" y="700"/>
     </wire>
     <wire>
       <p1 x="580" y="460"/>
@@ -1760,12 +1802,16 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p2 x="400" y="700"/>
     </wire>
     <wire>
-      <p1 x="340" y="200"/>
-      <p2 x="340" y="400"/>
+      <p1 x="1040" y="620"/>
+      <p2 x="1040" y="680"/>
     </wire>
     <wire>
-      <p1 x="340" y="80"/>
-      <p2 x="340" y="120"/>
+      <p1 x="340" y="20"/>
+      <p2 x="340" y="40"/>
+    </wire>
+    <wire>
+      <p1 x="340" y="200"/>
+      <p2 x="340" y="400"/>
     </wire>
     <wire>
       <p1 x="340" y="680"/>
@@ -1773,7 +1819,7 @@ An dieser Adresse muss sich die ISR befinden.</string>
     </wire>
     <wire>
       <p1 x="920" y="400"/>
-      <p2 x="920" y="620"/>
+      <p2 x="920" y="580"/>
     </wire>
     <wire>
       <p1 x="1240" y="60"/>
@@ -1859,6 +1905,10 @@ 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"/>
@@ -1871,6 +1921,10 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p1 x="620" y="680"/>
       <p2 x="620" y="700"/>
     </wire>
+    <wire>
+      <p1 x="300" y="60"/>
+      <p2 x="300" y="120"/>
+    </wire>
     <wire>
       <p1 x="560" y="680"/>
       <p2 x="560" y="700"/>
@@ -1887,10 +1941,6 @@ An dieser Adresse muss sich die ISR befinden.</string>
       <p1 x="440" y="680"/>
       <p2 x="440" y="700"/>
     </wire>
-    <wire>
-      <p1 x="1080" y="640"/>
-      <p2 x="1080" y="680"/>
-    </wire>
     <wire>
       <p1 x="380" y="680"/>
       <p2 x="380" y="700"/>