From: Daniel Kirschten Date: Sun, 6 Oct 2019 23:41:26 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/development' into development X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=0c404f876557865fb7361ca458ac90caf41afe19;hp=5fa70b5d24aa650cca02cf5eaf459d7aad2022de;p=Mograsim.git Merge remote-tracking branch 'origin/development' into development --- diff --git a/plugins/net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF b/plugins/net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF index 82e0a34d..bf9b692a 100644 --- a/plugins/net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF +++ b/plugins/net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF @@ -10,6 +10,10 @@ Export-Package: net.mograsim.logic.model.am2900, net.mograsim.logic.model.am2900.components.am2910, net.mograsim.logic.model.am2900.machine, net.mograsim.logic.model.am2900.machine.registers, + net.mograsim.logic.model.am2900.machine.registers.am2901, + net.mograsim.logic.model.am2900.machine.registers.am2904, + net.mograsim.logic.model.am2900.machine.registers.am2904.msr, + net.mograsim.logic.model.am2900.machine.registers.am2904.musr, net.mograsim.logic.model.examples Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.osgi, diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json index c3b5fcfa..6eba852e 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json @@ -1929,6 +1929,34 @@ "delegateTarget": "dff4_finewe#0", "subStateID": "q" } + }, + "q1": { + "id": "delegating", + "params": { + "delegateTarget": "dff4_finewe#0", + "subStateID": "q1" + } + }, + "q2": { + "id": "delegating", + "params": { + "delegateTarget": "dff4_finewe#0", + "subStateID": "q2" + } + }, + "q3": { + "id": "delegating", + "params": { + "delegateTarget": "dff4_finewe#0", + "subStateID": "q3" + } + }, + "q4": { + "id": "delegating", + "params": { + "delegateTarget": "dff4_finewe#0", + "subStateID": "q4" + } } } }, diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json index 0ef5caa0..6aa0738b 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json @@ -1104,7 +1104,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "µSR", + "centerText": "\u00b5SR", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, @@ -1121,6 +1121,34 @@ "delegateTarget": "dff4_finewe#0", "subStateID": "q" } + }, + "q1": { + "id": "delegating", + "params": { + "delegateTarget": "dff4_finewe#0", + "subStateID": "q1" + } + }, + "q2": { + "id": "delegating", + "params": { + "delegateTarget": "dff4_finewe#0", + "subStateID": "q2" + } + }, + "q3": { + "id": "delegating", + "params": { + "delegateTarget": "dff4_finewe#0", + "subStateID": "q3" + } + }, + "q4": { + "id": "delegating", + "params": { + "delegateTarget": "dff4_finewe#0", + "subStateID": "q4" + } } } }, diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff4_finewe.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff4_finewe.java index d362a157..6aebcbd6 100644 --- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff4_finewe.java +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff4_finewe.java @@ -46,9 +46,7 @@ public class Modeldff4_finewe extends SimpleRectangularHardcodedModelComponent @Override public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) { - Bit[] QC = (Bit[]) lastState; - if (QC == null) - QC = new Bit[] { U, U, U, U, U }; + Bit[] QC = castAndInitState(lastState); Bit CVal = readEnds.get("C").getValue(); @@ -77,29 +75,60 @@ public class Modeldff4_finewe extends SimpleRectangularHardcodedModelComponent @Override protected Object getHighLevelState(Object state, String stateID) { - switch (stateID) + Bit[] QC = castAndInitState(state); + + if ("q".equals(stateID)) + return BitVector.of(Arrays.copyOfRange(QC, 1, 5)); + if (stateID.length() == 2 && stateID.charAt(0) == 'q') { - case "q": - return state == null ? BitVector.of(U, U, U, U) : BitVector.of(Arrays.copyOfRange((Bit[]) state, 1, 5)); - default: - return super.getHighLevelState(state, stateID); + char secondChar = stateID.charAt(1); + if (secondChar >= '1' && secondChar <= '4') + return BitVector.of(QC[secondChar - '0']); } + return super.getHighLevelState(state, stateID); } @Override protected Object setHighLevelState(Object lastState, String stateID, Object newHighLevelState) { - switch (stateID) + Bit[] QC = castAndInitState(lastState); + + if ("q".equals(stateID)) { - case "q": BitVector newHighLevelStateCasted = (BitVector) newHighLevelState; if (newHighLevelStateCasted.length() != 4) throw new IllegalArgumentException("Expected BitVector of length 4, not " + newHighLevelStateCasted.length()); - System.arraycopy(newHighLevelStateCasted.getBits(), 0, lastState, 1, 4); - return lastState; - default: - return super.setHighLevelState(lastState, stateID, newHighLevelState); + System.arraycopy(newHighLevelStateCasted.getBits(), 0, QC, 1, 4); + return QC; + } + if (stateID.length() == 2 && stateID.charAt(0) == 'q') + { + char secondChar = stateID.charAt(1); + if (secondChar >= '1' && secondChar <= '4') + { + Bit newHighLevelStateCasted; + if (newHighLevelState instanceof Bit) + newHighLevelStateCasted = (Bit) newHighLevelState; + else + { + BitVector vector = (BitVector) newHighLevelState; + if (vector.length() != 1) + throw new IllegalArgumentException("Expected BitVector of length 1, not " + vector.length()); + newHighLevelStateCasted = vector.getMSBit(0); + } + QC[secondChar - '0'] = newHighLevelStateCasted; + return QC; + } } + return super.setHighLevelState(QC, stateID, newHighLevelState); + } + + private static Bit[] castAndInitState(Object state) + { + Bit[] QC = (Bit[]) state; + if (QC == null) + QC = new Bit[] { U, U, U, U, U }; + return QC; } static 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 20f7c58f..7ad92b4b 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,16 +1,16 @@ package net.mograsim.logic.model.am2900.machine; +import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; -import java.util.Set; +import java.util.List; -import net.mograsim.logic.model.am2900.machine.registers.NumberedRegister; -import net.mograsim.logic.model.am2900.machine.registers.QRegister; +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.model.LogicModelModifiable; import net.mograsim.machine.ISASchema; import net.mograsim.machine.MachineDefinition; -import net.mograsim.machine.Register; -import net.mograsim.machine.RegisterGroup; +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) @@ -19,15 +19,19 @@ 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 Set allRegisters; + public static final List unsortedRegisters; + public static final List registerGroups; static { - Set allRegistersModifiable = new HashSet<>(); - allRegistersModifiable.add(QRegister.instance); - allRegistersModifiable.addAll(NumberedRegister.instancesCorrectOrder); - // TODO MSR, muSR, MIR, IR, PC/BZ... - allRegisters = Collections.unmodifiableSet(allRegistersModifiable); + List unsortedRegistersModifiable = new ArrayList<>(); + // TODO MIR, IR, PC/BZ... + unsortedRegisters = Collections.unmodifiableList(unsortedRegistersModifiable); + List registerGroupsModifiable = new ArrayList<>(); + registerGroupsModifiable.add(Am2901RegisterGroup.instance); + registerGroupsModifiable.add(Am2904RegisterGroup.instance); + // TODO Am2910 + registerGroups = Collections.unmodifiableList(registerGroupsModifiable); } public final boolean strict; @@ -62,9 +66,15 @@ public class AbstractAm2900MachineDefinition implements MachineDefinition } @Override - public Set getRegisters() + public List getUnsortedRegisters() { - return allRegisters; + return unsortedRegisters; + } + + @Override + public List getRegisterGroups() + { + return registerGroups; } @Override @@ -98,10 +108,4 @@ public class AbstractAm2900MachineDefinition implements MachineDefinition return Am2900MicroInstructionMemoryDefinition.instance; } - @Override - public Set getRegisterGroups() - { - return null; // TODO create groups for am2904, am2901-asmUsable, am2901-internal, ... - } - } diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java index 352ce123..fa281db4 100644 --- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java @@ -1,8 +1,7 @@ package net.mograsim.logic.model.am2900.machine; -import java.util.HashMap; import java.util.HashSet; -import java.util.Map; +import java.util.List; import java.util.Set; import java.util.function.Consumer; @@ -10,8 +9,7 @@ import net.mograsim.logic.core.components.CoreClock; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.types.Bit; import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.model.am2900.machine.registers.NumberedRegister; -import net.mograsim.logic.model.am2900.machine.registers.QRegister; +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; import net.mograsim.logic.model.model.LogicModel; import net.mograsim.logic.model.model.LogicModelModifiable; import net.mograsim.logic.model.model.components.ModelComponent; @@ -21,13 +19,14 @@ import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.machine.Machine; import net.mograsim.machine.MachineDefinition; -import net.mograsim.machine.Register; import net.mograsim.machine.mi.AssignableMicroInstructionMemory; import net.mograsim.machine.mi.MicroInstruction; import net.mograsim.machine.mi.MicroInstructionDefinition; import net.mograsim.machine.mi.StandardMicroInstructionMemory; import net.mograsim.machine.mi.parameters.MicroInstructionParameter; import net.mograsim.machine.mi.parameters.ParameterClassification; +import net.mograsim.machine.registers.Register; +import net.mograsim.machine.registers.RegisterGroup; import net.mograsim.machine.standard.memory.AssignableMainMemory; import net.mograsim.machine.standard.memory.WordAddressableMemory; @@ -43,7 +42,6 @@ public class Am2900Machine implements Machine private long activeInstructionAddress; private final Set amicListeners; - private final Map, Consumer>> modelListenersPerRegisterListenerPerRegister; public Am2900Machine(LogicModelModifiable model, AbstractAm2900MachineDefinition am2900MachineDefinition) { @@ -52,7 +50,6 @@ public class Am2900Machine implements Machine this.am2900 = IndirectModelComponentCreator.createComponent(logicModel, "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/Am2900.json", "Am2900"); this.amicListeners = new HashSet<>(); - this.modelListenersPerRegisterListenerPerRegister = new HashMap<>(); CoreModelParameters params = new CoreModelParameters(); params.gateProcessTime = 50; @@ -92,12 +89,27 @@ public class Am2900Machine implements Machine am2900.setHighLevelState("muir_2.q", jzMI.toBitVector()); if (!machineDefinition.strict) { - for (Register r : machineDefinition.getRegisters()) - setRegister(r, BitVector.of(Bit.ZERO, r.getWidth())); + setRegistersToZero(machineDefinition.getUnsortedRegisters()); + setRegisterGroupToZero(machineDefinition.getRegisterGroups()); // TODO reset latches? } } + private void setRegistersToZero(List registers) + { + for (Register r : registers) + setRegister(r, BitVector.of(Bit.ZERO, r.getWidth())); + } + + private void setRegisterGroupToZero(List registerGroups) + { + for (RegisterGroup rg : registerGroups) + { + setRegistersToZero(rg.getRegisters()); + setRegisterGroupToZero(rg.getSubGroups()); + } + } + @Override public LogicModel getModel() { @@ -121,74 +133,34 @@ public class Am2900Machine implements Machine return clock; } - // TODO too much code duplication - @Override public BitVector getRegister(Register r) { - String am2901CellSuffix = getAm2901CellSuffix(r); - BitVector result = BitVector.of(); - for (int i = 0; i < 16; i += 4) - { - String hlsID = String.format("am2901_%d-%d.%s", (i + 3), i, am2901CellSuffix); - result = result.concat((BitVector) am2900.getHighLevelState(hlsID)); - } - return result; + return castAm2900Register(r).read(am2900); } @Override public void setRegister(Register r, BitVector value) { - String am2901CellSuffix = getAm2901CellSuffix(r); - for (int i = 0; i < 16; i += 4) - { - String hlsID = String.format("am2901_%d-%d.%s", (i + 3), i, am2901CellSuffix); - am2900.setHighLevelState(hlsID, value.subVector(i, i + 4)); - } + castAm2900Register(r).write(am2900, value); } @Override public void addRegisterListener(Register r, Consumer listener) { - Map, Consumer> modelListenersPerRegisterListener = modelListenersPerRegisterListenerPerRegister - .computeIfAbsent(r, k -> new HashMap<>()); - if (modelListenersPerRegisterListener.containsKey(listener)) - return; - - Consumer modelListener = v -> listener.accept(getRegister(r)); - String am2901CellSuffix = getAm2901CellSuffix(r); - for (int i = 0; i < 16; i += 4) - { - String hlsID = String.format("am2901_%d-%d.%s", (i + 3), i, am2901CellSuffix); - am2900.addHighLevelStateListener(hlsID, modelListener); - } + castAm2900Register(r).addListener(am2900, listener); } @Override public void removeRegisterListener(Register r, Consumer listener) { - Map, Consumer> modelListenersPerRegisterListener = modelListenersPerRegisterListenerPerRegister.get(r); - if (modelListenersPerRegisterListener == null) - return; - - Consumer modelListener = modelListenersPerRegisterListener.get(listener); - if (modelListener == null) - return; - - String am2901CellSuffix = getAm2901CellSuffix(r); - for (int i = 0; i < 16; i += 4) - { - String hlsID = String.format("am2901_%d-%d.%s", (i + 3), i, am2901CellSuffix); - am2900.removeHighLevelStateListener(hlsID, modelListener); - } + castAm2900Register(r).removeListener(am2900, listener); } - private static String getAm2901CellSuffix(Register r) + private static Am2900Register castAm2900Register(Register r) { - if (r instanceof QRegister) - return "qreg.q"; - if (r instanceof NumberedRegister) - return "regs.c" + ((NumberedRegister) r).getIndexAsBitstring() + ".q"; + if (r instanceof Am2900Register) + return (Am2900Register) r; throw new IllegalArgumentException("Not a register of an Am2900Machine: " + r); } diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionDefinition.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionDefinition.java index 0b6a26f8..2f53e660 100644 --- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionDefinition.java +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionDefinition.java @@ -43,23 +43,23 @@ public class Am2900MicroInstructionDefinition implements MicroInstructionDefinit // 0b10_0101, 0b10_0100, 0b10_1101, 0b10_1100, 0b10_1110, 0b10_1111, 0b10_0010, 0b10_0011, 0b10_0000, 0b10_0001 }, // 6); // TODO: Maybe "X" and "notX" are swapped. - private static final MnemonicFamily am2904StatusInstructions = new MnemonicFamilyBuilder(6).addX().setXDefault() - .add("LoadM_LoadY_µ_NxorOVRorZ", "Set_Set_µ_NxnorOVRornotZ", "Swap_Swap_µ_NxorOVR", "Reset_Reset_µ_NxnorOVR", - "Load_LoadForShiftThroughOvr_µ_Z", "Load_Invert_µ_notZ", "LoadOvrRetain_Load_µ_OVR", "LoadOvrRetain_Load_µ_notOVR", - "ResetZ_LoadCarryInvert_µ_CorZ", "SetZ_LoadCarryInvert_µ_notCandnotZ", "ResetC_Load_µ_C", "SetC_Load_µ_notC", - "ResetN_Load_µ_notCorZ", "SetN_Load_µ_CandnotZ", "ResetOvr_Load_IM_NxorN", "SetOvr_Load_IM_NxnorN", - "Load_Load_µ_NxorOVRorZ", "Load_Load_µ_NxnorOVRornotZ", "Load_Load_µ_NxorOVR", "Load_Load_µ_NxnorOVR", "Load_Load_µ_Z", - "Load_Load_µ_notZ", "Load_Load_µ_OVR", "Load_Load_µ_notOVR", "LoadCarryInvert_LoadCarryInvert_µ_CorZ", - "LoadCarryInvert_LoadCarryInvert_µ_notCandnotZ", "Load_Load_µ_C", "Load_Load_µ_notC", "Load_Load_µ_notCorZ", - "Load_Load_µ_CandnotZ", "Load_Load_µ_N", "Load_Load_µ_notN", "Load_Load_M_NxorOVRorZ", "Load_Load_M_NxnorOVRornotZ", - "Load_Load_M_NxorOVR", "Load_Load_M_NxnorOVR", "Load_Load_M_Z", "Load_Load_M_notZ", "Load_Load_M_OVR", - "Load_Load_M_notOVR", "LoadCarryInvert_LoadCarryInvert_M_CorZ", "LoadCarryInvert_LoadCarryInvert_M_notCandnotZ", - "Load_Load_M_C", "Load_Load_M_notC", "Load_Load_M_notCorZ", "Load_Load_M_CandnotZ", "Load_Load_M_N", "Load_Load_M_notN", - "Load_Load_I_NxorOVRorZ", "Load_Load_I_NxnorOVRornotZ", "Load_Load_I_NxorOVR", "Load_Load_I_NxnorOVR", "Load_Load_I_Z", - "Load_Load_I_notZ", "Load_Load_I_OVR", "Load_Load_I_notOVR", "LoadCarryInvert_LoadCarryInvert_I_notCorZ", - "LoadCarryInvert_LoadCarryInvert_I_CandnotZ", "Load_Load_I_C", "Load_Load_I_notC", "Load_Load_I_notCorZ", - "Load_Load_I_CandnotZ", "Load_Load_I_N", "Load_Load_I_notN") - .build(); + private static final MnemonicFamily am2904StatusInstructions = new MnemonicFamilyBuilder(6).addX().setXDefault().add( + "LoadM_LoadY_\u00b5_NxorOVRorZ", "Set_Set_\u00b5_NxnorOVRornotZ", "Swap_Swap_\u00b5_NxorOVR", "Reset_Reset_\u00b5_NxnorOVR", + "Load_LoadForShiftThroughOvr_\u00b5_Z", "Load_Invert_\u00b5_notZ", "LoadOvrRetain_Load_\u00b5_OVR", + "LoadOvrRetain_Load_\u00b5_notOVR", "ResetZ_LoadCarryInvert_\u00b5_CorZ", "SetZ_LoadCarryInvert_\u00b5_notCandnotZ", + "ResetC_Load_\u00b5_C", "SetC_Load_\u00b5_notC", "ResetN_Load_\u00b5_notCorZ", "SetN_Load_\u00b5_CandnotZ", + "ResetOvr_Load_IM_NxorN", "SetOvr_Load_IM_NxnorN", "Load_Load_\u00b5_NxorOVRorZ", "Load_Load_\u00b5_NxnorOVRornotZ", + "Load_Load_\u00b5_NxorOVR", "Load_Load_\u00b5_NxnorOVR", "Load_Load_\u00b5_Z", "Load_Load_\u00b5_notZ", "Load_Load_\u00b5_OVR", + "Load_Load_\u00b5_notOVR", "LoadCarryInvert_LoadCarryInvert_\u00b5_CorZ", "LoadCarryInvert_LoadCarryInvert_\u00b5_notCandnotZ", + "Load_Load_\u00b5_C", "Load_Load_\u00b5_notC", "Load_Load_\u00b5_notCorZ", "Load_Load_\u00b5_CandnotZ", "Load_Load_\u00b5_N", + "Load_Load_\u00b5_notN", "Load_Load_M_NxorOVRorZ", "Load_Load_M_NxnorOVRornotZ", "Load_Load_M_NxorOVR", "Load_Load_M_NxnorOVR", + "Load_Load_M_Z", "Load_Load_M_notZ", "Load_Load_M_OVR", "Load_Load_M_notOVR", "LoadCarryInvert_LoadCarryInvert_M_CorZ", + "LoadCarryInvert_LoadCarryInvert_M_notCandnotZ", "Load_Load_M_C", "Load_Load_M_notC", "Load_Load_M_notCorZ", + "Load_Load_M_CandnotZ", "Load_Load_M_N", "Load_Load_M_notN", "Load_Load_I_NxorOVRorZ", "Load_Load_I_NxnorOVRornotZ", + "Load_Load_I_NxorOVR", "Load_Load_I_NxnorOVR", "Load_Load_I_Z", "Load_Load_I_notZ", "Load_Load_I_OVR", "Load_Load_I_notOVR", + "LoadCarryInvert_LoadCarryInvert_I_notCorZ", "LoadCarryInvert_LoadCarryInvert_I_CandnotZ", "Load_Load_I_C", "Load_Load_I_notC", + "Load_Load_I_notCorZ", "Load_Load_I_CandnotZ", "Load_Load_I_N", "Load_Load_I_notN").build(); + // 00b5 = micro symbol private static final BooleanClassification ccen = new BooleanClassification(true, "PS", "C"); private static final MnemonicFamily am2910Instructions = new MnemonicFamilyBuilder(4).addX() .add("JZ", "CJS", "JMAP", "CJP", "PUSH", "JSRP", "CJV", "JRP", "RFCT", "RPCT", "CRTN", "CJPP", "LDCT", "LOOP", "CONT", "TWB") diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/Am2900Register.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/Am2900Register.java new file mode 100644 index 00000000..a0f1eb82 --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/Am2900Register.java @@ -0,0 +1,8 @@ +package net.mograsim.logic.model.am2900.machine.registers; + +import net.mograsim.machine.registers.ModelComponentBasedRegister; + +public interface Am2900Register extends ModelComponentBasedRegister +{ + // marker interface +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/NumberedRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/NumberedRegister.java deleted file mode 100644 index 7ca3d382..00000000 --- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/NumberedRegister.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.mograsim.logic.model.am2900.machine.registers; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; - -import net.mograsim.machine.StandardRegister; - -public class NumberedRegister extends StandardRegister -{ - public static final List instancesCorrectOrder; - - static - { - List instancesCorrectOrderModifiable = new ArrayList<>(); - for (int i = 0; i < 16; i++) - instancesCorrectOrderModifiable.add(new NumberedRegister(i)); - instancesCorrectOrder = Collections.unmodifiableList(instancesCorrectOrderModifiable); - } - - private final int index; - private final String indexBitstring; - - private NumberedRegister(int i) - { - super("R" + i, new HashSet<>(Arrays.asList(new String[] { "R" + i, "Register #" + i, "Register " + i })), 16, new HashMap<>()); - this.index = i; - - StringBuilder sb = new StringBuilder(); - sb.append((index & 0b1000) != 0 ? '1' : '0'); - sb.append((index & 0b0100) != 0 ? '1' : '0'); - sb.append((index & 0b0010) != 0 ? '1' : '0'); - sb.append((index & 0b0001) != 0 ? '1' : '0'); - this.indexBitstring = sb.toString(); - } - - public int getIndex() - { - return index; - } - - public String getIndexAsBitstring() - { - return indexBitstring; - } -} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/QRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/QRegister.java deleted file mode 100644 index b5d35407..00000000 --- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/QRegister.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.mograsim.logic.model.am2900.machine.registers; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; - -import net.mograsim.machine.StandardRegister; - -public class QRegister extends StandardRegister -{ - public static final QRegister instance = new QRegister(); - - private QRegister() - { - super("qreg", new HashSet<>(Arrays.asList(new String[] { "qreg", "Q register" })), 16, new HashMap<>()); - } -} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2901/Am2901Register.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2901/Am2901Register.java new file mode 100644 index 00000000..c16a4d2c --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2901/Am2901Register.java @@ -0,0 +1,21 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2901; + +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; +import net.mograsim.machine.registers.HighLevelStateBasedRegister; + +public class Am2901Register extends HighLevelStateBasedRegister implements Am2900Register +{ + public Am2901Register(String id, String cellSuffix, int logicWidthPerAm2901) + { + super(id, new int[] { logicWidthPerAm2901, logicWidthPerAm2901, logicWidthPerAm2901, logicWidthPerAm2901 }, + prefixWithAm2901s(cellSuffix)); + } + + private static String[] prefixWithAm2901s(String suffix) + { + String[] prefixed = new String[4]; + for (int i = 0, b = 0; i < 4; i++, b += 4) + prefixed[i] = String.format("am2901_%d-%d.%s", (b + 3), b, suffix); + return prefixed; + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2901/Am2901RegisterGroup.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2901/Am2901RegisterGroup.java new file mode 100644 index 00000000..88766b1d --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2901/Am2901RegisterGroup.java @@ -0,0 +1,25 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2901; + +import java.util.ArrayList; +import java.util.List; + +import net.mograsim.machine.registers.Register; +import net.mograsim.machine.registers.SimpleRegisterGroup; + +public class Am2901RegisterGroup extends SimpleRegisterGroup +{ + public static final Am2901RegisterGroup instance = new Am2901RegisterGroup(); + + private Am2901RegisterGroup() + { + super("Am2901", getAllRegisters()); + } + + private static Register[] getAllRegisters() + { + List allRegistersModifiable = new ArrayList<>(); + allRegistersModifiable.addAll(NumberedRegister.instancesCorrectOrder); + allRegistersModifiable.add(QRegister.instance); + return allRegistersModifiable.toArray(Register[]::new); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2901/NumberedRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2901/NumberedRegister.java new file mode 100644 index 00000000..e98e5946 --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2901/NumberedRegister.java @@ -0,0 +1,34 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2901; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class NumberedRegister extends Am2901Register +{ + public static final List instancesCorrectOrder; + + static + { + List instancesCorrectOrderModifiable = new ArrayList<>(); + for (int i = 0; i < 16; i++) + instancesCorrectOrderModifiable.add(new NumberedRegister(i)); + instancesCorrectOrder = Collections.unmodifiableList(instancesCorrectOrderModifiable); + } + + private NumberedRegister(int index) + { + super("R" + index, "regs.c" + getIndexAsBitstring(index) + ".q", 4); + + } + + private static String getIndexAsBitstring(int index) + { + StringBuilder sb = new StringBuilder(); + sb.append((index & 0b1000) != 0 ? '1' : '0'); + sb.append((index & 0b0100) != 0 ? '1' : '0'); + sb.append((index & 0b0010) != 0 ? '1' : '0'); + sb.append((index & 0b0001) != 0 ? '1' : '0'); + return sb.toString(); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2901/QRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2901/QRegister.java new file mode 100644 index 00000000..4e426cc6 --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2901/QRegister.java @@ -0,0 +1,11 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2901; + +public class QRegister extends Am2901Register +{ + public static final QRegister instance = new QRegister(); + + private QRegister() + { + super("Q", "qreg.q", 4); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/Am2904RegisterGroup.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/Am2904RegisterGroup.java new file mode 100644 index 00000000..9f30a458 --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/Am2904RegisterGroup.java @@ -0,0 +1,15 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2904; + +import net.mograsim.logic.model.am2900.machine.registers.am2904.msr.MSRRegisterGroup; +import net.mograsim.logic.model.am2900.machine.registers.am2904.musr.muSRRegisterGroup; +import net.mograsim.machine.registers.SimpleRegisterGroup; + +public class Am2904RegisterGroup extends SimpleRegisterGroup +{ + public static final Am2904RegisterGroup instance = new Am2904RegisterGroup(); + + private Am2904RegisterGroup() + { + super("Am2904", MSRRegisterGroup.instance, muSRRegisterGroup.instance); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MCRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MCRegister.java new file mode 100644 index 00000000..8fc2540e --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MCRegister.java @@ -0,0 +1,14 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2904.msr; + +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; +import net.mograsim.machine.registers.HighLevelStateBasedRegister; + +public class MCRegister extends HighLevelStateBasedRegister implements Am2900Register +{ + public static final MCRegister instance = new MCRegister(); + + private MCRegister() + { + super("C", "am2904.msr.q2", 1); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MNRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MNRegister.java new file mode 100644 index 00000000..4df3e84c --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MNRegister.java @@ -0,0 +1,14 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2904.msr; + +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; +import net.mograsim.machine.registers.HighLevelStateBasedRegister; + +public class MNRegister extends HighLevelStateBasedRegister implements Am2900Register +{ + public static final MNRegister instance = new MNRegister(); + + private MNRegister() + { + super("N", "am2904.msr.q3", 1); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MOVRRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MOVRRegister.java new file mode 100644 index 00000000..9243edb1 --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MOVRRegister.java @@ -0,0 +1,14 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2904.msr; + +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; +import net.mograsim.machine.registers.HighLevelStateBasedRegister; + +public class MOVRRegister extends HighLevelStateBasedRegister implements Am2900Register +{ + public static final MOVRRegister instance = new MOVRRegister(); + + private MOVRRegister() + { + super("OVR", "am2904.msr.q4", 1); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MSRRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MSRRegister.java new file mode 100644 index 00000000..f25260fc --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MSRRegister.java @@ -0,0 +1,14 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2904.msr; + +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; +import net.mograsim.machine.registers.HighLevelStateBasedRegister; + +public class MSRRegister extends HighLevelStateBasedRegister implements Am2900Register +{ + public static final MSRRegister instance = new MSRRegister(); + + private MSRRegister() + { + super("MSR", "am2904.msr.q", 4); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MSRRegisterGroup.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MSRRegisterGroup.java new file mode 100644 index 00000000..015a3c08 --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MSRRegisterGroup.java @@ -0,0 +1,13 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2904.msr; + +import net.mograsim.machine.registers.SimpleRegisterGroup; + +public class MSRRegisterGroup extends SimpleRegisterGroup +{ + public static final MSRRegisterGroup instance = new MSRRegisterGroup(); + + private MSRRegisterGroup() + { + super("MSR", MSRRegister.instance, MZRegister.instance, MCRegister.instance, MNRegister.instance, MOVRRegister.instance); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MZRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MZRegister.java new file mode 100644 index 00000000..691f86dc --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/msr/MZRegister.java @@ -0,0 +1,14 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2904.msr; + +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; +import net.mograsim.machine.registers.HighLevelStateBasedRegister; + +public class MZRegister extends HighLevelStateBasedRegister implements Am2900Register +{ + public static final MZRegister instance = new MZRegister(); + + private MZRegister() + { + super("Z", "am2904.msr.q1", 1); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muCRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muCRegister.java new file mode 100644 index 00000000..9c0a45b2 --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muCRegister.java @@ -0,0 +1,14 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2904.musr; + +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; +import net.mograsim.machine.registers.HighLevelStateBasedRegister; + +public class muCRegister extends HighLevelStateBasedRegister implements Am2900Register +{ + public static final muCRegister instance = new muCRegister(); + + private muCRegister() + { + super("C", "am2904.musr.q2", 1); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muNRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muNRegister.java new file mode 100644 index 00000000..f0d4c9bd --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muNRegister.java @@ -0,0 +1,14 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2904.musr; + +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; +import net.mograsim.machine.registers.HighLevelStateBasedRegister; + +public class muNRegister extends HighLevelStateBasedRegister implements Am2900Register +{ + public static final muNRegister instance = new muNRegister(); + + private muNRegister() + { + super("N", "am2904.musr.q3", 1); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muOVRRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muOVRRegister.java new file mode 100644 index 00000000..54bac108 --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muOVRRegister.java @@ -0,0 +1,14 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2904.musr; + +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; +import net.mograsim.machine.registers.HighLevelStateBasedRegister; + +public class muOVRRegister extends HighLevelStateBasedRegister implements Am2900Register +{ + public static final muOVRRegister instance = new muOVRRegister(); + + private muOVRRegister() + { + super("OVR", "am2904.musr.q4", 1); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muSRRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muSRRegister.java new file mode 100644 index 00000000..0134c9c9 --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muSRRegister.java @@ -0,0 +1,14 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2904.musr; + +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; +import net.mograsim.machine.registers.HighLevelStateBasedRegister; + +public class muSRRegister extends HighLevelStateBasedRegister implements Am2900Register +{ + public static final muSRRegister instance = new muSRRegister(); + + private muSRRegister() + { + super("\u00b5SR", "am2904.musr.q", 4); // 00b5 = micro symbol + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muSRRegisterGroup.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muSRRegisterGroup.java new file mode 100644 index 00000000..396af05f --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muSRRegisterGroup.java @@ -0,0 +1,14 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2904.musr; + +import net.mograsim.machine.registers.SimpleRegisterGroup; + +public class muSRRegisterGroup extends SimpleRegisterGroup +{ + public static final muSRRegisterGroup instance = new muSRRegisterGroup(); + + private muSRRegisterGroup() + { + super("\u00b5SR", muSRRegister.instance, muZRegister.instance, muCRegister.instance, muNRegister.instance, muOVRRegister.instance); + // 00b5 = micro symbol + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muZRegister.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muZRegister.java new file mode 100644 index 00000000..22fe0d44 --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/registers/am2904/musr/muZRegister.java @@ -0,0 +1,14 @@ +package net.mograsim.logic.model.am2900.machine.registers.am2904.musr; + +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; +import net.mograsim.machine.registers.HighLevelStateBasedRegister; + +public class muZRegister extends HighLevelStateBasedRegister implements Am2900Register +{ + public static final muZRegister instance = new muZRegister(); + + private muZRegister() + { + super("Z", "am2904.musr.q1", 1); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.machine/META-INF/MANIFEST.MF b/plugins/net.mograsim.machine/META-INF/MANIFEST.MF index afbfc4c4..20cd1a96 100644 --- a/plugins/net.mograsim.machine/META-INF/MANIFEST.MF +++ b/plugins/net.mograsim.machine/META-INF/MANIFEST.MF @@ -17,6 +17,7 @@ Export-Package: net.mograsim.machine, net.mograsim.machine.mi, net.mograsim.machine.mi.components, net.mograsim.machine.mi.parameters, + net.mograsim.machine.registers, net.mograsim.machine.standard.memory Bundle-Activator: net.mograsim.machine.MachineLoader Bundle-ActivationPolicy: lazy diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java index ed219573..66408ced 100644 --- a/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java +++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java @@ -7,6 +7,7 @@ import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.model.model.LogicModel; import net.mograsim.machine.mi.AssignableMicroInstructionMemory; +import net.mograsim.machine.registers.Register; import net.mograsim.machine.standard.memory.AssignableMainMemory; public interface Machine diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineDefinition.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineDefinition.java index 1c4aa868..18e628f5 100644 --- a/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineDefinition.java +++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineDefinition.java @@ -1,8 +1,10 @@ package net.mograsim.machine; -import java.util.Set; +import java.util.List; import net.mograsim.machine.mi.MicroInstructionMemoryDefinition; +import net.mograsim.machine.registers.Register; +import net.mograsim.machine.registers.RegisterGroup; public interface MachineDefinition { @@ -32,12 +34,12 @@ public interface MachineDefinition ISASchema getISASchema(); /** - * Returns a set of all {@link Register}s present in the machine. + * Returns a set of all {@link Register}s present in the machine that are not part of a register group. * * @return all registers present in the machine. * @author Christian Femers */ - Set getRegisters(); + List getUnsortedRegisters(); /** * Returns a set of all RegisterGroups that the machine contains @@ -45,7 +47,7 @@ public interface MachineDefinition * @return all register groups present in the machine. * @author Christian Femers */ - Set getRegisterGroups(); + List getRegisterGroups(); /** * The number of bits used by the machine to address main memory. Note that this should be the number of bits used in the CPU, not a diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/Register.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/Register.java deleted file mode 100644 index 979f1be3..00000000 --- a/plugins/net.mograsim.machine/src/net/mograsim/machine/Register.java +++ /dev/null @@ -1,54 +0,0 @@ -package net.mograsim.machine; - -import java.util.Set; - -/** - * A register in a machine is defined by this interface. A hardware register may have {@link Register#names() named sub-registers}. - * - * - * @author Christian Femers - * - */ -public interface Register extends Identifiable -{ - /** - * The unique identifier of the register. This does not have to be the display name or name in the assembly language. - * - * @return the registers id as case sensitive String - * @author Christian Femers - */ - @Override - String id(); - - /** - * The name(s) of this register. This is the displayed name and the name used in the assembly language. All names of all registers must - * be case-insensitive unique. A register can have multiple names if these names address different regions (but still have a common - * hardware structure), e.g. EAX, AX, AL, AH. - * - * @return all the names of regions addressing this register, must be case-insensitive. - * @author Christian Femers - */ - Set names(); - - /** - * Returns the complete width in bits of the underlying hardware structure the register and possible sub-registers are part of. - * - * @param name the name of the register - * @return the width of the (sub-)register in bits. - * - * @see #names() - * @author Christian Femers - */ - int getWidth(); - - /** - * Returns the width in bits of the register or a named part of it. - * - * @param name the name of the register - * @return the width of the (sub-)register in bits. - * - * @see #names() - * @author Christian Femers - */ - int getWidth(String name); -} diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/RegisterGroup.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/RegisterGroup.java deleted file mode 100644 index 4838590f..00000000 --- a/plugins/net.mograsim.machine/src/net/mograsim/machine/RegisterGroup.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.mograsim.machine; - -import java.util.Set; - -public interface RegisterGroup extends Identifiable -{ - /** - * Returns all Registers contained in this group and subgroups - */ - Set getRegisters(); - - /** - * Returns the sub groups of this group. May very well be an empty set. - */ - Set getSubGroups(); -} diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/SimpleRegisterGroup.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/SimpleRegisterGroup.java deleted file mode 100644 index 0c1d2ae5..00000000 --- a/plugins/net.mograsim.machine/src/net/mograsim/machine/SimpleRegisterGroup.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.mograsim.machine; - -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -public class SimpleRegisterGroup implements RegisterGroup -{ - - private final String id; - private final Set registers; - - protected SimpleRegisterGroup(String id, Register... registers) - { - this.id = id; - this.registers = Collections.unmodifiableSet(new HashSet<>(List.of(registers))); - } - - @Override - public String id() - { - return id; - } - - @Override - public Set getRegisters() - { - return registers; - } - - @Override - public Set getSubGroups() - { - return Set.of(); - } - -} diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/StandardRegister.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/StandardRegister.java deleted file mode 100644 index 6fea551f..00000000 --- a/plugins/net.mograsim.machine/src/net/mograsim/machine/StandardRegister.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.mograsim.machine; - -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -public abstract class StandardRegister implements Register -{ - private final String id; - private final Set names; - private final int width; - private final Map widthForAliases; - - public StandardRegister(String id, Set names, int width, Map widthForAliases) - { - this.id = id; - this.names = Collections.unmodifiableSet(new HashSet<>(names)); - this.width = width; - this.widthForAliases = Collections.unmodifiableMap(new HashMap<>(widthForAliases)); - } - - @Override - public String id() - { - return id; - } - - @Override - public Set names() - { - return names; - } - - @Override - public int getWidth() - { - return width; - } - - @Override - public int getWidth(String name) - { - return widthForAliases.getOrDefault(name, width); - } -} \ No newline at end of file diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/UnionRegisterGroup.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/UnionRegisterGroup.java deleted file mode 100644 index bfe4248f..00000000 --- a/plugins/net.mograsim.machine/src/net/mograsim/machine/UnionRegisterGroup.java +++ /dev/null @@ -1,41 +0,0 @@ -package net.mograsim.machine; - -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -public class UnionRegisterGroup implements RegisterGroup -{ - private final String id; - private final Set subGroups; - private final Set subGroupRegisters; - - public UnionRegisterGroup(String id, RegisterGroup... subGroups) - { - this.id = id; - this.subGroups = Collections.unmodifiableSet(new HashSet<>(List.of(subGroups))); - this.subGroupRegisters = this.subGroups.stream().flatMap(sg -> sg.getRegisters().stream()).distinct() - .collect(Collectors.toUnmodifiableSet()); - } - - @Override - public String id() - { - return id; - } - - @Override - public Set getRegisters() - { - return subGroupRegisters; - } - - @Override - public Set getSubGroups() - { - return subGroups; - } - -} diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/HighLevelStateBasedRegister.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/HighLevelStateBasedRegister.java new file mode 100644 index 00000000..e774f703 --- /dev/null +++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/HighLevelStateBasedRegister.java @@ -0,0 +1,82 @@ +package net.mograsim.machine.registers; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.function.Consumer; + +import net.mograsim.logic.core.types.BitVector; +import net.mograsim.logic.model.model.components.ModelComponent; + +public class HighLevelStateBasedRegister extends SimpleRegister implements ModelComponentBasedRegister +{ + private final String[] hlsIDsToConcat; + private final int[] hlsWidthes; + + private final Map, Consumer> modelListenersPerRegisterListener; + + public HighLevelStateBasedRegister(String id, String hlsID, int logicWidth) + { + this(id, new int[] { logicWidth }, hlsID); + } + + public HighLevelStateBasedRegister(String id, int[] hlsWidthes, String... hlsIDsToConcat) + { + super(id, Arrays.stream(hlsWidthes).sum()); + if (hlsIDsToConcat.length != hlsWidthes.length) + throw new IllegalArgumentException(); + this.hlsIDsToConcat = Arrays.copyOf(hlsIDsToConcat, hlsIDsToConcat.length); + this.hlsWidthes = Arrays.copyOf(hlsWidthes, hlsIDsToConcat.length); + + this.modelListenersPerRegisterListener = new HashMap<>(); + } + + @Override + public BitVector read(ModelComponent component) + { + BitVector result = BitVector.of(); + for (int i = 0; i < hlsIDsToConcat.length; i++) + { + BitVector hls = (BitVector) component.getHighLevelState(hlsIDsToConcat[i]); + if (hls.length() != hlsWidthes[i]) + throw new IllegalArgumentException(); + result = result.concat(hls); + } + return result; + } + + @Override + public void write(ModelComponent component, BitVector value) + { + if (value.length() != getWidth()) + throw new IllegalArgumentException(); + for (int i = 0, off = 0; i < hlsIDsToConcat.length; i++) + { + int oldOff = off; + off += hlsWidthes[i]; + component.setHighLevelState(hlsIDsToConcat[i], value.subVector(oldOff, off)); + } + } + + @Override + public void addListener(ModelComponent component, Consumer listener) + { + if (modelListenersPerRegisterListener.containsKey(listener)) + return; + + Consumer modelListener = v -> listener.accept(read(component)); + for (String hlsID : hlsIDsToConcat) + component.addHighLevelStateListener(hlsID, modelListener); + } + + @Override + public void removeListener(ModelComponent component, Consumer listener) + { + Consumer modelListener = modelListenersPerRegisterListener.get(listener); + if (modelListener == null) + return; + + for (String hlsID : hlsIDsToConcat) + component.removeHighLevelStateListener(hlsID, modelListener); + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/ModelComponentBasedRegister.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/ModelComponentBasedRegister.java new file mode 100644 index 00000000..96e34a7a --- /dev/null +++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/ModelComponentBasedRegister.java @@ -0,0 +1,17 @@ +package net.mograsim.machine.registers; + +import java.util.function.Consumer; + +import net.mograsim.logic.core.types.BitVector; +import net.mograsim.logic.model.model.components.ModelComponent; + +public interface ModelComponentBasedRegister +{ + public BitVector read(ModelComponent component); + + public void write(ModelComponent component, BitVector value); + + public void addListener(ModelComponent component, Consumer listener); + + public void removeListener(ModelComponent component, Consumer listener); +} \ No newline at end of file diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/Register.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/Register.java new file mode 100644 index 00000000..8c3f90bf --- /dev/null +++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/Register.java @@ -0,0 +1,24 @@ +package net.mograsim.machine.registers; + +import net.mograsim.machine.Identifiable; + +/** + * A register in a machine is defined by this interface. A hardware register may have {@link Register#names() named sub-registers}. + * + * + * @author Christian Femers + * + */ +public interface Register extends Identifiable +{ + /** + * Returns the complete width in bits of the underlying hardware structure the register and possible sub-registers are part of. + * + * @param name the name of the register + * @return the width of the (sub-)register in bits. + * + * @see #names() + * @author Christian Femers + */ + int getWidth(); +} \ No newline at end of file diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/RegisterGroup.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/RegisterGroup.java new file mode 100644 index 00000000..8fe60f37 --- /dev/null +++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/RegisterGroup.java @@ -0,0 +1,18 @@ +package net.mograsim.machine.registers; + +import java.util.List; + +import net.mograsim.machine.Identifiable; + +public interface RegisterGroup extends Identifiable +{ + /** + * Returns all Registers contained in this group that are not part of a subgroup. + */ + List getRegisters(); + + /** + * Returns the sub groups of this group. May very well be an empty set. + */ + List getSubGroups(); +} diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/SimpleRegister.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/SimpleRegister.java new file mode 100644 index 00000000..57c2150e --- /dev/null +++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/SimpleRegister.java @@ -0,0 +1,25 @@ +package net.mograsim.machine.registers; + +public class SimpleRegister implements Register +{ + private final String id; + private final int width; + + public SimpleRegister(String id, int width) + { + this.id = id; + this.width = width; + } + + @Override + public String id() + { + return id; + } + + @Override + public int getWidth() + { + return width; + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/SimpleRegisterGroup.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/SimpleRegisterGroup.java new file mode 100644 index 00000000..09e80292 --- /dev/null +++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/registers/SimpleRegisterGroup.java @@ -0,0 +1,45 @@ +package net.mograsim.machine.registers; + +import java.util.List; + +public class SimpleRegisterGroup implements RegisterGroup +{ + private final String id; + private final List registers; + private final List subgroups; + + protected SimpleRegisterGroup(String id, Register... registers) + { + this(id, new RegisterGroup[0], registers); + } + + protected SimpleRegisterGroup(String id, RegisterGroup... subgroups) + { + this(id, subgroups, new Register[0]); + } + + protected SimpleRegisterGroup(String id, RegisterGroup[] subgroups, Register... registers) + { + this.id = id; + this.registers = List.of(registers); + this.subgroups = List.of(subgroups); + } + + @Override + public String id() + { + return id; + } + + @Override + public List getRegisters() + { + return registers; + } + + @Override + public List getSubGroups() + { + return subgroups; + } +} \ No newline at end of file diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineRegister.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineRegister.java index 8c0685dc..f8d343f4 100644 --- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineRegister.java +++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineRegister.java @@ -18,7 +18,7 @@ import org.eclipse.swt.SWT; import net.mograsim.logic.core.types.BitVector; import net.mograsim.machine.Machine; -import net.mograsim.machine.Register; +import net.mograsim.machine.registers.Register; import net.mograsim.plugin.MograsimActivator; public class MachineRegister extends PlatformObject implements IRegister diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineRegisterGroup.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineRegisterGroup.java index bb7ed264..fdf90ad8 100644 --- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineRegisterGroup.java +++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineRegisterGroup.java @@ -1,7 +1,6 @@ package net.mograsim.plugin.launch; import java.util.List; -import java.util.Set; import java.util.stream.Collectors; import org.eclipse.core.runtime.PlatformObject; @@ -12,22 +11,20 @@ import org.eclipse.debug.core.model.IRegister; import org.eclipse.debug.core.model.IRegisterGroup; import net.mograsim.machine.Machine; -import net.mograsim.machine.Register; +import net.mograsim.machine.registers.Register; import net.mograsim.plugin.MograsimActivator; -import net.mograsim.plugin.util.NumberRespectingStringComparator; public class MachineRegisterGroup extends PlatformObject implements IRegisterGroup { private final MachineStackFrame stackFrame; + private final String name; private final List registers; - public MachineRegisterGroup(MachineStackFrame stackFrame) + public MachineRegisterGroup(MachineStackFrame stackFrame, String name, List registers) { this.stackFrame = stackFrame; - Set machineRegisters = getMachine().getDefinition().getRegisters(); - this.registers = machineRegisters.stream() - .sorted((r1, r2) -> NumberRespectingStringComparator.CASE_SENSITIVE.compare(r1.id(), r2.id())) - .map(r -> new MachineRegister(this, r)).collect(Collectors.toUnmodifiableList()); + this.name = name; + this.registers = registers.stream().map(r -> new MachineRegister(this, r)).collect(Collectors.toUnmodifiableList()); } @Override @@ -56,7 +53,7 @@ public class MachineRegisterGroup extends PlatformObject implements IRegisterGro @Override public String getName() throws DebugException { - return "pseudo register group"; + return name; } @Override @@ -68,6 +65,11 @@ public class MachineRegisterGroup extends PlatformObject implements IRegisterGro @Override public boolean hasRegisters() throws DebugException { - return true; + return hasRegistersSafe(); + } + + public boolean hasRegistersSafe() + { + return registers.size() > 0; } } \ No newline at end of file diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineStackFrame.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineStackFrame.java index 14f64206..2744a3c3 100644 --- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineStackFrame.java +++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineStackFrame.java @@ -1,5 +1,9 @@ package net.mograsim.plugin.launch; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import org.eclipse.core.runtime.PlatformObject; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.ILaunch; @@ -10,17 +14,34 @@ import org.eclipse.debug.core.model.IThread; import org.eclipse.debug.core.model.IVariable; import net.mograsim.machine.Machine; +import net.mograsim.machine.MachineDefinition; +import net.mograsim.machine.registers.RegisterGroup; import net.mograsim.plugin.MograsimActivator; public class MachineStackFrame extends PlatformObject implements IStackFrame { private final MachineThread thread; - private final MachineRegisterGroup registerGroup; + private final List registerGroups; public MachineStackFrame(MachineThread thread) { this.thread = thread; - this.registerGroup = new MachineRegisterGroup(this); + List registerGroupsModifiable = new ArrayList<>(); + MachineDefinition machDef = getMachine().getDefinition(); + if (!machDef.getUnsortedRegisters().isEmpty()) + registerGroupsModifiable.add(new MachineRegisterGroup(this, "", machDef.getUnsortedRegisters())); + addRegisterGroups(null, registerGroupsModifiable, machDef.getRegisterGroups()); + this.registerGroups = Collections.unmodifiableList(registerGroupsModifiable); + } + + private void addRegisterGroups(String base, List target, List registerGroups) + { + for (RegisterGroup rg : registerGroups) + { + String name = (base == null ? "" : base + '.') + rg.id(); + target.add(new MachineRegisterGroup(this, name, rg.getRegisters())); + addRegisterGroups(name, target, rg.getSubGroups()); + } } @Override @@ -182,7 +203,7 @@ public class MachineStackFrame extends PlatformObject implements IStackFrame @Override public IRegisterGroup[] getRegisterGroups() throws DebugException { - return new IRegisterGroup[] { registerGroup }; + return registerGroups.toArray(IRegisterGroup[]::new); } @Override