Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.logic.model.am2900 / src / net / mograsim / logic / model / am2900 / machine / Am2900MachineDefinition.java

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MachineDefinition.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MachineDefinition.java
index 6f9b6d8..0ac06ea 100644 (file)
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MachineDefinition.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MachineDefinition.java
@@ -1,16 +1,27 @@
 package net.mograsim.logic.model.am2900.machine;
 
+import java.util.Objects;
 import java.util.Set;
 
 import net.mograsim.machine.ISASchema;
 import net.mograsim.machine.Machine;
 import net.mograsim.machine.MachineDefinition;
+import net.mograsim.machine.MachineRegistry;
 import net.mograsim.machine.MainMemoryDefinition;
 import net.mograsim.machine.Register;
+import net.mograsim.machine.mi.MicroInstructionMemoryDefinition;
 
 public class Am2900MachineDefinition implements MachineDefinition
 {
        private MainMemoryDefinition memoryDefinition = new Am2900MainMemoryDefinition();
+       private MicroInstructionMemoryDefinition microInstMemoryDefinition = new Am2900MicroInstructionMemoryDefinition();
+       private final static Am2900MachineDefinition instance = new Am2900MachineDefinition();
+
+       public static Am2900MachineDefinition getInstance()
+       {
+               return Objects.requireNonNullElseGet((Am2900MachineDefinition) MachineRegistry.getinstalledMachines().get("Am2900"),
+                               () -> instance);
+       }
 
        @Override
        public Machine createNew()
@@ -44,4 +55,9 @@ public class Am2900MachineDefinition implements MachineDefinition
                return memoryDefinition;
        }
 
+       @Override
+       public MicroInstructionMemoryDefinition getMicroInstructionMemoryDefinition()
+       {
+               return microInstMemoryDefinition;
+       }
 }