More spu information, especially for sgx features

Cpu class example
Exec class for running process and return stdout

Author: florianbecker

.gitignore

@@ -0,0 +1 @@
+*.user

CMakeLists.txt

@@ -34,3 +34,4 @@ project(modern.cpp.core)
 include(cmake/env.cmake)
 
 add_subdirectory(source)
+add_subdirectory(examples)

README.md

@@ -10,14 +10,15 @@ make -j`nproc`
 ```
 
 ## Classes
-- **CPUID** - Get CPUID.
-- **Double** - Less, Greater, Equal, Round.
+- **CPU** - Get CPU informations.
+- **Double** - Less, Greater, Equal, Between, Round.
+- **Exec** - Run command and return stdout.
 - **Serial** - Serial communication class.
 - **Timing** - Measering time, cpu and real time.
 
 ## Template classes
-- **CSVWriter** - write out comma seperated values.
-- **Timer** - timeout thread one time or interval.
+- **CSVWriter** - Write out comma seperated values.
+- **Timer** - Timeout thread on time or interval.
 
 ## Unixservice class
 - Main function to run as a unix daemon.

examples/CMakeLists.txt

@@ -0,0 +1,33 @@
+#/*
+# * Copyright (c) 2020 Florian Becker <[email protected]> (VX APPS).
+# * All rights reserved.
+# *
+# * Redistribution and use in source and binary forms, with or without
+# * modification, are permitted provided that the following conditions are met:
+# *
+# * 1. Redistributions of source code must retain the above copyright notice, this
+# *    list of conditions and the following disclaimer.
+# *
+# * 2. Redistributions in binary form must reproduce the above copyright notice,
+# *    this list of conditions and the following disclaimer in the documentation
+# *    and/or other materials provided with the distribution.
+# *
+# * 3. Neither the name of the copyright holder nor the names of its
+# *    contributors may be used to endorse or promote products derived from
+# *    this software without specific prior written permission.
+# *
+# * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# */
+
+project(examples)
+
+add_subdirectory(cpuinfo)

examples/cpuinfo/CMakeLists.txt

@@ -0,0 +1,39 @@
+#/*
+# * Copyright (c) 2020 Florian Becker <[email protected]> (VX APPS).
+# * All rights reserved.
+# *
+# * Redistribution and use in source and binary forms, with or without
+# * modification, are permitted provided that the following conditions are met:
+# *
+# * 1. Redistributions of source code must retain the above copyright notice, this
+# *    list of conditions and the following disclaimer.
+# *
+# * 2. Redistributions in binary form must reproduce the above copyright notice,
+# *    this list of conditions and the following disclaimer in the documentation
+# *    and/or other materials provided with the distribution.
+# *
+# * 3. Neither the name of the copyright holder nor the names of its
+# *    contributors may be used to endorse or promote products derived from
+# *    this software without specific prior written permission.
+# *
+# * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# */
+
+project(cpuinfo)
+
+include_directories(../../source)
+
+add_executable(cpuinfo
+  main.cpp
+)
+
+target_link_libraries(cpuinfo PRIVATE modern.cpp.core)

examples/cpuinfo/main.cpp

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2020 Florian Becker <[email protected]> (VX APPS).
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* stl header */
+#include <iostream>
+
+/* modern.cpp.core header */
+#include <CPU.h>
+
+/** SGX information leaf. */
+constexpr unsigned int sgxLeaf = 12;
+
+/** Maximum subleafs to read out. */
+constexpr unsigned int maximumSubLeafs = 10;
+
+int main() {
+
+  VX::CPU cpu;
+  std::cout << std::hex << cpu.eax() << " " << cpu.ebx() << " " << cpu.ecx() << " " << cpu.edx() << " " << std::dec <<  std::endl;
+
+  std::cout << "Stepping: " << cpu.stepping() << std::endl;
+  std::cout << "Model: " << cpu.model() << std::endl;
+  std::cout << "Family: " << cpu.family() << std::endl;
+  std::cout << "Type: " << cpu.type() << std::endl;
+  std::cout << "Extended model: " << cpu.extendedModel() << std::endl;
+  std::cout << "Extended family: " << cpu.extendedFamily() << std::endl;
+
+  std::cout << "SMX support: " << cpu.smxSupport() << std::endl;
+
+  std::cout << std::endl << "Extended features" << std::endl;
+
+  std::cout << "SGX support: " << cpu.sgxSupport() << std::endl;
+  std::cout << "SGX launch control support: " << cpu.sgxLaunchControlSupport() << std::endl;
+
+  std::cout << std::endl << "SGX features" << std::endl;
+
+  std::cout << "SGX version 1 support: " << cpu.sgxVersion1Support() << std::endl;
+  std::cout << "SGX version 2 support: " << cpu.sgxVersion2Support() << std::endl;
+  std::cout << "Maximum enclave size: " << cpu.maximumEnclaveSize() << std::endl;
+  std::cout << "Maximum enclave size 64: " << cpu.maximumEnclaveSize64() << std::endl;
+
+  for ( unsigned int i = 1; i < maximumSubLeafs; i++ ) {
+
+    std::cout << std::endl << "SGX subleaf " << i << std::endl;
+    cpu.updateNativeId( sgxLeaf, i );
+    std::cout << std::hex << cpu.eax() << " " << cpu.ebx() << " " << cpu.ecx() << " " << cpu.edx() << " " << std::endl;
+  }
+  return 0;
+}

source/CMakeLists.txt

@@ -32,9 +32,12 @@ project(modern.cpp.core)
 
 add_library(modern.cpp.core
   ../README.md
-  CPUID.h
+  CPU.cpp
+  CPU.h
   Double.cpp
   Double.h
+  Exec.cpp
+  Exec.h
   ModernCppCore.h
   Serial.cpp
   Serial.h

source/CPUID.h source/CPU.cppsource/CPUID.h renamed to source/CPU.cpp

@@ -28,75 +28,41 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#pragma once
-
 #ifdef _WIN32
-  #include <climits>
   #include <intrin.h>
-  using uint32_t = unsigned __int32;
-#else
-  #include <stdint.h>
+  using unsigned int = unsigned __int32;
 #endif
 
-/**
- * @brief VX (VX Apps) Namespace.
- */
+/* local header */
+#include "CPU.h"
+
 namespace VX {
 
-  /**
-   * @brief The CPUID class for receiving CPU id.
-   * @author Florian Becker <fb\@vxapps.com> (VX Apps)
-   */
-  class CPUID {
+  /** Leaf of extended information. */
+  constexpr unsigned int extendedLeaf = 7;
 
-  public:
-    /**
-     * @brief Default constructor for CPUID.
-     * @param _i   Core id.
-     */
-    explicit CPUID( int _i ) {
+  /** Leaf of sgx information. */
+  constexpr unsigned int sgxLeaf = 12;
 
-#ifdef _WIN32
-      __cpuid( ( int * )regs, _i );
+  CPU::CPU( unsigned int _leaf, unsigned int _subleaf ) {
+
+    updateNativeId( sgxLeaf, 0 );
+    m_sgxLeaf = m_currentLeaf;
+    updateNativeId( extendedLeaf, 0 );
+    m_extendedLeaf = m_currentLeaf;
+    updateNativeId( 1, 0 );
+    m_leaf = m_currentLeaf;
+    updateNativeId( _leaf, _subleaf );
+  }
+
+  void CPU::updateNativeId( unsigned int _leaf, unsigned int _subleaf ) {
 
+#ifdef _WIN32
+      __cpuid( m_currentLeaf.data(), _leaf, _subleaf );
 #else
       asm volatile
-      ( "cpuid" : "=a"( regs[0] ), "=b"( regs[1] ), "=c"( regs[2] ), "=d"( regs[3] )
-        : "a"( _i ), "c"( 0 ) );
-      /* ECX is set to zero for CPUID function 4 */
+      ( "cpuid" : "=a"( m_currentLeaf[0] ), "=b"( m_currentLeaf[1] ), "=c"( m_currentLeaf[2] ), "=d"( m_currentLeaf[3] )
+        : "a"( _leaf ), "c"( _subleaf ) );
 #endif
-    }
-
-    /**
-     * @brief Return EAX id.
-     * @return The EAX id.
-     */
-    uint32_t EAX() const { return regs[0]; }
-
-    /**
-     * @brief Return EBX id.
-     * @return The EBX id.
-     */
-    uint32_t EBX() const { return regs[1]; }
-
-    /**
-     * @brief Return ECX id.
-     * @return The ECX id.
-     */
-    uint32_t ECX() const { return regs[2]; }
-
-    /**
-     * @brief Return EDX id.
-     * @return The EDX id.
-     */
-    uint32_t EDX() const { return regs[3]; }
-
-  private:
-//    std::vector<uint32_t> m_regs;
-    /**
-     * @brief Reg parts.
-     * @todo: Convert to vector<int>.
-     */
-    uint32_t regs[4] = {};
-  };
+  }
 }