Am2900Machine now has registers

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

diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MachineDefinition.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MachineDefinition.java
index e75c79a..325f63f 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MachineDefinition.java
+++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MachineDefinition.java
@@ -1,7 +1,11 @@
 package net.mograsim.logic.model.am2900.machine;
 
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
 
+import net.mograsim.logic.model.am2900.machine.registers.NumberedRegister;
+import net.mograsim.logic.model.am2900.machine.registers.QRegister;
 import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.machine.ISASchema;
 import net.mograsim.machine.MachineDefinition;
@@ -11,6 +15,24 @@ import net.mograsim.machine.Register;
 //(used for detecting installed machines in plugin.core)
 public class Am2900MachineDefinition implements MachineDefinition
 {
+       public static final String AM2900_MACHINE_ID = "Am2900";
+
+       public static final Set<Register> allRegisters;
+
+       static
+       {
+               Set<Register> allRegistersModifiable = new HashSet<>();
+               allRegistersModifiable.add(QRegister.instance);
+               allRegistersModifiable.addAll(NumberedRegister.instancesCorrectOrder);
+               allRegisters = Collections.unmodifiableSet(allRegistersModifiable);
+       }
+
+       @Override
+       public String getId()
+       {
+               return AM2900_MACHINE_ID;
+       }
+
        @Override
        public Am2900Machine createNew()
        {
@@ -32,8 +54,7 @@ public class Am2900MachineDefinition implements MachineDefinition
        @Override
        public Set<Register> getRegisters()
        {
-               // TODO Auto-generated method stub
-               return null;
+               return allRegisters;
        }
 
        @Override
@@ -65,4 +86,5 @@ public class Am2900MachineDefinition implements MachineDefinition
        {
                return Am2900MicroInstructionMemoryDefinition.instance;
        }
+
 }