From 311889bc93a5bb3a309b0c82272514c1de175b32 Mon Sep 17 00:00:00 2001 From: Kevin Ramharak Date: Wed, 23 Jan 2019 10:08:15 +0100 Subject: [PATCH] fix operandValid check; remove unused import; --- .../server/assembly/instruction/SetccInstruction.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetccInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/SetccInstruction.java index 76d89f2..3041e83 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetccInstruction.java +++ b/Server/src/main/java/net/simon987/server/assembly/instruction/SetccInstruction.java @@ -10,7 +10,6 @@ import net.simon987.server.assembly.MachineCode; import net.simon987.server.assembly.exception.AssemblyException; import net.simon987.server.assembly.exception.IllegalOperandException; import net.simon987.server.assembly.exception.InvalidMnemonicException; -import net.simon987.server.logging.LogManager; import java.io.ByteArrayOutputStream; @@ -156,6 +155,11 @@ public class SetccInstruction extends Instruction { return false; } + @Override + public boolean operandValid(Operand o1) { + return o1.getType() != OperandType.IMMEDIATE16; + } + /** * Encodes the instruction. Writes the result in the outputStream. * Needs one operand of OperandType.REGISTER or OperandType.MEMORY_REG16