VerilogExporter now orders interface pins more transparently

diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/VerilogExporter.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/VerilogExporter.java
index daef1aa..fb1fd2f 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/VerilogExporter.java
+++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/VerilogExporter.java
@@ -229,7 +229,8 @@ public class VerilogExporter
        {
                return combinedInterfacePinsPerComponentID.entrySet().stream().collect(Collectors.toMap(Entry::getKey, e ->
                {
-                       List<String> names = e.getValue().values().stream().distinct().collect(Collectors.toList());
+                       List<String> names = e.getValue().values().stream().distinct().sorted().collect(Collectors.toList());
+                       System.out.println("Assuming following order for interface pins of " + e.getKey() + ": " + names);
                        Map<String, Integer> widthesPerName = Arrays.stream(componentsById.get(e.getKey()).interfacePins)
                                        .collect(Collectors.toMap(p -> p.name, p -> p.logicWidth));
                        List<Integer> widthes = names.stream().map(widthesPerName::get).collect(Collectors.toList());
@@ -462,6 +463,8 @@ public class VerilogExporter
                }
        }
 
+       private static Map<Tuple2<String, JsonElement>, Tuple2<List<String>, List<Integer>>> atomicComponentInterfaces = new HashMap<>();
+
        private Tuple2<List<String>, List<Integer>> getSubcomponentInterfacePinNamesAndWidths(String subcomponentID,
                        JsonElement subcomponentParams)
        {
@@ -469,13 +472,23 @@ public class VerilogExporter
                if (result != null)
                        return result;
 
+               Tuple2<String, JsonElement> subcomponentKey = new Tuple2<>(subcomponentID, subcomponentParams);
+
+               result = atomicComponentInterfaces.get(subcomponentKey);
+               if (result != null)
+                       return result;
+
                Map<String, Pin> pins = IndirectModelComponentCreator
                                .createComponent(new LogicModelModifiable(), subcomponentID, subcomponentParams).getPins();
                List<String> names = pins.keySet().stream().sorted().collect(Collectors.toList());
                List<Integer> widthes = pins.entrySet().stream().sorted(Comparator.comparing(e -> e.getKey())).map(Entry::getValue)
                                .map(p -> p.logicWidth).collect(Collectors.toList());
-               System.out.println("Assuming following order for interface pins of " + subcomponentID + ": " + names);
-               return new Tuple2<>(names, widthes);
+               System.out.println(
+                               "Assuming following order for interface pins of " + subcomponentID + " with params " + subcomponentParams + ": " + names);
+               result = new Tuple2<>(names, widthes);
+
+               atomicComponentInterfaces.put(subcomponentKey, result);
+               return result;
        }
 
        private static void appendLogicWidth(StringBuilder result, int logicWidth)
@@ -540,6 +553,41 @@ public class VerilogExporter
                        this.e1 = e1;
                        this.e2 = e2;
                }
+
+               @Override
+               public int hashCode()
+               {
+                       final int prime = 31;
+                       int result = 1;
+                       result = prime * result + ((e1 == null) ? 0 : e1.hashCode());
+                       result = prime * result + ((e2 == null) ? 0 : e2.hashCode());
+                       return result;
+               }
+
+               @Override
+               public boolean equals(Object obj)
+               {
+                       if (this == obj)
+                               return true;
+                       if (obj == null)
+                               return false;
+                       if (getClass() != obj.getClass())
+                               return false;
+                       Tuple2<?, ?> other = (Tuple2<?, ?>) obj;
+                       if (e1 == null)
+                       {
+                               if (other.e1 != null)
+                                       return false;
+                       } else if (!e1.equals(other.e1))
+                               return false;
+                       if (e2 == null)
+                       {
+                               if (other.e2 != null)
+                                       return false;
+                       } else if (!e2.equals(other.e2))
+                               return false;
+                       return true;
+               }
        }
 
        private static String sanitizeVerilog(String str)