harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r480913 [1/3] - in /harmony/enhanced/drlvm/trunk: build/custom/msvc_2003/vmcore/ vm/em/src/ vm/gc_cc/src/ vm/gc_gen/src/common/ vm/include/open/ vm/interpreter/ vm/interpreter/src/ vm/jitrino/config/em64t/ vm/jitrino/config/ia32/ vm/jitrino...
Date Thu, 30 Nov 2006 12:55:01 GMT
Author: varlax
Date: Thu Nov 30 04:54:59 2006
New Revision: 480913

URL: http://svn.apache.org/viewvc?view=rev&rev=480913
Log:
HARMONY-1925 [drlvm] VM property module should be redeveloped. VM properties initialization should be improved.
Substantially redone the original patch.
Tested on SUSE9, Windows 2003 Server, WinXP.

Added:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
Modified:
    harmony/enhanced/drlvm/trunk/build/custom/msvc_2003/vmcore/vmcore.vcproj
    harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_cc/src/init.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp
    harmony/enhanced/drlvm/trunk/vm/include/open/vm.h
    harmony/enhanced/drlvm/trunk/vm/include/open/vm_util.h
    harmony/enhanced/drlvm/trunk/vm/interpreter/interpreter.emconf
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/client.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/jet.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/opt.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/server.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/server_static.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/ti.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/client.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/jet.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/opt.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/server.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/server_static.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/ti.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlJITInterface.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/m2n_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/classloader.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/environment.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/init.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/jarfile_util.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/properties.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Environment.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Verifier_stub.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/manifest.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/properties.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/interpreter/interp_exports.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_property.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMExecutionEngine.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/verify_stack_enumeration.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/em64t/nt_exception_filter.cpp
    harmony/enhanced/drlvm/trunk/vm/vmi/src/vmi.cpp

Modified: harmony/enhanced/drlvm/trunk/build/custom/msvc_2003/vmcore/vmcore.vcproj
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/custom/msvc_2003/vmcore/vmcore.vcproj?view=diff&rev=480913&r1=480912&r2=480913
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/custom/msvc_2003/vmcore/vmcore.vcproj (original)
+++ harmony/enhanced/drlvm/trunk/build/custom/msvc_2003/vmcore/vmcore.vcproj Thu Nov 30 04:54:59 2006
@@ -1,1139 +1,1142 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="vmcore"
-	ProjectGUID="{65E079BA-B8F1-4057-9307-B80A5B9EC379}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="bin\$(ConfigurationName)"
-			IntermediateDirectory="tmp\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\..\vm\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\vmcore\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\vmcore\src\util\ia32\base_natives&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\vmcore\src\util\win\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\port\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\port\src\lil\ia32\pim\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\port\src\encoder\ia32_em64t&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\zlib\include&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\apr\include\apr-1&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_VM;GC_V4;USE_DLL_JIT;APR_DECLARE_STATIC;PLATFORM_NT;_WIN32_WINNT=0x0501;_IA32_"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="port.lib apr-1.lib aprutil-1.lib zdll.lib log4cxx.lib hythr.lib jthread.lib advapi32.lib odbc32.lib userenv.lib ws2_32.lib mswsock.lib"
-				OutputFile="$(OutDir)/harmonyvm.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\vm\port\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\apr\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\aprutil\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\zlib\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\log4cxx\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\vm\hythr\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\vm\jthread\_bin&quot;"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/harmonyvm.pdb"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/harmonyvm.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="       ... Copying files to bin/default folder ...."
-				CommandLine="copy $(OutDir)\harmonyvm.dll $(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\deploy\jre\bin\default
-copy $(OutDir)\harmonyvm.pdb $(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\deploy\jre\bin\default
-copy $(OutDir)\harmonyvm.lib $(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\deploy\jre\bin\default
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="bin\$(ConfigurationName)"
-			IntermediateDirectory="tmp\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\..\vm\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\vmcore\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\vmcore\src\util\ia32\base_natives&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\vmcore\src\util\win\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\port\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\port\src\lil\ia32\pim\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\port\src\encoder\ia32_em64t&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\zlib\include&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\apr\include\apr-1&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_VM;GC_V4;USE_DLL_JIT;APR_DECLARE_STATIC;PLATFORM_NT;_WIN32_WINNT=0x0501;_IA32_"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="port.lib apr-1.lib aprutil-1.lib zdll.lib log4cxx.lib hythr.lib jthread.lib advapi32.lib odbc32.lib userenv.lib ws2_32.lib mswsock.lib"
-				OutputFile="$(OutDir)/harmonyvm.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\vm\port\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\apr\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\aprutil\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\zlib\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\log4cxx\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\vm\hythr\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\vm\jthread\_bin&quot;"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/harmonyvm.pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/harmonyvm.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="       ... Copying files to bin/default folder ...."
-				CommandLine="copy $(OutDir)\harmonyvm.dll $(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\deploy\jre\bin\default
-copy $(OutDir)\harmonyvm.pdb $(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\deploy\jre\bin\default
-copy $(OutDir)\harmonyvm.lib $(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\deploy\jre\bin\default
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="include"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\annotations.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\assertion_registry.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\atomics.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\bit_vector.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\bytereader.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\Class.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\class_interface.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\classloader.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\classpath_const.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\compile.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\dll_em_intf.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\dll_gc.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\dll_jit_intf.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\dump.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\em_intf_cpp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\environment.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\exceptions.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\exceptions_impl.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\exceptions_int.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\exceptions_jit.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\exceptions_type.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\finalize.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\GlobalClassLoaderIterator.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\hashtable.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\heap.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\ini.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\init.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jarfile_support.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jarfile_util.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jit_export.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jit_export_jpda.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jit_export_rt.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jit_intf_cpp.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jit_runtime_support_common.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jni_direct.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jni_utils.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jvmti_break_intf.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jvmti_dasm.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jvmti_direct.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jvmti_interface.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jvmti_internal.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\jvmti_utils.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\lock_manager.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\manifest.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\mem_alloc.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\method_lookup.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\mon_enter_exit.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\native_frame.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\native_modules.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\native_overrides.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\native_stack.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\native_utils.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\natives_support.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\nogc.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\object.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\object_generic.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\object_handles.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\object_layout.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\Package.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\platform_utils.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\primitives_support.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\properties.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\reflection.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\root_set_enum_internal.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\simplehashtable.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\stack_dump.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\stack_trace.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\stack_walker.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\String_Pool.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\suspend_checker.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\sync_bits.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\thread_dump.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\thread_generic.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\thread_manager.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\type.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\unloading.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\verifier.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\Verifier_stub.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\verify_stack_enumeration.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\version.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\version_svn_tag.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\version_svn_tag_orig.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\vm_arrays.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\vm_core_types.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\vm_import.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\vm_log.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\vm_stats.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\vm_strings.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\vm_synch.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\include\vm_threads.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="class_support"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Assertion_Registry.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\C_Interface.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Class.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Class_File_Loader.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\class_impl.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\classloader.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Environment.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Initialize.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\java_type.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\manifest.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\method.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\method_lookup.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Prepare.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Resolve.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\String_Pool.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\type.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Verifier_stub.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="exception"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\exception\exceptions.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\exception\exceptions_impl.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\exception\exceptions_int.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\exception\exceptions_jit.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="gc"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\gc\dll_gc.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\gc\root_set_enum_common.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\gc\stop_the_world_root_set_enum.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="init"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\init\finalize.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\init\parse_arguments.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\init\properties.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\init\vm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\init\vm_init.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\init\vm_main.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\init\vm_shutdown.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="interpreter"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\interpreter\interp_exports.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\interpreter\interp_imports.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="jit"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jit\bit_vector.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jit\compile.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jit\dll_jit.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jit\dump.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jit\ini.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jit\jit_runtime_support.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jit\native_overrides.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jit\primitives_support.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="jni"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jni\jni.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jni\jni_array.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jni\jni_field.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jni\jni_method.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jni\jni_utils.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="jvmti"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_break.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_break_intf.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_capability.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_class.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_dasm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_enumerate.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_event.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_extension.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_field.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_general.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_heap.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_heap.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_internal.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_jni.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_locals.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_mem.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_method.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_object.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_pop_frame.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_property.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_rawmon.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_roots.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_roots.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_stack.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_step.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_tags.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_tags.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_thread.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_thread_group.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_timer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_trace.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_trace.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_watch.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\ulist.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="kernel_classes"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_EMThreadSupport.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_EMThreadSupport.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_FinalizerThread.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_FinalizerThread.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_reflect_VMField.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_reflect_VMField.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_reflect_VMReflection.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_reflect_VMReflection.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_Runtime_SubProcess.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_Runtime_SubProcess_SubInputStream.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_Runtime_SubProcess_SubOutputStream.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_System.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_System.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMClassRegistry.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMClassRegistry.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMExecutionEngine.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMExecutionEngine.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMMemoryManager.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMMemoryManager.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMStart.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMThreadManager.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMThreadManager.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_util_concurrent_locks_LockSupport.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_util_concurrent_locks_LockSupport.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_kernel_vm_VM.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_kernel_vm_VM.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_util_concurrent_Atomics.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_util_concurrent_Atomics.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_vm_VMDebug.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_vm_VMDebug.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_vm_VMGenericsAndAnnotations.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_vm_VMGenericsAndAnnotations.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_vm_VMStack.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_vm_VMStack.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\Runtime_win.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="object"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\object\object_handles.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\object\vm_arrays.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="reflection"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\reflection\annotations.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\reflection\reflection.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="stack"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\stack\stack_dump.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\stack\stack_trace.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="thread"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\thread\atomics.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\thread\lock_manager.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\thread\mon_enter_exit.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\thread\object_generic.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\thread\suspend.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\thread\thread_dump.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\thread\thread_generic.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\thread\thread_manager.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\thread\verify_stack_enumeration.cpp">
-			</File>
-			<Filter
-				Name="hythr"
-				Filter="">
-				<File
-					RelativePath="..\..\..\..\vm\vmcore\src\thread\hythr\hythreads.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\vmcore\src\thread\hythr\hythreads.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="util"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\util\bytereader.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\util\jarfile_support.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\util\mem_alloc.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\util\native_stack.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\util\natives_support.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\util\vm_stats.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\util\vm_strings.cpp">
-			</File>
-			<Filter
-				Name="win"
-				Filter="">
-				<File
-					RelativePath="..\..\..\..\vm\vmcore\src\util\win\native_modules.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\vmcore\src\util\win\nt_platform_utils.cpp">
-				</File>
-				<Filter
-					Name="ia32"
-					Filter="">
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\win\ia32\nt_exception_filter.cpp">
-					</File>
-				</Filter>
-				<Filter
-					Name="include"
-					Filter="">
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\win\include\exception_filter.h">
-					</File>
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\win\include\java_lang_thread_nt.h">
-					</File>
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\win\include\platform.h">
-					</File>
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\win\include\platform_lowlevel.h">
-					</File>
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\win\include\vm_process.h">
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="ia32"
-				Filter="">
-				<Filter
-					Name="base"
-					Filter="">
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\compile_IA32.cpp">
-					</File>
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\ini_iA32.cpp">
-					</File>
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\invoke_native_stub_ia32.asm">
-					</File>
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\jit_generic_rt_support_ia32.cpp">
-					</File>
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\jit_lock_rt_support_ia32.cpp">
-					</File>
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\jit_runtime_support_ia32.cpp">
-					</File>
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\native_stack_ia32.cpp">
-					</File>
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\optimize_ia32.cpp">
-					</File>
-				</Filter>
-				<Filter
-					Name="base_natives"
-					Filter="">
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base_natives\java_lang_thread_ia32.cpp">
-					</File>
-					<File
-						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base_natives\java_lang_thread_ia32.h">
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="verifier"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\verifier\Graph.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\verifier\ver_dataflow.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\verifier\ver_real.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\verifier\ver_utils.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmcore\src\verifier\Verifier.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="port_lil"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\port\src\lil\lil.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\port\src\lil\lil_code_generator.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\port\src\lil\ia32\pim\lil_code_generator_ia32.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\port\src\lil\lil_code_generator_utils.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\port\src\lil\ia32\pim\m2n_ia32.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\port\src\lil\ia32\pim\m2n_ia32_internal.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\port\src\lil\pim\stack_iterator.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\port\src\lil\ia32\pim\stack_iterator_ia32.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="vmstart"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\vmstart\src\compmgr\component_manager_impl.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmstart\src\compmgr\component_manager_impl.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\vmstart\src\main.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="vm_include"
-			Filter="">
-			<File
-				RelativePath="..\..\..\..\vm\include\component_manager.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\include\em_intf.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\include\internal_jit_intf.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\include\interpreter.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\include\interpreter_exports.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\include\interpreter_imports.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\include\jit_import.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\include\jit_import_rt.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\include\jit_intf.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\include\jit_runtime_support.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\include\jni.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\include\jni_types.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\include\jvmti.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\vm\include\jvmti_types.h">
-			</File>
-			<Filter
-				Name="open"
-				Filter="">
-				<File
-					RelativePath="..\..\..\..\vm\include\open\bytecodes.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\common.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\compmgr.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\ee_em_intf.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\em.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\em_profile_access.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\em_vm.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\gc.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\hycomp.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\hythread.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\hythread_ext.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\jthread.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\thread.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\thread_externals.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\thread_helpers.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\ti_thread.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\types.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\vm.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\vm_gc.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\vm_kernel_classes.h">
-				</File>
-				<File
-					RelativePath="..\..\..\..\vm\include\open\vm_util.h">
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="vmcore"
+	ProjectGUID="{65E079BA-B8F1-4057-9307-B80A5B9EC379}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="bin\$(ConfigurationName)"
+			IntermediateDirectory="tmp\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\..\vm\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\vmcore\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\vmcore\src\util\ia32\base_natives&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\vmcore\src\util\win\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\port\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\port\src\lil\ia32\pim\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\port\src\encoder\ia32_em64t&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\zlib\include&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\apr\include\apr-1&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_VM;GC_V4;USE_DLL_JIT;APR_DECLARE_STATIC;PLATFORM_NT;_WIN32_WINNT=0x0501;_IA32_"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="port.lib apr-1.lib aprutil-1.lib zdll.lib log4cxx.lib hythr.lib jthread.lib advapi32.lib odbc32.lib userenv.lib ws2_32.lib mswsock.lib"
+				OutputFile="$(OutDir)/harmonyvm.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\vm\port\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\apr\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\aprutil\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\zlib\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\log4cxx\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\vm\hythr\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\vm\jthread\_bin&quot;"
+				ModuleDefinitionFile=""
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/harmonyvm.pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/harmonyvm.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="       ... Copying files to bin/default folder ...."
+				CommandLine="copy $(OutDir)\harmonyvm.dll $(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\deploy\jre\bin\default
+copy $(OutDir)\harmonyvm.pdb $(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\deploy\jre\bin\default
+copy $(OutDir)\harmonyvm.lib $(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\deploy\jre\bin\default
+"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="bin\$(ConfigurationName)"
+			IntermediateDirectory="tmp\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\..\vm\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\vmcore\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\vmcore\src\util\ia32\base_natives&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\vmcore\src\util\win\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\port\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\port\src\lil\ia32\pim\include&quot;;&quot;$(ProjectDir)\..\..\..\..\vm\port\src\encoder\ia32_em64t&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\zlib\include&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\apr\include\apr-1&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_VM;GC_V4;USE_DLL_JIT;APR_DECLARE_STATIC;PLATFORM_NT;_WIN32_WINNT=0x0501;_IA32_"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="port.lib apr-1.lib aprutil-1.lib zdll.lib log4cxx.lib hythr.lib jthread.lib advapi32.lib odbc32.lib userenv.lib ws2_32.lib mswsock.lib"
+				OutputFile="$(OutDir)/harmonyvm.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\vm\port\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\apr\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\aprutil\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\zlib\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\extra\log4cxx\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\vm\hythr\_bin&quot;;&quot;$(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\semis\vm\jthread\_bin&quot;"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/harmonyvm.pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/harmonyvm.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="       ... Copying files to bin/default folder ...."
+				CommandLine="copy $(OutDir)\harmonyvm.dll $(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\deploy\jre\bin\default
+copy $(OutDir)\harmonyvm.pdb $(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\deploy\jre\bin\default
+copy $(OutDir)\harmonyvm.lib $(ProjectDir)\..\..\..\win_ia32_msvc_$(ConfigurationName)\deploy\jre\bin\default
+"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="include"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\annotations.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\assertion_registry.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\atomics.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\bit_vector.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\bytereader.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\Class.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\class_interface.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\classloader.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\classpath_const.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\compile.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\dll_em_intf.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\dll_gc.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\dll_jit_intf.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\dump.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\em_intf_cpp.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\environment.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\exceptions.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\exceptions_impl.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\exceptions_int.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\exceptions_jit.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\exceptions_type.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\finalize.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\GlobalClassLoaderIterator.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\hashtable.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\heap.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\ini.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\init.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jarfile_support.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jarfile_util.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jit_export.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jit_export_jpda.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jit_export_rt.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jit_intf_cpp.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jit_runtime_support_common.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jni_direct.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jni_utils.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jvmti_break_intf.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jvmti_dasm.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jvmti_direct.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jvmti_interface.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jvmti_internal.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\jvmti_utils.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\lock_manager.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\manifest.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\mem_alloc.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\method_lookup.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\mon_enter_exit.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\native_frame.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\native_modules.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\native_overrides.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\native_stack.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\native_utils.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\natives_support.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\nogc.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\object.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\object_generic.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\object_handles.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\object_layout.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\Package.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\platform_utils.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\primitives_support.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\properties.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\reflection.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\root_set_enum_internal.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\simplehashtable.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\stack_dump.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\stack_trace.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\stack_walker.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\String_Pool.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\suspend_checker.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\sync_bits.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\thread_dump.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\thread_generic.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\thread_manager.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\type.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\unloading.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\verifier.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\Verifier_stub.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\verify_stack_enumeration.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\version.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\version_svn_tag.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\version_svn_tag_orig.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\vm_arrays.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\vm_core_types.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\vm_import.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\vm_log.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\vm_stats.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\vm_strings.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\vm_synch.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\include\vm_threads.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="class_support"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Assertion_Registry.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\C_Interface.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Class.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Class_File_Loader.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\class_impl.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\classloader.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Environment.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Initialize.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\java_type.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\manifest.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\method.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\method_lookup.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Prepare.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Resolve.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\String_Pool.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\type.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\class_support\Verifier_stub.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="exception"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\exception\exceptions.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\exception\exceptions_impl.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\exception\exceptions_int.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\exception\exceptions_jit.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="gc"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\gc\dll_gc.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\gc\root_set_enum_common.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\gc\stop_the_world_root_set_enum.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="init"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\init\finalize.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\init\parse_arguments.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\init\properties.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\init\vm.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\init\vm_init.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\init\vm_main.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\init\vm_properties.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\init\vm_shutdown.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="interpreter"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\interpreter\interp_exports.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\interpreter\interp_imports.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="jit"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jit\bit_vector.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jit\compile.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jit\dll_jit.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jit\dump.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jit\ini.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jit\jit_runtime_support.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jit\native_overrides.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jit\primitives_support.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="jni"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jni\jni.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jni\jni_array.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jni\jni_field.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jni\jni_method.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jni\jni_utils.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="jvmti"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_break.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_break_intf.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_capability.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_class.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_dasm.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_enumerate.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_event.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_extension.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_field.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_general.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_heap.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_heap.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_internal.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_jni.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_locals.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_mem.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_method.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_object.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_pop_frame.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_property.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_rawmon.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_roots.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_roots.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_stack.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_step.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_tags.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_tags.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_thread.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_thread_group.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_timer.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_trace.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_trace.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\jvmti_watch.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\jvmti\ulist.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="kernel_classes"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_EMThreadSupport.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_EMThreadSupport.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_FinalizerThread.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_FinalizerThread.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_reflect_VMField.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_reflect_VMField.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_reflect_VMReflection.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_reflect_VMReflection.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_Runtime_SubProcess.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_Runtime_SubProcess_SubInputStream.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_Runtime_SubProcess_SubOutputStream.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_System.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_System.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMClassRegistry.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMClassRegistry.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMExecutionEngine.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMExecutionEngine.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMMemoryManager.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMMemoryManager.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMStart.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMThreadManager.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_lang_VMThreadManager.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_util_concurrent_locks_LockSupport.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\java_util_concurrent_locks_LockSupport.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_kernel_vm_VM.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_kernel_vm_VM.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_util_concurrent_Atomics.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_util_concurrent_Atomics.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_vm_VMDebug.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_vm_VMDebug.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_vm_VMGenericsAndAnnotations.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_vm_VMGenericsAndAnnotations.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_vm_VMStack.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\org_apache_harmony_vm_VMStack.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\kernel_classes\native\Runtime_win.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="object"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\object\object_handles.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\object\vm_arrays.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="reflection"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\reflection\annotations.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\reflection\reflection.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="stack"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\stack\stack_dump.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\stack\stack_trace.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="thread"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\thread\atomics.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\thread\lock_manager.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\thread\mon_enter_exit.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\thread\object_generic.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\thread\suspend.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\thread\thread_dump.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\thread\thread_generic.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\thread\thread_manager.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\thread\verify_stack_enumeration.cpp">
+			</File>
+			<Filter
+				Name="hythr"
+				Filter="">
+				<File
+					RelativePath="..\..\..\..\vm\vmcore\src\thread\hythr\hythreads.cpp">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\vmcore\src\thread\hythr\hythreads.h">
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="util"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\util\bytereader.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\util\jarfile_support.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\util\mem_alloc.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\util\native_stack.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\util\natives_support.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\util\vm_stats.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\util\vm_strings.cpp">
+			</File>
+			<Filter
+				Name="win"
+				Filter="">
+				<File
+					RelativePath="..\..\..\..\vm\vmcore\src\util\win\native_modules.cpp">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\vmcore\src\util\win\nt_platform_utils.cpp">
+				</File>
+				<Filter
+					Name="ia32"
+					Filter="">
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\win\ia32\nt_exception_filter.cpp">
+					</File>
+				</Filter>
+				<Filter
+					Name="include"
+					Filter="">
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\win\include\exception_filter.h">
+					</File>
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\win\include\java_lang_thread_nt.h">
+					</File>
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\win\include\platform.h">
+					</File>
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\win\include\platform_lowlevel.h">
+					</File>
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\win\include\vm_process.h">
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="ia32"
+				Filter="">
+				<Filter
+					Name="base"
+					Filter="">
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\compile_IA32.cpp">
+					</File>
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\ini_iA32.cpp">
+					</File>
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\invoke_native_stub_ia32.asm">
+					</File>
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\jit_generic_rt_support_ia32.cpp">
+					</File>
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\jit_lock_rt_support_ia32.cpp">
+					</File>
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\jit_runtime_support_ia32.cpp">
+					</File>
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\native_stack_ia32.cpp">
+					</File>
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base\optimize_ia32.cpp">
+					</File>
+				</Filter>
+				<Filter
+					Name="base_natives"
+					Filter="">
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base_natives\java_lang_thread_ia32.cpp">
+					</File>
+					<File
+						RelativePath="..\..\..\..\vm\vmcore\src\util\ia32\base_natives\java_lang_thread_ia32.h">
+					</File>
+				</Filter>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="verifier"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier\Graph.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier\ver_dataflow.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier\ver_real.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier\ver_utils.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmcore\src\verifier\Verifier.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="port_lil"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\port\src\lil\lil.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\port\src\lil\lil_code_generator.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\port\src\lil\ia32\pim\lil_code_generator_ia32.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\port\src\lil\lil_code_generator_utils.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\port\src\lil\ia32\pim\m2n_ia32.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\port\src\lil\ia32\pim\m2n_ia32_internal.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\port\src\lil\pim\stack_iterator.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\port\src\lil\ia32\pim\stack_iterator_ia32.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="vmstart"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\vmstart\src\compmgr\component_manager_impl.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmstart\src\compmgr\component_manager_impl.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\vmstart\src\main.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="vm_include"
+			Filter="">
+			<File
+				RelativePath="..\..\..\..\vm\include\component_manager.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\include\em_intf.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\include\internal_jit_intf.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\include\interpreter.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\include\interpreter_exports.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\include\interpreter_imports.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\include\jit_import.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\include\jit_import_rt.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\include\jit_intf.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\include\jit_runtime_support.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\include\jni.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\include\jni_types.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\include\jvmti.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\vm\include\jvmti_types.h">
+			</File>
+			<Filter
+				Name="open"
+				Filter="">
+				<File
+					RelativePath="..\..\..\..\vm\include\open\bytecodes.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\common.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\compmgr.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\ee_em_intf.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\em.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\em_profile_access.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\em_vm.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\gc.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\hycomp.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\hythread.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\hythread_ext.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\jthread.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\thread.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\thread_externals.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\thread_helpers.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\ti_thread.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\types.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\vm.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\vm_gc.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\vm_kernel_classes.h">
+				</File>
+				<File
+					RelativePath="..\..\..\..\vm\include\open\vm_util.h">
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp?view=diff&rev=480913&r1=480912&r2=480913
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp Thu Nov 30 04:54:59 2006
@@ -174,7 +174,9 @@
  *  deprecated
  */
 std::string buildDefaultLibPath(const std::string& dll_name) {
-    std::string library_path = vm_get_property_value("vm.boot.library.path");
+    char* c_string_tmp_value = get_property("vm.boot.library.path", VM_PROPERTIES);
+    std::string library_path = c_string_tmp_value == NULL ? "" : c_string_tmp_value;
+    destroy_property_value(c_string_tmp_value);
 #ifdef PLATFORM_NT
     std::string fullPath = dll_name + ".dll";
     
@@ -214,7 +216,9 @@
 
     std::string path = origPath;
     if (path.find('/') == path.npos && path.find('\\') == path.npos ) {
-        std::string dir = vm_get_property_value(O_A_H_VM_VMDIR);
+        char* c_string_tmp_value = get_property(O_A_H_VM_VMDIR, JAVA_PROPERTIES);
+        std::string dir = c_string_tmp_value == NULL ? "" : c_string_tmp_value;
+        destroy_property_value(c_string_tmp_value);
         if (libPrefix.length() > 0 && !startsWith(path, libPrefix)) {
             path = libPrefix + path;
         }
@@ -297,9 +301,15 @@
             } else if (startsWith(line, "-D") && (idx = line.find('=')) != std::string::npos) {
                 std::string name = line.substr(2, idx-2);                   
                 std::string value = line.substr(idx+1);
-                const char* old_value = vm_get_property_value(name.c_str());
-                if (old_value == NULL || *old_value == 0) {
-                    vm_properties_set_value(name.c_str(), value.c_str());
+                if (!is_property_set(name.c_str(), JAVA_PROPERTIES)) {
+                    set_property(name.c_str(), value.c_str(), JAVA_PROPERTIES);
+                }
+                continue;
+            } else if (startsWith(line, "-XD") && (idx = line.find('=')) != std::string::npos) {
+                std::string name = line.substr(3, idx-3);                   
+                std::string value = line.substr(idx+1);
+                if (!is_property_set(name.c_str(),VM_PROPERTIES)) {
+                    set_property(name.c_str(), value.c_str(), VM_PROPERTIES);
                 }
                 continue;
             } 
@@ -315,10 +325,12 @@
 }
 
 std::string DrlEMImpl::readConfiguration() {
-    std::string  configFileName = vm_get_property_value("em.properties");
+    char* c_string_tmp_value = get_property("em.properties", VM_PROPERTIES);
+    std::string  configFileName = c_string_tmp_value == NULL ? "" : c_string_tmp_value;
+    destroy_property_value(c_string_tmp_value);
     if (configFileName.empty()) {
-        bool jitTiMode = vm_get_property_value_boolean("vm.jvmti.enabled", false);
-        bool interpreterMode = vm_get_boolean_property_value_with_default("vm.use_interpreter");
+        bool jitTiMode = get_boolean_property("vm.jvmti.enabled", FALSE, VM_PROPERTIES);
+        bool interpreterMode = get_boolean_property("vm.use_interpreter", FALSE, VM_PROPERTIES);
         configFileName = interpreterMode ? "interpreter" : (jitTiMode ? "ti" : "client");
     } 
     if (!endsWith(configFileName, EM_CONFIG_EXT)) {
@@ -326,7 +338,9 @@
     }
 
     if (configFileName.find('/') == configFileName.npos && configFileName.find('\\') == configFileName.npos ) {
-        std::string defaultConfigDir = vm_get_property_value(O_A_H_VM_VMDIR);
+        c_string_tmp_value = get_property(O_A_H_VM_VMDIR, JAVA_PROPERTIES);
+        std::string defaultConfigDir = c_string_tmp_value == NULL ? "" : c_string_tmp_value;
+        destroy_property_value(c_string_tmp_value);
         
         configFileName = defaultConfigDir + "/" + configFileName;
     }
@@ -378,9 +392,13 @@
 
 std::string DrlEMImpl::getJITLibFromCmdLine(const std::string& jitName) const {
     std::string propName = std::string("em.")+jitName+".jitPath";
-    std::string jitLib  = vm_get_property_value(propName.c_str());
+    char* c_string_tmp_value = get_property(propName.c_str(), VM_PROPERTIES);
+    std::string jitLib  = c_string_tmp_value == NULL ? "" : c_string_tmp_value;
+    destroy_property_value(c_string_tmp_value);
     if (jitLib.empty()) {
-        jitLib = vm_get_property_value("em.jitPath");
+        c_string_tmp_value = get_property("em.jitPath", VM_PROPERTIES);
+        jitLib = c_string_tmp_value == NULL ? "" : c_string_tmp_value;
+        destroy_property_value(c_string_tmp_value);
     }
     return jitLib;
 }

Modified: harmony/enhanced/drlvm/trunk/vm/gc_cc/src/init.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_cc/src/init.cpp?view=diff&rev=480913&r1=480912&r2=480913
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_cc/src/init.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_cc/src/init.cpp Thu Nov 30 04:54:59 2006
@@ -65,50 +65,33 @@
 const char *lp_hint = NULL;
 bool jvmti_heap_iteration = false;
 
-static size_t parse_size_string(const char* size_string) {
-    size_t len = strlen(size_string);
+static size_t get_size_property(const char* name) 
+{
+    char* size_string = get_property(name, VM_PROPERTIES);
+    size_t size = atol(size_string);
+    int sizeModifier = tolower(size_string[strlen(size_string) - 1]);
+    destroy_property_value(size_string);
+
     size_t unit = 1;
-    if (tolower(size_string[len - 1]) == 'k') {
-        unit = 1024;
-    } else if (tolower(size_string[len - 1]) == 'm') {
-        unit = 1024 * 1024;
-    } else if (tolower(size_string[len - 1]) == 'g') {
-        unit = 1024 * 1024 * 1024;
+    switch (sizeModifier) {
+    case 'k': unit = 1024; break;
+    case 'm': unit = 1024 * 1024; break;
+    case 'g': unit = 1024 * 1024 * 1024;break;
     }
-    size_t size = atol(size_string);
+
     size_t res = size * unit;
     if (res / unit != size) {
-        // overflow happened
+        /* overflow happened */
         return 0;
     }
     return res;
 }
 
-static bool get_property_value_boolean(char* name, bool deflt) {
-    const char* value = vm_get_property_value(name);
-    if (value == NULL || 0 == value[0])
-       return deflt;
-
-    return (strcmp("0", value) != 0
-        && strcmp("off", value) != 0 
-        && strcmp("false", value) != 0);
-}
-
-static int get_property_value_int(char* name) {
-    const char* value = vm_get_property_value(name);
-    return (NULL == value) ? 0 : atoi(value);
-}
-
-static bool is_property_set(char* name) {
-    const char* value = vm_get_property_value(name);
-    return (NULL != value && 0 != value[0]);
-}
-
 static void parse_configuration_properties() {
     max_heap_size = HEAP_SIZE_DEFAULT;
     min_heap_size = 16 MB;
-    if (is_property_set("gc.mx")) {
-        max_heap_size = parse_size_string(vm_get_property_value("gc.mx"));
+    if (is_property_set("gc.mx", VM_PROPERTIES) == 1) {
+        max_heap_size = get_size_property("gc.mx");
 
         if (max_heap_size < 16 MB) {
             INFO("max heap size is too small: " << max_heap_size);
@@ -123,8 +106,8 @@
         if (min_heap_size < 16 MB) min_heap_size = 16 MB;
     }
 
-    if (is_property_set("gc.ms")) {
-        min_heap_size = parse_size_string(vm_get_property_value("gc.ms"));
+    if (is_property_set("gc.ms", VM_PROPERTIES) == 1) {
+        min_heap_size = get_size_property("gc.ms");
 
         if (min_heap_size < 16 MB) {
             INFO("min heap size is too small: " << min_heap_size);
@@ -152,35 +135,36 @@
 #endif
 
 
-    if (is_property_set("gc.lp")) {
-        lp_hint = vm_get_property_value("gc.lp");
+    if (is_property_set("gc.lp", VM_PROPERTIES) == 1) {
+        char* value = get_property("gc.lp", VM_PROPERTIES);
+        lp_hint = strdup(value);
+        destroy_property_value(value);
     }
     
-    if (is_property_set("gc.type"))
-        gc_algorithm = get_property_value_int("gc.type");
+    gc_algorithm = get_int_property("gc.type", 0, VM_PROPERTIES);
 
     // version
     INFO(gc_version_string());
     INFO("GC type = " << gc_algorithm);
 
-    if (get_property_value_boolean("gc.ignore_finalizers", false)) {
+    if (get_boolean_property("gc.ignore_finalizers", false, VM_PROPERTIES)) {
         ignore_finalizers = true;
         INFO("GC will ignore finalizers");
     }
 
-    if (get_property_value_boolean("gc.adaptive", true)) {
+    if (get_boolean_property("gc.adaptive", true, VM_PROPERTIES)) {
         INFO("GC will use adaptive algorithm selection");
     } else {
         INFO("GC will NOT use adaptive algorithm selection");
         gc_adaptive = false;
     }
 
-    if (get_property_value_boolean("gc.remember_root_set", false)) {
+    if (get_boolean_property("gc.remember_root_set", false, VM_PROPERTIES)) {
         remember_root_set = true;
         INFO("GC will retrieve root set before any modification in heap");
     }
 
-    if (get_property_value_boolean("gc.heap_iteration", false)) {
+    if (get_boolean_property("gc.heap_iteration", false, VM_PROPERTIES)) {
         jvmti_heap_iteration = true;
         INFO("GC jvmti heap iteration enabled");
     }
@@ -189,7 +173,7 @@
 void gc_vm_initialized() {
     TRACE2("gc.init", "gc_vm_initialized");
 
-    if (get_property_value_boolean("gc.heap_iteration", false)) {
+    if (get_boolean_property("gc.heap_iteration", false, VM_PROPERTIES)) {
         jvmti_heap_iteration = true;
         INFO("GC jvmti heap iteration enabled");
     }



Mime
View raw message