From a9360a465f646254cfbf9fb9bb2e73f485c240ca Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Wed, 14 Dec 2016 20:14:32 +0100
Subject: [PATCH] new DataField converter writes hex numbers

---
 src/main/dig/processor/ProcessorIntr.dig      | 357 +++++++++---------
 .../core/memory/DataFieldConverter.java       |   4 +-
 .../core/memory/DataFieldConverterTest.java   |  16 +-
 3 files changed, 184 insertions(+), 193 deletions(-)

diff --git a/src/main/dig/processor/ProcessorIntr.dig b/src/main/dig/processor/ProcessorIntr.dig
index 9b25bf315..8488da966 100644
--- a/src/main/dig/processor/ProcessorIntr.dig
+++ b/src/main/dig/processor/ProcessorIntr.dig
@@ -165,9 +165,9 @@ Single-Cycle CPU.</string>
         </entry>
         <entry>
           <string>Data</string>
-          <data size="4131">39339,4608,32782,26864,32800,4608,29680,36746,4608,32782,26864,5130,29680,28658,18432,
-18944,32797,26656,18944,32797,26656,18432,18944,32797,26656,18944,32797,26656,27151,
-528,10271,15386,25091,32816,5648,28162,32823,5648,29681,27138,0,0,0,0,0,0,0,0,0,0,
+          <data size="4131">99ab,1200,800e,68f0,8020,1200,73f0,8f8a,1200,800e,68f0,140a,73f0,6ff2,4800,4a00,801d,
+6820,4a00,801d,6820,4800,4a00,801d,6820,4a00,801d,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,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,
@@ -266,10 +266,9 @@ Single-Cycle CPU.</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,0,0,0,0,0,0,30912,8417,19692,8417,19680,
-31744,22017,22208,15552,25602,5313,5120,29532,15360,25607,16064,32768,15296,25608,
-5121,21008,28165,16576,15553,25602,5120,21008,21004,19982,6369,20174,6369,29196,30913,
-27148</data>
+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>
         </entry>
         <entry>
           <string>lastDataFile</string>
@@ -345,7 +344,7 @@ Single-Cycle CPU.</string>
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="1360" y="140"/>
+      <pos x="1340" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -707,7 +706,7 @@ Single-Cycle CPU.</string>
           <string>st</string>
         </entry>
       </elementAttributes>
-      <pos x="1340" y="160"/>
+      <pos x="1320" y="160"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -721,7 +720,7 @@ Single-Cycle CPU.</string>
           <string>ld</string>
         </entry>
       </elementAttributes>
-      <pos x="1340" y="220"/>
+      <pos x="1320" y="220"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -797,7 +796,7 @@ Single-Cycle CPU.</string>
           <string>C</string>
         </entry>
       </elementAttributes>
-      <pos x="1340" y="200"/>
+      <pos x="1320" y="200"/>
     </visualElement>
     <visualElement>
       <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/Intr.dig</elementName>
@@ -947,20 +946,6 @@ Single-Cycle CPU.</string>
       <elementAttributes/>
       <pos x="360" y="120"/>
     </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="3"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>A</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1280" y="160"/>
-    </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
@@ -973,7 +958,7 @@ Single-Cycle CPU.</string>
           <string>D</string>
         </entry>
       </elementAttributes>
-      <pos x="1420" y="80"/>
+      <pos x="1400" y="80"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -1022,69 +1007,8 @@ Single-Cycle CPU.</string>
     <visualElement>
       <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/Terminal.dig</elementName>
       <elementAttributes/>
-      <pos x="1360" y="640"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>ioW</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1340" y="700"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>D</string>
-        </entry>
-      </elementAttributes>
       <pos x="1340" y="640"/>
     </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>A</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1340" y="660"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>C</string>
-        </entry>
-      </elementAttributes>
-      <pos x="1340" y="680"/>
-    </visualElement>
-    <visualElement>
-      <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/GPO.dig</elementName>
-      <elementAttributes/>
-      <pos x="1360" y="280"/>
-    </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
@@ -1097,7 +1021,7 @@ Single-Cycle CPU.</string>
           <string>ioW</string>
         </entry>
       </elementAttributes>
-      <pos x="1340" y="340"/>
+      <pos x="1320" y="700"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -1111,7 +1035,7 @@ Single-Cycle CPU.</string>
           <string>D</string>
         </entry>
       </elementAttributes>
-      <pos x="1340" y="280"/>
+      <pos x="1320" y="640"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -1125,7 +1049,7 @@ Single-Cycle CPU.</string>
           <string>A</string>
         </entry>
       </elementAttributes>
-      <pos x="1340" y="300"/>
+      <pos x="1320" y="660"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -1139,87 +1063,148 @@ Single-Cycle CPU.</string>
           <string>C</string>
         </entry>
       </elementAttributes>
-      <pos x="1340" y="320"/>
+      <pos x="1320" y="680"/>
+    </visualElement>
+    <visualElement>
+      <elementName>/home/hneemann/Dokumente/Java/digital/src/main/dig/processor/GPO.dig</elementName>
+      <elementAttributes/>
+      <pos x="1340" y="280"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>ioW</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1320" y="340"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>D</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1320" y="280"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>A</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1320" y="300"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>C</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1320" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="120"/>
+      <pos x="1480" y="120"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="160"/>
+      <pos x="1480" y="160"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="200"/>
+      <pos x="1480" y="200"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="240"/>
+      <pos x="1480" y="240"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="280"/>
+      <pos x="1480" y="280"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="320"/>
+      <pos x="1480" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="360"/>
+      <pos x="1480" y="360"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="400"/>
+      <pos x="1480" y="400"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="440"/>
+      <pos x="1480" y="440"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="480"/>
+      <pos x="1480" y="480"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="520"/>
+      <pos x="1480" y="520"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="560"/>
+      <pos x="1480" y="560"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="600"/>
+      <pos x="1480" y="600"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="640"/>
+      <pos x="1480" y="640"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="680"/>
+      <pos x="1480" y="680"/>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="1500" y="720"/>
+      <pos x="1480" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>Counter</elementName>
@@ -1250,71 +1235,81 @@ Single-Cycle CPU.</string>
       <elementAttributes/>
       <pos x="980" y="700"/>
     </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>A</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1280" y="80"/>
+    </visualElement>
   </visualElements>
   <wires>
     <wire>
-      <p1 x="1500" y="120"/>
-      <p2 x="1420" y="280"/>
+      <p1 x="1480" y="120"/>
+      <p2 x="1400" y="280"/>
     </wire>
     <wire>
-      <p1 x="1420" y="300"/>
-      <p2 x="1500" y="160"/>
+      <p1 x="1400" y="300"/>
+      <p2 x="1480" y="160"/>
     </wire>
     <wire>
-      <p1 x="1420" y="320"/>
-      <p2 x="1500" y="200"/>
+      <p1 x="1400" y="320"/>
+      <p2 x="1480" y="200"/>
     </wire>
     <wire>
-      <p1 x="1500" y="240"/>
-      <p2 x="1420" y="340"/>
+      <p1 x="1480" y="240"/>
+      <p2 x="1400" y="340"/>
     </wire>
     <wire>
-      <p1 x="1420" y="360"/>
-      <p2 x="1500" y="280"/>
+      <p1 x="1400" y="360"/>
+      <p2 x="1480" y="280"/>
     </wire>
     <wire>
-      <p1 x="1500" y="320"/>
-      <p2 x="1420" y="380"/>
+      <p1 x="1480" y="320"/>
+      <p2 x="1400" y="380"/>
     </wire>
     <wire>
-      <p1 x="1500" y="400"/>
-      <p2 x="1420" y="420"/>
+      <p1 x="1480" y="400"/>
+      <p2 x="1400" y="420"/>
     </wire>
     <wire>
-      <p1 x="1500" y="480"/>
-      <p2 x="1420" y="460"/>
+      <p1 x="1480" y="480"/>
+      <p2 x="1400" y="460"/>
     </wire>
     <wire>
-      <p1 x="1420" y="480"/>
-      <p2 x="1500" y="520"/>
+      <p1 x="1400" y="480"/>
+      <p2 x="1480" y="520"/>
     </wire>
     <wire>
-      <p1 x="1500" y="560"/>
-      <p2 x="1420" y="500"/>
+      <p1 x="1480" y="560"/>
+      <p2 x="1400" y="500"/>
     </wire>
     <wire>
-      <p1 x="1500" y="640"/>
-      <p2 x="1420" y="540"/>
+      <p1 x="1480" y="640"/>
+      <p2 x="1400" y="540"/>
     </wire>
     <wire>
-      <p1 x="1420" y="580"/>
-      <p2 x="1500" y="720"/>
+      <p1 x="1400" y="580"/>
+      <p2 x="1480" y="720"/>
     </wire>
     <wire>
-      <p1 x="1420" y="560"/>
-      <p2 x="1500" y="680"/>
+      <p1 x="1400" y="560"/>
+      <p2 x="1480" y="680"/>
     </wire>
     <wire>
-      <p1 x="1420" y="520"/>
-      <p2 x="1500" y="600"/>
+      <p1 x="1400" y="520"/>
+      <p2 x="1480" y="600"/>
     </wire>
     <wire>
-      <p1 x="1420" y="400"/>
-      <p2 x="1500" y="360"/>
+      <p1 x="1400" y="400"/>
+      <p2 x="1480" y="360"/>
     </wire>
     <wire>
-      <p1 x="1340" y="640"/>
-      <p2 x="1360" y="640"/>
+      <p1 x="1320" y="640"/>
+      <p2 x="1340" y="640"/>
     </wire>
     <wire>
       <p1 x="1080" y="640"/>
@@ -1326,7 +1321,7 @@ Single-Cycle CPU.</string>
     </wire>
     <wire>
       <p1 x="1240" y="0"/>
-      <p2 x="1440" y="0"/>
+      <p2 x="1420" y="0"/>
     </wire>
     <wire>
       <p1 x="800" y="0"/>
@@ -1337,8 +1332,8 @@ Single-Cycle CPU.</string>
       <p2 x="1160" y="320"/>
     </wire>
     <wire>
-      <p1 x="1340" y="320"/>
-      <p2 x="1360" y="320"/>
+      <p1 x="1320" y="320"/>
+      <p2 x="1340" y="320"/>
     </wire>
     <wire>
       <p1 x="760" y="580"/>
@@ -1377,8 +1372,8 @@ Single-Cycle CPU.</string>
       <p2 x="640" y="200"/>
     </wire>
     <wire>
-      <p1 x="1340" y="200"/>
-      <p2 x="1360" y="200"/>
+      <p1 x="1320" y="200"/>
+      <p2 x="1340" y="200"/>
     </wire>
     <wire>
       <p1 x="340" y="200"/>
@@ -1428,13 +1423,9 @@ Single-Cycle CPU.</string>
       <p1 x="1160" y="140"/>
       <p2 x="1240" y="140"/>
     </wire>
-    <wire>
-      <p1 x="1280" y="140"/>
-      <p2 x="1360" y="140"/>
-    </wire>
     <wire>
       <p1 x="1240" y="140"/>
-      <p2 x="1280" y="140"/>
+      <p2 x="1340" y="140"/>
     </wire>
     <wire>
       <p1 x="340" y="400"/>
@@ -1457,20 +1448,24 @@ Single-Cycle CPU.</string>
       <p2 x="1240" y="80"/>
     </wire>
     <wire>
-      <p1 x="1420" y="80"/>
-      <p2 x="1440" y="80"/>
+      <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="980" y="660"/>
       <p2 x="1000" y="660"/>
     </wire>
     <wire>
-      <p1 x="1340" y="660"/>
-      <p2 x="1360" y="660"/>
+      <p1 x="1320" y="660"/>
+      <p2 x="1340" y="660"/>
     </wire>
     <wire>
-      <p1 x="1340" y="340"/>
-      <p2 x="1360" y="340"/>
+      <p1 x="1320" y="340"/>
+      <p2 x="1340" y="340"/>
     </wire>
     <wire>
       <p1 x="1140" y="340"/>
@@ -1481,8 +1476,8 @@ Single-Cycle CPU.</string>
       <p2 x="460" y="20"/>
     </wire>
     <wire>
-      <p1 x="1340" y="280"/>
-      <p2 x="1360" y="280"/>
+      <p1 x="1320" y="280"/>
+      <p2 x="1340" y="280"/>
     </wire>
     <wire>
       <p1 x="1140" y="280"/>
@@ -1509,8 +1504,8 @@ Single-Cycle CPU.</string>
       <p2 x="840" y="540"/>
     </wire>
     <wire>
-      <p1 x="1340" y="220"/>
-      <p2 x="1360" y="220"/>
+      <p1 x="1320" y="220"/>
+      <p2 x="1340" y="220"/>
     </wire>
     <wire>
       <p1 x="760" y="480"/>
@@ -1545,8 +1540,8 @@ Single-Cycle CPU.</string>
       <p2 x="1260" y="160"/>
     </wire>
     <wire>
-      <p1 x="1340" y="160"/>
-      <p2 x="1360" y="160"/>
+      <p1 x="1320" y="160"/>
+      <p2 x="1340" y="160"/>
     </wire>
     <wire>
       <p1 x="540" y="160"/>
@@ -1569,8 +1564,8 @@ Single-Cycle CPU.</string>
       <p2 x="1000" y="680"/>
     </wire>
     <wire>
-      <p1 x="1340" y="680"/>
-      <p2 x="1360" y="680"/>
+      <p1 x="1320" y="680"/>
+      <p2 x="1340" y="680"/>
     </wire>
     <wire>
       <p1 x="1140" y="360"/>
@@ -1589,8 +1584,8 @@ Single-Cycle CPU.</string>
       <p2 x="1280" y="40"/>
     </wire>
     <wire>
-      <p1 x="1340" y="300"/>
-      <p2 x="1360" y="300"/>
+      <p1 x="1320" y="300"/>
+      <p2 x="1340" y="300"/>
     </wire>
     <wire>
       <p1 x="1140" y="300"/>
@@ -1637,8 +1632,8 @@ Single-Cycle CPU.</string>
       <p2 x="840" y="500"/>
     </wire>
     <wire>
-      <p1 x="1420" y="180"/>
-      <p2 x="1440" y="180"/>
+      <p1 x="1400" y="180"/>
+      <p2 x="1420" y="180"/>
     </wire>
     <wire>
       <p1 x="1160" y="180"/>
@@ -1657,8 +1652,8 @@ Single-Cycle CPU.</string>
       <p2 x="360" y="180"/>
     </wire>
     <wire>
-      <p1 x="1420" y="440"/>
-      <p2 x="1500" y="440"/>
+      <p1 x="1400" y="440"/>
+      <p2 x="1480" y="440"/>
     </wire>
     <wire>
       <p1 x="1000" y="440"/>
@@ -1697,8 +1692,8 @@ Single-Cycle CPU.</string>
       <p2 x="640" y="120"/>
     </wire>
     <wire>
-      <p1 x="1340" y="700"/>
-      <p2 x="1360" y="700"/>
+      <p1 x="1320" y="700"/>
+      <p2 x="1340" y="700"/>
     </wire>
     <wire>
       <p1 x="1000" y="380"/>
@@ -1712,10 +1707,6 @@ Single-Cycle CPU.</string>
       <p1 x="320" y="240"/>
       <p2 x="320" y="440"/>
     </wire>
-    <wire>
-      <p1 x="1280" y="140"/>
-      <p2 x="1280" y="160"/>
-    </wire>
     <wire>
       <p1 x="580" y="460"/>
       <p2 x="580" y="560"/>
@@ -1748,6 +1739,14 @@ Single-Cycle CPU.</string>
       <p1 x="460" y="680"/>
       <p2 x="460" y="700"/>
     </wire>
+    <wire>
+      <p1 x="1420" y="0"/>
+      <p2 x="1420" y="80"/>
+    </wire>
+    <wire>
+      <p1 x="1420" y="80"/>
+      <p2 x="1420" y="180"/>
+    </wire>
     <wire>
       <p1 x="400" y="680"/>
       <p2 x="400" y="700"/>
@@ -1840,14 +1839,6 @@ Single-Cycle CPU.</string>
       <p1 x="800" y="160"/>
       <p2 x="800" y="460"/>
     </wire>
-    <wire>
-      <p1 x="1440" y="0"/>
-      <p2 x="1440" y="80"/>
-    </wire>
-    <wire>
-      <p1 x="1440" y="80"/>
-      <p2 x="1440" y="180"/>
-    </wire>
     <wire>
       <p1 x="1060" y="200"/>
       <p2 x="1060" y="380"/>
diff --git a/src/main/java/de/neemann/digital/core/memory/DataFieldConverter.java b/src/main/java/de/neemann/digital/core/memory/DataFieldConverter.java
index baddf32ce..f0a1c19bb 100644
--- a/src/main/java/de/neemann/digital/core/memory/DataFieldConverter.java
+++ b/src/main/java/de/neemann/digital/core/memory/DataFieldConverter.java
@@ -38,7 +38,7 @@ public class DataFieldConverter implements Converter {
                 pos = 0;
             }
 
-            final String s = Long.toString(d);
+            final String s = Long.toHexString(d);
             data.append(s);
             pos += s.length();
         }
@@ -68,7 +68,7 @@ public class DataFieldConverter implements Converter {
             StringTokenizer st = new StringTokenizer(reader.getValue(), ",");
             int i = 0;
             while (st.hasMoreTokens()) {
-                df.setData(i, Long.parseLong(st.nextToken().trim()));
+                df.setData(i, Long.parseLong(st.nextToken().trim(),16));
                 i++;
             }
             return df;
diff --git a/src/test/java/de/neemann/digital/core/memory/DataFieldConverterTest.java b/src/test/java/de/neemann/digital/core/memory/DataFieldConverterTest.java
index b9e4b3ebd..01eea9017 100644
--- a/src/test/java/de/neemann/digital/core/memory/DataFieldConverterTest.java
+++ b/src/test/java/de/neemann/digital/core/memory/DataFieldConverterTest.java
@@ -90,19 +90,19 @@ public class DataFieldConverterTest extends TestCase {
         XStream xStream = getxStream();
 
         String xml = xStream.toXML(d);
-        assertEquals("<dataField size=\"1000\">0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,\n" +
-                "31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,\n" +
-                "58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,\n" +
-                "85,86,87,88,89,90,91,92,93,94,95,96,97,98,99</dataField>", xml);
+        assertEquals("<dataField size=\"1000\">0,1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,10,11,12,13,14,15,16,17,18,19,1a,1b,1c,1d,1e,1f,20,\n" +
+                "21,22,23,24,25,26,27,28,29,2a,2b,2c,2d,2e,2f,30,31,32,33,34,35,36,37,38,39,3a,3b,\n" +
+                "3c,3d,3e,3f,40,41,42,43,44,45,46,47,48,49,4a,4b,4c,4d,4e,4f,50,51,52,53,54,55,56,\n" +
+                "57,58,59,5a,5b,5c,5d,5e,5f,60,61,62,63</dataField>", xml);
     }
 
     public void testUnmarshalMuch() throws Exception {
         XStream xStream = getxStream();
 
-        DataField df = (DataField) xStream.fromXML("<dataField size=\"1000\">0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30\n" +
-                ",31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57\n" +
-                ",58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84\n" +
-                ",85,86,87,88,89,90,91,92,93,94,95,96,97,98,99</dataField>");
+        DataField df = (DataField) xStream.fromXML("<dataField size=\"1000\">0,1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,10,11,12,13,14,15,16,17,18,19,1a,1b,1c,1d,1e,1f,20,\n" +
+                "21,22,23,24,25,26,27,28,29,2a,2b,2c,2d,2e,2f,30,31,32,33,34,35,36,37,38,39,3a,3b,\n" +
+                "3c,3d,3e,3f,40,41,42,43,44,45,46,47,48,49,4a,4b,4c,4d,4e,4f,50,51,52,53,54,55,56,\n" +
+                "57,58,59,5a,5b,5c,5d,5e,5f,60,61,62,63</dataField>");
 
         assertEquals(1000, df.size());
         for (int i = 0; i < 100; i++)