From 2f0277488bcaea2c7267a6e6489133fcf738e3c9 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Mon, 27 Mar 2017 18:17:31 +0200
Subject: [PATCH] better layout of Von Neumann processor

---
 .../dig/processor/ProcessorVonNeumann.dig     | 263 +++++++++---------
 src/main/dig/processor/core/ClockDiv.dig      |  76 +++--
 .../dig/processor/core/ControlTwoCycle.dig    | 126 +++++++--
 3 files changed, 261 insertions(+), 204 deletions(-)

diff --git a/src/main/dig/processor/ProcessorVonNeumann.dig b/src/main/dig/processor/ProcessorVonNeumann.dig
index b437cfb00..137f6a628 100644
--- a/src/main/dig/processor/ProcessorVonNeumann.dig
+++ b/src/main/dig/processor/ProcessorVonNeumann.dig
@@ -141,6 +141,10 @@ Von Neumann Two-Cycle CPU.</string>
     <visualElement>
       <elementName>Driver</elementName>
       <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="1"/>
+        </entry>
         <entry>
           <string>Bits</string>
           <int>16</int>
@@ -150,7 +154,7 @@ Von Neumann Two-Cycle CPU.</string>
           <boolean>true</boolean>
         </entry>
       </elementAttributes>
-      <pos x="520" y="120"/>
+      <pos x="480" y="40"/>
     </visualElement>
     <visualElement>
       <elementName>PC.dig</elementName>
@@ -173,7 +177,7 @@ Von Neumann Two-Cycle CPU.</string>
           <int>500000</int>
         </entry>
       </elementAttributes>
-      <pos x="1140" y="600"/>
+      <pos x="560" y="560"/>
     </visualElement>
     <visualElement>
       <elementName>Driver</elementName>
@@ -215,7 +219,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>stPC</string>
         </entry>
       </elementAttributes>
-      <pos x="620" y="680"/>
+      <pos x="640" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -229,7 +233,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>WE</string>
         </entry>
       </elementAttributes>
-      <pos x="600" y="680"/>
+      <pos x="620" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -243,7 +247,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>imm</string>
         </entry>
       </elementAttributes>
-      <pos x="580" y="680"/>
+      <pos x="600" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -257,7 +261,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>abs</string>
         </entry>
       </elementAttributes>
-      <pos x="560" y="680"/>
+      <pos x="580" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -271,7 +275,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>muxB</string>
         </entry>
       </elementAttributes>
-      <pos x="540" y="680"/>
+      <pos x="560" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -285,7 +289,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>src2D</string>
         </entry>
       </elementAttributes>
-      <pos x="520" y="680"/>
+      <pos x="540" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -299,7 +303,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>muxA</string>
         </entry>
       </elementAttributes>
-      <pos x="500" y="680"/>
+      <pos x="520" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -313,7 +317,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>ALU2D</string>
         </entry>
       </elementAttributes>
-      <pos x="480" y="680"/>
+      <pos x="500" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -327,7 +331,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>ALUop</string>
         </entry>
       </elementAttributes>
-      <pos x="460" y="680"/>
+      <pos x="480" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -341,7 +345,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>sf</string>
         </entry>
       </elementAttributes>
-      <pos x="440" y="680"/>
+      <pos x="460" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -355,7 +359,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>br</string>
         </entry>
       </elementAttributes>
-      <pos x="420" y="680"/>
+      <pos x="440" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -369,7 +373,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>st</string>
         </entry>
       </elementAttributes>
-      <pos x="400" y="680"/>
+      <pos x="420" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -383,7 +387,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>ld</string>
         </entry>
       </elementAttributes>
-      <pos x="380" y="680"/>
+      <pos x="400" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -397,7 +401,7 @@ Von Neumann Two-Cycle CPU.</string>
           <string>ioW</string>
         </entry>
       </elementAttributes>
-      <pos x="360" y="680"/>
+      <pos x="380" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -411,21 +415,17 @@ Von Neumann Two-Cycle CPU.</string>
           <string>ioR</string>
         </entry>
       </elementAttributes>
-      <pos x="340" y="680"/>
+      <pos x="360" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="3"/>
-        </entry>
         <entry>
           <string>NetName</string>
           <string>stPC</string>
         </entry>
       </elementAttributes>
-      <pos x="520" y="160"/>
+      <pos x="520" y="40"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -582,12 +582,16 @@ Von Neumann Two-Cycle CPU.</string>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
         <entry>
           <string>NetName</string>
           <string>C</string>
         </entry>
       </elementAttributes>
-      <pos x="1280" y="640"/>
+      <pos x="340" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -738,36 +742,30 @@ Von Neumann Two-Cycle CPU.</string>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
         <entry>
           <string>NetName</string>
           <string>C_in</string>
         </entry>
       </elementAttributes>
-      <pos x="1280" y="600"/>
+      <pos x="320" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
+          <rotation rotation="3"/>
         </entry>
         <entry>
           <string>NetName</string>
           <string>S_in</string>
         </entry>
       </elementAttributes>
-      <pos x="580" y="540"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>S_in</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1280" y="620"/>
+      <pos x="300" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -791,12 +789,7 @@ Von Neumann Two-Cycle CPU.</string>
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="620" y="560"/>
-    </visualElement>
-    <visualElement>
-      <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/ClockDiv.dig</elementName>
-      <elementAttributes/>
-      <pos x="1160" y="600"/>
+      <pos x="640" y="600"/>
     </visualElement>
     <visualElement>
       <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/Terminal.dig</elementName>
@@ -807,10 +800,14 @@ Von Neumann Two-Cycle CPU.</string>
   <wires>
     <wire>
       <p1 x="280" y="0"/>
-      <p2 x="600" y="0"/>
+      <p2 x="480" y="0"/>
     </wire>
     <wire>
-      <p1 x="600" y="0"/>
+      <p1 x="480" y="0"/>
+      <p2 x="640" y="0"/>
+    </wire>
+    <wire>
+      <p1 x="640" y="0"/>
       <p2 x="800" y="0"/>
     </wire>
     <wire>
@@ -829,10 +826,6 @@ Von Neumann Two-Cycle CPU.</string>
       <p1 x="1000" y="320"/>
       <p2 x="1020" y="320"/>
     </wire>
-    <wire>
-      <p1 x="1260" y="640"/>
-      <p2 x="1280" y="640"/>
-    </wire>
     <wire>
       <p1 x="480" y="260"/>
       <p2 x="1300" y="260"/>
@@ -889,14 +882,14 @@ Von Neumann Two-Cycle CPU.</string>
       <p1 x="1160" y="140"/>
       <p2 x="1220" y="140"/>
     </wire>
-    <wire>
-      <p1 x="1280" y="140"/>
-      <p2 x="1320" y="140"/>
-    </wire>
     <wire>
       <p1 x="1220" y="140"/>
       <p2 x="1280" y="140"/>
     </wire>
+    <wire>
+      <p1 x="1280" y="140"/>
+      <p2 x="1320" y="140"/>
+    </wire>
     <wire>
       <p1 x="640" y="460"/>
       <p2 x="660" y="460"/>
@@ -937,25 +930,13 @@ Von Neumann Two-Cycle CPU.</string>
       <p1 x="1400" y="340"/>
       <p2 x="1420" y="340"/>
     </wire>
-    <wire>
-      <p1 x="1140" y="600"/>
-      <p2 x="1160" y="600"/>
-    </wire>
-    <wire>
-      <p1 x="1260" y="600"/>
-      <p2 x="1280" y="600"/>
-    </wire>
-    <wire>
-      <p1 x="1400" y="220"/>
-      <p2 x="1420" y="220"/>
-    </wire>
     <wire>
       <p1 x="740" y="540"/>
       <p2 x="840" y="540"/>
     </wire>
     <wire>
-      <p1 x="580" y="540"/>
-      <p2 x="600" y="540"/>
+      <p1 x="1400" y="220"/>
+      <p2 x="1420" y="220"/>
     </wire>
     <wire>
       <p1 x="800" y="160"/>
@@ -983,7 +964,7 @@ Von Neumann Two-Cycle CPU.</string>
     </wire>
     <wire>
       <p1 x="500" y="480"/>
-      <p2 x="620" y="480"/>
+      <p2 x="640" y="480"/>
     </wire>
     <wire>
       <p1 x="820" y="480"/>
@@ -1037,13 +1018,17 @@ Von Neumann Two-Cycle CPU.</string>
       <p1 x="1240" y="40"/>
       <p2 x="1260" y="40"/>
     </wire>
+    <wire>
+      <p1 x="500" y="40"/>
+      <p2 x="520" y="40"/>
+    </wire>
     <wire>
       <p1 x="1400" y="300"/>
       <p2 x="1500" y="300"/>
     </wire>
     <wire>
-      <p1 x="1260" y="620"/>
-      <p2 x="1280" y="620"/>
+      <p1 x="560" y="560"/>
+      <p2 x="620" y="560"/>
     </wire>
     <wire>
       <p1 x="740" y="560"/>
@@ -1101,24 +1086,20 @@ Von Neumann Two-Cycle CPU.</string>
       <p1 x="340" y="440"/>
       <p2 x="360" y="440"/>
     </wire>
-    <wire>
-      <p1 x="540" y="120"/>
-      <p2 x="600" y="120"/>
-    </wire>
     <wire>
       <p1 x="760" y="120"/>
       <p2 x="840" y="120"/>
     </wire>
     <wire>
       <p1 x="460" y="120"/>
-      <p2 x="500" y="120"/>
+      <p2 x="480" y="120"/>
     </wire>
     <wire>
       <p1 x="340" y="120"/>
       <p2 x="360" y="120"/>
     </wire>
     <wire>
-      <p1 x="600" y="120"/>
+      <p1 x="640" y="120"/>
       <p2 x="660" y="120"/>
     </wire>
     <wire>
@@ -1133,10 +1114,26 @@ Von Neumann Two-Cycle CPU.</string>
       <p1 x="1140" y="380"/>
       <p2 x="1220" y="380"/>
     </wire>
+    <wire>
+      <p1 x="640" y="480"/>
+      <p2 x="640" y="600"/>
+    </wire>
+    <wire>
+      <p1 x="640" y="700"/>
+      <p2 x="640" y="720"/>
+    </wire>
+    <wire>
+      <p1 x="640" y="0"/>
+      <p2 x="640" y="120"/>
+    </wire>
     <wire>
       <p1 x="1280" y="140"/>
       <p2 x="1280" y="360"/>
     </wire>
+    <wire>
+      <p1 x="320" y="700"/>
+      <p2 x="320" y="720"/>
+    </wire>
     <wire>
       <p1 x="1220" y="60"/>
       <p2 x="1220" y="80"/>
@@ -1158,32 +1155,32 @@ Von Neumann Two-Cycle CPU.</string>
       <p2 x="580" y="520"/>
     </wire>
     <wire>
-      <p1 x="580" y="660"/>
-      <p2 x="580" y="680"/>
+      <p1 x="580" y="700"/>
+      <p2 x="580" y="720"/>
     </wire>
     <wire>
       <p1 x="900" y="160"/>
       <p2 x="900" y="500"/>
     </wire>
     <wire>
-      <p1 x="520" y="140"/>
-      <p2 x="520" y="160"/>
-    </wire>
-    <wire>
-      <p1 x="520" y="660"/>
-      <p2 x="520" y="680"/>
+      <p1 x="520" y="700"/>
+      <p2 x="520" y="720"/>
     </wire>
     <wire>
       <p1 x="460" y="420"/>
       <p2 x="460" y="520"/>
     </wire>
     <wire>
-      <p1 x="460" y="660"/>
-      <p2 x="460" y="680"/>
+      <p1 x="460" y="700"/>
+      <p2 x="460" y="720"/>
     </wire>
     <wire>
-      <p1 x="400" y="660"/>
-      <p2 x="400" y="680"/>
+      <p1 x="400" y="700"/>
+      <p2 x="400" y="720"/>
+    </wire>
+    <wire>
+      <p1 x="340" y="700"/>
+      <p2 x="340" y="720"/>
     </wire>
     <wire>
       <p1 x="340" y="180"/>
@@ -1193,33 +1190,29 @@ Von Neumann Two-Cycle CPU.</string>
       <p1 x="340" y="80"/>
       <p2 x="340" y="120"/>
     </wire>
-    <wire>
-      <p1 x="340" y="660"/>
-      <p2 x="340" y="680"/>
-    </wire>
     <wire>
       <p1 x="1300" y="180"/>
       <p2 x="1300" y="260"/>
     </wire>
+    <wire>
+      <p1 x="600" y="700"/>
+      <p2 x="600" y="720"/>
+    </wire>
+    <wire>
+      <p1 x="280" y="0"/>
+      <p2 x="280" y="400"/>
+    </wire>
     <wire>
       <p1 x="1240" y="160"/>
       <p2 x="1240" y="400"/>
     </wire>
     <wire>
-      <p1 x="600" y="0"/>
-      <p2 x="600" y="120"/>
+      <p1 x="540" y="700"/>
+      <p2 x="540" y="720"/>
     </wire>
     <wire>
-      <p1 x="600" y="660"/>
-      <p2 x="600" y="680"/>
-    </wire>
-    <wire>
-      <p1 x="600" y="540"/>
-      <p2 x="600" y="560"/>
-    </wire>
-    <wire>
-      <p1 x="280" y="0"/>
-      <p2 x="280" y="400"/>
+      <p1 x="540" y="160"/>
+      <p2 x="540" y="420"/>
     </wire>
     <wire>
       <p1 x="1500" y="0"/>
@@ -1229,14 +1222,6 @@ Von Neumann Two-Cycle CPU.</string>
       <p1 x="1500" y="200"/>
       <p2 x="1500" y="300"/>
     </wire>
-    <wire>
-      <p1 x="540" y="160"/>
-      <p2 x="540" y="420"/>
-    </wire>
-    <wire>
-      <p1 x="540" y="660"/>
-      <p2 x="540" y="680"/>
-    </wire>
     <wire>
       <p1 x="860" y="160"/>
       <p2 x="860" y="180"/>
@@ -1245,13 +1230,21 @@ Von Neumann Two-Cycle CPU.</string>
       <p1 x="860" y="580"/>
       <p2 x="860" y="600"/>
     </wire>
+    <wire>
+      <p1 x="480" y="700"/>
+      <p2 x="480" y="720"/>
+    </wire>
     <wire>
       <p1 x="480" y="140"/>
       <p2 x="480" y="260"/>
     </wire>
     <wire>
-      <p1 x="480" y="660"/>
-      <p2 x="480" y="680"/>
+      <p1 x="480" y="60"/>
+      <p2 x="480" y="120"/>
+    </wire>
+    <wire>
+      <p1 x="480" y="0"/>
+      <p2 x="480" y="20"/>
     </wire>
     <wire>
       <p1 x="800" y="60"/>
@@ -1269,6 +1262,10 @@ Von Neumann Two-Cycle CPU.</string>
       <p1 x="800" y="160"/>
       <p2 x="800" y="420"/>
     </wire>
+    <wire>
+      <p1 x="420" y="700"/>
+      <p2 x="420" y="720"/>
+    </wire>
     <wire>
       <p1 x="1060" y="200"/>
       <p2 x="1060" y="340"/>
@@ -1278,48 +1275,48 @@ Von Neumann Two-Cycle CPU.</string>
       <p2 x="1060" y="360"/>
     </wire>
     <wire>
-      <p1 x="420" y="660"/>
-      <p2 x="420" y="680"/>
+      <p1 x="360" y="700"/>
+      <p2 x="360" y="720"/>
     </wire>
     <wire>
-      <p1 x="360" y="660"/>
-      <p2 x="360" y="680"/>
+      <p1 x="300" y="700"/>
+      <p2 x="300" y="720"/>
     </wire>
     <wire>
-      <p1 x="620" y="480"/>
-      <p2 x="620" y="560"/>
+      <p1 x="620" y="700"/>
+      <p2 x="620" y="720"/>
     </wire>
     <wire>
-      <p1 x="620" y="660"/>
-      <p2 x="620" y="680"/>
+      <p1 x="620" y="560"/>
+      <p2 x="620" y="600"/>
     </wire>
     <wire>
-      <p1 x="1200" y="200"/>
-      <p2 x="1200" y="360"/>
-    </wire>
-    <wire>
-      <p1 x="560" y="660"/>
-      <p2 x="560" y="680"/>
+      <p1 x="560" y="700"/>
+      <p2 x="560" y="720"/>
     </wire>
     <wire>
       <p1 x="560" y="180"/>
       <p2 x="560" y="440"/>
     </wire>
     <wire>
-      <p1 x="500" y="660"/>
-      <p2 x="500" y="680"/>
+      <p1 x="1200" y="200"/>
+      <p2 x="1200" y="360"/>
     </wire>
     <wire>
-      <p1 x="440" y="660"/>
-      <p2 x="440" y="680"/>
+      <p1 x="500" y="700"/>
+      <p2 x="500" y="720"/>
+    </wire>
+    <wire>
+      <p1 x="440" y="700"/>
+      <p2 x="440" y="720"/>
     </wire>
     <wire>
       <p1 x="1400" y="300"/>
       <p2 x="1400" y="340"/>
     </wire>
     <wire>
-      <p1 x="380" y="660"/>
-      <p2 x="380" y="680"/>
+      <p1 x="380" y="700"/>
+      <p2 x="380" y="720"/>
     </wire>
     <wire>
       <p1 x="1340" y="180"/>
diff --git a/src/main/dig/processor/core/ClockDiv.dig b/src/main/dig/processor/core/ClockDiv.dig
index 5cb200c03..e9e3e6bb1 100644
--- a/src/main/dig/processor/core/ClockDiv.dig
+++ b/src/main/dig/processor/core/ClockDiv.dig
@@ -24,17 +24,17 @@ dann ausgeführt.</string>
           <string>Clock</string>
         </entry>
       </elementAttributes>
-      <pos x="340" y="280"/>
+      <pos x="340" y="300"/>
     </visualElement>
     <visualElement>
       <elementName>T_FF</elementName>
       <elementAttributes/>
-      <pos x="440" y="280"/>
+      <pos x="440" y="300"/>
     </visualElement>
     <visualElement>
       <elementName>Not</elementName>
       <elementAttributes/>
-      <pos x="380" y="280"/>
+      <pos x="380" y="300"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -46,20 +46,6 @@ dann ausgeführt.</string>
       <elementAttributes/>
       <pos x="560" y="320"/>
     </visualElement>
-    <visualElement>
-      <elementName>Out</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Description</string>
-          <string>Taktsignal für das Lesen eines Befehlswortes</string>
-        </entry>
-        <entry>
-          <string>Label</string>
-          <string>C_in</string>
-        </entry>
-      </elementAttributes>
-      <pos x="660" y="260"/>
-    </visualElement>
     <visualElement>
       <elementName>Out</elementName>
       <elementAttributes>
@@ -75,6 +61,20 @@ Befehlswortes konfiguriert.</string>
       </elementAttributes>
       <pos x="660" y="300"/>
     </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Taktsignal für das Lesen eines Befehlswortes</string>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>C_in</string>
+        </entry>
+      </elementAttributes>
+      <pos x="660" y="260"/>
+    </visualElement>
     <visualElement>
       <elementName>Out</elementName>
       <elementAttributes>
@@ -103,12 +103,12 @@ steuert.</string>
   </visualElements>
   <wires>
     <wire>
-      <p1 x="360" y="240"/>
-      <p2 x="560" y="240"/>
+      <p1 x="500" y="320"/>
+      <p2 x="560" y="320"/>
     </wire>
     <wire>
-      <p1 x="520" y="320"/>
-      <p2 x="560" y="320"/>
+      <p1 x="360" y="240"/>
+      <p2 x="560" y="240"/>
     </wire>
     <wire>
       <p1 x="620" y="260"/>
@@ -118,22 +118,6 @@ steuert.</string>
       <p1 x="620" y="340"/>
       <p2 x="660" y="340"/>
     </wire>
-    <wire>
-      <p1 x="420" y="280"/>
-      <p2 x="440" y="280"/>
-    </wire>
-    <wire>
-      <p1 x="340" y="280"/>
-      <p2 x="360" y="280"/>
-    </wire>
-    <wire>
-      <p1 x="500" y="280"/>
-      <p2 x="540" y="280"/>
-    </wire>
-    <wire>
-      <p1 x="360" y="280"/>
-      <p2 x="380" y="280"/>
-    </wire>
     <wire>
       <p1 x="540" y="280"/>
       <p2 x="560" y="280"/>
@@ -142,24 +126,32 @@ steuert.</string>
       <p1 x="360" y="360"/>
       <p2 x="560" y="360"/>
     </wire>
+    <wire>
+      <p1 x="420" y="300"/>
+      <p2 x="440" y="300"/>
+    </wire>
+    <wire>
+      <p1 x="340" y="300"/>
+      <p2 x="360" y="300"/>
+    </wire>
     <wire>
       <p1 x="500" y="300"/>
-      <p2 x="520" y="300"/>
+      <p2 x="540" y="300"/>
     </wire>
     <wire>
       <p1 x="540" y="300"/>
       <p2 x="660" y="300"/>
     </wire>
     <wire>
-      <p1 x="520" y="300"/>
-      <p2 x="520" y="320"/>
+      <p1 x="360" y="300"/>
+      <p2 x="380" y="300"/>
     </wire>
     <wire>
       <p1 x="360" y="240"/>
-      <p2 x="360" y="280"/>
+      <p2 x="360" y="300"/>
     </wire>
     <wire>
-      <p1 x="360" y="280"/>
+      <p1 x="360" y="300"/>
       <p2 x="360" y="360"/>
     </wire>
     <wire>
diff --git a/src/main/dig/processor/core/ControlTwoCycle.dig b/src/main/dig/processor/core/ControlTwoCycle.dig
index c8816ebdb..4cd1d0bc4 100644
--- a/src/main/dig/processor/core/ControlTwoCycle.dig
+++ b/src/main/dig/processor/core/ControlTwoCycle.dig
@@ -376,23 +376,6 @@ realisiert, und nicht durch 24 einzelne Schaltnetze.</string>
       <elementAttributes/>
       <pos x="320" y="240"/>
     </visualElement>
-    <visualElement>
-      <elementName>In</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Description</string>
-          <string>Dieser Eingang schaltet das Leitwerk zunächst auf 
-&quot;no operation&quot; und setzt dann den Ausgang &quot;ld&quot;,
-damit der nächste Befehl aus dem Speicher
-ausgelesen werden kann.</string>
-        </entry>
-        <entry>
-          <string>Label</string>
-          <string>ins</string>
-        </entry>
-      </elementAttributes>
-      <pos x="200" y="240"/>
-    </visualElement>
     <visualElement>
       <elementName>And</elementName>
       <elementAttributes/>
@@ -408,6 +391,51 @@ ausgelesen werden kann.</string>
       <elementAttributes/>
       <pos x="680" y="160"/>
     </visualElement>
+    <visualElement>
+      <elementName>ClockDiv.dig</elementName>
+      <elementAttributes/>
+      <pos x="80" y="420"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Clock</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>Clock</string>
+        </entry>
+      </elementAttributes>
+      <pos x="60" y="420"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>C</string>
+        </entry>
+      </elementAttributes>
+      <pos x="680" y="620"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>C_in</string>
+        </entry>
+      </elementAttributes>
+      <pos x="680" y="580"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>S_in</string>
+        </entry>
+      </elementAttributes>
+      <pos x="680" y="540"/>
+    </visualElement>
   </visualElements>
   <wires>
     <wire>
@@ -446,6 +474,18 @@ ausgelesen werden kann.</string>
       <p1 x="620" y="420"/>
       <p2 x="860" y="420"/>
     </wire>
+    <wire>
+      <p1 x="180" y="420"/>
+      <p2 x="240" y="420"/>
+    </wire>
+    <wire>
+      <p1 x="60" y="420"/>
+      <p2 x="80" y="420"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="580"/>
+      <p2 x="680" y="580"/>
+    </wire>
     <wire>
       <p1 x="380" y="200"/>
       <p2 x="400" y="200"/>
@@ -474,21 +514,25 @@ ausgelesen werden kann.</string>
       <p1 x="240" y="360"/>
       <p2 x="260" y="360"/>
     </wire>
-    <wire>
-      <p1 x="620" y="300"/>
-      <p2 x="860" y="300"/>
-    </wire>
     <wire>
       <p1 x="620" y="460"/>
       <p2 x="860" y="460"/>
     </wire>
     <wire>
-      <p1 x="620" y="240"/>
-      <p2 x="680" y="240"/>
+      <p1 x="180" y="460"/>
+      <p2 x="200" y="460"/>
     </wire>
     <wire>
-      <p1 x="200" y="240"/>
-      <p2 x="240" y="240"/>
+      <p1 x="620" y="300"/>
+      <p2 x="860" y="300"/>
+    </wire>
+    <wire>
+      <p1 x="200" y="620"/>
+      <p2 x="680" y="620"/>
+    </wire>
+    <wire>
+      <p1 x="620" y="240"/>
+      <p2 x="680" y="240"/>
     </wire>
     <wire>
       <p1 x="240" y="240"/>
@@ -538,6 +582,18 @@ ausgelesen werden kann.</string>
       <p1 x="620" y="440"/>
       <p2 x="680" y="440"/>
     </wire>
+    <wire>
+      <p1 x="180" y="440"/>
+      <p2 x="220" y="440"/>
+    </wire>
+    <wire>
+      <p1 x="240" y="540"/>
+      <p2 x="680" y="540"/>
+    </wire>
+    <wire>
+      <p1 x="620" y="380"/>
+      <p2 x="860" y="380"/>
+    </wire>
     <wire>
       <p1 x="460" y="220"/>
       <p2 x="480" y="220"/>
@@ -546,14 +602,18 @@ ausgelesen werden kann.</string>
       <p1 x="620" y="220"/>
       <p2 x="860" y="220"/>
     </wire>
-    <wire>
-      <p1 x="620" y="380"/>
-      <p2 x="860" y="380"/>
-    </wire>
     <wire>
       <p1 x="240" y="240"/>
       <p2 x="240" y="360"/>
     </wire>
+    <wire>
+      <p1 x="240" y="420"/>
+      <p2 x="240" y="540"/>
+    </wire>
+    <wire>
+      <p1 x="240" y="360"/>
+      <p2 x="240" y="420"/>
+    </wire>
     <wire>
       <p1 x="640" y="120"/>
       <p2 x="640" y="160"/>
@@ -566,6 +626,10 @@ ausgelesen werden kann.</string>
       <p1 x="580" y="200"/>
       <p2 x="580" y="220"/>
     </wire>
+    <wire>
+      <p1 x="200" y="460"/>
+      <p2 x="200" y="620"/>
+    </wire>
     <wire>
       <p1 x="280" y="180"/>
       <p2 x="280" y="280"/>
@@ -574,6 +638,10 @@ ausgelesen werden kann.</string>
       <p1 x="280" y="280"/>
       <p2 x="280" y="320"/>
     </wire>
+    <wire>
+      <p1 x="220" y="440"/>
+      <p2 x="220" y="580"/>
+    </wire>
     <wire>
       <p1 x="300" y="120"/>
       <p2 x="300" y="240"/>