Platform: Clean up the recently added things.

A lot of it didn't make sense.

Author: e3ndr

Platform/src/main/java/co/casterlabs/commons/platform/ArchFamily.java

@@ -18,17 +18,18 @@
 @AllArgsConstructor
 public enum ArchFamily {
     // @formatter:off
-    X86   ("x86",   "x86|i[0-9]86|ia32|amd64|ia64|itanium64"),
-    ARM   ("arm",   "arm|aarch"),
-    PPC   ("ppc",   "ppc|power"),
-    SPARC ("sparc", "sparc"),
-    MIPS  ("mips",  "mips"),
-    S390  ("s390",  "s390"),
-    RISCV ("riscv", "riscv"),
+    X86   ("x86",   false, "x86|i[0-9]86|ia32|amd64|ia64|itanium64"),
+    ARM   ("arm",   false, "arm|aarch"),
+    PPC   ("ppc",   true,  "ppc|power"),
+    SPARC ("sparc", true,  "sparc"),
+    MIPS  ("mips",  true,  "mips"),
+    S390  ("s390",  true,  "s390"),
+    RISCV ("riscv", false, "riscv"),
     ;
     // @formatter:on
 
     private String name;
+    public final boolean isUsuallyBigEndian;
     private String regex;
 
     static ArchFamily get() {
@@ -53,4 +54,61 @@ public String toString() {
         return this.name;
     }
 
+    /**
+     * @param  wordSize The word size, usually 32 or 64.
+     * 
+     * @return          A "standard" target name.
+     */
+    public String getArchTarget(int wordSize) {
+        return getArchTarget(wordSize, this.isUsuallyBigEndian);
+    }
+
+    /**
+     * @param  wordSize  The word size, usually 32 or 64.
+     * @param  bigEndian Whether or not the processor is bigEndian or littleEndian.
+     *                   Some CPUs don't support this so this will be silently
+     *                   ignored.
+     * 
+     * @return           A "standard" target name.
+     */
+    public String getArchTarget(int wordSize, boolean isBigEndian) {
+        // https://github.com/llvm/llvm-project/blob/main/llvm/include/llvm/TargetParser/Triple.h
+        switch (this) {
+            case ARM:
+                return wordSize == 64 ? //
+                    (isBigEndian ? "aarch64_be" : "aarch64") : //
+                    (isBigEndian ? "armeb" : "arm");
+
+            case MIPS:
+                return wordSize == 64 ? //
+                    (isBigEndian ? "mips64" : "mips64el") : //
+                    (isBigEndian ? "mips" : "mipsel");
+
+            case PPC:
+                return wordSize == 64 ? //
+                    (isBigEndian ? "ppc64" : "ppc64le") : //
+                    (isBigEndian ? "ppc" : "ppcle");
+
+            case RISCV:
+                return wordSize == 64 ? "riscv64" : "riscv32";
+
+            case S390:
+                return "systemz"; // TODO LLVM appears to not have a s390x variant?
+
+            case SPARC:
+                return wordSize == 64 ? //
+                    ("sparcv9") : //
+                    (isBigEndian ? "sparc" : "sparcel");
+
+            case X86:
+                return Platform.wordSize == 64 ? "x86_64" : "x86";
+
+            // Don't create a `default:` entry.
+            // We want the compiler to warn us about missed values.
+
+        }
+
+        throw new RuntimeException("Unable to figure out LLVM for arch: " + Platform.archFamily);
+    }
+
 }

Platform/src/main/java/co/casterlabs/commons/platform/OSDistribution.java

@@ -26,25 +26,25 @@ public enum OSDistribution {
     // @formatter:off
 
 	// DOS
-	MS_DOS     (DOS,     "MS-DOS",      "<manually detected>"),
+	MS_DOS     (DOS,     "MS-DOS",      "MSDOS",   "<manually detected>"),
 
 	// Windows
-    WINDOWS_9X (WINDOWS, "Windows 9x",  "windows (95|98|me|ce)"),
-    WINDOWS_NT (WINDOWS, "Windows NT",  "win"),
+    WINDOWS_9X (WINDOWS, "Windows 9x",  "MSDOS",   "windows (95|98|me|ce)"),
+    WINDOWS_NT (WINDOWS, "Windows NT",  "Windows", "win"),
 
 	// Unix
-    MACOS      (UNIX,    "macOS",       "mac|darwin"),
-    SOLARIS    (UNIX,    "Solaris",     "sun|solaris"),
-    BSD        (UNIX,    "BSD",         "bsd"),
-    LINUX      (UNIX,    "Linux",       "nux"),
+    MACOS      (UNIX,    "macOS",       "macOS",   "mac|darwin"),
+    SOLARIS    (UNIX,    "Solaris",     "Solaris", "sun|solaris"),
+    BSD        (UNIX,    "BSD",         "BSD",     "bsd"),
+    LINUX      (UNIX,    "Linux",       "Linux",   "nux"),
 
     // VMS
-	OPEN_VMS   (VMS,     "OpenVMS",     "vms"),
+	OPEN_VMS   (VMS,     "OpenVMS",     "VMS",     "vms"),
 
 	/**
 	 * This is the fallback, this is not to be considered to be a valid value.
 	 */
-    GENERIC    (null,    "Generic",     ""),
+    GENERIC    (null,    "Generic",     "Generic", ""),
 
     ;
     // @formatter:on
@@ -56,6 +56,12 @@ public enum OSDistribution {
      * A friendly name for the distribution (e.g "macOS" or "Windows NT").
      */
     public final String name;
+
+    /**
+     * A "standard" target name.
+     */
+    public final String target;
+
     private String regex;
 
     static OSDistribution get(OSFamily family) {

Platform/src/main/java/co/casterlabs/commons/platform/Platform.java

@@ -24,12 +24,6 @@ public class Platform {
     /* CPU Architecture */
     /* ---------------- */
 
-    /** The CPU Architecture of the host, e.g x86 or arm. */
-    public static final ArchFamily archFamily = ArchFamily.get();
-
-    /** A more familiar LLVM-like name, such as amd64 or x86_64. */
-    public static final String archTarget = _PlatformUtil.getArchTarget();
-
     /**
      * Whether or not the current machine's endianess is big endian.
      * 
@@ -45,6 +39,9 @@ public class Platform {
      */
     public static final int wordSize = _PlatformUtil.getWordSize();
 
+    /** The CPU Architecture of the host, e.g x86 or arm. */
+    public static final ArchFamily archFamily = ArchFamily.get();
+
     /* ---------------- */
     /* Operating System */
     /* ---------------- */

Platform/src/main/java/co/casterlabs/commons/platform/_PlatformUtil.java

@@ -66,44 +66,4 @@ static int getWordSize() {
         return -1;
     }
 
-    static String getArchTarget() {
-        // https://github.com/llvm/llvm-project/blob/main/llvm/include/llvm/TargetParser/Triple.h
-        switch (Platform.archFamily) {
-            case ARM:
-                return Platform.wordSize == 64 ? //
-                    (Platform.isBigEndian ? "arm" : "aarch64") : //
-                    (Platform.isBigEndian ? "armeb" : "arm");
-
-            case MIPS:
-                return Platform.wordSize == 64 ? //
-                    (Platform.isBigEndian ? "mips64" : "mips64el") : //
-                    (Platform.isBigEndian ? "mips" : "mipsel");
-
-            case PPC:
-                return Platform.wordSize == 64 ? //
-                    (Platform.isBigEndian ? "ppc64" : "ppc64le") : //
-                    (Platform.isBigEndian ? "ppc" : "ppcle");
-
-            case RISCV:
-                return Platform.wordSize == 64 ? "riscv64" : "riscv32";
-
-            case S390:
-                return "systemz"; // TODO LLVM appears to not have a s390x variant?
-
-            case SPARC:
-                return Platform.wordSize == 64 ? //
-                    ("sparcv9") : //
-                    (Platform.isBigEndian ? "sparc" : "sparcel");
-
-            case X86:
-                return Platform.wordSize == 64 ? "x86_64" : "x86";
-
-            // Don't create a `default:` entry.
-            // We want the compiler to warn us about missed values.
-
-        }
-
-        throw new RuntimeException("Unable to figure out LLVM for arch: " + Platform.archFamily);
-    }
-
 }