diff --git a/Server/src/main/java/net/simon987/server/assembly/DefaultInstructionSet.java b/Server/src/main/java/net/simon987/server/assembly/DefaultInstructionSet.java index 723865c..a1bed9b 100755 --- a/Server/src/main/java/net/simon987/server/assembly/DefaultInstructionSet.java +++ b/Server/src/main/java/net/simon987/server/assembly/DefaultInstructionSet.java @@ -1,7 +1,6 @@ package net.simon987.server.assembly; import net.simon987.server.assembly.instruction.*; -import net.simon987.server.logging.LogManager; import java.util.HashMap; import java.util.Map; @@ -107,7 +106,7 @@ public class DefaultInstructionSet implements InstructionSet { public void add(Instruction instruction) { Instruction aliasedInstruction = instructionMap.get(instruction.getOpCode()); if (aliasedInstruction != null) { - aliasesMap.put(instruction.getMnemonic(), aliasedInstruction); + aliasesMap.put(instruction.getMnemonic(), instruction); } else { instructionMap.put(instruction.getOpCode(), instruction); } diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SalInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/SalInstruction.java index f24ab94..8d3a405 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SalInstruction.java +++ b/Server/src/main/java/net/simon987/server/assembly/instruction/SalInstruction.java @@ -1,13 +1,11 @@ package net.simon987.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; - /** * Alias of SHL instruction */ -public class SalInstruction extends Instruction { +public class SalInstruction extends ShlInstruction { public SalInstruction() { - super("sal", ShlInstruction.OPCODE); + super("sal"); } } diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/ShlInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/ShlInstruction.java index 58b356f..2f473f8 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/ShlInstruction.java +++ b/Server/src/main/java/net/simon987/server/assembly/instruction/ShlInstruction.java @@ -13,6 +13,10 @@ public class ShlInstruction extends Instruction { super("shl", OPCODE); } + public ShlInstruction(String alias) { + super(alias, OPCODE); + } + @Override public Status execute(Target dst, int dstIndex, Target src, int srcIndex, Status status) {