From ff4f6c23eb04ee3ebeee4ef9eb482e9d42164011 Mon Sep 17 00:00:00 2001
From: Kevin Ramharak <kevin.ramharak@infocaster.net>
Date: Mon, 14 Jan 2019 18:32:27 +0100
Subject: [PATCH 1/2] adjust source code so all instructions use the same
 patterns

---
 .../simon987/server/assembly/instruction/BrkInstruction.java  | 4 +++-
 .../simon987/server/assembly/instruction/DecInstruction.java  | 2 +-
 .../simon987/server/assembly/instruction/IncInstruction.java  | 2 +-
 .../simon987/server/assembly/instruction/NopInstruction.java  | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/BrkInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/BrkInstruction.java
index cf2e92f..e0c4ed0 100755
--- a/Server/src/main/java/net/simon987/server/assembly/instruction/BrkInstruction.java
+++ b/Server/src/main/java/net/simon987/server/assembly/instruction/BrkInstruction.java
@@ -9,8 +9,10 @@ import net.simon987.server.assembly.Status;
  */
 public class BrkInstruction extends Instruction {
 
+    public static final int OPCODE = 0;
+
     public BrkInstruction() {
-        super("brk", 0);
+        super("brk", OPCODE);
     }
 
     @Override
diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/DecInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/DecInstruction.java
index 29a3ddb..d04cd59 100644
--- a/Server/src/main/java/net/simon987/server/assembly/instruction/DecInstruction.java
+++ b/Server/src/main/java/net/simon987/server/assembly/instruction/DecInstruction.java
@@ -7,7 +7,7 @@ import net.simon987.server.assembly.Util;
 
 public class DecInstruction extends Instruction {
 
-    public static final int OPCODE = 0x2B;
+    public static final int OPCODE = 43;
 
     public DecInstruction() {
         super("dec", OPCODE);
diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/IncInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/IncInstruction.java
index 05c5fa4..952a1d2 100644
--- a/Server/src/main/java/net/simon987/server/assembly/instruction/IncInstruction.java
+++ b/Server/src/main/java/net/simon987/server/assembly/instruction/IncInstruction.java
@@ -7,7 +7,7 @@ import net.simon987.server.assembly.Util;
 
 public class IncInstruction extends Instruction {
 
-    public static final int OPCODE = 0x2A;
+    public static final int OPCODE = 43;
 
     public IncInstruction() {
         super("inc", OPCODE);
diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/NopInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/NopInstruction.java
index a0c8b95..be687bd 100755
--- a/Server/src/main/java/net/simon987/server/assembly/instruction/NopInstruction.java
+++ b/Server/src/main/java/net/simon987/server/assembly/instruction/NopInstruction.java
@@ -8,7 +8,9 @@ import net.simon987.server.assembly.Instruction;
  */
 public class NopInstruction extends Instruction {
 
+    public static final int OPCODE = 63;
+
     public NopInstruction() {
-        super("nop", 63);
+        super("nop", OPCODE);
     }
 }

From 4f8eb2725e9e11ffb05a3e3ea100708ebd0e939f Mon Sep 17 00:00:00 2001
From: Kevin Ramharak <kevin.ramharak@infocaster.net>
Date: Mon, 14 Jan 2019 18:37:42 +0100
Subject: [PATCH 2/2] fix typo

---
 .../simon987/server/assembly/instruction/IncInstruction.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/IncInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/IncInstruction.java
index 952a1d2..23a5403 100644
--- a/Server/src/main/java/net/simon987/server/assembly/instruction/IncInstruction.java
+++ b/Server/src/main/java/net/simon987/server/assembly/instruction/IncInstruction.java
@@ -7,7 +7,7 @@ import net.simon987.server.assembly.Util;
 
 public class IncInstruction extends Instruction {
 
-    public static final int OPCODE = 43;
+    public static final int OPCODE = 42;
 
     public IncInstruction() {
         super("inc", OPCODE);