diff options
| author | Sergiy Kuryata <sergeyk@microsoft.com> | 2015-03-25 17:24:41 -0700 |
|---|---|---|
| committer | Sergiy Kuryata <sergeyk@microsoft.com> | 2015-03-25 17:24:41 -0700 |
| commit | e54ca4e9d8fd53d531c9e62e3469e0f606e455e5 (patch) | |
| tree | f3c40490ada19b289bffda246658a0680cd218a0 /src/debug | |
| parent | 3338e4c42a47d78242f33d900d9b4a0e0b2db2f8 (diff) | |
| parent | d4e7a7205366c6eb371d093e7053ee58191be91b (diff) | |
| download | coreclr-e54ca4e9d8fd53d531c9e62e3469e0f606e455e5.tar.gz coreclr-e54ca4e9d8fd53d531c9e62e3469e0f606e455e5.tar.bz2 coreclr-e54ca4e9d8fd53d531c9e62e3469e0f606e455e5.zip | |
Merge pull request #570 from Djuffin/cordb_platform_fix
Fix CORDB_PLATFORM mismatch between DAC and SOS
Diffstat (limited to 'src/debug')
| -rw-r--r-- | src/debug/daccess/daccess.cpp | 4 | ||||
| -rw-r--r-- | src/debug/daccess/datatargetadapter.cpp | 21 | ||||
| -rw-r--r-- | src/debug/di/shimlocaldatatarget.cpp | 3 | ||||
| -rw-r--r-- | src/debug/di/shimremotedatatarget.cpp | 4 |
4 files changed, 27 insertions, 5 deletions
diff --git a/src/debug/daccess/daccess.cpp b/src/debug/daccess/daccess.cpp index 85d4d463a8..e5299b693e 100644 --- a/src/debug/daccess/daccess.cpp +++ b/src/debug/daccess/daccess.cpp @@ -5501,9 +5501,9 @@ ClrDataAccess::Initialize(void) #ifdef FEATURE_PAL #if defined(DBG_TARGET_X86) - CorDebugPlatform hostPlatform = CORDB_PLATFORM_MAC_X86; + CorDebugPlatform hostPlatform = CORDB_PLATFORM_POSIX_X86; #elif defined(DBG_TARGET_AMD64) - CorDebugPlatform hostPlatform = CORDB_PLATFORM_MAC_AMD64; + CorDebugPlatform hostPlatform = CORDB_PLATFORM_POSIX_AMD64; #else #error Unknown Processor. #endif diff --git a/src/debug/daccess/datatargetadapter.cpp b/src/debug/daccess/datatargetadapter.cpp index 73a1c485f4..902b7dab13 100644 --- a/src/debug/daccess/datatargetadapter.cpp +++ b/src/debug/daccess/datatargetadapter.cpp @@ -112,6 +112,24 @@ DataTargetAdapter::GetPlatform( switch(ulMachineType) { +#ifdef FEATURE_PAL + case IMAGE_FILE_MACHINE_I386: + ulExpectedPointerSize = 4; + platform = CORDB_PLATFORM_POSIX_X86; + break; + + case IMAGE_FILE_MACHINE_AMD64: + ulExpectedPointerSize = 8; + platform = CORDB_PLATFORM_POSIX_AMD64; + break; + + case IMAGE_FILE_MACHINE_IA64: + case IMAGE_FILE_MACHINE_ARMNT: + case IMAGE_FILE_MACHINE_ARM64: + _ASSERTE_MSG(false, "Not supported platform."); + return E_NOTIMPL; + +#else // FEATURE_PAL case IMAGE_FILE_MACHINE_I386: ulExpectedPointerSize = 4; platform = CORDB_PLATFORM_WINDOWS_X86; @@ -135,7 +153,8 @@ DataTargetAdapter::GetPlatform( case IMAGE_FILE_MACHINE_ARM64: ulExpectedPointerSize = 8; platform = CORDB_PLATFORM_WINDOWS_ARM64; - break; + break; +#endif // FEATURE_PAL default: // No other platforms are current supported diff --git a/src/debug/di/shimlocaldatatarget.cpp b/src/debug/di/shimlocaldatatarget.cpp index 45d0b6cebe..9f3ba2ec1d 100644 --- a/src/debug/di/shimlocaldatatarget.cpp +++ b/src/debug/di/shimlocaldatatarget.cpp @@ -277,6 +277,9 @@ HRESULT STDMETHODCALLTYPE ShimLocalDataTarget::GetPlatform( CorDebugPlatform *pPlatform) { +#ifdef FEATURE_PAL +#error ShimLocalDataTarget is not implemented on PAL systems yet +#endif // Assume that we're running on Windows for now. #if defined(DBG_TARGET_X86) *pPlatform = CORDB_PLATFORM_WINDOWS_X86; diff --git a/src/debug/di/shimremotedatatarget.cpp b/src/debug/di/shimremotedatatarget.cpp index 3498700ac1..278ef68016 100644 --- a/src/debug/di/shimremotedatatarget.cpp +++ b/src/debug/di/shimremotedatatarget.cpp @@ -212,9 +212,9 @@ ShimRemoteDataTarget::GetPlatform( { #ifdef FEATURE_PAL #if defined(DBG_TARGET_X86) - *pPlatform = CORDB_PLATFORM_MAC_X86; + *pPlatform = CORDB_PLATFORM_POSIX_X86; #elif defined(DBG_TARGET_AMD64) - *pPlatform = CORDB_PLATFORM_MAC_AMD64; + *pPlatform = CORDB_PLATFORM_POSIX_AMD64; #else #error Unknown Processor. #endif |