X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fmachine%2FAbstractAm2900MachineDefinition.java;h=7096cd726dcfb1225478d44b72c13b6d105b29d1;hb=58c2b670f915c217fcdde1b874606a5550f4e5c7;hp=7ad92b4b5b0b4bd11fb266e9356068833fcfca34;hpb=f430c331e21b61d3e1a720cdb0638ca3d8bca711;p=Mograsim.git diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/AbstractAm2900MachineDefinition.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/AbstractAm2900MachineDefinition.java index 7ad92b4b..7096cd72 100644 --- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/AbstractAm2900MachineDefinition.java +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/AbstractAm2900MachineDefinition.java @@ -4,8 +4,12 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import net.mograsim.logic.model.am2900.machine.registers.InstrRegister; +import net.mograsim.logic.model.am2900.machine.registers.PCRegister; +import net.mograsim.logic.model.am2900.machine.registers.muInstrRegister; import net.mograsim.logic.model.am2900.machine.registers.am2901.Am2901RegisterGroup; import net.mograsim.logic.model.am2900.machine.registers.am2904.Am2904RegisterGroup; +import net.mograsim.logic.model.am2900.machine.registers.am2910.Am2910RegisterGroup; import net.mograsim.logic.model.model.LogicModelModifiable; import net.mograsim.machine.ISASchema; import net.mograsim.machine.MachineDefinition; @@ -25,12 +29,14 @@ public class AbstractAm2900MachineDefinition implements MachineDefinition static { List unsortedRegistersModifiable = new ArrayList<>(); - // TODO MIR, IR, PC/BZ... + unsortedRegistersModifiable.add(muInstrRegister.instance); + unsortedRegistersModifiable.add(InstrRegister.instance); + unsortedRegistersModifiable.add(PCRegister.instance); unsortedRegisters = Collections.unmodifiableList(unsortedRegistersModifiable); List registerGroupsModifiable = new ArrayList<>(); registerGroupsModifiable.add(Am2901RegisterGroup.instance); registerGroupsModifiable.add(Am2904RegisterGroup.instance); - // TODO Am2910 + registerGroupsModifiable.add(Am2910RegisterGroup.instance); registerGroups = Collections.unmodifiableList(registerGroupsModifiable); }