X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fmachine%2FAm2900Machine.java;h=33c29f06b937d6635f249b18c3de22430818e3e1;hb=58c2b670f915c217fcdde1b874606a5550f4e5c7;hp=759fda984be478e6c3d2d46c77c2fa6fe36d8c2a;hpb=45cdf52447cc661bdffa0573ea31ff52cc134ad5;p=Mograsim.git

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 759fda98..33c29f06 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,13 +1,16 @@
 package net.mograsim.logic.model.am2900.machine;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.function.Consumer;
 
 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.am2900.machine.registers.muInstrRegister;
 import net.mograsim.logic.model.model.LogicModel;
 import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.ModelComponent;
@@ -17,19 +20,20 @@ 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;
 
 public class Am2900Machine implements Machine
 {
-	private Am2900MachineDefinition machineDefinition;
+	private AbstractAm2900MachineDefinition machineDefinition;
 	private LogicModelModifiable logicModel;
 	private ModelComponent am2900;
 	private Timeline timeline;
@@ -40,7 +44,7 @@ public class Am2900Machine implements Machine
 
 	private final Set<ActiveMicroInstructionChangedListener> amicListeners;
 
-	public Am2900Machine(LogicModelModifiable model, Am2900MachineDefinition am2900MachineDefinition)
+	public Am2900Machine(LogicModelModifiable model, AbstractAm2900MachineDefinition am2900MachineDefinition)
 	{
 		this.machineDefinition = am2900MachineDefinition;
 		this.logicModel = model;
@@ -50,6 +54,7 @@ public class Am2900Machine implements Machine
 
 		CoreModelParameters params = new CoreModelParameters();
 		params.gateProcessTime = 50;
+		params.hardcodedComponentProcessTime = params.gateProcessTime * 5;
 		params.wireTravelTime = 10;
 		mainMemory = new AssignableMainMemory(new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition()));
 		instMemory = new AssignableMicroInstructionMemory(
@@ -84,6 +89,26 @@ public class Am2900Machine implements Machine
 		defaultParams[19] = paramClassifications[19].parse("JZ");
 		MicroInstruction jzMI = MicroInstruction.create(defaultParams);
 		am2900.setHighLevelState("muir_2.q", jzMI.toBitVector());
+		Bit regsValue = machineDefinition.strict ? Bit.U : Bit.ZERO;
+		setRegistersTo(machineDefinition.getUnsortedRegisters(), regsValue);
+		setRegisterGroupTo(machineDefinition.getRegisterGroups(), regsValue);
+		// TODO reset latches?
+	}
+
+	private void setRegistersTo(List<Register> registers, Bit value)
+	{
+		for (Register r : registers)
+			if (r != muInstrRegister.instance)// don't reset; sometimes causes a glitch
+				setRegister(r, BitVector.of(value, r.getWidth()));
+	}
+
+	private void setRegisterGroupTo(List<RegisterGroup> registerGroups, Bit value)
+	{
+		for (RegisterGroup rg : registerGroups)
+		{
+			setRegistersTo(rg.getRegisters(), value);
+			setRegisterGroupTo(rg.getSubGroups(), value);
+		}
 	}
 
 	@Override
@@ -112,37 +137,32 @@ public class Am2900Machine implements Machine
 	@Override
 	public BitVector getRegister(Register r)
 	{
-		String am2901CellSuffix;
-		if (r instanceof QRegister)
-			am2901CellSuffix = "qreg.q";
-		else if (r instanceof NumberedRegister)
-			am2901CellSuffix = "regs.c" + ((NumberedRegister) r).getIndexAsBitstring() + ".q";
-		else
-			throw new IllegalArgumentException("Not a register of an Am2900Machine: " + 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;
-		if (r instanceof QRegister)
-			am2901CellSuffix = "qreg.q";
-		else if (r instanceof NumberedRegister)
-			am2901CellSuffix = "regs.c" + ((NumberedRegister) r).getIndexAsBitstring() + ".q";
-		else
-			throw new IllegalArgumentException("Not a register of an Am2900Machine: " + 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<BitVector> listener)
+	{
+		castAm2900Register(r).addListener(am2900, listener);
+	}
+
+	@Override
+	public void removeRegisterListener(Register r, Consumer<BitVector> listener)
+	{
+		castAm2900Register(r).removeListener(am2900, listener);
+	}
+
+	private static Am2900Register castAm2900Register(Register r)
+	{
+		if (r instanceof Am2900Register)
+			return (Am2900Register) r;
+		throw new IllegalArgumentException("Not a register of an Am2900Machine: " + r);
 	}
 
 	@Override
@@ -165,8 +185,7 @@ public class Am2900Machine implements Machine
 
 	private long getCurrentMicroInstructionAddress()
 	{
-		// TODO: replace with highlevelstate
-		BitVector vector = logicModel.getWireBySubmodelPath("Am2900.wire_mpm_address").getWireValues();
+		BitVector vector = (BitVector) am2900.getHighLevelState("mpm_address");
 		return vector.isBinary() ? vector.getUnsignedValueLong() : -1;
 	}