浏览代码

Begin creating intefaces for graph search

Fabio Battaglia 5 年之前
父节点
当前提交
6a99d77b19

+ 5 - 5
src/main/java/info/hkzlab/dupal/analyzer/board/boardio/DuPALAnalyzer.java

@@ -37,8 +37,8 @@ public class DuPALAnalyzer {
         int ioAsOutMask = 0;
         int maxINVal = 1 << (dpci.palSpecs.getPinCount_IN() + dpci.palSpecs.getPinCount_IO());
 
-        logger.info("Starting IO type detection... This could take a while.");
-        logger.info("Highest address for input pins: " + String.format("%06X", maxINVal-1));
+        logger.info("detectIOTypeMask -> Starting IO type detection... This could take a while.");
+        logger.info("detectIOTypeMask -> Highest address for input pins: " + String.format("%06X", maxINVal-1));
 
         for(int idx = 0; idx < maxINVal; idx++) {
 
@@ -60,12 +60,12 @@ public class DuPALAnalyzer {
 
                 ioAsOutMask |= (pinstat ^ BitUtils.scatterBitField((sub_idx >> dpci.palSpecs.getPinCount_IN()), dpci.palSpecs.getMask_IO_R())) & dpci.palSpecs.getMask_IO_R();
                 
-                logger.info(String.format("idx: C(%06X) -> S(%06X) | M[%06X]", sub_idx, sub_writeAddr, ioAsOutMask));
+                logger.info(String.format("detectIOTypeMask -> idx: C(%06X) -> S(%06X) | M[%06X]", sub_idx, sub_writeAddr, ioAsOutMask));
             }
 
             if(dpci.palSpecs.getPinCount_RO() == 0) break; // No need to try multiple registered states
 
-            logger.info("Pulsing clock with address " + String.format("%06X", writeAddr));
+            logger.info("detectIOTypeMask -> Pulsing clock with address " + String.format("%06X", writeAddr));
             dpci.writeAndPulseClock(writeAddr);
         }
 
@@ -80,7 +80,7 @@ public class DuPALAnalyzer {
         if(ioAsOutMask < 0) {
             ioAsOutMask = detectIOTypeMask(dpci);
 
-            logger.info("Detected the following IO Type mask: " + String.format("%06X", ioAsOutMask));
+            logger.info("detectIOTypeMask -> Detected the following IO Type mask: " + String.format("%06X", ioAsOutMask));
         }
     }
 }

+ 0 - 5
src/main/java/info/hkzlab/dupal/analyzer/palanalisys/RegState.java

@@ -1,5 +0,0 @@
-package info.hkzlab.dupal.analyzer.palanalisys;
-
-public class RegState {
-    
-}

+ 7 - 0
src/main/java/info/hkzlab/dupal/analyzer/palanalisys/graph/GraphLink.java

@@ -0,0 +1,7 @@
+package info.hkzlab.dupal.analyzer.palanalisys.graph;
+
+public interface GraphLink {
+    public int getLinkCombination();
+    public GraphState getSourceState();
+    public GraphState getDestinationState();
+}

+ 9 - 0
src/main/java/info/hkzlab/dupal/analyzer/palanalisys/graph/GraphState.java

@@ -0,0 +1,9 @@
+package info.hkzlab.dupal.analyzer.palanalisys.graph;
+
+public interface GraphState {
+    public int[] getInternalState();
+
+    public boolean isStateFull();
+    public GraphLink getLinkAtIdx(int idx);
+    public int getMaxLinks();
+}

+ 1 - 1
src/main/java/info/hkzlab/dupal/analyzer/palanalisys/OutLink.java → src/main/java/info/hkzlab/dupal/analyzer/palanalisys/graph/OutLink.java

@@ -1,4 +1,4 @@
-package info.hkzlab.dupal.analyzer.palanalisys;
+package info.hkzlab.dupal.analyzer.palanalisys.graph;
 
 public class OutLink {
 

+ 1 - 1
src/main/java/info/hkzlab/dupal/analyzer/palanalisys/OutState.java → src/main/java/info/hkzlab/dupal/analyzer/palanalisys/graph/OutState.java

@@ -1,4 +1,4 @@
-package info.hkzlab.dupal.analyzer.palanalisys;
+package info.hkzlab.dupal.analyzer.palanalisys.graph;
 
 import java.util.Arrays;
 

+ 5 - 0
src/main/java/info/hkzlab/dupal/analyzer/palanalisys/graph/Pathfinder.java

@@ -0,0 +1,5 @@
+package info.hkzlab.dupal.analyzer.palanalisys.graph;
+
+public class Pathfinder {
+    
+}

+ 5 - 0
src/main/java/info/hkzlab/dupal/analyzer/palanalisys/graph/RegState.java

@@ -0,0 +1,5 @@
+package info.hkzlab.dupal.analyzer.palanalisys.graph;
+
+public class RegState {
+    
+}