X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fmachine%2FAm2900MicroInstructionDefinition.java;h=d61b751dda3019ccf49b5bfd59d8d6dbfe91db7d;hb=fa5e3151a923b6cb6120f62436e24ac103a9290c;hp=a91910db16925cd7a8066293c2455bfd5db50da4;hpb=e5460cbb1f4ae06479a92d4ab483b08e8e01e4a6;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionDefinition.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionDefinition.java
index a91910db..d61b751d 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionDefinition.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionDefinition.java
@@ -20,12 +20,11 @@ public class Am2900MicroInstructionDefinition implements MicroInstructionDefinit
 			"SDCO", "SRCO", "SRCIO", "SR", "SDIC", "SDRCI", "SDRCO", "SDXOR", "SDR");
 	private final static MnemonicFamily am2904CarryInstructions = new MnemonicFamily(new String[] { "0", "1", "Cx", "µ", "!µ", "M", "!M" },
 			new long[] { 0b000000, 0b010000, 0b100000, 0b110000, 0b110100, 0b111000, 0b111100 }, 6);
-	private final static MnemonicFamily am2901DestInstructions = new MnemonicFamily(
-			new MnemonicPair("X", BitVector.of(Bit.ZERO, 4))/* TODO */);
-	private final static MnemonicFamily am2901FuncInstructions = new MnemonicFamily(
-			new MnemonicPair("X", BitVector.of(Bit.ZERO, 4))/* TODO */);
-	private final static MnemonicFamily am2901SrcInstructions = new MnemonicFamily(
-			new MnemonicPair("X", BitVector.of(Bit.ZERO, 4))/* TODO */);
+	private final static MnemonicFamily am2901DestInstructions = new MnemonicFamily("QREG", "NOP", "RAMA", "RAMF", "RAMQD", "RAMD", "RAMQU",
+			"RAMU");
+	private final static MnemonicFamily am2901FuncInstructions = new MnemonicFamily("ADD", "SUBR", "SUBS", "OR", "AND", "NOTRS", "EXOR",
+			"EXNOR");
+	private final static MnemonicFamily am2901SrcInstructions = new MnemonicFamily("AQ", "AB", "ZQ", "ZB", "ZA", "DA", "DQ", "DZ");
 	private final static MnemonicFamily interruptInstructions = new MnemonicFamily(
 			new MnemonicPair("X", BitVector.of(Bit.ZERO, 4))/* TODO */);
 	private final static BooleanClassification hL = new BooleanClassification("H", "L");