Rename Utils to Ia32Utils

Builds/Platform/EFI/MiniVisorDxe.inf

@@ -39,8 +39,8 @@
   ../../../Sources/MiniVisor.c
   ../../../Sources/MiniVisor.h
   ../../../Sources/Platform.h
-  ../../../Sources/Utils.c
+  ../../../Sources/Ia32Utils.c
-  ../../../Sources/Utils.h
+  ../../../Sources/Ia32Utils.h
   ../../../Sources/Ia32.h
   ../../../Sources/Asm.asm
   ../../../Sources/Asm.h

Sources/ExtendedPageTables.c

@@ -14,7 +14,7 @@
 #include "Platform.h"
 #include "Logger.h"
 #include "MemoryType.h"
-#include "Utils.h"
+#include "Ia32Utils.h"
 
 //
 // The set of EPT paging structure entries involved with to translate the GPA.

Sources/HostUtils.c

@@ -10,7 +10,7 @@
 #include "HostUtils.h"
 #include "Logger.h"
 #include "ExtendedPageTables.h"
-#include "Utils.h"
+#include "Ia32Utils.h"
 #include "MemoryAccess.h"
 
 /*!

Sources/Ia32Utils.c

@@ -1,5 +1,5 @@
 /*!
-    @file Utils.c
+    @file Ia32Utils.c
 
     @brief Utility functions that could be used by both the host and non-host.
 
@@ -7,7 +7,7 @@
 
     @copyright Copyright (c) 2020 - , Satoshi Tanda. All rights reserved.
  */
-#include "Utils.h"
+#include "Ia32Utils.h"
 #include "Asm.h"
 #include "Logger.h"
 

Sources/Ia32Utils.h

@@ -1,5 +1,5 @@
 /*!
-    @file Utils.h
+    @file Ia32Utils.h
 
     @brief Utility functions that could be used by both the host and non-host.
 

Sources/MemoryAccess.c

@@ -87,7 +87,7 @@ Exit:
         paging structures of the returned entry.
 
     @return The pointer to the final paging structure when the virtual address
-        is not mapped in the physical address. If not, returns the pointer to the
+        is mapped in the physical address. If not, returns the pointer to the
         paging structure entry that indicated that the page is not present (ie,
         the Present bit is cleared).
  */

Sources/MiniVisor.c

@@ -17,7 +17,7 @@
 #include "Public.h"
 #include "MemoryType.h"
 #include "HostNesting.h"
-#include "Utils.h"
+#include "Ia32Utils.h"
 #include "MemoryAccess.h"
 
 //

Sources/MiniVisor.vcxproj

@@ -133,7 +133,7 @@
     <ClInclude Include="Platform\Windows\WinLogger.h" />
     <ClInclude Include="Platform\Windows\WinPlatform.h" />
     <ClInclude Include="Public.h" />
-    <ClInclude Include="Utils.h" />
+    <ClInclude Include="Ia32Utils.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ExtendedPageTables.c" />
@@ -165,7 +165,7 @@
     <ClCompile Include="Platform\Windows\WinPlatform.c">
       <ExcludedFromBuild Condition="'$(Configuration)'=='UEFI'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="Utils.c" />
+    <ClCompile Include="Ia32Utils.c" />
   </ItemGroup>
   <ItemGroup>
     <None Include="AsmCommon.inc" />

Sources/MiniVisor.vcxproj.filters

@@ -66,9 +66,6 @@
     <ClInclude Include="Public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Utils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="HostVmcall.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -117,6 +114,9 @@
     <ClInclude Include="HostNesting.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Ia32Utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ExtendedPageTables.c">
@@ -134,9 +134,6 @@
     <ClCompile Include="MiniVisor.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Utils.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="HostVmcall.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -167,6 +164,9 @@
     <ClCompile Include="MemoryAccess.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Ia32Utils.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <MASM Include="Asm.asm">

Sources/Platform/EFI/EfiCommon.h

@@ -67,6 +67,7 @@ unsigned __int64 __readcr0(void);
 unsigned __int64 __readcr2(void);
 unsigned __int64 __readcr3(void);
 unsigned __int64 __readcr4(void);
+unsigned __int64 __readcr8(void);
 unsigned __int64 __readdr(unsigned int);
 unsigned __int64 __readeflags(void);
 unsigned __int64 __readmsr(unsigned long);
@@ -80,6 +81,7 @@ unsigned char __vmx_vmwrite(unsigned __int64, unsigned __int64);
 unsigned long __segmentlimit(unsigned long);
 void __cpuid(int[4], int);
 void __cpuidex(int[4], int, int);
+void __debugbreak(void);
 void __invlpg(void *);
 void __lidt(void *);
 void __sidt(void *);
@@ -92,21 +94,31 @@ void __writecr3(unsigned __int64);
 void __writecr4(unsigned __int64);
 void __writedr(unsigned int, unsigned __int64);
 void __writemsr(unsigned long, unsigned __int64);
+void _disable(void);
+void _enable(void);
 void _lgdt(void *);
 void _sgdt(void *);
 void _xsetbv(unsigned int, unsigned __int64);
 
+//
+// Required. Otherwise, link error occurs.
+//
+#pragma intrinsic(_disable)
+#pragma intrinsic(_enable)
+
 //
 // MSVC compatibility macro definitions.
 //
 #define __drv_aliasesMem
 #define __drv_allocatesMem(x)
 #define __drv_freesMem(x)
+#define __drv_strictTypeMatch(x)
 #define _Acquires_lock_(x)
 #define _In_
 #define _In_opt_
 #define _In_range_(x, y)
 #define _In_reads_bytes_(x)
+#define _In_z_
 #define _Inout_
 #define _IRQL_raises_(x)
 #define _IRQL_requires_max_(x)

Sources/Platform/EFI/EfiHostInitialization.c

@@ -33,7 +33,7 @@
 #include "EfiHostInitialization.h"
 #include "EfiAsm.h"
 #include "EfiPlatform.h"
-#include "../../Utils.h"
+#include "../../Ia32Utils.h"
 #include "EfiLogger.h"
 
 //