Index: drlvm.sln =================================================================== --- drlvm.sln (r‚vision 642646) +++ drlvm.sln (copie de travail) @@ -9,10 +9,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "em", "em\em.vcproj", "{6581FED0-5E16-479A-873B-26C072AF7679}" ProjectSection(ProjectDependencies) = postProject {0FDD6505-BDF8-4574-95FF-7BC800C0EF18} = {0FDD6505-BDF8-4574-95FF-7BC800C0EF18} + {92149593-4D5D-4AA5-9E27-D26EB6B208BD} = {92149593-4D5D-4AA5-9E27-D26EB6B208BD} {65E079BA-B8F1-4057-9307-B80A5B9EC379} = {65E079BA-B8F1-4057-9307-B80A5B9EC379} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "port_encoder", "port_encoder\port_encoder.vcproj", "{B89AC381-5594-4B8B-B6D8-FC6AD020F612}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder", "encoder\encoder.vcproj", "{B89AC381-5594-4B8B-B6D8-FC6AD020F612}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject @@ -22,28 +23,43 @@ {65E079BA-B8F1-4057-9307-B80A5B9EC379} = {65E079BA-B8F1-4057-9307-B80A5B9EC379} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gc_cc", "gc_cc\gc_cc.vcproj", "{3B33CE22-1196-4B02-A486-E8AED9DDA548}" - ProjectSection(ProjectDependencies) = postProject - {0FDD6505-BDF8-4574-95FF-7BC800C0EF18} = {0FDD6505-BDF8-4574-95FF-7BC800C0EF18} - {65E079BA-B8F1-4057-9307-B80A5B9EC379} = {65E079BA-B8F1-4057-9307-B80A5B9EC379} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmcore", "vmcore\vmcore.vcproj", "{65E079BA-B8F1-4057-9307-B80A5B9EC379}" ProjectSection(ProjectDependencies) = postProject {0FDD6505-BDF8-4574-95FF-7BC800C0EF18} = {0FDD6505-BDF8-4574-95FF-7BC800C0EF18} + {BDCBBB06-84E7-4F39-B4D9-CF3EC6A2925E} = {BDCBBB06-84E7-4F39-B4D9-CF3EC6A2925E} + {6B863807-57C4-4BC7-A05E-78AFCE3D7F7B} = {6B863807-57C4-4BC7-A05E-78AFCE3D7F7B} {B89AC381-5594-4B8B-B6D8-FC6AD020F612} = {B89AC381-5594-4B8B-B6D8-FC6AD020F612} + {92149593-4D5D-4AA5-9E27-D26EB6B208BD} = {92149593-4D5D-4AA5-9E27-D26EB6B208BD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hythr", "hythr\hythr.vcproj", "{0FDD6505-BDF8-4574-95FF-7BC800C0EF18}" ProjectSection(ProjectDependencies) = postProject + {92149593-4D5D-4AA5-9E27-D26EB6B208BD} = {92149593-4D5D-4AA5-9E27-D26EB6B208BD} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gc_gen", "gc_gen\gc_gen.vcproj", "{3B33CE22-1196-4B02-A486-E8AED9DDA548}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gc_gen_uncomp", "gc_gen_uncomp\gc_gen_uncomp.vcproj", "{3B33CE22-1196-4B02-A486-E8AED9DDA548}" ProjectSection(ProjectDependencies) = postProject {0FDD6505-BDF8-4574-95FF-7BC800C0EF18} = {0FDD6505-BDF8-4574-95FF-7BC800C0EF18} {65E079BA-B8F1-4057-9307-B80A5B9EC379} = {65E079BA-B8F1-4057-9307-B80A5B9EC379} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "port", "port\port.vcproj", "{92149593-4D5D-4AA5-9E27-D26EB6B208BD}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ch", "ch\ch.vcproj", "{BDCBBB06-84E7-4F39-B4D9-CF3EC6A2925E}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "verifier", "verifier\verifier.vcproj", "{6B863807-57C4-4BC7-A05E-78AFCE3D7F7B}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmi", "vmi\vmi.vcproj", "{D17F651F-3F7F-4F76-B6CF-FEB32F8667BC}" + ProjectSection(ProjectDependencies) = postProject + {65E079BA-B8F1-4057-9307-B80A5B9EC379} = {65E079BA-B8F1-4057-9307-B80A5B9EC379} + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -66,10 +82,6 @@ {C9FC1C2B-6440-4460-8889-48353D136D31}.Debug.Build.0 = Debug|Win32 {C9FC1C2B-6440-4460-8889-48353D136D31}.Release.ActiveCfg = Release|Win32 {C9FC1C2B-6440-4460-8889-48353D136D31}.Release.Build.0 = Release|Win32 - {3B33CE22-1196-4B02-A486-E8AED9DDA548}.Debug.ActiveCfg = Debug|Win32 - {3B33CE22-1196-4B02-A486-E8AED9DDA548}.Debug.Build.0 = Debug|Win32 - {3B33CE22-1196-4B02-A486-E8AED9DDA548}.Release.ActiveCfg = Release|Win32 - {3B33CE22-1196-4B02-A486-E8AED9DDA548}.Release.Build.0 = Release|Win32 {65E079BA-B8F1-4057-9307-B80A5B9EC379}.Debug.ActiveCfg = Debug|Win32 {65E079BA-B8F1-4057-9307-B80A5B9EC379}.Debug.Build.0 = Debug|Win32 {65E079BA-B8F1-4057-9307-B80A5B9EC379}.Release.ActiveCfg = Release|Win32 @@ -82,6 +94,22 @@ {3B33CE22-1196-4B02-A486-E8AED9DDA548}.Debug.Build.0 = Debug|Win32 {3B33CE22-1196-4B02-A486-E8AED9DDA548}.Release.ActiveCfg = Release|Win32 {3B33CE22-1196-4B02-A486-E8AED9DDA548}.Release.Build.0 = Release|Win32 + {92149593-4D5D-4AA5-9E27-D26EB6B208BD}.Debug.ActiveCfg = Debug|Win32 + {92149593-4D5D-4AA5-9E27-D26EB6B208BD}.Debug.Build.0 = Debug|Win32 + {92149593-4D5D-4AA5-9E27-D26EB6B208BD}.Release.ActiveCfg = Release|Win32 + {92149593-4D5D-4AA5-9E27-D26EB6B208BD}.Release.Build.0 = Release|Win32 + {BDCBBB06-84E7-4F39-B4D9-CF3EC6A2925E}.Debug.ActiveCfg = Debug|Win32 + {BDCBBB06-84E7-4F39-B4D9-CF3EC6A2925E}.Debug.Build.0 = Debug|Win32 + {BDCBBB06-84E7-4F39-B4D9-CF3EC6A2925E}.Release.ActiveCfg = Release|Win32 + {BDCBBB06-84E7-4F39-B4D9-CF3EC6A2925E}.Release.Build.0 = Release|Win32 + {6B863807-57C4-4BC7-A05E-78AFCE3D7F7B}.Debug.ActiveCfg = Debug|Win32 + {6B863807-57C4-4BC7-A05E-78AFCE3D7F7B}.Debug.Build.0 = Debug|Win32 + {6B863807-57C4-4BC7-A05E-78AFCE3D7F7B}.Release.ActiveCfg = Release|Win32 + {6B863807-57C4-4BC7-A05E-78AFCE3D7F7B}.Release.Build.0 = Release|Win32 + {D17F651F-3F7F-4F76-B6CF-FEB32F8667BC}.Debug.ActiveCfg = Debug|Win32 + {D17F651F-3F7F-4F76-B6CF-FEB32F8667BC}.Debug.Build.0 = Debug|Win32 + {D17F651F-3F7F-4F76-B6CF-FEB32F8667BC}.Release.ActiveCfg = Release|Win32 + {D17F651F-3F7F-4F76-B6CF-FEB32F8667BC}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection Index: em/em.vcproj =================================================================== --- em/em.vcproj (r‚vision 642646) +++ em/em.vcproj (copie de travail) @@ -20,11 +20,11 @@ @@ -74,9 +77,9 @@ CharacterSet="2"> @@ -124,28 +128,6 @@ - - - - - - - - - - - - - - @@ -156,14 +138,38 @@ RelativePath="..\..\..\..\vm\em\src\DrlProfileCollectionFramework.h"> + + + + + + + + + + + + + + + + Index: interpreter/interpreter.vcproj =================================================================== --- interpreter/interpreter.vcproj (r‚vision 642646) +++ interpreter/interpreter.vcproj (copie de travail) @@ -19,11 +19,11 @@ @@ -73,9 +75,9 @@ CharacterSet="2"> Index: vmcore/vmcore.vcproj =================================================================== --- vmcore/vmcore.vcproj (r‚vision 642646) +++ vmcore/vmcore.vcproj (copie de travail) @@ -19,11 +19,11 @@ @@ -76,9 +78,9 @@ CharacterSet="2"> @@ -130,292 +135,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -705,189 +424,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + RelativePath="..\..\..\..\vm\vmcore\src\lil\lil.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\lil\lil_code_generator.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\lil\lil_code_generator_utils.cpp"> + + + + + + + + + + + + + + + + + + + RelativePath="..\..\..\..\vm\vmcore\src\ncai\ncai.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\ncai\ncai_break.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\ncai\ncai_event.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\ncai\ncai_memory.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\ncai\ncai_methods.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\ncai\ncai_modules.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\ncai\ncai_registers.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\ncai\ncai_signals.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\ncai\ncai_stack.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\ncai\ncai_step.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\ncai\ncai_thread.cpp"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - + RelativePath="..\..\..\..\vm\vmcore\src\thread\helpers\thread_helpers_ia32.cpp"> @@ -1000,70 +786,27 @@ RelativePath="..\..\..\..\vm\vmcore\src\util\bytereader.cpp"> + + + RelativePath="..\..\..\..\vm\vmcore\src\util\natives_support.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\util\signals.cpp"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1105,39 +842,25 @@ + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + RelativePath="..\..\..\..\vm\vmcore\src\reflection\annotations.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\reflection\reflection.cpp"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + RelativePath="..\..\..\..\vm\vmcore\src\stack\native_stack.cpp"> + RelativePath="..\..\..\..\vm\vmcore\src\stack\stack_trace.cpp"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: hythr/hythr.vcproj =================================================================== --- hythr/hythr.vcproj (r‚vision 642646) +++ hythr/hythr.vcproj (copie de travail) @@ -20,12 +20,12 @@ @@ -79,10 +81,10 @@ CharacterSet="2"> @@ -140,9 +144,6 @@ RelativePath="..\..\..\..\vm\thread\src\win\os_condvar.c"> - - @@ -191,6 +192,12 @@ + + + + Index: jitrino/jitrino.vcproj =================================================================== --- jitrino/jitrino.vcproj (r‚vision 642646) +++ jitrino/jitrino.vcproj (copie de travail) @@ -20,12 +20,13 @@ @@ -81,13 +84,13 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="1" OmitFramePointers="TRUE" - AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\..\vm\port\include";"$(ProjectDir)\..\..\..\..\vm\port\src\encoder\ia32_em64t";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\shared";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\vm\drl";"$(ProjectDir)\..\..\..\..\vm\vmcore\include";"$(ProjectDir)\..\..\..\..\vm\include";"$(ProjectDir)\..\..\..\..\vm\jitrino\src";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\main";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\vm";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\codegenerator";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\dynopt";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\translator";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\optimizer";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\translator\java";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\jet";"$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\apr\include\apr-1"" - PreprocessorDefinitions="_IA32_;WIN32;NDEBUG;_WINDOWS;_USRDLL;PLATFORM_NT" - RuntimeLibrary="0" + AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\..\vm\jitrino\src\codegenerator";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\codegenerator\ia32";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\dynopt";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\jet";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\main";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\optimizer";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\optimizer\abcd";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\optimizer\ssa";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\shared";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\translator";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\translator\java";"$(ProjectDir)\..\..\..\..\vm\jitrino\src\vm";"$(ProjectDir)\..\..\..\..\vm\port\src\encoder\ia32_em64t";"$(ProjectDir)\..\..\..\..\vm\vmcore\src\util\win\include";"$(ProjectDir)\..\..\..\windows_x86_msvc_$(ConfigurationName)\deploy\include";"$(ProjectDir)\..\..\..\..\vm\include";"$(ProjectDir)\..\..\..\..\vm\vmcore\include";"$(ProjectDir)\..\..\..\..\vm\port\include"" + PreprocessorDefinitions="_IA32_;WIN32;NDEBUG;_WINDOWS;_USRDLL;PROJECT_JITRINO;PLATFORM_NT;REFS_USE_UNCOMPRESSED;VM_STATS;JIT_LOGS;JIT_STATS;_WIN32_WINNT=0x0501;_REENTRANT;__SMP__;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0" + RuntimeLibrary="2" EnableEnhancedInstructionSet="2" UsePrecompiledHeader="2" WarningLevel="4" - WarnAsError="TRUE" + WarnAsError="FALSE" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="3" DisableSpecificWarnings="4100;4127;4201;4511;4512;4702"/> @@ -98,7 +101,7 @@ OutputFile="$(OutDir)/jitrino.dll" LinkIncremental="1" AdditionalLibraryDirectories="" - GenerateDebugInformation="TRUE" + GenerateDebugInformation="FALSE" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -109,8 +112,10 @@ @@ -170,6 +175,12 @@ RelativePath="..\..\..\..\vm\jitrino\src\optimizer\CSEHash.h"> + + + + + + + + + + + +