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=cbc65b8639533d92ac68bfae8a60289ac338a47a;hb=13befb68923c540a13cfe5b5b28bf0f7ddf5c41b;hp=fa40eb82fd95d4d5195bc39d99e2ed2b70771ba6;hpb=2d1f3e4780616f3b638133a243fcdb7a6738baf9;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 fa40eb82..cbc65b86 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
@@ -1,45 +1,64 @@
 package net.mograsim.logic.model.am2900.machine;
 
+import java.util.ArrayList;
 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 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;
-import net.mograsim.machine.Register;
+import net.mograsim.machine.registers.Register;
+import net.mograsim.machine.registers.RegisterGroup;
 
 //we can't use the Singleton pattern here because a MachineDefinition needs a public parameterless constructor
 //(used for detecting installed machines in plugin.core)
 public class AbstractAm2900MachineDefinition implements MachineDefinition
 {
-	public static final String SIMPLE_AM2900_MACHINE_ID = "Am2900Simple";
-	public static final String STRICT_AM2900_MACHINE_ID = "Am2900Strict";
+	public static final String AM2900_TEACHING_MACHINE_ID = "Am2900Simple";
+	public static final String AM2900_EXPERT_MACHINE_ID = "Am2900Strict";
+	public static final String AM2900_TEACHING_DESCRIPTION = "Am2900Teaching\nTODO Description";
+	public static final String AM2900_EXPERT_DESCRIPTION = "Am2900Expert\nTODO Description";
 
-	public static final Set<Register> allRegisters;
+	public static final List<Register> unsortedRegisters;
+	public static final List<RegisterGroup> registerGroups;
 
 	static
 	{
-		Set<Register> allRegistersModifiable = new HashSet<>();
-		allRegistersModifiable.add(QRegister.instance);
-		allRegistersModifiable.addAll(NumberedRegister.instancesCorrectOrder);
-		// TODO MSR, muSR, MIR, IR, PC/BZ...
-		allRegisters = Collections.unmodifiableSet(allRegistersModifiable);
+		List<Register> unsortedRegistersModifiable = new ArrayList<>();
+		unsortedRegistersModifiable.add(muInstrRegister.instance);
+		unsortedRegistersModifiable.add(InstrRegister.instance);
+		unsortedRegistersModifiable.add(PCRegister.instance);
+		unsortedRegisters = Collections.unmodifiableList(unsortedRegistersModifiable);
+		List<RegisterGroup> registerGroupsModifiable = new ArrayList<>();
+		registerGroupsModifiable.add(Am2901RegisterGroup.instance);
+		registerGroupsModifiable.add(Am2904RegisterGroup.instance);
+		registerGroupsModifiable.add(Am2910RegisterGroup.instance);
+		registerGroups = Collections.unmodifiableList(registerGroupsModifiable);
 	}
 
-	public final boolean strict;
+	public final boolean expert;
 
-	protected AbstractAm2900MachineDefinition(boolean strict)
+	protected AbstractAm2900MachineDefinition(boolean expert)
 	{
-		this.strict = strict;
+		this.expert = expert;
 	}
 
 	@Override
 	public String getId()
 	{
-		return strict ? STRICT_AM2900_MACHINE_ID : SIMPLE_AM2900_MACHINE_ID;
+		return expert ? AM2900_EXPERT_MACHINE_ID : AM2900_TEACHING_MACHINE_ID;
+	}
+
+	@Override
+	public String getDescription()
+	{
+		return expert ? AM2900_EXPERT_DESCRIPTION : AM2900_TEACHING_DESCRIPTION;
 	}
 
 	@Override
@@ -61,9 +80,15 @@ public class AbstractAm2900MachineDefinition implements MachineDefinition
 	}
 
 	@Override
-	public Set<Register> getRegisters()
+	public List<Register> getUnsortedRegisters()
+	{
+		return unsortedRegisters;
+	}
+
+	@Override
+	public List<RegisterGroup> getRegisterGroups()
 	{
-		return allRegisters;
+		return registerGroups;
 	}
 
 	@Override
@@ -81,14 +106,14 @@ public class AbstractAm2900MachineDefinition implements MachineDefinition
 	@Override
 	public int hashCode()
 	{
-		return strict ? 12345 : 54321;
+		return expert ? 12345 : 54321;
 	}
 
 	@Override
 	public boolean equals(Object obj)
 	{
 		return obj != null && obj instanceof AbstractAm2900MachineDefinition
-				&& ((AbstractAm2900MachineDefinition) obj).strict == this.strict;
+				&& ((AbstractAm2900MachineDefinition) obj).expert == this.expert;
 	}
 
 	@Override