X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2FAm2900Loader.java;h=10cf14123d5c600299e911cfb13b799051227fa4;hb=693b8a0f9e1d2b9c9897a9de60fbdb2c45ee7544;hp=172c4b1ea8e73c9db0b14ea1537510b07191cd45;hpb=b32414f8406634aca730d724a011023c0da8bf22;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java index 172c4b1e..10cf1412 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java @@ -7,9 +7,11 @@ import org.osgi.framework.BundleContext; import net.mograsim.logic.model.serializing.ClassLoaderBasedResourceLoader; import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; +import net.mograsim.machine.MachineLoader; public class Am2900Loader implements BundleActivator { + // TODO use dff16 in dff16_we & dff16_invwe private static AtomicBoolean activated = new AtomicBoolean(false); @Override @@ -31,6 +33,7 @@ public class Am2900Loader implements BundleActivator ClassLoaderBasedResourceLoader resourceLoader = ClassLoaderBasedResourceLoader.create(Am2900Loader.class.getClassLoader()); IndirectModelComponentCreator.registerResourceLoader(resourceLoader, "Am2900Loader"); IndirectModelComponentCreator.loadStandardComponentIDs(Am2900Loader.class.getResourceAsStream("standardComponentIDMapping.json")); + MachineLoader.setup(); // System.out.println("SETUP DONE"); // TODO: Debug } }