From 02beb3190f96dafc7eae635fa0ead338e21cb7db Mon Sep 17 00:00:00 2001
From: _xeroxz <xerox@back.engineering>
Date: Tue, 1 Jun 2021 23:26:48 -0700
Subject: [PATCH 1/2] changed the location of vcxproj and filters out of the
 src dir

---
 src/vmprofiler.vcxproj                        | 184 ----------
 vmprofiler.sln                                |  99 +++---
 vmprofiler.vcxproj                            | 182 ++++++++++
 ...proj.filters => vmprofiler.vcxproj.filters | 316 +++++++++---------
 4 files changed, 391 insertions(+), 390 deletions(-)
 delete mode 100644 src/vmprofiler.vcxproj
 create mode 100644 vmprofiler.vcxproj
 rename src/vmprofiler.vcxproj.filters => vmprofiler.vcxproj.filters (50%)

diff --git a/src/vmprofiler.vcxproj b/src/vmprofiler.vcxproj
deleted file mode 100644
index 29a1f7d..0000000
--- a/src/vmprofiler.vcxproj
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DBG|x64">
-      <Configuration>DBG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{D0B6092A-9944-4F24-9486-4B7DAE372619}</ProjectGuid>
-    <RootNamespace>vmprofiler</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>vmprofiler</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DBG|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DBG|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir);$(ProjectDir)..\dependencies\zydis\msvc;$(ProjectDir)..\dependencies\zydis\dependencies\zycore\include;$(ProjectDir)..\include;$(ProjectDir)..\dependencies\zydis\include;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DBG|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir);$(ProjectDir)..\dependencies\zydis\msvc;$(ProjectDir)..\dependencies\zydis\dependencies\zycore\include;$(ProjectDir)..\include;$(ProjectDir)..\dependencies\zydis\include;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;ZYDIS_STATIC_DEFINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(ProjectDir)..\libs\*;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DBG|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(ProjectDir)..\libs\*;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="calc_jmp.cpp" />
-    <ClCompile Include="vmhandler.cpp" />
-    <ClCompile Include="vminstrs.cpp" />
-    <ClCompile Include="vmprofiles\add.cpp" />
-    <ClCompile Include="vmprofiles\call.cpp" />
-    <ClCompile Include="vmprofiles\div.cpp" />
-    <ClCompile Include="vmprofiles\jmp.cpp" />
-    <ClCompile Include="vmprofiles\lconst.cpp" />
-    <ClCompile Include="vmprofiles\lflags.cpp" />
-    <ClCompile Include="vmprofiles\lreg.cpp" />
-    <ClCompile Include="vmprofiles\mul.cpp" />
-    <ClCompile Include="vmprofiles\nand.cpp" />
-    <ClCompile Include="vmprofiles\pushvsp.cpp" />
-    <ClCompile Include="vmprofiles\read.cpp" />
-    <ClCompile Include="vmprofiles\shl.cpp" />
-    <ClCompile Include="vmprofiles\shr.cpp" />
-    <ClCompile Include="vmprofiles\sreg.cpp" />
-    <ClCompile Include="vmprofiles\vmexit.cpp" />
-    <ClCompile Include="vmprofiles\write.cpp" />
-    <ClCompile Include="vmutils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Allocator.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\API\Memory.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\API\Synchronization.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\API\Terminal.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\API\Thread.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\ArgParse.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Bitset.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Comparison.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Defines.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Format.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\LibC.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\List.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Object.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Status.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\String.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Types.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Vector.h" />
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Zycore.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Decoder.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\DecoderTypes.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Formatter.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\FormatterBuffer.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Generated\EnumInstructionCategory.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Generated\EnumISAExt.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Generated\EnumISASet.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Generated\EnumMnemonic.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Generated\EnumRegister.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Internal\DecoderData.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Internal\FormatterATT.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Internal\FormatterBase.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Internal\FormatterIntel.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Internal\SharedData.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Internal\String.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\MetaInfo.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Mnemonic.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Register.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\SharedTypes.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\ShortString.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Status.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Utils.h" />
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Zydis.h" />
-    <ClInclude Include="..\dependencies\zydis\msvc\ZycoreExportConfig.h" />
-    <ClInclude Include="..\dependencies\zydis\msvc\ZydisExportConfig.h" />
-    <ClInclude Include="..\include\transform.hpp" />
-    <ClInclude Include="..\include\vmp2.hpp" />
-    <ClInclude Include="..\include\vmprofiler.hpp" />
-    <ClInclude Include="..\include\vmutils.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\dependencies\zydis\msvc\zydis\Zydis.vcxproj">
-      <Project>{88a23124-5640-35a0-b890-311d7a67a7d2}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\.clang-format" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vmprofiler.sln b/vmprofiler.sln
index 016b13a..c4b9ee3 100644
--- a/vmprofiler.sln
+++ b/vmprofiler.sln
@@ -3,12 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30907.101
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmprofiler", "src\vmprofiler.vcxproj", "{D0B6092A-9944-4F24-9486-4B7DAE372619}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zydis", "dependencies\zydis\msvc\zydis\Zydis.vcxproj", "{88A23124-5640-35A0-B890-311D7A67A7D2}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmprofiler", "vmprofiler.vcxproj", "{D0B6092A-9944-4F24-9486-4B7DAE372619}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		DBG|x64 = DBG|x64
+		DBG|x86 = DBG|x86
 		Debug Kernel|x64 = Debug Kernel|x64
 		Debug Kernel|x86 = Debug Kernel|x86
 		Debug MD DLL|x64 = Debug MD DLL|x64
@@ -33,49 +35,10 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug Kernel|x64.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug Kernel|x64.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug Kernel|x86.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug Kernel|x86.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD DLL|x64.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD DLL|x64.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD DLL|x86.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD DLL|x86.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD|x64.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD|x64.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD|x86.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD|x86.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT DLL|x64.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT DLL|x64.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT DLL|x86.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT DLL|x86.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT|x64.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT|x64.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT|x86.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT|x86.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release Kernel|x64.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release Kernel|x64.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release Kernel|x86.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release Kernel|x86.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD DLL|x64.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD DLL|x64.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD DLL|x86.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD DLL|x86.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD|x64.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD|x64.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD|x86.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD|x86.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT DLL|x64.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT DLL|x64.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT DLL|x86.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT DLL|x86.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT|x64.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT|x64.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT|x86.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT|x86.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release|x64.ActiveCfg = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release|x64.Build.0 = Release|x64
-		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release|x86.ActiveCfg = Release|x64
+		{88A23124-5640-35A0-B890-311D7A67A7D2}.DBG|x64.ActiveCfg = Debug MT|x64
+		{88A23124-5640-35A0-B890-311D7A67A7D2}.DBG|x64.Build.0 = Debug MT|x64
+		{88A23124-5640-35A0-B890-311D7A67A7D2}.DBG|x86.ActiveCfg = Debug MT|Win32
+		{88A23124-5640-35A0-B890-311D7A67A7D2}.DBG|x86.Build.0 = Debug MT|Win32
 		{88A23124-5640-35A0-B890-311D7A67A7D2}.Debug Kernel|x64.ActiveCfg = Debug Kernel|x64
 		{88A23124-5640-35A0-B890-311D7A67A7D2}.Debug Kernel|x64.Build.0 = Debug Kernel|x64
 		{88A23124-5640-35A0-B890-311D7A67A7D2}.Debug Kernel|x64.Deploy.0 = Debug Kernel|x64
@@ -124,6 +87,52 @@ Global
 		{88A23124-5640-35A0-B890-311D7A67A7D2}.Release|x64.Build.0 = Release MD DLL|x64
 		{88A23124-5640-35A0-B890-311D7A67A7D2}.Release|x86.ActiveCfg = Release MT DLL|Win32
 		{88A23124-5640-35A0-B890-311D7A67A7D2}.Release|x86.Build.0 = Release MT DLL|Win32
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.DBG|x64.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.DBG|x64.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.DBG|x86.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug Kernel|x64.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug Kernel|x64.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug Kernel|x86.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug Kernel|x86.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD DLL|x64.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD DLL|x64.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD DLL|x86.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD DLL|x86.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD|x64.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD|x64.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD|x86.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD|x86.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT DLL|x64.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT DLL|x64.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT DLL|x86.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT DLL|x86.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT|x64.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT|x64.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT|x86.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT|x86.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release Kernel|x64.ActiveCfg = Release|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release Kernel|x64.Build.0 = Release|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release Kernel|x86.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release Kernel|x86.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD DLL|x64.ActiveCfg = Release|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD DLL|x64.Build.0 = Release|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD DLL|x86.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD DLL|x86.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD|x64.ActiveCfg = Release|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD|x64.Build.0 = Release|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD|x86.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD|x86.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT DLL|x64.ActiveCfg = Release|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT DLL|x64.Build.0 = Release|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT DLL|x86.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT DLL|x86.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT|x64.ActiveCfg = Release|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT|x64.Build.0 = Release|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT|x86.ActiveCfg = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT|x86.Build.0 = DBG|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release|x64.ActiveCfg = Release|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release|x64.Build.0 = Release|x64
+		{D0B6092A-9944-4F24-9486-4B7DAE372619}.Release|x86.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/vmprofiler.vcxproj b/vmprofiler.vcxproj
new file mode 100644
index 0000000..760225c
--- /dev/null
+++ b/vmprofiler.vcxproj
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DBG|x64">
+      <Configuration>DBG</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{D0B6092A-9944-4F24-9486-4B7DAE372619}</ProjectGuid>
+    <RootNamespace>vmprofiler</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>vmprofiler</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DBG|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DBG|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(ProjectDir)dependencies\zydis\msvc;$(ProjectDir)dependencies\zydis\dependencies\zycore\include;$(ProjectDir)include;$(ProjectDir)dependencies\zydis\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DBG|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(ProjectDir)dependencies\zydis\msvc;$(ProjectDir)dependencies\zydis\dependencies\zycore\include;$(ProjectDir)include;$(ProjectDir)dependencies\zydis\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;ZYDIS_STATIC_DEFINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <Optimization>Disabled</Optimization>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(ProjectDir)..\libs\*;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DBG|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <Optimization>Disabled</Optimization>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(ProjectDir)..\libs\*;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\dependencies\zydis\msvc\zydis\Zydis.vcxproj">
+      <Project>{88a23124-5640-35a0-b890-311d7a67a7d2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Allocator.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\API\Memory.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\API\Synchronization.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\API\Terminal.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\API\Thread.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\ArgParse.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Bitset.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Comparison.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Defines.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Format.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\LibC.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\List.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Object.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Status.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\String.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Types.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Vector.h" />
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Zycore.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Decoder.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\DecoderTypes.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Formatter.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\FormatterBuffer.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Generated\EnumInstructionCategory.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Generated\EnumISAExt.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Generated\EnumISASet.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Generated\EnumMnemonic.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Generated\EnumRegister.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Internal\DecoderData.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Internal\FormatterATT.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Internal\FormatterBase.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Internal\FormatterIntel.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Internal\SharedData.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Internal\String.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\MetaInfo.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Mnemonic.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Register.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\SharedTypes.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\ShortString.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Status.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Utils.h" />
+    <ClInclude Include="dependencies\zydis\include\Zydis\Zydis.h" />
+    <ClInclude Include="include\transform.hpp" />
+    <ClInclude Include="include\vmp2.hpp" />
+    <ClInclude Include="include\vmprofiler.hpp" />
+    <ClInclude Include="include\vmutils.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include=".clang-format" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\calc_jmp.cpp" />
+    <ClCompile Include="src\vmhandler.cpp" />
+    <ClCompile Include="src\vminstrs.cpp" />
+    <ClCompile Include="src\vmprofiles\add.cpp" />
+    <ClCompile Include="src\vmprofiles\call.cpp" />
+    <ClCompile Include="src\vmprofiles\div.cpp" />
+    <ClCompile Include="src\vmprofiles\jmp.cpp" />
+    <ClCompile Include="src\vmprofiles\lconst.cpp" />
+    <ClCompile Include="src\vmprofiles\lflags.cpp" />
+    <ClCompile Include="src\vmprofiles\lreg.cpp" />
+    <ClCompile Include="src\vmprofiles\mul.cpp" />
+    <ClCompile Include="src\vmprofiles\nand.cpp" />
+    <ClCompile Include="src\vmprofiles\pushvsp.cpp" />
+    <ClCompile Include="src\vmprofiles\read.cpp" />
+    <ClCompile Include="src\vmprofiles\shl.cpp" />
+    <ClCompile Include="src\vmprofiles\shr.cpp" />
+    <ClCompile Include="src\vmprofiles\sreg.cpp" />
+    <ClCompile Include="src\vmprofiles\vmexit.cpp" />
+    <ClCompile Include="src\vmprofiles\write.cpp" />
+    <ClCompile Include="src\vmutils.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/vmprofiler.vcxproj.filters b/vmprofiler.vcxproj.filters
similarity index 50%
rename from src/vmprofiler.vcxproj.filters
rename to vmprofiler.vcxproj.filters
index 8d3fb39..99d0148 100644
--- a/src/vmprofiler.vcxproj.filters
+++ b/vmprofiler.vcxproj.filters
@@ -9,236 +9,230 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
     </Filter>
-    <Filter Include="Header Files\Zydis">
-      <UniqueIdentifier>{b85373f1-1f33-4b4f-aadd-04432b6d62f0}</UniqueIdentifier>
+    <Filter Include="Source Files\vmprofiles">
+      <UniqueIdentifier>{388154c1-cb08-493f-88fb-7e16cfffa010}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Zycore">
-      <UniqueIdentifier>{f57dabfd-2fe1-46a9-96d5-990cd620eda3}</UniqueIdentifier>
+    <Filter Include="Resources">
+      <UniqueIdentifier>{5bb0ecc9-da37-4a13-8958-3c8eef2ceab5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Zydis\Generated">
-      <UniqueIdentifier>{40b5c3d5-2a68-4f45-b655-b621ef669204}</UniqueIdentifier>
+    <Filter Include="Header Files\Zydis">
+      <UniqueIdentifier>{89c9e25e-6ed2-4fe5-a340-d1069097b7cf}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files\Zydis\Internal">
-      <UniqueIdentifier>{4dc3025a-a1f4-460d-b992-1ed53e44f2c0}</UniqueIdentifier>
+      <UniqueIdentifier>{a2348d30-59b2-4f94-b3fd-56a5ba9fdf82}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Zycore\API">
-      <UniqueIdentifier>{a4d9e340-8f8c-4606-bce8-58b86119c829}</UniqueIdentifier>
+    <Filter Include="Header Files\Zydis\Generated">
+      <UniqueIdentifier>{ea095705-fd73-4d97-af37-9960074282fb}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\vmprofiles">
-      <UniqueIdentifier>{388154c1-cb08-493f-88fb-7e16cfffa010}</UniqueIdentifier>
+    <Filter Include="Header Files\Zycore">
+      <UniqueIdentifier>{e64d3416-311e-4d5d-8855-266011fdbcec}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Resources">
-      <UniqueIdentifier>{5bb0ecc9-da37-4a13-8958-3c8eef2ceab5}</UniqueIdentifier>
+    <Filter Include="Header Files\Zycore\API">
+      <UniqueIdentifier>{b4d15e7c-77b4-497f-89ea-cb7366955816}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="vmutils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\add.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\div.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\jmp.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\lconst.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\lreg.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\mul.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\nand.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\pushvsp.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\read.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\sreg.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\vmexit.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\write.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\shl.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\shr.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="calc_jmp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vmhandler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vminstrs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\call.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-    <ClCompile Include="vmprofiles\lflags.cpp">
-      <Filter>Source Files\vmprofiles</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\transform.hpp">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Allocator.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vmprofiler.hpp">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\ArgParse.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vmutils.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Bitset.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Generated\EnumInstructionCategory.h">
-      <Filter>Header Files\Zydis\Generated</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Comparison.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Generated\EnumISAExt.h">
-      <Filter>Header Files\Zydis\Generated</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Defines.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Generated\EnumISASet.h">
-      <Filter>Header Files\Zydis\Generated</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Format.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Generated\EnumMnemonic.h">
-      <Filter>Header Files\Zydis\Generated</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\LibC.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Generated\EnumRegister.h">
-      <Filter>Header Files\Zydis\Generated</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\List.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Internal\DecoderData.h">
-      <Filter>Header Files\Zydis\Internal</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Object.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Internal\FormatterATT.h">
-      <Filter>Header Files\Zydis\Internal</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Status.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Internal\FormatterBase.h">
-      <Filter>Header Files\Zydis\Internal</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\String.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Internal\FormatterIntel.h">
-      <Filter>Header Files\Zydis\Internal</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Types.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Internal\SharedData.h">
-      <Filter>Header Files\Zydis\Internal</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Vector.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Internal\String.h">
-      <Filter>Header Files\Zydis\Internal</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\Zycore.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Decoder.h">
-      <Filter>Header Files\Zydis</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\API\Memory.h">
+      <Filter>Header Files\Zycore\API</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\DecoderTypes.h">
-      <Filter>Header Files\Zydis</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\API\Synchronization.h">
+      <Filter>Header Files\Zycore\API</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Formatter.h">
-      <Filter>Header Files\Zydis</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\API\Terminal.h">
+      <Filter>Header Files\Zycore\API</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\FormatterBuffer.h">
-      <Filter>Header Files\Zydis</Filter>
+    <ClInclude Include="dependencies\zydis\dependencies\zycore\include\Zycore\API\Thread.h">
+      <Filter>Header Files\Zycore\API</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\MetaInfo.h">
+    <ClInclude Include="dependencies\zydis\include\Zydis\Decoder.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Mnemonic.h">
+    <ClInclude Include="dependencies\zydis\include\Zydis\DecoderTypes.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Register.h">
+    <ClInclude Include="dependencies\zydis\include\Zydis\Formatter.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\SharedTypes.h">
+    <ClInclude Include="dependencies\zydis\include\Zydis\FormatterBuffer.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\ShortString.h">
+    <ClInclude Include="dependencies\zydis\include\Zydis\MetaInfo.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Status.h">
+    <ClInclude Include="dependencies\zydis\include\Zydis\Mnemonic.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Utils.h">
+    <ClInclude Include="dependencies\zydis\include\Zydis\Register.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\include\Zydis\Zydis.h">
+    <ClInclude Include="dependencies\zydis\include\Zydis\SharedTypes.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\API\Memory.h">
-      <Filter>Header Files\Zycore\API</Filter>
-    </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\API\Synchronization.h">
-      <Filter>Header Files\Zycore\API</Filter>
-    </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\API\Terminal.h">
-      <Filter>Header Files\Zycore\API</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\ShortString.h">
+      <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\API\Thread.h">
-      <Filter>Header Files\Zycore\API</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Status.h">
+      <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Allocator.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Utils.h">
+      <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\ArgParse.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Zydis.h">
+      <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Bitset.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Internal\DecoderData.h">
+      <Filter>Header Files\Zydis\Internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Comparison.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Internal\FormatterATT.h">
+      <Filter>Header Files\Zydis\Internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Defines.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Internal\FormatterBase.h">
+      <Filter>Header Files\Zydis\Internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Format.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Internal\FormatterIntel.h">
+      <Filter>Header Files\Zydis\Internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\LibC.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Internal\SharedData.h">
+      <Filter>Header Files\Zydis\Internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\List.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Internal\String.h">
+      <Filter>Header Files\Zydis\Internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Object.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Generated\EnumInstructionCategory.h">
+      <Filter>Header Files\Zydis\Generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Status.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Generated\EnumISAExt.h">
+      <Filter>Header Files\Zydis\Generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\String.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Generated\EnumISASet.h">
+      <Filter>Header Files\Zydis\Generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Types.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Generated\EnumMnemonic.h">
+      <Filter>Header Files\Zydis\Generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Vector.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="dependencies\zydis\include\Zydis\Generated\EnumRegister.h">
+      <Filter>Header Files\Zydis\Generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\dependencies\zycore\include\Zycore\Zycore.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="include\transform.hpp">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\msvc\ZycoreExportConfig.h">
+    <ClInclude Include="include\vmp2.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\zydis\msvc\ZydisExportConfig.h">
+    <ClInclude Include="include\vmprofiler.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vmp2.hpp">
+    <ClInclude Include="include\vmutils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\.clang-format">
+    <None Include=".clang-format">
       <Filter>Resources</Filter>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\vmprofiles\add.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\call.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\div.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\jmp.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\lconst.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\lflags.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\lreg.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\mul.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\nand.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\pushvsp.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\read.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\shl.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\shr.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\sreg.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\vmexit.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmprofiles\write.cpp">
+      <Filter>Source Files\vmprofiles</Filter>
+    </ClCompile>
+    <ClCompile Include="src\calc_jmp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmhandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vminstrs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vmutils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file

From ecd7f5abc1f97a2743334e942e50f66c55cf039f Mon Sep 17 00:00:00 2001
From: _xeroxz <xerox@back.engineering>
Date: Tue, 1 Jun 2021 23:44:31 -0700
Subject: [PATCH 2/2] fixed operand decryption transform map ref's

---
 include/transform.hpp |  2 +-
 src/vminstrs.cpp      | 74 +++++++++++++++++++++----------------------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/include/transform.hpp b/include/transform.hpp
index bc2ef88..f0a4624 100644
--- a/include/transform.hpp
+++ b/include/transform.hpp
@@ -211,7 +211,7 @@ namespace vm
             }
         }
 
-        inline bool has_imm( zydis_decoded_instr_t *instr )
+        inline bool has_imm( const zydis_decoded_instr_t *instr )
         {
             return instr->operand_count > 1 && ( instr->operands[ 1 ].type & ZYDIS_OPERAND_TYPE_IMMEDIATE );
         }
diff --git a/src/vminstrs.cpp b/src/vminstrs.cpp
index 99ebf3f..9d92817 100644
--- a/src/vminstrs.cpp
+++ b/src/vminstrs.cpp
@@ -7,48 +7,48 @@ namespace vm
         std::pair< std::uint64_t, std::uint64_t > decrypt_operand( transform::map_t &transforms, std::uint64_t operand,
                                                                    std::uint64_t rolling_key )
         {
-            const auto generic_decrypt_0 = &transforms[ transform::type::generic0 ];
-            const auto key_decrypt = &transforms[ transform::type::rolling_key ];
-            const auto generic_decrypt_1 = &transforms[ transform::type::generic1 ];
-            const auto generic_decrypt_2 = &transforms[ transform::type::generic2 ];
-            const auto generic_decrypt_3 = &transforms[ transform::type::generic3 ];
-            const auto update_key = &transforms[ transform::type::update_key ];
-
-            if ( generic_decrypt_0->mnemonic != ZYDIS_MNEMONIC_INVALID )
+            const auto& generic_decrypt_0 = transforms[ transform::type::generic0 ];
+            const auto& key_decrypt = transforms[ transform::type::rolling_key ];
+            const auto& generic_decrypt_1 = transforms[ transform::type::generic1 ];
+            const auto& generic_decrypt_2 = transforms[ transform::type::generic2 ];
+            const auto& generic_decrypt_3 = transforms[ transform::type::generic3 ];
+            const auto& update_key = transforms[ transform::type::update_key ];
+
+            if ( generic_decrypt_0.mnemonic != ZYDIS_MNEMONIC_INVALID )
             {
                 operand = transform::apply(
-                    generic_decrypt_0->operands[ 0 ].size, generic_decrypt_0->mnemonic, operand,
+                    generic_decrypt_0.operands[ 0 ].size, generic_decrypt_0.mnemonic, operand,
                     // check to see if this instruction has an IMM...
-                    transform::has_imm( generic_decrypt_0 ) ? generic_decrypt_0->operands[ 1 ].imm.value.u : 0 );
+                    transform::has_imm( &generic_decrypt_0 ) ? generic_decrypt_0.operands[ 1 ].imm.value.u : 0 );
             }
 
             // apply transformation with rolling decrypt key...
-            operand = transform::apply( key_decrypt->operands[ 0 ].size, key_decrypt->mnemonic, operand, rolling_key );
+            operand = transform::apply( key_decrypt.operands[ 0 ].size, key_decrypt.mnemonic, operand, rolling_key );
 
             // apply three generic transformations...
             {
                 operand = transform::apply(
-                    generic_decrypt_1->operands[ 0 ].size, generic_decrypt_1->mnemonic, operand,
+                    generic_decrypt_1.operands[ 0 ].size, generic_decrypt_1.mnemonic, operand,
                     // check to see if this instruction has an IMM...
-                    transform::has_imm( generic_decrypt_1 ) ? generic_decrypt_1->operands[ 1 ].imm.value.u : 0 );
+                    transform::has_imm( &generic_decrypt_1 ) ? generic_decrypt_1.operands[ 1 ].imm.value.u : 0 );
 
                 operand = transform::apply(
-                    generic_decrypt_2->operands[ 0 ].size, generic_decrypt_2->mnemonic, operand,
+                    generic_decrypt_2.operands[ 0 ].size, generic_decrypt_2.mnemonic, operand,
                     // check to see if this instruction has an IMM...
-                    transform::has_imm( generic_decrypt_2 ) ? generic_decrypt_2->operands[ 1 ].imm.value.u : 0 );
+                    transform::has_imm( &generic_decrypt_2 ) ? generic_decrypt_2.operands[ 1 ].imm.value.u : 0 );
 
                 operand = transform::apply(
-                    generic_decrypt_3->operands[ 0 ].size, generic_decrypt_3->mnemonic, operand,
+                    generic_decrypt_3.operands[ 0 ].size, generic_decrypt_3.mnemonic, operand,
                     // check to see if this instruction has an IMM...
-                    transform::has_imm( generic_decrypt_3 ) ? generic_decrypt_3->operands[ 1 ].imm.value.u : 0 );
+                    transform::has_imm( &generic_decrypt_3 ) ? generic_decrypt_3.operands[ 1 ].imm.value.u : 0 );
             }
 
             // update rolling key...
             auto result =
-                transform::apply( update_key->operands[ 0 ].size, update_key->mnemonic, rolling_key, operand );
+                transform::apply( update_key.operands[ 0 ].size, update_key.mnemonic, rolling_key, operand );
 
             // update decryption key correctly...
-            switch ( update_key->operands[ 0 ].size )
+            switch ( update_key.operands[ 0 ].size )
             {
             case 8:
                 rolling_key = ( rolling_key & ~0xFFull ) + result;
@@ -70,18 +70,18 @@ namespace vm
             transform::map_t inverse;
             inverse_transforms( transforms, inverse );
 
-            const auto generic_decrypt_0 = &inverse[ transform::type::generic0 ];
-            const auto key_decrypt = &inverse[ transform::type::rolling_key ];
-            const auto generic_decrypt_1 = &inverse[ transform::type::generic1 ];
-            const auto generic_decrypt_2 = &inverse[ transform::type::generic2 ];
-            const auto generic_decrypt_3 = &inverse[ transform::type::generic3 ];
-            const auto update_key = &inverse[ transform::type::update_key ];
+            const auto& generic_decrypt_0 = inverse[ transform::type::generic0 ];
+            const auto& key_decrypt = inverse[ transform::type::rolling_key ];
+            const auto& generic_decrypt_1 = inverse[ transform::type::generic1 ];
+            const auto& generic_decrypt_2 = inverse[ transform::type::generic2 ];
+            const auto& generic_decrypt_3 = inverse[ transform::type::generic3 ];
+            const auto& update_key = inverse[ transform::type::update_key ];
 
             auto result =
-                transform::apply( update_key->operands[ 0 ].size, update_key->mnemonic, rolling_key, operand );
+                transform::apply( update_key.operands[ 0 ].size, update_key.mnemonic, rolling_key, operand );
 
             // make sure we update the rolling decryption key correctly...
-            switch ( update_key->operands[ 0 ].size )
+            switch ( update_key.operands[ 0 ].size )
             {
             case 8:
                 rolling_key = ( rolling_key & ~0xFFull ) + result;
@@ -96,29 +96,29 @@ namespace vm
 
             {
                 operand = transform::apply(
-                    generic_decrypt_3->operands[ 0 ].size, generic_decrypt_3->mnemonic, operand,
+                    generic_decrypt_3.operands[ 0 ].size, generic_decrypt_3.mnemonic, operand,
                     // check to see if this instruction has an IMM...
-                    transform::has_imm( generic_decrypt_3 ) ? generic_decrypt_3->operands[ 1 ].imm.value.u : 0 );
+                    transform::has_imm( &generic_decrypt_3 ) ? generic_decrypt_3.operands[ 1 ].imm.value.u : 0 );
 
                 operand = transform::apply(
-                    generic_decrypt_2->operands[ 0 ].size, generic_decrypt_2->mnemonic, operand,
+                    generic_decrypt_2.operands[ 0 ].size, generic_decrypt_2.mnemonic, operand,
                     // check to see if this instruction has an IMM...
-                    transform::has_imm( generic_decrypt_2 ) ? generic_decrypt_2->operands[ 1 ].imm.value.u : 0 );
+                    transform::has_imm( &generic_decrypt_2 ) ? generic_decrypt_2.operands[ 1 ].imm.value.u : 0 );
 
                 operand = transform::apply(
-                    generic_decrypt_1->operands[ 0 ].size, generic_decrypt_1->mnemonic, operand,
+                    generic_decrypt_1.operands[ 0 ].size, generic_decrypt_1.mnemonic, operand,
                     // check to see if this instruction has an IMM...
-                    transform::has_imm( generic_decrypt_1 ) ? generic_decrypt_1->operands[ 1 ].imm.value.u : 0 );
+                    transform::has_imm( &generic_decrypt_1 ) ? generic_decrypt_1.operands[ 1 ].imm.value.u : 0 );
             }
 
-            operand = transform::apply( key_decrypt->operands[ 0 ].size, key_decrypt->mnemonic, operand, rolling_key );
+            operand = transform::apply( key_decrypt.operands[ 0 ].size, key_decrypt.mnemonic, operand, rolling_key );
 
-            if ( generic_decrypt_0->mnemonic != ZYDIS_MNEMONIC_INVALID )
+            if ( generic_decrypt_0.mnemonic != ZYDIS_MNEMONIC_INVALID )
             {
                 operand = transform::apply(
-                    generic_decrypt_0->operands[ 0 ].size, generic_decrypt_0->mnemonic, operand,
+                    generic_decrypt_0.operands[ 0 ].size, generic_decrypt_0.mnemonic, operand,
                     // check to see if this instruction has an IMM...
-                    transform::has_imm( generic_decrypt_0 ) ? generic_decrypt_0->operands[ 1 ].imm.value.u : 0 );
+                    transform::has_imm( &generic_decrypt_0 ) ? generic_decrypt_0.operands[ 1 ].imm.value.u : 0 );
             }
 
             return { operand, rolling_key };