simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-19 18:46:43 +00:00
Code Issues Projects Releases Wiki Activity

slightly rework aliases to work with inheritance

Browse Source
This commit is contained in:
Kevin Ramharak 2019-01-22 22:12:34 +01:00
parent 439547102f
commit a030e9fc5d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Server/src/main/java/net/simon987/server/assembly/DefaultInstructionSet.java
View File

@ -1,7 +1,6 @@
package net.simon987.server.assembly; package net.simon987.server.assembly;
import net.simon987.server.assembly.instruction.*; import net.simon987.server.assembly.instruction.*;
import net.simon987.server.logging.LogManager;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -107,7 +106,7 @@ public class DefaultInstructionSet implements InstructionSet {
public void add(Instruction instruction) { public void add(Instruction instruction) {
Instruction aliasedInstruction = instructionMap.get(instruction.getOpCode()); Instruction aliasedInstruction = instructionMap.get(instruction.getOpCode());
if (aliasedInstruction != null) { if (aliasedInstruction != null) {
aliasesMap.put(instruction.getMnemonic(), aliasedInstruction); aliasesMap.put(instruction.getMnemonic(), instruction);
} else { } else {
instructionMap.put(instruction.getOpCode(), instruction); instructionMap.put(instruction.getOpCode(), instruction);
} }

6
Server/src/main/java/net/simon987/server/assembly/instruction/SalInstruction.java
View File

@ -1,13 +1,11 @@
package net.simon987.server.assembly.instruction; package net.simon987.server.assembly.instruction;
import net.simon987.server.assembly.Instruction;
/** /**
* Alias of SHL instruction * Alias of SHL instruction
*/ */
public class SalInstruction extends Instruction { public class SalInstruction extends ShlInstruction {
public SalInstruction() { public SalInstruction() {
super("sal", ShlInstruction.OPCODE); super("sal");
} }
} }

4
Server/src/main/java/net/simon987/server/assembly/instruction/ShlInstruction.java
View File

@ -13,6 +13,10 @@ public class ShlInstruction extends Instruction {
super("shl", OPCODE); super("shl", OPCODE);
} }
public ShlInstruction(String alias) {
super(alias, OPCODE);
}
@Override @Override
public Status execute(Target dst, int dstIndex, Target src, int srcIndex, Status status) { public Status execute(Target dst, int dstIndex, Target src, int srcIndex, Status status) {