improved state listing

mattulbrich · Dec 3, 2022 · 6017337 · 6017337
1 parent df808e4
commit 6017337
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/edu/kit/kastel/formal/mimaflux/State.java b/src/main/java/edu/kit/kastel/formal/mimaflux/State.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
 
 public class State {
 
@@ -106,9 +107,11 @@ public int get(int addr) {
     public void printToConsole(Map<String, Integer> labelMap) {
         System.out.printf("        IAR  = 0x%06x = %8d\t\t(instruction there: %s)%n", iar, iar, toInstruction(mem[iar]));
         System.out.printf("        ACCU = 0x%06x = %8d%n", accu, accu);
+        Optional<Integer> maxLen = labelMap.keySet().stream().map(x -> x.length()).max(Integer::compare);
         for (Entry<String, Integer> entry : labelMap.entrySet()) {
             int val = entry.getValue();
-            System.out.printf("Label '%s' at mem[0x%05x]  =  0x%06x = %8d = %s%n", entry.getKey(), val, mem[val], mem[val], toInstruction(mem[val]));
+            System.out.printf("Label '%" + maxLen.get() +
+                    "s' at mem[0x%05x]  =  0x%06x = %8d = %s%n", entry.getKey(), val, mem[val], mem[val], toInstruction(mem[val]));
         }
         if (MimaFlux.mmargs.printRanges != null) {
             for (Range range : MimaFlux.mmargs.printRanges) {