From af74a52085c81dc546d005c678765d2974e9931a Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Sun, 10 Jul 2016 15:54:00 +0200
Subject: [PATCH] better processor layout

---
 src/main/dig/processor/Processor.dig    | 348 ++++++++++++------------
 src/main/dig/processorExp/Processor.dig | 156 +++++------
 2 files changed, 244 insertions(+), 260 deletions(-)

diff --git a/src/main/dig/processor/Processor.dig b/src/main/dig/processor/Processor.dig
index d945a2cda..b969889e8 100644
--- a/src/main/dig/processor/Processor.dig
+++ b/src/main/dig/processor/Processor.dig
@@ -11,7 +11,7 @@
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="620" y="540"/>
+      <pos x="620" y="500"/>
     </visualElement>
     <visualElement>
       <elementName>Register.dig</elementName>
@@ -269,12 +269,12 @@
           <string>/home/hneemann/Dokumente/Java/assembler/assembler3/src/main/asm/Conway2.hex</string>
         </entry>
       </elementAttributes>
-      <pos x="380" y="460"/>
+      <pos x="360" y="360"/>
     </visualElement>
     <visualElement>
       <elementName>Const</elementName>
       <elementAttributes/>
-      <pos x="360" y="500"/>
+      <pos x="340" y="400"/>
     </visualElement>
     <visualElement>
       <elementName>Driver</elementName>
@@ -311,7 +311,7 @@
           <int>500000</int>
         </entry>
       </elementAttributes>
-      <pos x="1160" y="540"/>
+      <pos x="1220" y="580"/>
     </visualElement>
     <visualElement>
       <elementName>Driver</elementName>
@@ -367,7 +367,7 @@
           <string>stPC</string>
         </entry>
       </elementAttributes>
-      <pos x="620" y="660"/>
+      <pos x="620" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -381,7 +381,7 @@
           <string>WE</string>
         </entry>
       </elementAttributes>
-      <pos x="600" y="660"/>
+      <pos x="600" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -395,7 +395,7 @@
           <string>imm</string>
         </entry>
       </elementAttributes>
-      <pos x="580" y="660"/>
+      <pos x="580" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -409,7 +409,7 @@
           <string>abs</string>
         </entry>
       </elementAttributes>
-      <pos x="560" y="660"/>
+      <pos x="560" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -423,7 +423,7 @@
           <string>muxB</string>
         </entry>
       </elementAttributes>
-      <pos x="540" y="660"/>
+      <pos x="540" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -437,7 +437,7 @@
           <string>src2D</string>
         </entry>
       </elementAttributes>
-      <pos x="520" y="660"/>
+      <pos x="520" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -451,7 +451,7 @@
           <string>muxA</string>
         </entry>
       </elementAttributes>
-      <pos x="500" y="660"/>
+      <pos x="500" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -465,7 +465,7 @@
           <string>ALU2D</string>
         </entry>
       </elementAttributes>
-      <pos x="480" y="660"/>
+      <pos x="480" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -479,7 +479,7 @@
           <string>ALUop</string>
         </entry>
       </elementAttributes>
-      <pos x="460" y="660"/>
+      <pos x="460" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -493,7 +493,7 @@
           <string>sf</string>
         </entry>
       </elementAttributes>
-      <pos x="440" y="660"/>
+      <pos x="440" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -507,7 +507,7 @@
           <string>br</string>
         </entry>
       </elementAttributes>
-      <pos x="420" y="660"/>
+      <pos x="420" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -521,7 +521,7 @@
           <string>st</string>
         </entry>
       </elementAttributes>
-      <pos x="400" y="660"/>
+      <pos x="400" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -535,7 +535,7 @@
           <string>ld</string>
         </entry>
       </elementAttributes>
-      <pos x="380" y="660"/>
+      <pos x="380" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -549,7 +549,7 @@
           <string>ioW</string>
         </entry>
       </elementAttributes>
-      <pos x="360" y="660"/>
+      <pos x="360" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -563,7 +563,7 @@
           <string>ioR</string>
         </entry>
       </elementAttributes>
-      <pos x="340" y="660"/>
+      <pos x="340" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -739,7 +739,7 @@
           <string>C</string>
         </entry>
       </elementAttributes>
-      <pos x="1180" y="540"/>
+      <pos x="1240" y="580"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -810,7 +810,7 @@
     <visualElement>
       <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/Graphics.dig</elementName>
       <elementAttributes/>
-      <pos x="1360" y="280"/>
+      <pos x="1360" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -824,7 +824,7 @@
           <string>ioW</string>
         </entry>
       </elementAttributes>
-      <pos x="1340" y="360"/>
+      <pos x="1340" y="400"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -838,7 +838,7 @@
           <string>ioR</string>
         </entry>
       </elementAttributes>
-      <pos x="1340" y="300"/>
+      <pos x="1340" y="340"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -852,7 +852,7 @@
           <string>C</string>
         </entry>
       </elementAttributes>
-      <pos x="1340" y="340"/>
+      <pos x="1340" y="380"/>
     </visualElement>
   </visualElements>
   <wires>
@@ -869,8 +869,8 @@
       <p2 x="1200" y="320"/>
     </wire>
     <wire>
-      <p1 x="1420" y="320"/>
-      <p2 x="1440" y="320"/>
+      <p1 x="1280" y="320"/>
+      <p2 x="1360" y="320"/>
     </wire>
     <wire>
       <p1 x="600" y="0"/>
@@ -888,10 +888,6 @@
       <p1 x="760" y="480"/>
       <p2 x="840" y="480"/>
     </wire>
-    <wire>
-      <p1 x="440" y="480"/>
-      <p2 x="460" y="480"/>
-    </wire>
     <wire>
       <p1 x="460" y="480"/>
       <p2 x="580" y="480"/>
@@ -933,12 +929,28 @@
       <p2 x="840" y="420"/>
     </wire>
     <wire>
-      <p1 x="760" y="520"/>
-      <p2 x="840" y="520"/>
+      <p1 x="1220" y="580"/>
+      <p2 x="1240" y="580"/>
     </wire>
     <wire>
-      <p1 x="540" y="520"/>
-      <p2 x="620" y="520"/>
+      <p1 x="1420" y="360"/>
+      <p2 x="1440" y="360"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="360"/>
+      <p2 x="1080" y="360"/>
+    </wire>
+    <wire>
+      <p1 x="1140" y="360"/>
+      <p2 x="1240" y="360"/>
+    </wire>
+    <wire>
+      <p1 x="320" y="360"/>
+      <p2 x="360" y="360"/>
+    </wire>
+    <wire>
+      <p1 x="760" y="520"/>
+      <p2 x="840" y="520"/>
     </wire>
     <wire>
       <p1 x="1160" y="200"/>
@@ -956,18 +968,6 @@
       <p1 x="1340" y="200"/>
       <p2 x="1360" y="200"/>
     </wire>
-    <wire>
-      <p1 x="1000" y="360"/>
-      <p2 x="1080" y="360"/>
-    </wire>
-    <wire>
-      <p1 x="1140" y="360"/>
-      <p2 x="1240" y="360"/>
-    </wire>
-    <wire>
-      <p1 x="1340" y="360"/>
-      <p2 x="1360" y="360"/>
-    </wire>
     <wire>
       <p1 x="820" y="40"/>
       <p2 x="840" y="40"/>
@@ -976,10 +976,6 @@
       <p1 x="1240" y="40"/>
       <p2 x="1260" y="40"/>
     </wire>
-    <wire>
-      <p1 x="360" y="460"/>
-      <p2 x="380" y="460"/>
-    </wire>
     <wire>
       <p1 x="880" y="460"/>
       <p2 x="900" y="460"/>
@@ -1020,10 +1016,6 @@
       <p1 x="1220" y="140"/>
       <p2 x="1280" y="140"/>
     </wire>
-    <wire>
-      <p1 x="1340" y="300"/>
-      <p2 x="1360" y="300"/>
-    </wire>
     <wire>
       <p1 x="1000" y="300"/>
       <p2 x="1060" y="300"/>
@@ -1032,6 +1024,10 @@
       <p1 x="1140" y="300"/>
       <p2 x="1160" y="300"/>
     </wire>
+    <wire>
+      <p1 x="1340" y="400"/>
+      <p2 x="1360" y="400"/>
+    </wire>
     <wire>
       <p1 x="760" y="400"/>
       <p2 x="840" y="400"/>
@@ -1044,12 +1040,16 @@
       <p1 x="500" y="400"/>
       <p2 x="560" y="400"/>
     </wire>
+    <wire>
+      <p1 x="340" y="400"/>
+      <p2 x="360" y="400"/>
+    </wire>
     <wire>
       <p1 x="340" y="80"/>
       <p2 x="1220" y="80"/>
     </wire>
     <wire>
-      <p1 x="360" y="240"/>
+      <p1 x="320" y="240"/>
       <p2 x="480" y="240"/>
     </wire>
     <wire>
@@ -1064,10 +1064,6 @@
       <p1 x="1140" y="340"/>
       <p2 x="1220" y="340"/>
     </wire>
-    <wire>
-      <p1 x="360" y="500"/>
-      <p2 x="380" y="500"/>
-    </wire>
     <wire>
       <p1 x="760" y="500"/>
       <p2 x="840" y="500"/>
@@ -1093,8 +1089,12 @@
       <p2 x="640" y="180"/>
     </wire>
     <wire>
-      <p1 x="1280" y="280"/>
-      <p2 x="1360" y="280"/>
+      <p1 x="500" y="440"/>
+      <p2 x="620" y="440"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="440"/>
+      <p2 x="840" y="440"/>
     </wire>
     <wire>
       <p1 x="1140" y="280"/>
@@ -1104,14 +1104,6 @@
       <p1 x="1000" y="280"/>
       <p2 x="1020" y="280"/>
     </wire>
-    <wire>
-      <p1 x="500" y="440"/>
-      <p2 x="540" y="440"/>
-    </wire>
-    <wire>
-      <p1 x="820" y="440"/>
-      <p2 x="840" y="440"/>
-    </wire>
     <wire>
       <p1 x="540" y="120"/>
       <p2 x="600" y="120"/>
@@ -1133,21 +1125,17 @@
       <p2 x="640" y="120"/>
     </wire>
     <wire>
-      <p1 x="1160" y="540"/>
-      <p2 x="1180" y="540"/>
+      <p1 x="1340" y="380"/>
+      <p2 x="1360" y="380"/>
     </wire>
     <wire>
-      <p1 x="1340" y="220"/>
-      <p2 x="1360" y="220"/>
+      <p1 x="420" y="380"/>
+      <p2 x="460" y="380"/>
     </wire>
     <wire>
       <p1 x="500" y="380"/>
       <p2 x="540" y="380"/>
     </wire>
-    <wire>
-      <p1 x="460" y="380"/>
-      <p2 x="480" y="380"/>
-    </wire>
     <wire>
       <p1 x="800" y="380"/>
       <p2 x="840" y="380"/>
@@ -1156,49 +1144,29 @@
       <p1 x="580" y="380"/>
       <p2 x="680" y="380"/>
     </wire>
+    <wire>
+      <p1 x="460" y="380"/>
+      <p2 x="480" y="380"/>
+    </wire>
+    <wire>
+      <p1 x="1340" y="220"/>
+      <p2 x="1360" y="220"/>
+    </wire>
     <wire>
       <p1 x="1280" y="140"/>
-      <p2 x="1280" y="280"/>
+      <p2 x="1280" y="320"/>
     </wire>
     <wire>
-      <p1 x="1440" y="0"/>
-      <p2 x="1440" y="180"/>
-    </wire>
-    <wire>
-      <p1 x="1440" y="180"/>
-      <p2 x="1440" y="320"/>
-    </wire>
-    <wire>
-      <p1 x="480" y="640"/>
-      <p2 x="480" y="660"/>
-    </wire>
-    <wire>
-      <p1 x="480" y="140"/>
-      <p2 x="480" y="240"/>
-    </wire>
-    <wire>
-      <p1 x="800" y="60"/>
-      <p2 x="800" y="140"/>
-    </wire>
-    <wire>
-      <p1 x="800" y="0"/>
-      <p2 x="800" y="20"/>
-    </wire>
-    <wire>
-      <p1 x="800" y="140"/>
-      <p2 x="800" y="160"/>
-    </wire>
-    <wire>
-      <p1 x="800" y="160"/>
-      <p2 x="800" y="380"/>
+      <p1 x="320" y="240"/>
+      <p2 x="320" y="360"/>
     </wire>
     <wire>
       <p1 x="580" y="380"/>
       <p2 x="580" y="480"/>
     </wire>
     <wire>
-      <p1 x="580" y="640"/>
-      <p2 x="580" y="660"/>
+      <p1 x="580" y="600"/>
+      <p2 x="580" y="620"/>
     </wire>
     <wire>
       <p1 x="900" y="160"/>
@@ -1220,69 +1188,25 @@
       <p1 x="1220" y="80"/>
       <p2 x="1220" y="140"/>
     </wire>
-    <wire>
-      <p1 x="420" y="640"/>
-      <p2 x="420" y="660"/>
-    </wire>
-    <wire>
-      <p1 x="1060" y="200"/>
-      <p2 x="1060" y="300"/>
-    </wire>
-    <wire>
-      <p1 x="1060" y="300"/>
-      <p2 x="1060" y="320"/>
-    </wire>
-    <wire>
-      <p1 x="520" y="640"/>
-      <p2 x="520" y="660"/>
-    </wire>
     <wire>
       <p1 x="520" y="140"/>
       <p2 x="520" y="160"/>
     </wire>
     <wire>
-      <p1 x="360" y="240"/>
-      <p2 x="360" y="460"/>
-    </wire>
-    <wire>
-      <p1 x="360" y="640"/>
-      <p2 x="360" y="660"/>
-    </wire>
-    <wire>
-      <p1 x="460" y="640"/>
-      <p2 x="460" y="660"/>
+      <p1 x="520" y="600"/>
+      <p2 x="520" y="620"/>
     </wire>
     <wire>
       <p1 x="460" y="380"/>
       <p2 x="460" y="480"/>
     </wire>
     <wire>
-      <p1 x="620" y="520"/>
-      <p2 x="620" y="540"/>
+      <p1 x="460" y="600"/>
+      <p2 x="460" y="620"/>
     </wire>
     <wire>
-      <p1 x="620" y="640"/>
-      <p2 x="620" y="660"/>
-    </wire>
-    <wire>
-      <p1 x="400" y="640"/>
-      <p2 x="400" y="660"/>
-    </wire>
-    <wire>
-      <p1 x="1200" y="200"/>
-      <p2 x="1200" y="320"/>
-    </wire>
-    <wire>
-      <p1 x="560" y="640"/>
-      <p2 x="560" y="660"/>
-    </wire>
-    <wire>
-      <p1 x="560" y="180"/>
-      <p2 x="560" y="400"/>
-    </wire>
-    <wire>
-      <p1 x="340" y="640"/>
-      <p2 x="340" y="660"/>
+      <p1 x="400" y="600"/>
+      <p2 x="400" y="620"/>
     </wire>
     <wire>
       <p1 x="340" y="180"/>
@@ -1293,36 +1217,28 @@
       <p2 x="340" y="120"/>
     </wire>
     <wire>
-      <p1 x="500" y="640"/>
-      <p2 x="500" y="660"/>
-    </wire>
-    <wire>
-      <p1 x="1240" y="160"/>
-      <p2 x="1240" y="360"/>
-    </wire>
-    <wire>
-      <p1 x="600" y="640"/>
-      <p2 x="600" y="660"/>
+      <p1 x="340" y="600"/>
+      <p2 x="340" y="620"/>
     </wire>
     <wire>
       <p1 x="600" y="0"/>
       <p2 x="600" y="120"/>
     </wire>
     <wire>
-      <p1 x="440" y="640"/>
-      <p2 x="440" y="660"/>
+      <p1 x="600" y="600"/>
+      <p2 x="600" y="620"/>
     </wire>
     <wire>
-      <p1 x="540" y="640"/>
-      <p2 x="540" y="660"/>
+      <p1 x="1240" y="160"/>
+      <p2 x="1240" y="360"/>
     </wire>
     <wire>
       <p1 x="540" y="160"/>
       <p2 x="540" y="380"/>
     </wire>
     <wire>
-      <p1 x="540" y="440"/>
-      <p2 x="540" y="520"/>
+      <p1 x="540" y="600"/>
+      <p2 x="540" y="620"/>
     </wire>
     <wire>
       <p1 x="860" y="160"/>
@@ -1333,8 +1249,84 @@
       <p2 x="860" y="560"/>
     </wire>
     <wire>
-      <p1 x="380" y="640"/>
-      <p2 x="380" y="660"/>
+      <p1 x="1440" y="0"/>
+      <p2 x="1440" y="180"/>
+    </wire>
+    <wire>
+      <p1 x="1440" y="180"/>
+      <p2 x="1440" y="360"/>
+    </wire>
+    <wire>
+      <p1 x="480" y="140"/>
+      <p2 x="480" y="240"/>
+    </wire>
+    <wire>
+      <p1 x="480" y="600"/>
+      <p2 x="480" y="620"/>
+    </wire>
+    <wire>
+      <p1 x="800" y="60"/>
+      <p2 x="800" y="140"/>
+    </wire>
+    <wire>
+      <p1 x="800" y="0"/>
+      <p2 x="800" y="20"/>
+    </wire>
+    <wire>
+      <p1 x="800" y="140"/>
+      <p2 x="800" y="160"/>
+    </wire>
+    <wire>
+      <p1 x="800" y="160"/>
+      <p2 x="800" y="380"/>
+    </wire>
+    <wire>
+      <p1 x="1060" y="200"/>
+      <p2 x="1060" y="300"/>
+    </wire>
+    <wire>
+      <p1 x="1060" y="300"/>
+      <p2 x="1060" y="320"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="600"/>
+      <p2 x="420" y="620"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="600"/>
+      <p2 x="360" y="620"/>
+    </wire>
+    <wire>
+      <p1 x="620" y="440"/>
+      <p2 x="620" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="620" y="600"/>
+      <p2 x="620" y="620"/>
+    </wire>
+    <wire>
+      <p1 x="560" y="600"/>
+      <p2 x="560" y="620"/>
+    </wire>
+    <wire>
+      <p1 x="560" y="180"/>
+      <p2 x="560" y="400"/>
+    </wire>
+    <wire>
+      <p1 x="1200" y="200"/>
+      <p2 x="1200" y="320"/>
+    </wire>
+    <wire>
+      <p1 x="500" y="600"/>
+      <p2 x="500" y="620"/>
+    </wire>
+    <wire>
+      <p1 x="440" y="600"/>
+      <p2 x="440" y="620"/>
+    </wire>
+    <wire>
+      <p1 x="380" y="600"/>
+      <p2 x="380" y="620"/>
     </wire>
   </wires>
   <measurementOrdering>
diff --git a/src/main/dig/processorExp/Processor.dig b/src/main/dig/processorExp/Processor.dig
index 24def4e8a..7263da1ff 100644
--- a/src/main/dig/processorExp/Processor.dig
+++ b/src/main/dig/processorExp/Processor.dig
@@ -11,7 +11,7 @@
           <rotation rotation="3"/>
         </entry>
       </elementAttributes>
-      <pos x="620" y="540"/>
+      <pos x="620" y="500"/>
     </visualElement>
     <visualElement>
       <elementName>Register.dig</elementName>
@@ -173,12 +173,12 @@
           <boolean>true</boolean>
         </entry>
       </elementAttributes>
-      <pos x="380" y="460"/>
+      <pos x="360" y="360"/>
     </visualElement>
     <visualElement>
       <elementName>Const</elementName>
       <elementAttributes/>
-      <pos x="360" y="500"/>
+      <pos x="340" y="400"/>
     </visualElement>
     <visualElement>
       <elementName>Driver</elementName>
@@ -441,7 +441,7 @@
           <string>stPC</string>
         </entry>
       </elementAttributes>
-      <pos x="620" y="660"/>
+      <pos x="620" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -455,7 +455,7 @@
           <string>WE</string>
         </entry>
       </elementAttributes>
-      <pos x="600" y="660"/>
+      <pos x="600" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -469,7 +469,7 @@
           <string>imm</string>
         </entry>
       </elementAttributes>
-      <pos x="580" y="660"/>
+      <pos x="580" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -483,7 +483,7 @@
           <string>abs</string>
         </entry>
       </elementAttributes>
-      <pos x="560" y="660"/>
+      <pos x="560" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -497,7 +497,7 @@
           <string>muxB</string>
         </entry>
       </elementAttributes>
-      <pos x="540" y="660"/>
+      <pos x="540" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -511,7 +511,7 @@
           <string>src2D</string>
         </entry>
       </elementAttributes>
-      <pos x="520" y="660"/>
+      <pos x="520" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -525,7 +525,7 @@
           <string>muxA</string>
         </entry>
       </elementAttributes>
-      <pos x="500" y="660"/>
+      <pos x="500" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -539,7 +539,7 @@
           <string>ALU2D</string>
         </entry>
       </elementAttributes>
-      <pos x="480" y="660"/>
+      <pos x="480" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -553,7 +553,7 @@
           <string>ALUop</string>
         </entry>
       </elementAttributes>
-      <pos x="460" y="660"/>
+      <pos x="460" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -567,7 +567,7 @@
           <string>sf</string>
         </entry>
       </elementAttributes>
-      <pos x="440" y="660"/>
+      <pos x="440" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -581,7 +581,7 @@
           <string>br</string>
         </entry>
       </elementAttributes>
-      <pos x="420" y="660"/>
+      <pos x="420" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -595,7 +595,7 @@
           <string>st</string>
         </entry>
       </elementAttributes>
-      <pos x="400" y="660"/>
+      <pos x="400" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -609,7 +609,7 @@
           <string>ld</string>
         </entry>
       </elementAttributes>
-      <pos x="380" y="660"/>
+      <pos x="380" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -623,7 +623,7 @@
           <string>ioW</string>
         </entry>
       </elementAttributes>
-      <pos x="360" y="660"/>
+      <pos x="360" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -637,7 +637,7 @@
           <string>ioR</string>
         </entry>
       </elementAttributes>
-      <pos x="340" y="660"/>
+      <pos x="340" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -1124,10 +1124,6 @@
       <p1 x="760" y="520"/>
       <p2 x="840" y="520"/>
     </wire>
-    <wire>
-      <p1 x="540" y="520"/>
-      <p2 x="620" y="520"/>
-    </wire>
     <wire>
       <p1 x="1160" y="200"/>
       <p2 x="1200" y="200"/>
@@ -1144,10 +1140,6 @@
       <p1 x="1340" y="200"/>
       <p2 x="1360" y="200"/>
     </wire>
-    <wire>
-      <p1 x="360" y="460"/>
-      <p2 x="380" y="460"/>
-    </wire>
     <wire>
       <p1 x="880" y="460"/>
       <p2 x="900" y="460"/>
@@ -1204,6 +1196,10 @@
       <p1 x="500" y="400"/>
       <p2 x="560" y="400"/>
     </wire>
+    <wire>
+      <p1 x="340" y="400"/>
+      <p2 x="360" y="400"/>
+    </wire>
     <wire>
       <p1 x="340" y="80"/>
       <p2 x="1220" y="80"/>
@@ -1249,17 +1245,13 @@
       <p2 x="1120" y="480"/>
     </wire>
     <wire>
-      <p1 x="440" y="480"/>
-      <p2 x="460" y="480"/>
+      <p1 x="460" y="480"/>
+      <p2 x="580" y="480"/>
     </wire>
     <wire>
       <p1 x="580" y="480"/>
       <p2 x="680" y="480"/>
     </wire>
-    <wire>
-      <p1 x="460" y="480"/>
-      <p2 x="580" y="480"/>
-    </wire>
     <wire>
       <p1 x="800" y="160"/>
       <p2 x="840" y="160"/>
@@ -1296,6 +1288,10 @@
       <p1 x="1280" y="420"/>
       <p2 x="1360" y="420"/>
     </wire>
+    <wire>
+      <p1 x="320" y="360"/>
+      <p2 x="360" y="360"/>
+    </wire>
     <wire>
       <p1 x="1000" y="360"/>
       <p2 x="1080" y="360"/>
@@ -1337,13 +1333,9 @@
       <p2 x="1380" y="560"/>
     </wire>
     <wire>
-      <p1 x="360" y="240"/>
+      <p1 x="320" y="240"/>
       <p2 x="480" y="240"/>
     </wire>
-    <wire>
-      <p1 x="360" y="500"/>
-      <p2 x="380" y="500"/>
-    </wire>
     <wire>
       <p1 x="760" y="500"/>
       <p2 x="840" y="500"/>
@@ -1370,7 +1362,7 @@
     </wire>
     <wire>
       <p1 x="500" y="440"/>
-      <p2 x="540" y="440"/>
+      <p2 x="620" y="440"/>
     </wire>
     <wire>
       <p1 x="820" y="440"/>
@@ -1409,8 +1401,8 @@
       <p2 x="540" y="380"/>
     </wire>
     <wire>
-      <p1 x="460" y="380"/>
-      <p2 x="480" y="380"/>
+      <p1 x="420" y="380"/>
+      <p2 x="460" y="380"/>
     </wire>
     <wire>
       <p1 x="800" y="380"/>
@@ -1420,6 +1412,10 @@
       <p1 x="580" y="380"/>
       <p2 x="680" y="380"/>
     </wire>
+    <wire>
+      <p1 x="460" y="380"/>
+      <p2 x="480" y="380"/>
+    </wire>
     <wire>
       <p1 x="1280" y="140"/>
       <p2 x="1280" y="280"/>
@@ -1436,13 +1432,17 @@
       <p1 x="1280" y="420"/>
       <p2 x="1280" y="580"/>
     </wire>
+    <wire>
+      <p1 x="320" y="240"/>
+      <p2 x="320" y="360"/>
+    </wire>
     <wire>
       <p1 x="580" y="380"/>
       <p2 x="580" y="480"/>
     </wire>
     <wire>
-      <p1 x="580" y="640"/>
-      <p2 x="580" y="660"/>
+      <p1 x="580" y="600"/>
+      <p2 x="580" y="620"/>
     </wire>
     <wire>
       <p1 x="900" y="160"/>
@@ -1465,24 +1465,24 @@
       <p2 x="1220" y="140"/>
     </wire>
     <wire>
-      <p1 x="520" y="640"/>
-      <p2 x="520" y="660"/>
+      <p1 x="520" y="600"/>
+      <p2 x="520" y="620"/>
     </wire>
     <wire>
       <p1 x="520" y="140"/>
       <p2 x="520" y="160"/>
     </wire>
     <wire>
-      <p1 x="460" y="640"/>
-      <p2 x="460" y="660"/>
+      <p1 x="460" y="600"/>
+      <p2 x="460" y="620"/>
     </wire>
     <wire>
       <p1 x="460" y="380"/>
       <p2 x="460" y="480"/>
     </wire>
     <wire>
-      <p1 x="400" y="640"/>
-      <p2 x="400" y="660"/>
+      <p1 x="400" y="600"/>
+      <p2 x="400" y="620"/>
     </wire>
     <wire>
       <p1 x="1300" y="520"/>
@@ -1493,8 +1493,8 @@
       <p2 x="1300" y="660"/>
     </wire>
     <wire>
-      <p1 x="340" y="640"/>
-      <p2 x="340" y="660"/>
+      <p1 x="340" y="600"/>
+      <p2 x="340" y="620"/>
     </wire>
     <wire>
       <p1 x="340" y="180"/>
@@ -1513,8 +1513,8 @@
       <p2 x="1240" y="360"/>
     </wire>
     <wire>
-      <p1 x="600" y="640"/>
-      <p2 x="600" y="660"/>
+      <p1 x="600" y="600"/>
+      <p2 x="600" y="620"/>
     </wire>
     <wire>
       <p1 x="600" y="0"/>
@@ -1525,17 +1525,13 @@
       <p2 x="1180" y="780"/>
     </wire>
     <wire>
-      <p1 x="540" y="640"/>
-      <p2 x="540" y="660"/>
+      <p1 x="540" y="600"/>
+      <p2 x="540" y="620"/>
     </wire>
     <wire>
       <p1 x="540" y="160"/>
       <p2 x="540" y="380"/>
     </wire>
-    <wire>
-      <p1 x="540" y="440"/>
-      <p2 x="540" y="520"/>
-    </wire>
     <wire>
       <p1 x="860" y="160"/>
       <p2 x="860" y="180"/>
@@ -1561,8 +1557,8 @@
       <p2 x="1440" y="440"/>
     </wire>
     <wire>
-      <p1 x="480" y="640"/>
-      <p2 x="480" y="660"/>
+      <p1 x="480" y="600"/>
+      <p2 x="480" y="620"/>
     </wire>
     <wire>
       <p1 x="480" y="140"/>
@@ -1585,8 +1581,8 @@
       <p2 x="800" y="380"/>
     </wire>
     <wire>
-      <p1 x="420" y="640"/>
-      <p2 x="420" y="660"/>
+      <p1 x="420" y="600"/>
+      <p2 x="420" y="620"/>
     </wire>
     <wire>
       <p1 x="1060" y="200"/>
@@ -1597,48 +1593,44 @@
       <p2 x="1060" y="320"/>
     </wire>
     <wire>
-      <p1 x="360" y="240"/>
-      <p2 x="360" y="460"/>
+      <p1 x="360" y="600"/>
+      <p2 x="360" y="620"/>
     </wire>
     <wire>
-      <p1 x="360" y="640"/>
-      <p2 x="360" y="660"/>
+      <p1 x="620" y="440"/>
+      <p2 x="620" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="620" y="600"/>
+      <p2 x="620" y="620"/>
     </wire>
     <wire>
       <p1 x="1260" y="640"/>
       <p2 x="1260" y="660"/>
     </wire>
-    <wire>
-      <p1 x="620" y="520"/>
-      <p2 x="620" y="540"/>
-    </wire>
-    <wire>
-      <p1 x="620" y="640"/>
-      <p2 x="620" y="660"/>
-    </wire>
     <wire>
       <p1 x="1200" y="200"/>
       <p2 x="1200" y="320"/>
     </wire>
     <wire>
-      <p1 x="560" y="640"/>
-      <p2 x="560" y="660"/>
+      <p1 x="560" y="600"/>
+      <p2 x="560" y="620"/>
     </wire>
     <wire>
       <p1 x="560" y="180"/>
       <p2 x="560" y="400"/>
     </wire>
     <wire>
-      <p1 x="500" y="640"/>
-      <p2 x="500" y="660"/>
+      <p1 x="500" y="600"/>
+      <p2 x="500" y="620"/>
     </wire>
     <wire>
-      <p1 x="440" y="640"/>
-      <p2 x="440" y="660"/>
+      <p1 x="440" y="600"/>
+      <p2 x="440" y="620"/>
     </wire>
     <wire>
-      <p1 x="380" y="640"/>
-      <p2 x="380" y="660"/>
+      <p1 x="380" y="600"/>
+      <p2 x="380" y="620"/>
     </wire>
   </wires>
   <measurementOrdering>