Numbers in MemoryView and mpm editor now have leading zeros

[Mograsim.git] / plugins / net.mograsim.plugin.core / src / net / mograsim / plugin / asm / AsmNumberUtil.java

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/asm/AsmNumberUtil.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/asm/AsmNumberUtil.java
index 580c324..38323fa 100644 (file)
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/asm/AsmNumberUtil.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/asm/AsmNumberUtil.java
@@ -172,6 +172,14 @@ public final class AsmNumberUtil
         * Formats a {@link BigInteger} in accordance with the pattern associated with the supplied {@link NumberType}
         */
        public static String toString(BigInteger number, NumberType type)
+       {
+               return toString(number, type, 0);
+       }
+
+       /**
+        * Formats a {@link BigInteger} in accordance with the pattern associated with the supplied {@link NumberType}
+        */
+       public static String toString(BigInteger number, NumberType type, int minBits)
        {
                String pattern;
                switch (type)
@@ -189,9 +197,36 @@ public final class AsmNumberUtil
                case HEXADECIMAL:
                        pattern = preferredHexPat;
                }
+
+               int digits;
+
+               switch (type.radix)
+               {
+               case 2:
+                       digits = minBits;
+                       break;
+               case 8:
+                       digits = minBits / 3;
+                       break;
+               case 16:
+                       digits = minBits / 4;
+                       break;
+               default:
+                       digits = 0;
+               }
+
+               String numberString, sign;
                if (number.signum() < 0)
-                       return String.format(pattern, "-", number.abs().toString(type.radix));
-               return String.format(pattern, "", number.toString(type.radix));
+               {
+                       sign = "-";
+                       numberString = number.abs().toString(type.radix);
+               } else
+               {
+                       sign = "";
+                       numberString = number.toString(type.radix);
+               }
+               numberString = "0".repeat(Integer.max(0, digits - numberString.length())) + numberString;
+               return String.format(pattern, sign, numberString);
        }
 
        public enum NumberType