From ff4a3d6f207275afbfc9a64f987b1cd5bb37cd9f Mon Sep 17 00:00:00 2001 From: Brent O'Neil Date: Sat, 30 Dec 2017 03:07:28 +1100 Subject: [PATCH] Fixed some whitespace nonsense from a merge. --- .../net/simon987/server/assembly/CPU.java | 6 ++--- .../net/simon987/server/assembly/Status.java | 20 +++++++------- .../assembly/instruction/IntInstruction.java | 23 +++++++--------- .../assembly/instruction/IntrInstruction.java | 26 +++++++++---------- 4 files changed, 35 insertions(+), 40 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 0cc47ed..3cde004 100755 --- a/Server/src/main/java/net/simon987/server/assembly/CPU.java +++ b/Server/src/main/java/net/simon987/server/assembly/CPU.java @@ -473,9 +473,9 @@ public class CPU implements JSONSerialisable { * */ public void Interrupt(int hw, int offset, boolean retry) { - Instruction push = instructionSet.get("push"); - push.execute(status.toByte(), status); + Instruction push = instructionSet.get("push"); + push.execute(status.toByte(), status); push.execute(ip, status); - this.setIp((char)(0x0200 + offset*2 + 0x0080*hw)); + this.setIp((char)(0x0200 + offset*2 + 0x0080*hw)); } } diff --git a/Server/src/main/java/net/simon987/server/assembly/Status.java b/Server/src/main/java/net/simon987/server/assembly/Status.java index 2bea560..e541a14 100755 --- a/Server/src/main/java/net/simon987/server/assembly/Status.java +++ b/Server/src/main/java/net/simon987/server/assembly/Status.java @@ -134,18 +134,18 @@ public class Status { } public char toByte() { - char stat = 0; - stat = (char) (stat | ((signFlag ? 1 : 0) << 3)); - stat = (char) (stat | ((zeroFlag ? 1 : 0) << 2)); - stat = (char) (stat | ((carryFlag ? 1 : 0) << 1)); - stat = (char) (stat | (overflowFlag ? 1 : 0)); - return stat; + char stat = 0; + stat = (char) (stat | ((signFlag ? 1 : 0) << 3)); + stat = (char) (stat | ((zeroFlag ? 1 : 0) << 2)); + stat = (char) (stat | ((carryFlag ? 1 : 0) << 1)); + stat = (char) (stat | (overflowFlag ? 1 : 0)); + return stat; } public void fromByte(char stat) { - setSignFlag((stat & (1 << 3)) != 0); - setZeroFlag((stat & (1 << 2)) != 0); - setCarryFlag((stat & (1 << 1)) != 0); - setOverflowFlag((stat & 1) != 0); + setSignFlag((stat & (1 << 3)) != 0); + setZeroFlag((stat & (1 << 2)) != 0); + setCarryFlag((stat & (1 << 1)) != 0); + setOverflowFlag((stat & 1) != 0); } } diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/IntInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/IntInstruction.java index 3a90690..84e0cb4 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/IntInstruction.java +++ b/Server/src/main/java/net/simon987/server/assembly/instruction/IntInstruction.java @@ -11,25 +11,22 @@ import net.simon987.server.assembly.Status; */ public class IntInstruction extends Instruction{ - public static final int OPCODE = 48; - private CPU cpu; + public static final int OPCODE = 48; + private CPU cpu; - public IntInstruction(CPU cpu) { - super("int", OPCODE); - this.cpu = cpu; - } + public IntInstruction(CPU cpu) { + super("int", OPCODE); + this.cpu = cpu; + } - @Override + @Override public Status execute(int src, Status status) { - cpu.Interrupt(0, src, false); + cpu.Interrupt(0, src, false); return status; } - public Status execute(Status status) { - cpu.Interrupt(0,0, false); + cpu.Interrupt(0,0, false); return status; - } - - + } } diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/IntrInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/IntrInstruction.java index feaf846..59b84ba 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/IntrInstruction.java +++ b/Server/src/main/java/net/simon987/server/assembly/instruction/IntrInstruction.java @@ -6,21 +6,19 @@ import net.simon987.server.assembly.Status; public class IntrInstruction extends Instruction{ - public static final int OPCODE = 49; - private CPU cpu; + public static final int OPCODE = 49; + private CPU cpu; - public IntrInstruction(CPU cpu) { - super("intr", OPCODE); - this.cpu = cpu; - } + public IntrInstruction(CPU cpu) { + super("intr", OPCODE); + this.cpu = cpu; + } - public Status execute(Status status) { - cpu.setIp((char)cpu.getMemory().get(cpu.getRegisterSet().getRegister("SP").getValue())); - status.fromByte((char) cpu.getMemory().get(cpu.getRegisterSet().getRegister("SP").getValue() + 1)); - cpu.getRegisterSet().getRegister("SP").setValue(cpu.getRegisterSet().getRegister("SP").getValue() + 2); //Increment SP (stack grows towards smaller) - return status; - } - - + public Status execute(Status status) { + cpu.setIp((char)cpu.getMemory().get(cpu.getRegisterSet().getRegister("SP").getValue())); + status.fromByte((char) cpu.getMemory().get(cpu.getRegisterSet().getRegister("SP").getValue() + 1)); + cpu.getRegisterSet().getRegister("SP").setValue(cpu.getRegisterSet().getRegister("SP").getValue() + 2); //Increment SP (stack grows towards smaller) + return status; + } }