From e2763faeee2b186e678a3f71410c3440c8e061fa Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 1 Jan 2018 15:58:42 -0500 Subject: [PATCH] Fixes #97 --- Server/src/main/java/net/simon987/server/assembly/CPU.java | 2 -- .../simon987/server/assembly/instruction/CmpInstruction.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Server/src/main/java/net/simon987/server/assembly/CPU.java b/Server/src/main/java/net/simon987/server/assembly/CPU.java index ecae97f..bd2f594 100755 --- a/Server/src/main/java/net/simon987/server/assembly/CPU.java +++ b/Server/src/main/java/net/simon987/server/assembly/CPU.java @@ -166,8 +166,6 @@ public class CPU implements JSONSerialisable { memory.set(EXECUTED_INS_ADDR, Util.getHigherWord(counter)); memory.set(EXECUTED_INS_ADDR + 1, Util.getLowerWord(counter)); - System.out.println(this);//todo remove - return elapsed; } diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/CmpInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/CmpInstruction.java index 313f367..ea6676e 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/CmpInstruction.java +++ b/Server/src/main/java/net/simon987/server/assembly/instruction/CmpInstruction.java @@ -31,7 +31,7 @@ public class CmpInstruction extends Instruction { status.setSignFlag(Util.checkSign16(result)); status.setZeroFlag((char) result == 0); - status.setOverflowFlag(Util.checkOverFlowAdd16(a, b)); + status.setOverflowFlag(Util.checkOverFlowSub16(a, b)); status.setCarryFlag(Util.checkCarry16(result)); return status;