summaryrefslogtreecommitdiff
path: root/src/debug/di
diff options
context:
space:
mode:
Diffstat (limited to 'src/debug/di')
-rw-r--r--src/debug/di/DI.props86
-rw-r--r--src/debug/di/dbi.sln20
-rw-r--r--src/debug/di/dbi.vcxproj143
-rw-r--r--src/debug/di/dirs.proj18
-rw-r--r--src/debug/di/rspriv.h4
-rw-r--r--src/debug/di/rsthread.cpp4
6 files changed, 4 insertions, 271 deletions
diff --git a/src/debug/di/DI.props b/src/debug/di/DI.props
deleted file mode 100644
index 1d7336dab0..0000000000
--- a/src/debug/di/DI.props
+++ /dev/null
@@ -1,86 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <!--*****************************************************-->
- <!--This MSBuild project file was automatically generated-->
- <!--from the original SOURCES/DIRS file by the KBC tool.-->
- <!--*****************************************************-->
- <!-- These features need to be enabled for each build artifact that wants to use them, they aren't controlled at the SKU level-->
- <PropertyGroup>
- <FeatureMetadataCustomDataSource>true</FeatureMetadataCustomDataSource>
- <FeatureMetadataDebuggeeDataSource>true</FeatureMetadataDebuggeeDataSource>
- </PropertyGroup>
- <!--Import the settings-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\src\Debug\XPlatCommon.props"/>
- <!--Leaf project Properties-->
- <PropertyGroup>
- <UserIncludes>
- $(UserIncludes);
- ..;
- ..\..\inc;
- ..\..\inc\dump;
- ..\..\..\vm;
- $(VCToolsIncPath);
- </UserIncludes>
- <ClAdditionalOptions>$(ClAdditionalOptions) -DUNICODE -D_UNICODE -DFEATURE_NO_HOST -DFEATURE_METADATA_LOAD_TRUSTED_IMAGES</ClAdditionalOptions>
- <OutputPath>$(ClrLibDest)</OutputPath>
- <TargetType>LIBRARY</TargetType>
- <PCHHeader Condition="'$(CCOVER)' == ''">stdafx.h</PCHHeader>
- <EnableCxxPCHHeaders Condition="'$(CCOVER)' == ''">true</EnableCxxPCHHeaders>
- <!--PCH: Both precompiled header and cpp are on the same ..\ path this is likely to be wrong.-->
- <PCHCompile Condition="'$(CCOVER)' == ''">..\stdafx.cpp</PCHCompile>
- <LinkNoLibraries>true</LinkNoLibraries>
- <LinkUseCMT>true</LinkUseCMT>
- <UseMsvcrt />
- </PropertyGroup>
- <!--Leaf Project Items-->
- <ItemGroup>
- <ProjectReference Condition="'$(XPlatHostLibBuildDir)'=='HostLocal'" Include="$(ClrSrcDirectory)inc\corguids.nativeproj" />
- <ProjectReference Condition="'$(XPlatHostLibBuildDir)'=='HostWinx86'" Include="$(ClrSrcDirectory)incx86\corguids.nativeproj" />
- <ProjectReference Condition="'$(XPlatHostLibBuildDir)'=='HostWinAMD64'" Include="$(ClrSrcDirectory)incamd64\corguids.nativeproj" />
- </ItemGroup>
- <ItemGroup>
- <SourcesPublish Include="..\publish.cpp" />
- </ItemGroup>
- <ItemGroup>
- <SourcesShim Include="..\ShimProcess.cpp" />
- <SourcesShim Include="..\ShimCallback.cpp" />
- <SourcesShim Include="..\ShimEvents.cpp" />
- <SourcesShim Include="..\ShimDataTarget.cpp" />
- <SourcesShim Include="..\ShimStackWalk.cpp" />
- </ItemGroup>
- <ItemGroup>
- <SourcesRightside Include="..\breakpoint.cpp" />
- <SourcesRightside Include="..\cordb.cpp" />
- <SourcesRightside Include="..\DbgTransportManager.cpp" />
- <SourcesRightside Include="..\DIValue.cpp" />
- <SourcesRightside Include="..\hash.cpp" />
- <SourcesRightside Include="..\module.cpp" />
- <SourcesRightside Include="..\NativePipeline.cpp" />
- <SourcesRightside Include="..\PlatformSpecific.cpp" />
- <SourcesRightside Include="..\process.cpp" />
- <SourcesRightside Include="..\RsAppDomain.cpp" />
- <SourcesRightside Include="..\RsAssembly.cpp" />
- <SourcesRightside Include="..\RsClass.cpp" />
- <SourcesRightside Include="..\RsFunction.cpp" />
- <SourcesRightside Include="..\RsMain.cpp" />
- <SourcesRightside Include="..\RsMda.cpp" />
- <SourcesRightside Include="..\RsRegSetCommon.cpp" />
- <SourcesRightside Include="..\RsStackWalk.cpp" />
- <SourcesRightside Include="..\RsThread.cpp" />
- <SourcesRightside Include="..\RsType.cpp" />
- <SourcesRightside Include="..\shared.cpp" />
- <SourcesRightside Include="..\symbolinfo.cpp" />
- <SourcesRightside Include="..\ValueHome.cpp" />
- </ItemGroup>
- <ItemGroup>
- <CppCompile Include="@(SourcesPublish)" />
- <CppCompile Include="@(SourcesShim)" />
- <CppCompile Include="@(SourcesRightside)" />
- <AssembleAmd64 Condition="'$(BuildArchitecture)' == 'amd64' and '$(CrossTargetArchitecture)' != 'arm64'" Include="..\amd64\floatconversion.asm" />
- </ItemGroup>
- <ItemGroup Condition="'$(BuildArchitecture)' == 'arm64'">
- <PreprocessAssembleArm Include="..\arm64\floatconversion.asm" />
- <AssembleArm64 Include="$(IntermediateOutputDirectory)\floatconversion.i" />
- </ItemGroup>
- <!--Import the targets-->
-</Project>
diff --git a/src/debug/di/dbi.sln b/src/debug/di/dbi.sln
deleted file mode 100644
index 33cbec162c..0000000000
--- a/src/debug/di/dbi.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbi", "dbi.vcxproj", "{D8445C62-03DC-4D6A-A2F2-1AAF31577151}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {D8445C62-03DC-4D6A-A2F2-1AAF31577151}.Debug|Win32.ActiveCfg = Debug|Win32
- {D8445C62-03DC-4D6A-A2F2-1AAF31577151}.Debug|Win32.Build.0 = Debug|Win32
- {D8445C62-03DC-4D6A-A2F2-1AAF31577151}.Release|Win32.ActiveCfg = Release|Win32
- {D8445C62-03DC-4D6A-A2F2-1AAF31577151}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/src/debug/di/dbi.vcxproj b/src/debug/di/dbi.vcxproj
deleted file mode 100644
index 08533b7240..0000000000
--- a/src/debug/di/dbi.vcxproj
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{D8445C62-03DC-4D6A-A2F2-1AAF31577151}</ProjectGuid>
- <Keyword>Win32Proj</Keyword>
- <RootNamespace>dbi</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v110</PlatformToolset>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v110</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DBI_EXPORTS;DBG_TARGET_X86;_TARGET_X86_;VS_COMPILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\inc;..\..\inc;C:\clr_next\src\InternalApis\Sys_clr\inc;C:\CLR_Next\binaries\amd64chk\IntraPartitionAPIs\clr\inc;C:\CLR_Next\src\ndp\Common\Inc\version;C:\CLR_Next\binaries\amd64chk\SysBuild\Version;..\inc\i386;..\inc\dump</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DBI_EXPORTS;DBG_TARGET_X86;_TARGET_X86_;VS_COMPILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\inc;..\..\inc;C:\clr_next\src\InternalApis\Sys_clr\inc;C:\CLR_Next\binaries\amd64chk\IntraPartitionAPIs\clr\inc;C:\CLR_Next\src\ndp\Common\Inc\version;C:\CLR_Next\binaries\amd64chk\SysBuild\Version;;..\inc\i386</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClInclude Include="classfactory.h" />
- <ClInclude Include="DbgTransportManager.h" />
- <ClInclude Include="DDPack.h" />
- <ClInclude Include="EventChannel.h" />
- <ClInclude Include="EventRedirectionPipeline.h" />
- <ClInclude Include="helpers.h" />
- <ClInclude Include="NativePipeline.h" />
- <ClInclude Include="RsEnumerator.hpp" />
- <ClInclude Include="RSPriv.h" />
- <ClInclude Include="ShimDataTarget.h" />
- <ClInclude Include="shimpriv.h" />
- <ClInclude Include="StdAfx.h" />
- <ClInclude Include="symbolinfo.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="RSPriv.inl" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="breakpoint.cpp" />
- <ClCompile Include="cordb.cpp" />
- <ClCompile Include="DbgTransportManager.cpp" />
- <ClCompile Include="DbgTransportPipeline.cpp" />
- <ClCompile Include="DDPack.cpp" />
- <ClCompile Include="DIValue.cpp" />
- <ClCompile Include="EventRedirectionPipeline.cpp" />
- <ClCompile Include="hash.cpp" />
- <ClCompile Include="i386\CordbRegisterSet.cpp" />
- <ClCompile Include="i386\primitives.cpp" />
- <ClCompile Include="LocalEventChannel.cpp" />
- <ClCompile Include="module.cpp" />
- <ClCompile Include="NativePipeline.cpp" />
- <ClCompile Include="PlatformSpecific.cpp" />
- <ClCompile Include="process.cpp" />
- <ClCompile Include="publish.cpp" />
- <ClCompile Include="RemoteEventChannel.cpp" />
- <ClCompile Include="RotorPipeline.cpp" />
- <ClCompile Include="RsAppDomain.cpp" />
- <ClCompile Include="RsAssembly.cpp" />
- <ClCompile Include="rsclass.cpp" />
- <ClCompile Include="rsfunction.cpp" />
- <ClCompile Include="RsMain.cpp" />
- <ClCompile Include="RsMda.cpp" />
- <ClCompile Include="RSRegSetCommon.cpp" />
- <ClCompile Include="RsStackWalk.cpp" />
- <ClCompile Include="RsThread.cpp" />
- <ClCompile Include="RsType.cpp" />
- <ClCompile Include="shared.cpp" />
- <ClCompile Include="shimcallback.cpp" />
- <ClCompile Include="ShimDataTarget.cpp" />
- <ClCompile Include="ShimEvents.cpp" />
- <ClCompile Include="ShimLocalDataTarget.cpp" />
- <ClCompile Include="ShimProcess.cpp" />
- <ClCompile Include="ShimRemoteDataTarget.cpp" />
- <ClCompile Include="ShimStackWalk.cpp" />
- <ClCompile Include="StdAfx.cpp" />
- <ClCompile Include="symbolinfo.cpp" />
- <ClCompile Include="ValueHome.cpp" />
- <ClCompile Include="WindowsPipeline.cpp" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project> \ No newline at end of file
diff --git a/src/debug/di/dirs.proj b/src/debug/di/dirs.proj
deleted file mode 100644
index c5a98947e5..0000000000
--- a/src/debug/di/dirs.proj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <!--Import the settings-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
-
- <PropertyGroup>
- <BuildInPhase1>true</BuildInPhase1>
- <BuildInPhaseDefault>false</BuildInPhaseDefault>
- <BuildCoreBinaries>true</BuildCoreBinaries>
- </PropertyGroup>
-
- <!--The following projects will build during PHASE 1-->
- <ItemGroup Condition="'$(BuildExePhase)' == '1'">
- <ProjectFile Condition="'$(FeatureDbiDebugging)'=='true'" Include="hostlocal\di.nativeproj" />
- </ItemGroup>
-
- <!--Import the targets-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
-</Project>
diff --git a/src/debug/di/rspriv.h b/src/debug/di/rspriv.h
index 18920add5d..8f369b7414 100644
--- a/src/debug/di/rspriv.h
+++ b/src/debug/di/rspriv.h
@@ -6929,11 +6929,11 @@ public:
// new-style constructor
CordbMiscFrame(DebuggerIPCE_JITFuncData * pJITFuncData);
-#if defined(DBG_TARGET_WIN64) || defined(DBG_TARGET_ARM)
+#ifdef WIN64EXCEPTIONS
SIZE_T parentIP;
FramePointer fpParentOrSelf;
bool fIsFilterFunclet;
-#endif // DBG_TARGET_WIN64 || DBG_TARGET_ARM
+#endif // WIN64EXCEPTIONS
};
diff --git a/src/debug/di/rsthread.cpp b/src/debug/di/rsthread.cpp
index a4660be570..02fae00b0f 100644
--- a/src/debug/di/rsthread.cpp
+++ b/src/debug/di/rsthread.cpp
@@ -5849,11 +5849,11 @@ CordbMiscFrame::CordbMiscFrame()
// the real constructor which stores the funclet-related information in the CordbMiscFrame
CordbMiscFrame::CordbMiscFrame(DebuggerIPCE_JITFuncData * pJITFuncData)
{
-#if defined(DBG_TARGET_WIN64) || defined(DBG_TARGET_ARM)
+#ifdef WIN64EXCEPTIONS
this->parentIP = pJITFuncData->parentNativeOffset;
this->fpParentOrSelf = pJITFuncData->fpParentOrSelf;
this->fIsFilterFunclet = (pJITFuncData->fIsFilterFrame == TRUE);
-#endif // DBG_TARGET_WIN64 || DBG_TARGET_ARM
+#endif // WIN64EXCEPTIONS
}
/* ------------------------------------------------------------------------- *