Improve native CPU architecture detection logic

Author: halx99

1k/1kiss.ps1

@@ -328,24 +328,14 @@ if ($options.xb.GetType() -eq [string]) {
     $options.xb = $options.xb.Split(' ')
 }
 
-[VersionEx]$pwsh_ver = [Regex]::Match($PSVersionTable.PSVersion.ToString(), '(\d+\.)+(\*|\d+)').Value
-if ([VersionEx]$pwsh_ver -lt [VersionEx]"7.0") {
+if (!$Global:IsPwsh7OrLater) {
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 }
 
 $osVerString = if ($IsWin) { "Microsoft Windows $($NtOSVersion.ToString())" } else { $PSVersionTable.OS }
 
 # arm64,x64
-# uname -m: arm64/aarch64,x86_64
-if ($IsWin) {
-    # refer: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-processor
-    $__1k_archs = @{9="x64"; 12="arm64"}
-    $__1k_arch_code = [int](Get-CimInstance Win32_Processor)[0].Architecture
-    $1k.println("Host architecture code: $__1k_arch_code")
-    $HOST_CPU = $__1k_archs[$__1k_arch_code]
-} else {
-    $HOST_CPU = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLower()
-}
+$HOST_CPU = Get-NativeArchitecture
 
 $1k.println("PowerShell $pwsh_ver on $osVerString ($HOST_CPU)")
 

1k/extensions.ps1

@@ -233,6 +233,9 @@ namespace System
 }
 
 
+$Global:pwsh_ver = [Regex]::Match($PSVersionTable.PSVersion.ToString(), '(\d+\.)+(\*|\d+)').Value
+$Global:IsPwsh7OrLater = [VersionEx]$Global:pwsh_ver -ge [VersionEx]"7.0"
+
 function Global:ConvertFrom-Props {
     param(
         [Parameter(Mandatory = $true)]
@@ -267,3 +270,36 @@ function Global:ConvertTo-Props {
     }
     return $str_ret
 }
+
+function Global:Get-NativeArchitecture {
+    $arch = $null
+    if ($Global:IsPwsh7OrLater) {
+        $arch = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLower()
+    }
+    else {
+        # refer to: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-processor
+        try {
+            $processorInfo = Get-CimInstance -ClassName Win32_Processor -ErrorAction Stop | Select-Object -First 1
+
+            switch ($processorInfo.Architecture) {
+                0 { $arch = "x86" }   # 32-bit Intel/AMD
+                5 { $arch = "arm32" }   # 32-bit ARM
+                12 { $arch = "arm64" }   # treat ARM as arm64 target
+                9 { $arch = "x64" }   # 64-bit Intel/AMD
+                6 { $arch = "ia64" }   # Intel Itanium
+                default { $arch = "x86" }   # fallback
+            }
+        }
+        catch {
+            # Fallback: only 32/64 bit detection if WMI/CIM is not available
+            if ([System.Environment]::Is64BitOperatingSystem) {
+                $arch = "x64"
+            }
+            else {
+                $arch = "x86"
+            }
+        }
+    }
+
+    return $arch
+}