import static org.junit.jupiter.api.Assertions.fail;\r
\r
import java.lang.reflect.Field;\r
+import java.util.ArrayList;\r
import java.util.HashMap;\r
import java.util.HashSet;\r
+import java.util.LinkedList;\r
+import java.util.List;\r
import java.util.Objects;\r
+import java.util.Queue;\r
import java.util.Set;\r
import java.util.TreeSet;\r
\r
import net.mograsim.logic.core.types.Bit;\r
import net.mograsim.logic.core.types.BitVector;\r
import net.mograsim.logic.core.types.BitVector.BitVectorMutator;\r
-import net.mograsim.logic.ui.model.ModelVisitor;\r
import net.mograsim.logic.ui.model.ViewModel;\r
import net.mograsim.logic.ui.model.ViewModelModifiable;\r
-import net.mograsim.logic.ui.model.components.GUIBitDisplay;\r
import net.mograsim.logic.ui.model.components.GUIComponent;\r
-import net.mograsim.logic.ui.model.components.GUIManualSwitch;\r
-import net.mograsim.logic.ui.model.components.SimpleRectangularGUIGate;\r
-import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent;\r
-import net.mograsim.logic.ui.model.components.SubmodelInterface;\r
+import net.mograsim.logic.ui.model.components.atomic.GUIBitDisplay;\r
+import net.mograsim.logic.ui.model.components.atomic.GUIManualSwitch;\r
import net.mograsim.logic.ui.model.components.mi.nandbased.am2901.GUIAm2901;\r
+import net.mograsim.logic.ui.model.components.submodels.SubmodelComponent;\r
import net.mograsim.logic.ui.model.wires.GUIWire;\r
-import net.mograsim.logic.ui.model.wires.WireCrossPoint;\r
+import net.mograsim.logic.ui.model.wires.Pin;\r
import net.mograsim.logic.ui.modeladapter.LogicModelParameters;\r
import net.mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;\r
\r
public class TestableAm2901Impl implements TestableAm2901\r
{\r
- private GUIAm2901 am2901;\r
+ private GUIComponent am2901;\r
private Timeline timeline;\r
private ManualSwitch I8, I7, I6, I5, I4, I3, I2, I1, I0;\r
private ManualSwitch C;\r
private BitDisplay F_0, Cn_4, OVR, F3;\r
private BitDisplay ORAMn, ORAMn_3, OQn, OQn_3;\r
\r
- private Set<GUIWire> allWires;\r
- private Set<GUIComponent> allComponents;\r
-\r
private Set<String> wireDebugChangeSet;\r
private boolean debugWires = false;\r
public int debugEventThreshold = 10_000;\r
timeline.executeNext();\r
if (!timeline.hasNext())\r
{\r
- System.out.println("run() took " + eventCounter + " events");\r
+// System.out.println("run() took " + eventCounter + " events");\r
return Result.SUCCESS;\r
}\r
}\r
{\r
// Create view model\r
ViewModelModifiable viewModel = new ViewModelModifiable();\r
+ // TODO replace with deserialized version as soon as high level states work for deserialized components\r
am2901 = new GUIAm2901(viewModel);\r
+// am2901 = IndirectGUIComponentCreator.createComponent(viewModel, "GUIAm2901");\r
+ // guess which pins are outputs and which are inputs\r
+ // TODO this code exists three times... but it seems too "hacky" to put it in a helper class\r
+ List<String> inputPinNames = new ArrayList<>();\r
+ List<String> outputPinNames = new ArrayList<>();\r
+ for (Pin p : am2901.getPins().values())\r
+ if (p.getRelX() == 0)\r
+ inputPinNames.add(p.name);\r
+ else\r
+ outputPinNames.add(p.name);\r
// Get switches\r
HashMap<String, GUIManualSwitch> idSwitchMap = new HashMap<>();\r
- for (String id : am2901.getInputPinNames())\r
+ for (String id : inputPinNames)\r
{\r
GUIManualSwitch sw = new GUIManualSwitch(viewModel);\r
new GUIWire(viewModel, am2901.getPin(id), sw.getOutputPin());\r
}\r
// Get displays\r
HashMap<String, GUIBitDisplay> idDisplayMap = new HashMap<>();\r
- for (String id : am2901.getOutputPinNames())\r
+ for (String id : outputPinNames)\r
{\r
GUIBitDisplay bd = new GUIBitDisplay(viewModel);\r
+// bd.addRedrawListener(() -> System.out.println(id + " " + bd.getBitDisplay().getDisplayedValue()));\r
new GUIWire(viewModel, am2901.getPin(id), bd.getInputPin());\r
idDisplayMap.put(id, bd);\r
}\r
setField(entry.getKey().replaceAll("\\+|=", "_"), entry.getValue().getManualSwitch());\r
for (var entry : idDisplayMap.entrySet())\r
setField(entry.getKey().replaceAll("\\+|=", "_"), entry.getValue().getBitDisplay());\r
- // Switch Clock off first\r
- C.switchOff();\r
\r
// Debug code\r
- allWires = new HashSet<>();\r
- allComponents = new HashSet<>();\r
- ModelAccumulator accumulator = new ModelAccumulator();\r
- accumulator.visit(viewModel);\r
- allWires.forEach(w -> w.addRedrawListener(() ->\r
+ HashSet<GUIWire> wiresIncludingSubmodels = new HashSet<>();\r
+ Queue<ViewModel> modelsToIterate = new LinkedList<>();\r
+ modelsToIterate.add(viewModel);\r
+ while (modelsToIterate.size() > 0)\r
+ {\r
+ ViewModel model = modelsToIterate.poll();\r
+ wiresIncludingSubmodels.addAll(model.getWires());\r
+ for (GUIComponent comp : model.getComponentsByName().values())\r
+ if (comp instanceof SubmodelComponent)\r
+ modelsToIterate.offer(((SubmodelComponent) comp).submodel);\r
+ }\r
+ wiresIncludingSubmodels.forEach(w -> w.addRedrawListener(() ->\r
{\r
if (debugWires)\r
{\r
- System.out.println(w);\r
wireDebugChangeSet.add(w.toString());\r
}\r
}));\r
@Override\r
public void setReg_A(String val_4_bit)\r
{\r
- var bits = BitVector.parse(val_4_bit);\r
- A3.setToValueOf(bits.getBit(0));\r
- A2.setToValueOf(bits.getBit(1));\r
- A1.setToValueOf(bits.getBit(2));\r
- A0.setToValueOf(bits.getBit(3));\r
+ var bits = BitVector.parseMSBFirst(val_4_bit);\r
+ A3.setToValueOf(bits.getBit(3));\r
+ A2.setToValueOf(bits.getBit(2));\r
+ A1.setToValueOf(bits.getBit(1));\r
+ A0.setToValueOf(bits.getBit(0));\r
}\r
\r
@Override\r
public void setReg_B(String val_4_bit)\r
{\r
- var bits = BitVector.parse(val_4_bit);\r
- B3.setToValueOf(bits.getBit(0));\r
- B2.setToValueOf(bits.getBit(1));\r
- B1.setToValueOf(bits.getBit(2));\r
- B0.setToValueOf(bits.getBit(3));\r
+ var bits = BitVector.parseMSBFirst(val_4_bit);\r
+ B3.setToValueOf(bits.getBit(3));\r
+ B2.setToValueOf(bits.getBit(2));\r
+ B1.setToValueOf(bits.getBit(1));\r
+ B0.setToValueOf(bits.getBit(0));\r
}\r
\r
@Override\r
@Override\r
public void setD(String val_4_bit)\r
{\r
- var bits = BitVector.parse(val_4_bit);\r
- D4.setToValueOf(bits.getBit(0));\r
- D3.setToValueOf(bits.getBit(1));\r
- D2.setToValueOf(bits.getBit(2));\r
- D1.setToValueOf(bits.getBit(3));\r
+ var bits = BitVector.parseMSBFirst(val_4_bit);\r
+ D4.setToValueOf(bits.getBit(3));\r
+ D3.setToValueOf(bits.getBit(2));\r
+ D2.setToValueOf(bits.getBit(1));\r
+ D1.setToValueOf(bits.getBit(0));\r
}\r
\r
@Override\r
}\r
\r
@Override\r
- public void toogleClock()\r
+ public void clockOn(boolean isClockOn)\r
{\r
- C.toggle();\r
+ C.setState(isClockOn);\r
}\r
\r
@Override\r
var y2 = Y3.getDisplayedValue();\r
var y1 = Y2.getDisplayedValue();\r
var y0 = Y1.getDisplayedValue();\r
- return y3.concat(y2).concat(y1).concat(y0).toString();\r
+ return y0.concat(y1).concat(y2).concat(y3).toBitStringMSBFirst();\r
}\r
\r
private void setField(String name, Object value)\r
return mutator.toBitVector();\r
}\r
\r
- class ModelAccumulator implements ModelVisitor\r
+ @Override\r
+ public void setDirectly(Register r, String val_4_bit)\r
{\r
- @Override\r
- public void visit(GUIWire w)\r
- {\r
- allWires.add(w);\r
- }\r
-\r
- @Override\r
- public void visit(SimpleRectangularGUIGate simpleRectangularGUIGate)\r
- {\r
- allComponents.add(simpleRectangularGUIGate);\r
- }\r
-\r
- @Override\r
- public void visit(SimpleRectangularSubmodelComponent simpleRectangularSubmodelComponent)\r
- {\r
- allComponents.add(simpleRectangularSubmodelComponent);\r
- simpleRectangularSubmodelComponent.getWires().forEach(w -> w.accept(this));\r
- simpleRectangularSubmodelComponent.getComponents().forEach(w -> w.accept(this));\r
- }\r
-\r
- @Override\r
- public void visit(WireCrossPoint wireCrossPoint)\r
- {\r
- // nothing\r
- }\r
-\r
- @Override\r
- public void visit(GUIBitDisplay guiBitDisplay)\r
- {\r
- allComponents.add(guiBitDisplay);\r
- }\r
-\r
- @Override\r
- public void visit(GUIManualSwitch guiManualSwitch)\r
- {\r
- allComponents.add(guiManualSwitch);\r
- }\r
+ am2901.setHighLevelState(regToStateID(r), BitVector.parseMSBFirst(val_4_bit));\r
+ }\r
\r
- @Override\r
- public void visit(SubmodelInterface submodelInterface)\r
- {\r
- // nothing\r
- }\r
+ @Override\r
+ public String getDirectly(Register r)\r
+ {\r
+ return ((BitVector) am2901.getHighLevelState(regToStateID(r))).toBitStringMSBFirst();\r
+ }\r
\r
- @Override\r
- public void visit(ViewModel viewModel)\r
- {\r
- viewModel.getWires().forEach(w -> w.accept(this));\r
- viewModel.getComponents().forEach(w -> w.accept(this));\r
- }\r
+ private static String regToStateID(Register r)\r
+ {\r
+ if (r == Register.Q)\r
+ return "qreg.q";\r
+ return "regs.c" + r.toBitString() + ".q";\r
}\r
}\r