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=ab0643f1fb790448537ce8c171d86910ff0c0670;hb=4166a936aca1d531e799d2920ec472952b76d0e3;hp=f705e74ee41bb102e2bea0d4022799a81bde50bf;hpb=0eb525202d3c871a2a20f789af1728248f3cff11;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 f705e74e..ab0643f1 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
@@ -6,6 +6,8 @@ import java.util.Set;
 import net.mograsim.logic.core.components.CoreClock;
 import net.mograsim.logic.core.timeline.Timeline;
 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.model.LogicModel;
 import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.ModelComponent;
@@ -81,7 +83,7 @@ public class Am2900Machine implements Machine
 		MicroInstructionParameter[] defaultParams = muiDef.createDefaultInstruction().getParameters();
 		defaultParams[19] = paramClassifications[19].parse("JZ");
 		MicroInstruction jzMI = MicroInstruction.create(defaultParams);
-		logicModel.getComponentByName("Am2900").setHighLevelState("muir_2.q", jzMI.toBitVector());
+		am2900.setHighLevelState("muir_2.q", jzMI.toBitVector());
 	}
 
 	@Override
@@ -110,15 +112,37 @@ public class Am2900Machine implements Machine
 	@Override
 	public BitVector getRegister(Register r)
 	{
-		// TODO Auto-generated method stub
-		return null;
+		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;
 	}
 
 	@Override
 	public void setRegister(Register r, BitVector value)
 	{
-		// TODO Auto-generated method stub
-
+		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));
+		}
 	}
 
 	@Override
@@ -141,8 +165,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;
 	}