Small refactoring and cleaup in xrCore.

OpenXRay · Mar 24, 2018 · bf5ed0d · bf5ed0d
1 parent f4b6566
commit bf5ed0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/src/xrCore/_math.cpp b/src/xrCore/_math.cpp
@@ -108,23 +108,17 @@ u64 __fastcall GetCLK(void)
 }
 #endif
 
-void Detect()
-{
-    // General CPU identification
-    if (!query_processor_info(&ID))
-    {
-        // Core.Fatal ("Fatal error: can't detect CPU/FPU.");
-        abort();
-    }
-}
-
 } // namespace CPU
 
 bool g_initialize_cpu_called = false;
 
 //------------------------------------------------------------------------------------
 void _initialize_cpu()
 {
+    // General CPU identification
+    if (!query_processor_info(&CPU::ID))
+        FATAL("Can't detect CPU/FPU.");
+
     Msg("* Detected CPU: %s [%s], F%d/M%d/S%d, 'rdtsc'", CPU::ID.modelName,
         +CPU::ID.vendor, CPU::ID.family, CPU::ID.model, CPU::ID.stepping);
 

diff --git a/src/xrCore/xrCore.cpp b/src/xrCore/xrCore.cpp
@@ -12,21 +12,10 @@
 
 #pragma comment(lib, "winmm.lib")
 
-#ifdef DEBUG
-#include <malloc.h>
-#endif // DEBUG
-
 XRCORE_API xrCore Core;
 
-namespace CPU
-{
-extern void Detect();
-}
-
 static u32 init_counter = 0;
 
-//. extern xr_vector<shared_str>* LogFile;
-
 void xrCore::Initialize(pcstr _ApplicationName, LogCallback cb, bool init_fs, pcstr fs_fname, bool plugin)
 {
     CalculateBuildId();
@@ -66,9 +55,6 @@ void xrCore::Initialize(pcstr _ApplicationName, LogCallback cb, bool init_fs, pc
         DWORD sz_comp = sizeof(CompName);
         GetComputerName(CompName, &sz_comp);
 
-        // Mathematics & PSI detection
-        CPU::Detect();
-
         Memory._initialize();
 
         InitLog();