From e90d2d381c85c83ef0b3ab2dba53f7bbdf8efbda Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Thu, 7 Feb 2019 11:41:09 +0100
Subject: [PATCH] Minor modifications to the processor example.

---
 src/main/dig/processor/Processor.dig          | 60 +++++++------------
 src/main/dig/processor/ProcessorIntr.dig      | 44 +++++---------
 src/main/dig/processor/ProcessorMux.dig       | 60 +++++++------------
 .../dig/processor/ProcessorVonNeumann.dig     | 58 +++++++-----------
 4 files changed, 79 insertions(+), 143 deletions(-)

diff --git a/src/main/dig/processor/Processor.dig b/src/main/dig/processor/Processor.dig
index 7eaf54b70..37a988b0a 100644
--- a/src/main/dig/processor/Processor.dig
+++ b/src/main/dig/processor/Processor.dig
@@ -69,35 +69,7 @@ Single-Cycle CPU.}}</string>
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="820" y="400"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Const</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Value</string>
-          <long>255</long>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-      </elementAttributes>
-      <pos x="820" y="420"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Const</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Value</string>
-          <long>4095</long>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-      </elementAttributes>
-      <pos x="820" y="440"/>
+      <pos x="800" y="420"/>
     </visualElement>
     <visualElement>
       <elementName>SignExt.dig</elementName>
@@ -172,7 +144,7 @@ Single-Cycle CPU.}}</string>
         </entry>
         <entry>
           <string>Data</string>
-          <data size="65536">8000,1360,8190,1350,1490,1483,1425,143a,20e1,14fc,4cef,6e55,1821,3c2f,65f9,6e1e,205,
+          <data>8000,1360,8190,1350,1490,1483,1425,143a,20e1,14fc,4cef,6e55,1821,3c2f,65f9,6e1e,205,
 216,1430,1420,14a0,8033,68c0,7a80,3c80,5e05,3c72,5e05,3c73,5e03,6e03,3c73,6401,14a3,
 741a,1801,1811,1821,3d24,65ec,1831,3d34,65e8,3091,ffff,7009,246,265,254,7c00,6fdd,
 1470,2031,2104,8058,68b0,1821,1801,8058,68b0,1831,1904,8058,68b0,1831,1904,8058,68b0,
@@ -828,10 +800,6 @@ Single-Cycle CPU.}}</string>
       <p1 x="640" y="400"/>
       <p2 x="660" y="400"/>
     </wire>
-    <wire>
-      <p1 x="820" y="400"/>
-      <p2 x="840" y="400"/>
-    </wire>
     <wire>
       <p1 x="1340" y="400"/>
       <p2 x="1360" y="400"/>
@@ -844,6 +812,10 @@ Single-Cycle CPU.}}</string>
       <p1 x="340" y="400"/>
       <p2 x="360" y="400"/>
     </wire>
+    <wire>
+      <p1 x="820" y="400"/>
+      <p2 x="840" y="400"/>
+    </wire>
     <wire>
       <p1 x="380" y="80"/>
       <p2 x="400" y="80"/>
@@ -916,6 +888,14 @@ Single-Cycle CPU.}}</string>
       <p1 x="740" y="480"/>
       <p2 x="840" y="480"/>
     </wire>
+    <wire>
+      <p1 x="800" y="420"/>
+      <p2 x="820" y="420"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="420"/>
+      <p2 x="840" y="420"/>
+    </wire>
     <wire>
       <p1 x="800" y="100"/>
       <p2 x="840" y="100"/>
@@ -940,10 +920,6 @@ Single-Cycle CPU.}}</string>
       <p1 x="1280" y="100"/>
       <p2 x="1360" y="100"/>
     </wire>
-    <wire>
-      <p1 x="820" y="420"/>
-      <p2 x="840" y="420"/>
-    </wire>
     <wire>
       <p1 x="1420" y="360"/>
       <p2 x="1440" y="360"/>
@@ -1240,6 +1216,14 @@ Single-Cycle CPU.}}</string>
       <p1 x="500" y="580"/>
       <p2 x="500" y="600"/>
     </wire>
+    <wire>
+      <p1 x="820" y="400"/>
+      <p2 x="820" y="420"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="420"/>
+      <p2 x="820" y="440"/>
+    </wire>
     <wire>
       <p1 x="440" y="580"/>
       <p2 x="440" y="600"/>
diff --git a/src/main/dig/processor/ProcessorIntr.dig b/src/main/dig/processor/ProcessorIntr.dig
index a1abbd7f0..e7782d27b 100644
--- a/src/main/dig/processor/ProcessorIntr.dig
+++ b/src/main/dig/processor/ProcessorIntr.dig
@@ -66,35 +66,7 @@ An dieser Adresse muss sich die ISR befinden.}}</string>
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="820" y="540"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Const</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Value</string>
-          <long>255</long>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-      </elementAttributes>
-      <pos x="820" y="560"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Const</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Value</string>
-          <long>4095</long>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-      </elementAttributes>
-      <pos x="820" y="580"/>
+      <pos x="800" y="560"/>
     </visualElement>
     <visualElement>
       <elementName>SignExt.dig</elementName>
@@ -173,7 +145,7 @@ An dieser Adresse muss sich die ISR befinden.}}</string>
         </entry>
         <entry>
           <string>Data</string>
-          <data size="65536">6e28,0,ffff,59e0,7800,fffe,59e0,20e2,20e1,4ce1,5601,5610,3c10,6402,1411,1400,7351,
+          <data>6e28,0,ffff,59e0,7800,fffe,59e0,20e2,20e1,4ce1,5601,5610,3c10,6402,1411,1400,7351,
 3c00,6407,3e10,8000,3b10,6408,1401,5210,6e05,4010,3c11,6402,1400,5210,5201,4e1e,18e1,
 18e2,fffe,5b0e,7200,ffff,5b0e,7e00,99ab,1200,803e,68f0,8020,1200,73f0,8f8a,1200,803e,
 68f0,8020,1200,73f0,1831,203,803e,68f0,140a,73f0,6feb,4800,4a00,804d,6820,4a00,804d,
@@ -1292,6 +1264,10 @@ Interrupt ausgelöst. Die ISR muss sich an Adresse
       <p1 x="760" y="620"/>
       <p2 x="840" y="620"/>
     </wire>
+    <wire>
+      <p1 x="800" y="560"/>
+      <p2 x="820" y="560"/>
+    </wire>
     <wire>
       <p1 x="500" y="560"/>
       <p2 x="620" y="560"/>
@@ -1556,6 +1532,14 @@ Interrupt ausgelöst. Die ISR muss sich an Adresse
       <p1 x="500" y="720"/>
       <p2 x="500" y="740"/>
     </wire>
+    <wire>
+      <p1 x="820" y="540"/>
+      <p2 x="820" y="560"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="560"/>
+      <p2 x="820" y="580"/>
+    </wire>
     <wire>
       <p1 x="440" y="720"/>
       <p2 x="440" y="740"/>
diff --git a/src/main/dig/processor/ProcessorMux.dig b/src/main/dig/processor/ProcessorMux.dig
index f1f064351..7bfef123b 100644
--- a/src/main/dig/processor/ProcessorMux.dig
+++ b/src/main/dig/processor/ProcessorMux.dig
@@ -58,35 +58,7 @@ Single-Cycle CPU.}}</string>
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="820" y="440"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Const</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Value</string>
-          <long>255</long>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-      </elementAttributes>
-      <pos x="820" y="460"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Const</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Value</string>
-          <long>4095</long>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-      </elementAttributes>
-      <pos x="820" y="480"/>
+      <pos x="800" y="460"/>
     </visualElement>
     <visualElement>
       <elementName>SignExt.dig</elementName>
@@ -142,7 +114,7 @@ Single-Cycle CPU.}}</string>
         </entry>
         <entry>
           <string>Data</string>
-          <data size="77">802e,1220,7800,5610,5200,3c00,5e0e,3c10,640c,210,2811,6422,210,2818,6431,210,2812,
+          <data>802e,1220,7800,5610,5200,3c00,5e0e,3c10,640c,210,2811,6422,210,2818,6431,210,2812,
 6404,210,2814,640c,6a02,801a,1220,1580,1491,7359,3e90,2081,6402,1580,1491,6fe1,8026,
 1220,1580,8000,1390,7359,4090,2081,6403,1580,8000,1390,6fd4,8032,1220,1491,14a0,7359,
 3ca0,6406,3e90,8000,3b90,65c9,14a1,6fc7,4090,3c91,65c4,14a0,6fc2,8045,1220,1484,9111,
@@ -890,6 +862,14 @@ Single-Cycle CPU.}}</string>
       <p1 x="740" y="520"/>
       <p2 x="840" y="520"/>
     </wire>
+    <wire>
+      <p1 x="800" y="460"/>
+      <p2 x="820" y="460"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="460"/>
+      <p2 x="840" y="460"/>
+    </wire>
     <wire>
       <p1 x="880" y="140"/>
       <p2 x="1060" y="140"/>
@@ -910,10 +890,6 @@ Single-Cycle CPU.}}</string>
       <p1 x="500" y="140"/>
       <p2 x="540" y="140"/>
     </wire>
-    <wire>
-      <p1 x="820" y="460"/>
-      <p2 x="840" y="460"/>
-    </wire>
     <wire>
       <p1 x="520" y="80"/>
       <p2 x="560" y="80"/>
@@ -1126,10 +1102,6 @@ Single-Cycle CPU.}}</string>
       <p1 x="640" y="440"/>
       <p2 x="660" y="440"/>
     </wire>
-    <wire>
-      <p1 x="820" y="440"/>
-      <p2 x="840" y="440"/>
-    </wire>
     <wire>
       <p1 x="500" y="440"/>
       <p2 x="560" y="440"/>
@@ -1138,6 +1110,10 @@ Single-Cycle CPU.}}</string>
       <p1 x="340" y="440"/>
       <p2 x="360" y="440"/>
     </wire>
+    <wire>
+      <p1 x="820" y="440"/>
+      <p2 x="840" y="440"/>
+    </wire>
     <wire>
       <p1 x="540" y="120"/>
       <p2 x="560" y="120"/>
@@ -1318,6 +1294,14 @@ Single-Cycle CPU.}}</string>
       <p1 x="500" y="620"/>
       <p2 x="500" y="640"/>
     </wire>
+    <wire>
+      <p1 x="820" y="440"/>
+      <p2 x="820" y="460"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="460"/>
+      <p2 x="820" y="480"/>
+    </wire>
     <wire>
       <p1 x="1400" y="-20"/>
       <p2 x="1400" y="200"/>
diff --git a/src/main/dig/processor/ProcessorVonNeumann.dig b/src/main/dig/processor/ProcessorVonNeumann.dig
index 893a1f2ba..02185c96a 100644
--- a/src/main/dig/processor/ProcessorVonNeumann.dig
+++ b/src/main/dig/processor/ProcessorVonNeumann.dig
@@ -53,35 +53,7 @@ Von Neumann Two-Cycle CPU.}}</string>
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="820" y="480"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Const</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Value</string>
-          <long>255</long>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-      </elementAttributes>
-      <pos x="820" y="500"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Const</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Value</string>
-          <long>4095</long>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-      </elementAttributes>
-      <pos x="820" y="520"/>
+      <pos x="800" y="500"/>
     </visualElement>
     <visualElement>
       <elementName>SignExt.dig</elementName>
@@ -976,10 +948,6 @@ Von Neumann Two-Cycle CPU.}}</string>
       <p1 x="640" y="480"/>
       <p2 x="660" y="480"/>
     </wire>
-    <wire>
-      <p1 x="820" y="480"/>
-      <p2 x="840" y="480"/>
-    </wire>
     <wire>
       <p1 x="500" y="480"/>
       <p2 x="560" y="480"/>
@@ -988,6 +956,10 @@ Von Neumann Two-Cycle CPU.}}</string>
       <p1 x="340" y="480"/>
       <p2 x="360" y="480"/>
     </wire>
+    <wire>
+      <p1 x="820" y="480"/>
+      <p2 x="840" y="480"/>
+    </wire>
     <wire>
       <p1 x="1400" y="420"/>
       <p2 x="1420" y="420"/>
@@ -1040,6 +1012,14 @@ Von Neumann Two-Cycle CPU.}}</string>
       <p1 x="740" y="560"/>
       <p2 x="840" y="560"/>
     </wire>
+    <wire>
+      <p1 x="800" y="500"/>
+      <p2 x="820" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="500"/>
+      <p2 x="840" y="500"/>
+    </wire>
     <wire>
       <p1 x="1180" y="180"/>
       <p2 x="1240" y="180"/>
@@ -1056,10 +1036,6 @@ Von Neumann Two-Cycle CPU.}}</string>
       <p1 x="560" y="180"/>
       <p2 x="660" y="180"/>
     </wire>
-    <wire>
-      <p1 x="820" y="500"/>
-      <p2 x="840" y="500"/>
-    </wire>
     <wire>
       <p1 x="1000" y="440"/>
       <p2 x="1080" y="440"/>
@@ -1308,6 +1284,14 @@ Von Neumann Two-Cycle CPU.}}</string>
       <p1 x="500" y="700"/>
       <p2 x="500" y="720"/>
     </wire>
+    <wire>
+      <p1 x="820" y="480"/>
+      <p2 x="820" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="500"/>
+      <p2 x="820" y="520"/>
+    </wire>
     <wire>
       <p1 x="440" y="700"/>
       <p2 x="440" y="720"/>