clean up arm detection logic

Author: Xor-el

HashLib/src/Utils/HlpArmHwCapProvider.pas

@@ -92,10 +92,9 @@   TArmHwCapProvider = class sealed
   strict private
   class var
     FGetAuxVal: TGetAuxValFunc;
-    FResolved: Boolean;
 
-  strict private
-    class procedure ResolveOnce(); static;
+  private
+    class procedure ResolveDynamicImports(); static;
 
   public
     class function GetHwCap(): UInt64; static;
@@ -110,10 +109,9 @@   TArmHwCapProvider = class sealed
   strict private
   class var
     FElfAuxInfo: TElfAuxInfoFunc;
-    FResolved: Boolean;
 
-  strict private
-    class procedure ResolveOnce(); static;
+  private
+    class procedure ResolveDynamicImports(); static;
 
   public
     class function GetHwCap(): UInt64; static;
@@ -139,15 +137,11 @@ implementation
 
 {$IF DEFINED(HASHLIB_LINUX) OR DEFINED(HASHLIB_ANDROID)}
 
-class procedure TArmHwCapProvider.ResolveOnce();
+class procedure TArmHwCapProvider.ResolveDynamicImports();
 var
   LHandle: Pointer;
 begin
-  if FResolved then
-    Exit;
-
   FGetAuxVal := nil;
-  FResolved := True;
 
   LHandle := dlopen(nil, RTLD_NOW);
   if LHandle = nil then
@@ -163,7 +157,6 @@ class procedure TArmHwCapProvider.ResolveOnce();
 
 class function TArmHwCapProvider.GetHwCap(): UInt64;
 begin
-  ResolveOnce();
   if System.Assigned(FGetAuxVal) then
     Result := FGetAuxVal(AT_HWCAP)
   else
@@ -172,7 +165,6 @@ class function TArmHwCapProvider.GetHwCap(): UInt64;
 
 class function TArmHwCapProvider.GetHwCap2(): UInt64;
 begin
-  ResolveOnce();
   if System.Assigned(FGetAuxVal) then
     Result := FGetAuxVal(AT_HWCAP2)
   else
@@ -185,15 +177,11 @@ class function TArmHwCapProvider.GetHwCap2(): UInt64;
 
 {$IF DEFINED(HASHLIB_BSD)}
 
-class procedure TArmHwCapProvider.ResolveOnce();
+class procedure TArmHwCapProvider.ResolveDynamicImports();
 var
   LHandle: Pointer;
 begin
-  if FResolved then
-    Exit;
-
   FElfAuxInfo := nil;
-  FResolved := True;
 
   LHandle := dlopen(nil, RTLD_NOW);
   if LHandle = nil then
@@ -216,7 +204,6 @@ class function TArmHwCapProvider.GetHwCap(): UInt64;
 var
   LValue: UInt64;
 begin
-  ResolveOnce();
   if System.Assigned(FElfAuxInfo) then
   begin
     LValue := 0;
@@ -233,7 +220,6 @@ class function TArmHwCapProvider.GetHwCap2(): UInt64;
 var
   LValue: UInt64;
 begin
-  ResolveOnce();
   if System.Assigned(FElfAuxInfo) then
   begin
     LValue := 0;
@@ -259,6 +245,11 @@ class function TArmHwCapProvider.HasProcessorFeature(AFeature: UInt32): Boolean;
 
 {$IFEND} // HASHLIB_MSWINDOWS
 
+{$IF DEFINED(HASHLIB_LINUX) OR DEFINED(HASHLIB_ANDROID) OR DEFINED(HASHLIB_BSD)}
+initialization
+  TArmHwCapProvider.ResolveDynamicImports;
+{$IFEND}
+
 {$IFEND} // HASHLIB_ARM
 
 end.

HashLib/src/Utils/HlpDarwinSysCtl.pas

@@ -31,10 +31,9 @@   TDarwinSysCtl = class sealed
   strict private
   class var
     FSysCtlByName: TSysCtlByNameFunc;
-    FResolved: Boolean;
 
-  strict private
-    class procedure ResolveOnce(); static;
+  private
+    class procedure ResolveDynamicImports(); static;
 
     /// <summary>
     /// Queries a single sysctl key. Returns True if the key exists and
@@ -63,15 +62,11 @@ implementation
 
 { TDarwinSysCtl }
 
-class procedure TDarwinSysCtl.ResolveOnce();
+class procedure TDarwinSysCtl.ResolveDynamicImports();
 var
   LHandle: Pointer;
 begin
-  if FResolved then
-    Exit;
-
   FSysCtlByName := nil;
-  FResolved := True;
 
   LHandle := dlopen(nil, RTLD_NOW);
   if LHandle = nil then
@@ -107,8 +102,6 @@ class function TDarwinSysCtl.QueryKey(const AName: PAnsiChar): Boolean;
 class function TDarwinSysCtl.HasFeature(const AModernName: PAnsiChar;
   const ALegacyName: PAnsiChar): Boolean;
 begin
-  ResolveOnce();
-
   if not System.Assigned(FSysCtlByName) then
   begin
     Result := False;
@@ -123,6 +116,9 @@ class function TDarwinSysCtl.HasFeature(const AModernName: PAnsiChar;
     Result := QueryKey(ALegacyName);
 end;
 
+initialization
+  TDarwinSysCtl.ResolveDynamicImports;
+
 {$IFEND} // HASHLIB_MACOS OR HASHLIB_IOS
 {$IFEND} // HASHLIB_ARM