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

Fixes #185

Browse Source
This commit is contained in:
simon987 2019-01-14 18:24:34 -05:00
parent ce8c5375ee
commit 993838651f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,9 +95,7 @@ public class DefaultInstructionSet implements InstructionSet {
if (instructionMap.containsKey(instruction.getOpCode())) { if (instructionMap.containsKey(instruction.getOpCode())) {
LogManager.LOGGER.fine(instruction.getMnemonic() + " instruction is an alias for " + LogManager.LOGGER.fine(instruction.getMnemonic() + " instruction is an alias for " +
instructionMap.get(instruction.getOpCode()).getMnemonic()); instructionMap.get(instruction.getOpCode()).getMnemonic());
} else {
instructionMap.put(instruction.getOpCode(), instruction);
} }
instructionMap.put(instruction.getOpCode(), instruction);
} }
} }

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

@ -133,7 +133,7 @@ public abstract class Instruction {
* *
* @param out encoded bytes will be written here * @param out encoded bytes will be written here
*/ */
void encode(ByteArrayOutputStream out, int currentLine) throws IllegalOperandException { public void encode(ByteArrayOutputStream out, int currentLine) throws IllegalOperandException {
if (!noOperandsValid()) { if (!noOperandsValid()) {
throw new IllegalOperandException("This instruction must have operand(s)!", currentLine); throw new IllegalOperandException("This instruction must have operand(s)!", currentLine);
@ -147,7 +147,7 @@ public abstract class Instruction {
} }
} }
void encode(ByteArrayOutputStream out, Operand o1, Operand o2, int currentLine) public void encode(ByteArrayOutputStream out, Operand o1, Operand o2, int currentLine)
throws IllegalOperandException { throws IllegalOperandException {
MachineCode code = new MachineCode(); MachineCode code = new MachineCode();
code.writeOpcode(opCode); code.writeOpcode(opCode);
@ -182,7 +182,7 @@ public abstract class Instruction {
} }
} }
void encode(ByteArrayOutputStream out, Operand o1, int currentLine) public void encode(ByteArrayOutputStream out, Operand o1, int currentLine)
throws IllegalOperandException { throws IllegalOperandException {
MachineCode code = new MachineCode(); MachineCode code = new MachineCode();
code.writeOpcode(opCode); code.writeOpcode(opCode);