automated merge

1 files changed, 14 insertions, 155 deletions

diff --git a/indra/llcommon/llprocessor.h b/indra/llcommon/llprocessor.h
index 746d007a7f..fc2c8dacfb 100644
--- a/indra/llcommon/llprocessor.h
+++ b/indra/llcommon/llprocessor.h
@@ -30,167 +30,26 @@
  * $/LicenseInfo$
  */
 
-// Author: Benjamin Jurke
-// File history: 27.02.2002   File created.
-///////////////////////////////////////////
-
 
 #ifndef LLPROCESSOR_H
 #define LLPROCESSOR_H
+class LLProcessorInfoImpl;
 
-// Options:
-///////////
-#if LL_WINDOWS
-#define PROCESSOR_FREQUENCY_MEASURE_AVAILABLE
-#endif
-
-#if LL_MSVC && _M_X64
-#      define LL_X86_64 1
-#      define LL_X86 1
-#elif LL_MSVC && _M_IX86
-#      define LL_X86 1
-#elif LL_GNUC && ( defined(__amd64__) || defined(__x86_64__) )
-#      define LL_X86_64 1
-#      define LL_X86 1
-#elif LL_GNUC && ( defined(__i386__) )
-#      define LL_X86 1
-#elif LL_GNUC && ( defined(__powerpc__) || defined(__ppc__) )
-#      define LL_PPC 1
-#endif
-
-
-struct ProcessorExtensions
-{
-	bool FPU_FloatingPointUnit;
-	bool VME_Virtual8086ModeEnhancements;
-	bool DE_DebuggingExtensions;
-	bool PSE_PageSizeExtensions;
-	bool TSC_TimeStampCounter;
-	bool MSR_ModelSpecificRegisters;
-	bool PAE_PhysicalAddressExtension;
-	bool MCE_MachineCheckException;
-	bool CX8_COMPXCHG8B_Instruction;
-	bool APIC_AdvancedProgrammableInterruptController;
-	unsigned int APIC_ID;
-	bool SEP_FastSystemCall;
-	bool MTRR_MemoryTypeRangeRegisters;
-	bool PGE_PTE_GlobalFlag;
-	bool MCA_MachineCheckArchitecture;
-	bool CMOV_ConditionalMoveAndCompareInstructions;
-	bool FGPAT_PageAttributeTable;
-	bool PSE36_36bitPageSizeExtension;
-	bool PN_ProcessorSerialNumber;
-	bool CLFSH_CFLUSH_Instruction;
-	unsigned int CLFLUSH_InstructionCacheLineSize;
-	bool DS_DebugStore;
-	bool ACPI_ThermalMonitorAndClockControl;
-	bool EMMX_MultimediaExtensions;
-	bool MMX_MultimediaExtensions;
-	bool FXSR_FastStreamingSIMD_ExtensionsSaveRestore;
-	bool SSE_StreamingSIMD_Extensions;
-	bool SSE2_StreamingSIMD2_Extensions;
-	bool Altivec_Extensions;
-	bool SS_SelfSnoop;
-	bool HT_HyperThreading;
-	unsigned int HT_HyterThreadingSiblings;
-	bool TM_ThermalMonitor;
-	bool IA64_Intel64BitArchitecture;
-	bool _3DNOW_InstructionExtensions;
-	bool _E3DNOW_InstructionExtensions;
-	bool AA64_AMD64BitArchitecture;
-};
-
-struct ProcessorCache
-{
-	bool bPresent;
-	char strSize[32];	/* Flawfinder: ignore */	
-	unsigned int uiAssociativeWays;
-	unsigned int uiLineSize;
-	bool bSectored;
-	char strCache[128];	/* Flawfinder: ignore */	
-};
-
-struct ProcessorL1Cache
-{
-    ProcessorCache Instruction;
-	ProcessorCache Data;
-};
-
-struct ProcessorTLB
+class LL_COMMON_API LLProcessorInfo
 {
-	bool bPresent;
-	char strPageSize[32];	/* Flawfinder: ignore */	
-	unsigned int uiAssociativeWays;
-	unsigned int uiEntries;
-	char strTLB[128];	/* Flawfinder: ignore */	
-};
-
-struct ProcessorInfo
-{
-	char strVendor[16];	/* Flawfinder: ignore */	
-	unsigned int uiFamily;
-	unsigned int uiExtendedFamily;
-	char strFamily[64];	/* Flawfinder: ignore */	
-	unsigned int uiModel;
-	unsigned int uiExtendedModel;
-	char strModel[128];	/* Flawfinder: ignore */	
-	unsigned int uiStepping;
-	unsigned int uiType;
-	char strType[64];	/* Flawfinder: ignore */	
-	unsigned int uiBrandID;
-	char strBrandID[64];	/* Flawfinder: ignore */	
-	char strProcessorSerial[64];	/* Flawfinder: ignore */	
-	unsigned long MaxSupportedLevel;
-	unsigned long MaxSupportedExtendedLevel;
-	ProcessorExtensions _Ext;
-	ProcessorL1Cache _L1;
-	ProcessorCache _L2;
-	ProcessorCache _L3;
-	ProcessorCache _Trace;
-	ProcessorTLB _Instruction;
-	ProcessorTLB _Data;
-};
-
-
-// CProcessor
-// ==========
-// Class for detecting the processor name, type and available
-// extensions as long as it's speed.
-/////////////////////////////////////////////////////////////
-class CProcessor
-{
-// Constructor / Destructor:
-////////////////////////////
 public:
-	CProcessor();
-
-// Private vars:
-////////////////
-public:
-	F64 uqwFrequency;
-	char strCPUName[128];	/* Flawfinder: ignore */	
-	ProcessorInfo CPUInfo;
-
-// Private functions:
-/////////////////////
+	LLProcessorInfo(); 
+ 	~LLProcessorInfo();
+
+	F64 getCPUFrequency() const;
+	bool hasSSE() const;
+	bool hasSSE2() const;
+	bool hasAltivec() const;
+	std::string getCPUFamilyName() const;
+	std::string getCPUBrandName() const;
+	std::string getCPUFeatureDescription() const;
 private:
-	bool AnalyzeIntelProcessor();
-	bool AnalyzeAMDProcessor();
-	bool AnalyzeUnknownProcessor();
-	bool CheckCPUIDPresence();
-	void DecodeProcessorConfiguration(unsigned int cfg);
-	void TranslateProcessorConfiguration();
-	void GetStandardProcessorConfiguration();
-	void GetStandardProcessorExtensions();
-
-// Public functions:
-////////////////////
-public:
-	F64 GetCPUFrequency(unsigned int uiMeasureMSecs);
-	const ProcessorInfo *GetCPUInfo();
-	bool CPUInfoToText(char *strBuffer, unsigned int uiMaxLen);
-	bool WriteInfoTextFile(const std::string& strFilename);
+	LLProcessorInfoImpl* mImpl;
 };
 
-
-#endif
+#endif // LLPROCESSOR_H