Cleanups

evmjit

@@ -1 +1 @@
-Subproject commit c6fcdbc7d650054c4ed597e735633a45144dc3df
+Subproject commit 2b9b53024dfa62b62a322909a43154f65f29d4ce

libethereum/VMFactory.cpp

@@ -1,7 +1,7 @@
 #include <libevm/VM.h>
 
 #if ETH_EVMJIT
-	#include<evmjit/libevmjit-cpp/VM.h>
+	#include<evmjit/libevmjit-cpp/JitVM.h>
 #endif
 
 #include "VMFactory.h"
@@ -14,7 +14,7 @@ namespace eth
 std::unique_ptr<VMFace> VMFactory::create(VMFactory::Kind _kind, u256 _gas)
 {
 #if ETH_EVMJIT
-	auto vm = _kind == Kind::JIT ? static_cast<VMFace*>(new jit::VM)
+	auto vm = _kind == Kind::JIT ? static_cast<VMFace*>(new JitVM)
 								 : static_cast<VMFace*>(new VM);
 #else
 	VMFace* vm = new VM;

windows/LibEvmJitCpp.vcxproj

@@ -127,10 +127,10 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\evmjit\libevmjit-cpp\Env.cpp" />
-    <ClCompile Include="..\evmjit\libevmjit-cpp\VM.cpp" />
+    <ClCompile Include="..\evmjit\libevmjit-cpp\JitVM.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\evmjit\libevmjit-cpp\VM.h" />
+    <ClInclude Include="..\evmjit\libevmjit-cpp\JitVM.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="LibEvmJit.vcxproj">

windows/LibEvmJitCpp.vcxproj.filters

@@ -4,10 +4,10 @@
     <Text Include="..\evmjit\libevmjit-cpp\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\evmjit\libevmjit-cpp\VM.cpp" />
     <ClCompile Include="..\evmjit\libevmjit-cpp\Env.cpp" />
+    <ClCompile Include="..\evmjit\libevmjit-cpp\JitVM.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\evmjit\libevmjit-cpp\VM.h" />
+    <ClInclude Include="..\evmjit\libevmjit-cpp\JitVM.h" />
   </ItemGroup>
 </Project>