From 48a1e1fb0a3d32e582fc0aa1c02c54383cd6188c Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Sun, 30 Jun 2019 18:07:04 +0200
Subject: [PATCH] Model analyser preserves the ff default values.

---
 .../digital/analyse/ModelAnalyser.java        |  5 ++++-
 .../digital/core/flipflops/FlipflopD.java     | 19 ++++++++++++++++---
 src/main/resources/analyser/JK_FF.dig         |  4 ++++
 src/main/resources/analyser/T_FF.dig          | 11 ++++++++++-
 src/main/resources/analyser/T_FF_EN.dig       |  4 ++++
 5 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/neemann/digital/analyse/ModelAnalyser.java b/src/main/java/de/neemann/digital/analyse/ModelAnalyser.java
index b14099098..4450a1480 100644
--- a/src/main/java/de/neemann/digital/analyse/ModelAnalyser.java
+++ b/src/main/java/de/neemann/digital/analyse/ModelAnalyser.java
@@ -70,6 +70,8 @@ public class ModelAnalyser {
 
             outputs.add(i++, new Signal(label + "+1", ff.getDInput()));
 
+            modelAnalyzerInfo.setSequentialInitValue(label, ff.getDefault());
+
             ObservableValue q = ff.getOutputs().get(0);
             final Signal sig = new Signal(label, q);
             if (inputs.contains(sig))
@@ -229,10 +231,11 @@ public class ModelAnalyser {
                     String label = ff.getLabel();
                     if (label.length() == 0)
                         label = createOutputBasedName(ff);
+                    long def = ff.getDefault();
                     for (int i = ff.getBits() - 1; i >= 0; i--) {
                         ObservableValue qn = new ObservableValue("", 1);
                         ObservableValue nqn = new ObservableValue("", 1);
-                        FlipflopD newff = new FlipflopD(label + i, qn, nqn);
+                        FlipflopD newff = new FlipflopD(label + i, qn, nqn, (def & (1L<<i))!=0 ?1:0);
                         spinput.addAtTop(qn);
                         model.add(newff);
                         newff.setInputs(new ObservableValues(insp.getOutputs().get(i), getClock()));
diff --git a/src/main/java/de/neemann/digital/core/flipflops/FlipflopD.java b/src/main/java/de/neemann/digital/core/flipflops/FlipflopD.java
index 29d4ee70d..099140355 100644
--- a/src/main/java/de/neemann/digital/core/flipflops/FlipflopD.java
+++ b/src/main/java/de/neemann/digital/core/flipflops/FlipflopD.java
@@ -40,6 +40,7 @@ public class FlipflopD extends Node implements Element {
     private ObservableValue qn;
     private boolean lastClock;
     private long value;
+    private long defaultValue;
 
     /**
      * Creates a new instance
@@ -58,9 +59,13 @@ public class FlipflopD extends Node implements Element {
      * @param label the label
      * @param q     output
      * @param qn    inverted output
+     * @param def   the default value
      */
-    public FlipflopD(String label, ObservableValue q, ObservableValue qn) {
-        this(new ElementAttributes().set(Keys.LABEL, label).setBits(q.getBits()), q, qn);
+    public FlipflopD(String label, ObservableValue q, ObservableValue qn, long def) {
+        this(new ElementAttributes()
+                .set(Keys.LABEL, label)
+                .setBits(q.getBits())
+                .set(Keys.DEFAULT, def), q, qn);
         if (qn.getBits() != q.getBits())
             throw new RuntimeException("wrong bit count given!");
     }
@@ -73,7 +78,8 @@ public class FlipflopD extends Node implements Element {
         isProbe = attributes.get(Keys.VALUE_IS_PROBE);
         label = attributes.getLabel();
 
-        value = attributes.get(Keys.DEFAULT);
+        defaultValue = attributes.get(Keys.DEFAULT);
+        value = defaultValue;
         q.setValue(value);
         qn.setValue(~value);
     }
@@ -145,4 +151,11 @@ public class FlipflopD extends Node implements Element {
     void setValue(long value) {
         this.value = value;
     }
+
+    /**
+     * @return the default value
+     */
+    public long getDefault() {
+        return defaultValue;
+    }
 }
diff --git a/src/main/resources/analyser/JK_FF.dig b/src/main/resources/analyser/JK_FF.dig
index 501696d43..17a8f7de0 100644
--- a/src/main/resources/analyser/JK_FF.dig
+++ b/src/main/resources/analyser/JK_FF.dig
@@ -19,6 +19,10 @@
           <string>Inputs</string>
           <int>1</int>
         </entry>
+        <entry>
+          <string>generic</string>
+          <string>this.Default=orig.Default;</string>
+        </entry>
       </elementAttributes>
       <pos x="240" y="60"/>
     </visualElement>
diff --git a/src/main/resources/analyser/T_FF.dig b/src/main/resources/analyser/T_FF.dig
index 72580f1cb..d490e041e 100644
--- a/src/main/resources/analyser/T_FF.dig
+++ b/src/main/resources/analyser/T_FF.dig
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <circuit>
   <version>1</version>
-  <attributes/>
+  <attributes>
+    <entry>
+      <string>isGeneric</string>
+      <boolean>true</boolean>
+    </entry>
+  </attributes>
   <visualElements>
     <visualElement>
       <elementName>D_FF</elementName>
@@ -14,6 +19,10 @@
           <string>Inputs</string>
           <int>1</int>
         </entry>
+        <entry>
+          <string>generic</string>
+          <string>this.Default=orig.Default;</string>
+        </entry>
       </elementAttributes>
       <pos x="240" y="60"/>
     </visualElement>
diff --git a/src/main/resources/analyser/T_FF_EN.dig b/src/main/resources/analyser/T_FF_EN.dig
index 213cdf465..d72b828dd 100644
--- a/src/main/resources/analyser/T_FF_EN.dig
+++ b/src/main/resources/analyser/T_FF_EN.dig
@@ -19,6 +19,10 @@
           <string>Inputs</string>
           <int>1</int>
         </entry>
+        <entry>
+          <string>generic</string>
+          <string>this.Default=orig.Default;</string>
+        </entry>
       </elementAttributes>
       <pos x="240" y="60"/>
     </visualElement>