diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-08-23 09:32:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-23 09:32:24 -0700 |
| commit | d8d3151f6744a89cf62d045d10e1b0dfa5e34015 (patch) | |
| tree | fab46f6003f595be8b1c89dc2776ea14474541a7 /src/inc | |
| parent | 6f3c15061e3e213805c3f75fcf9a9049d5ec96d3 (diff) | |
| download | coreclr-d8d3151f6744a89cf62d045d10e1b0dfa5e34015.tar.gz coreclr-d8d3151f6744a89cf62d045d10e1b0dfa5e34015.tar.bz2 coreclr-d8d3151f6744a89cf62d045d10e1b0dfa5e34015.zip | |
Deal with compilation warnings in VM in cross-bitness scenario (#18707)
Diffstat (limited to 'src/inc')
| -rw-r--r-- | src/inc/clrnt.h | 2 | ||||
| -rw-r--r-- | src/inc/daccess.h | 4 | ||||
| -rw-r--r-- | src/inc/regdisp.h | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/inc/clrnt.h b/src/inc/clrnt.h index 487a370d02..95f7458fd0 100644 --- a/src/inc/clrnt.h +++ b/src/inc/clrnt.h @@ -907,7 +907,7 @@ FORCEINLINE ULONG RtlpGetFunctionEndAddress ( __in PT_RUNTIME_FUNCTION FunctionEntry, - __in ULONG ImageBase + __in TADDR ImageBase ) { ULONG FunctionLength; diff --git a/src/inc/daccess.h b/src/inc/daccess.h index 01ed65dc76..67e5843ac4 100644 --- a/src/inc/daccess.h +++ b/src/inc/daccess.h @@ -2399,13 +2399,13 @@ typedef DPTR(IMAGE_TLS_DIRECTORY) PTR_IMAGE_TLS_DIRECTORY; typedef DPTR(struct _UNWIND_INFO) PTR_UNWIND_INFO; #endif -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ typedef DPTR(T_RUNTIME_FUNCTION) PTR_RUNTIME_FUNCTION; typedef DPTR(struct _UNWIND_INFO) PTR_UNWIND_INFO; #if defined(_TARGET_AMD64_) typedef DPTR(union _UNWIND_CODE) PTR_UNWIND_CODE; #endif // _TARGET_AMD64_ -#endif // _WIN64 +#endif // _TARGET_64BIT_ #ifdef _TARGET_ARM_ typedef DPTR(RUNTIME_FUNCTION) PTR_RUNTIME_FUNCTION; diff --git a/src/inc/regdisp.h b/src/inc/regdisp.h index ed60f4bcfd..06ceaf24a6 100644 --- a/src/inc/regdisp.h +++ b/src/inc/regdisp.h @@ -147,7 +147,7 @@ inline TADDR GetRegdisplayStackMark(REGDISPLAY *display) { #endif } -#elif defined(_WIN64) +#elif defined(_TARGET_64BIT_) #if defined(_TARGET_ARM64_) typedef struct _Arm64VolatileContextPointer @@ -278,7 +278,7 @@ inline TADDR GetRegdisplayStackMark(REGDISPLAY *display) { #error "RegDisplay functions are not implemented on this platform." #endif -#if defined(_WIN64) || defined(_TARGET_ARM_) || (defined(_TARGET_X86_) && defined(WIN64EXCEPTIONS)) +#if defined(_TARGET_64BIT_) || defined(_TARGET_ARM_) || (defined(_TARGET_X86_) && defined(WIN64EXCEPTIONS)) // This needs to be implemented for platforms that have funclets. inline LPVOID GetRegdisplayReturnValue(REGDISPLAY *display) { @@ -289,7 +289,7 @@ inline LPVOID GetRegdisplayReturnValue(REGDISPLAY *display) #elif defined(_TARGET_ARM64_) return (LPVOID)display->pCurrentContext->X0; #elif defined(_TARGET_ARM_) - return (LPVOID)display->pCurrentContext->R0; + return (LPVOID)((TADDR)display->pCurrentContext->R0); #elif defined(_TARGET_X86_) return (LPVOID)display->pCurrentContext->Eax; #else @@ -302,24 +302,24 @@ inline void SyncRegDisplayToCurrentContext(REGDISPLAY* pRD) { LIMITED_METHOD_CONTRACT; -#if defined(_WIN64) +#if defined(_TARGET_64BIT_) pRD->SP = (INT_PTR)GetSP(pRD->pCurrentContext); pRD->ControlPC = INT_PTR(GetIP(pRD->pCurrentContext)); -#elif defined(_TARGET_ARM_) // _WIN64 +#elif defined(_TARGET_ARM_) pRD->SP = (DWORD)GetSP(pRD->pCurrentContext); pRD->ControlPC = (DWORD)GetIP(pRD->pCurrentContext); -#elif defined(_TARGET_X86_) // _TARGET_ARM_ +#elif defined(_TARGET_X86_) pRD->SP = (DWORD)GetSP(pRD->pCurrentContext); pRD->ControlPC = (DWORD)GetIP(pRD->pCurrentContext); #else // _TARGET_X86_ PORTABILITY_ASSERT("SyncRegDisplayToCurrentContext"); -#endif // _TARGET_ARM_ || _TARGET_X86_ +#endif #ifdef DEBUG_REGDISPLAY CheckRegDisplaySP(pRD); #endif // DEBUG_REGDISPLAY } -#endif // _WIN64 || _TARGET_ARM_ || (_TARGET_X86_ && WIN64EXCEPTIONS) +#endif // _TARGET_64BIT_ || _TARGET_ARM_ || (_TARGET_X86_ && WIN64EXCEPTIONS) typedef REGDISPLAY *PREGDISPLAY; |