X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fmachine%2FAm2900MachineDefinition.java;h=0ac06ea77b1b658c2c3e4967739bd3eda57a0896;hb=7b8035a065c7b64f38850907d519f9a7dfb67e24;hp=134997ddfe283d2f12653204458e4c9e4bb3e272;hpb=d09827f6dc03fa3cded8e996b4ce45fdae3755ca;p=Mograsim.git 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 134997dd..0ac06ea7 100644 --- 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,10 +1,12 @@ 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; @@ -13,6 +15,13 @@ 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()