Fix instruction status label

abecirovic3 · May 25, 2022 · 4f52748 · 4f52748
1 parent 9dead1b
commit 4f52748
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/out/production/MIC-1-Simulator/sample/Controller.class b/out/production/MIC-1-Simulator/sample/Controller.class
diff --git a/out/production/MIC-1-Simulator/sample/Main.class b/out/production/MIC-1-Simulator/sample/Main.class
diff --git a/src/sample/Controller.java b/src/sample/Controller.java
@@ -335,12 +335,16 @@ private void initializeMPCField() {
                     microCodeLinesLengths[newVal.intValue()][0], microCodeLinesLengths[newVal.intValue()][1]);
             if (newVal.intValue() <= 2) {
                 instructionStatusLabel.textProperty().bind(resourceFactory.getStringBinding("instr-fetch"));
-            }
-            if (newVal.intValue() >= 3) {
+            } else if (newVal.intValue() == 3) {
                 instructionStatusLabel.textProperty().unbind();
                 instructionStatusLabel.
                         setText(resourceFactory.getResources().getString("instr-exec") + ": " +
                                 instructionParser.getInstructionString((short) cpu.MBRProperty().get()));
+            } else {
+                instructionStatusLabel.textProperty().unbind();
+                instructionStatusLabel.
+                        setText(resourceFactory.getResources().getString("instr-exec") + ": " +
+                                instructionParser.getInstructionString(cpu.getRegisters().get(3).getValue()));
             }
         });
     }