From df4cab4f2dbf42102659c013599266e07be2d249 Mon Sep 17 00:00:00 2001 From: Fabian Stemmler Date: Tue, 10 Sep 2019 18:13:13 +0200 Subject: [PATCH] Fleshed out Am2900MicroInstructionDefinition --- .../machine/Am2900MicroInstructionDefinition.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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"); -- 2.17.1