V0.2.0

Added support for gcc toolchain (EDK2 GCC5)
psyq321 · Jan 13, 2022 · 06301cb · 06301cb
1 parent 63be6d5
commit 06301cb
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 9 deletions.
diff --git a/PowerMonkeyApp/DelayX86.c b/PowerMonkeyApp/DelayX86.c
@@ -33,8 +33,15 @@
 #include "SaferAsmHdr.h"
 #include <immintrin.h>
 
+#if defined(__GNUC__) && !defined(__clang__)
+#include <x86intrin.h>
+#else
+
 #pragma intrinsic(__rdtsc)                // At this point, code will look so
 #pragma intrinsic(_mm_pause)              // fugly that writing it in pure SMM
+                                          // ASM would count as an improvement
+#endif
+
 
 /*******************************************************************************
  * Globals that must be initialized

diff --git a/PowerMonkeyApp/LowLevel.c b/PowerMonkeyApp/LowLevel.c
@@ -33,12 +33,13 @@
 #include "LowLevel.h"
 #include "MiniLog.h"
 
-
 /*******************************************************************************
  * Compiler Overrides
  ******************************************************************************/
 
+#if defined(_MSC_VER)
 #pragma warning( disable : 4090 )
+#endif
 
 /*******************************************************************************
  * Globals

diff --git a/PowerMonkeyApp/MiniLog.c b/PowerMonkeyApp/MiniLog.c
@@ -24,9 +24,6 @@
 *
 *******************************************************************************/
 
-#pragma intrinsic(__rdtsc)
-#pragma intrinsic(__cpuid)
-
 /*******************************************************************************
  * Includes
  ******************************************************************************/
@@ -39,6 +36,7 @@
 #include <Library/DebugLib.h>
 #include <Protocol/MpService.h>
 #include <Library/SynchronizationLib.h>
+#include <immintrin.h>
 
 #include "CONFIGURATION.h"
 #include "MiniLog.h"
@@ -47,7 +45,18 @@
 #include "DelayX86.h"
 
 extern PLATFORM* gPlatform;
-
+
+/*******************************************************************************
+ *
+ ******************************************************************************/
+
+#if defined(__GNUC__) && !defined(__clang__)
+#include <x86intrin.h>
+#else
+#pragma intrinsic(__rdtsc)
+#endif
+
+
 /*******************************************************************************
  * Globals
  ******************************************************************************/

diff --git a/PowerMonkeyApp/MpDispatcher.c b/PowerMonkeyApp/MpDispatcher.c
@@ -252,5 +252,4 @@ EFI_STATUS EFIAPI RunOnAllProcessors(
   }
 
   return status;
-}
-
+}
diff --git a/PowerMonkeyApp/PowerMonkey.c b/PowerMonkeyApp/PowerMonkey.c
@@ -262,7 +262,7 @@ VOID PrintBanner(VOID)
     " |  ____// _ \\ | | | | / _  ) / __)| || || | / _ \\ |  _ \\ | | / )/ _  )| | | |\n"
     " | |    | |_| || | | |( (/ / | |   | || || || |_| || | | || |< (( (/ / | |_| |\n"
     " |_|     \\___/  \\____| \\____)|_|   |_||_||_| \\___/ |_| |_||_| \\_)\\____) \\__  |\n"
-    "                                                         Version 0.1.9 (____/\n"
+    "                                                         Version 0.2.0 (____/\n"
   );
 
   AsciiPrint(

diff --git a/README.MD b/README.MD
@@ -159,7 +159,9 @@ This route is based on Alex Ionescu's excellent [VisualUEFI project](https://git
 
 #### **Building - EDK2 route:**
 
-NOTE: Only MSVC (VS2019) and CLANG (CLANGDWARF) toolchains are validated. For CLANGDWARF toolchain, you will need to add:
+NOTE: Only MSVC (VS2019), gcc (GCC5) and Clang (CLANGDWARF) toolchains are validated. 
+
+For CLANGDWARF toolchain, you will need to add:
 
 `DEBUG_CLANGDWARF_X64_DLINK_FLAGS =`**`  -z notext ... `**<p>`RELEASE_CLANGDWARF_X64_DLINK_FLAGS =`**`  -z notext ... `**<p>`NOOPT_CLANGDWARF_X64_DLINK_FLAGS =`**`  -z notext ... `**
-Original file line number
+Diff line change
@@ Expand Up / @@ -252,5 +252,4 @@ EFI_STATUS EFIAPI RunOnAllProcessors( @@
       }
       return status;
-    }
+    }