From 448a91d9437ea94387cda57ebe5fa670dfc9ae14 Mon Sep 17 00:00:00 2001 From: Egor Chesakov Date: Wed, 28 Feb 2018 17:45:12 -0800 Subject: Replace ambiguous _WIN64 and BIT64 with _TARGET_64BIT_ macro --- src/inc/jithelpers.h | 6 +++--- src/vm/array.cpp | 4 ++-- src/vm/ceeload.cpp | 6 +++--- src/vm/class.cpp | 8 ++++---- src/vm/codeman.cpp | 4 ++-- src/vm/codeman.h | 4 ++-- src/vm/compile.cpp | 6 +++--- src/vm/dataimage.h | 6 +++--- src/vm/dllimport.cpp | 10 +++++----- src/vm/ecalllist.h | 4 ++-- src/vm/methodtablebuilder.cpp | 6 +++--- src/vm/mscorlib.h | 4 ++-- src/vm/object.h | 4 ++-- src/vm/pefile.cpp | 2 +- src/vm/stubhelpers.cpp | 4 ++-- src/vm/stubhelpers.h | 4 ++-- src/zap/zapimage.cpp | 10 +++++----- src/zap/zapimage.h | 2 +- src/zap/zaprelocs.h | 2 +- src/zap/zapwriter.cpp | 2 +- src/zap/zapwriter.h | 6 +++--- 21 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/inc/jithelpers.h b/src/inc/jithelpers.h index 2238aa87e0..140badfbb4 100644 --- a/src/inc/jithelpers.h +++ b/src/inc/jithelpers.h @@ -38,15 +38,15 @@ // CORINFO_HELP_DBL2INT, CORINFO_HELP_DBL2UINT, and CORINFO_HELP_DBL2LONG get // patched for CPUs that support SSE2 (P4 and above). -#ifndef BIT64 +#ifndef _TARGET_64BIT_ JITHELPER(CORINFO_HELP_LLSH, JIT_LLsh, CORINFO_HELP_SIG_REG_ONLY) JITHELPER(CORINFO_HELP_LRSH, JIT_LRsh, CORINFO_HELP_SIG_REG_ONLY) JITHELPER(CORINFO_HELP_LRSZ, JIT_LRsz, CORINFO_HELP_SIG_REG_ONLY) -#else // !BIT64 +#else // !_TARGET_64BIT_ JITHELPER(CORINFO_HELP_LLSH, NULL, CORINFO_HELP_SIG_CANNOT_USE_ALIGN_STUB) JITHELPER(CORINFO_HELP_LRSH, NULL, CORINFO_HELP_SIG_CANNOT_USE_ALIGN_STUB) JITHELPER(CORINFO_HELP_LRSZ, NULL, CORINFO_HELP_SIG_CANNOT_USE_ALIGN_STUB) -#endif // BIT64 +#endif // _TARGET_64BIT_ JITHELPER(CORINFO_HELP_LMUL, JIT_LMul, CORINFO_HELP_SIG_16_STACK) JITHELPER(CORINFO_HELP_LMUL_OVF, JIT_LMulOvf, CORINFO_HELP_SIG_16_STACK) JITHELPER(CORINFO_HELP_ULMUL_OVF, JIT_ULMulOvf, CORINFO_HELP_SIG_16_STACK) diff --git a/src/vm/array.cpp b/src/vm/array.cpp index 61b81a0056..6c58fe727b 100644 --- a/src/vm/array.cpp +++ b/src/vm/array.cpp @@ -503,10 +503,10 @@ MethodTable* Module::CreateArrayMethodTable(TypeHandle elemTypeHnd, CorElementTy if (arrayKind == ELEMENT_TYPE_ARRAY) baseSize += Rank*sizeof(DWORD)*2; -#if !defined(_WIN64) && (DATA_ALIGNMENT > 4) +#if !defined(_TARGET_64BIT_) && (DATA_ALIGNMENT > 4) if (dwComponentSize >= DATA_ALIGNMENT) baseSize = (DWORD)ALIGN_UP(baseSize, DATA_ALIGNMENT); -#endif // !defined(_WIN64) && (DATA_ALIGNMENT > 4) +#endif // !defined(_TARGET_64BIT_) && (DATA_ALIGNMENT > 4) pMT->SetBaseSize(baseSize); // Because of array method table persisting, we need to copy the map for (unsigned index = 0; index < pParentClass->GetNumInterfaces(); ++index) diff --git a/src/vm/ceeload.cpp b/src/vm/ceeload.cpp index a80e7f63ef..50724c0c35 100644 --- a/src/vm/ceeload.cpp +++ b/src/vm/ceeload.cpp @@ -86,13 +86,13 @@ #pragma warning(disable:4244) #endif // _MSC_VER -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ #define COR_VTABLE_PTRSIZED COR_VTABLE_64BIT #define COR_VTABLE_NOT_PTRSIZED COR_VTABLE_32BIT -#else // !_WIN64 +#else // !_TARGET_64BIT_ #define COR_VTABLE_PTRSIZED COR_VTABLE_32BIT #define COR_VTABLE_NOT_PTRSIZED COR_VTABLE_64BIT -#endif // !_WIN64 +#endif // !_TARGET_64BIT_ #define CEE_FILE_GEN_GROWTH_COLLECTIBLE 2048 diff --git a/src/vm/class.cpp b/src/vm/class.cpp index cd2bbbae47..c3e0637306 100644 --- a/src/vm/class.cpp +++ b/src/vm/class.cpp @@ -991,9 +991,9 @@ CorElementType EEClass::ComputeInternalCorElementTypeForValueType(MethodTable * if (pMT->GetNumInstanceFields() == 1 && (!pMT->HasLayout() || pMT->GetNumInstanceFieldBytes() == 4 -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ || pMT->GetNumInstanceFieldBytes() == 8 -#endif // _WIN64 +#endif // _TARGET_64BIT_ )) // Don't do the optimization if we're getting specified anything but the trivial layout. { FieldDesc * pFD = pMT->GetApproxFieldDescListRaw(); @@ -1025,10 +1025,10 @@ CorElementType EEClass::ComputeInternalCorElementTypeForValueType(MethodTable * case ELEMENT_TYPE_U: case ELEMENT_TYPE_I4: case ELEMENT_TYPE_U4: -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ case ELEMENT_TYPE_I8: case ELEMENT_TYPE_U8: -#endif // _WIN64 +#endif // _TARGET_64BIT_ { return type; diff --git a/src/vm/codeman.cpp b/src/vm/codeman.cpp index ec5313ff4a..d69329f44f 100644 --- a/src/vm/codeman.cpp +++ b/src/vm/codeman.cpp @@ -2188,9 +2188,9 @@ HeapList* LoaderCodeHeap::CreateCodeHeap(CodeHeapRequestInfo *pInfo, LoaderHeap DBG_ADDR(pHp->startAddress), DBG_ADDR(pHp->startAddress+pHp->maxCodeHeapSize) )); -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ emitJump((LPBYTE)pHp->CLRPersonalityRoutine, (void *)ProcessCLRException); -#endif +#endif // _TARGET_64BIT_ pCodeHeap.SuppressRelease(); RETURN pHp; diff --git a/src/vm/codeman.h b/src/vm/codeman.h index 0663d598c1..e30b6332ac 100644 --- a/src/vm/codeman.h +++ b/src/vm/codeman.h @@ -1277,7 +1277,7 @@ public: BOOL Acquired(); }; -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ static ULONG GetCLRPersonalityRoutineValue() { LIMITED_METHOD_CONTRACT; @@ -1285,7 +1285,7 @@ public: (size_t)((ULONG)offsetof(HeapList, CLRPersonalityRoutine))); return offsetof(HeapList, CLRPersonalityRoutine); } -#endif // _WIN64 +#endif // _TARGET_64BIT_ static EEJitManager * GetEEJitManager() { diff --git a/src/vm/compile.cpp b/src/vm/compile.cpp index 9d8274d4ac..6d8c168df8 100644 --- a/src/vm/compile.cpp +++ b/src/vm/compile.cpp @@ -334,17 +334,17 @@ HRESULT CEECompileInfo::LoadAssemblyByPath( // by LoadAssembly then we can blame it on bitness mismatch. We do the check here // and not in the CATCH to distinguish between the COR_IMAGE_ERROR that can be thrown by // VerifyIsAssembly (not necessarily a bitness mismatch) and that from LoadAssembly -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ if (pImage->Has32BitNTHeaders()) { hrProcessLibraryBitnessMismatch = PEFMT_E_32BIT; } -#else +#else // !_TARGET_64BIT_ if (!pImage->Has32BitNTHeaders()) { hrProcessLibraryBitnessMismatch = PEFMT_E_64BIT; } -#endif +#endif // !_TARGET_64BIT_ AssemblySpec spec; spec.InitializeSpec(TokenFromRid(1, mdtAssembly), pImage->GetMDImport(), NULL, FALSE); diff --git a/src/vm/dataimage.h b/src/vm/dataimage.h index 0167ec5762..90f3d4cb97 100644 --- a/src/vm/dataimage.h +++ b/src/vm/dataimage.h @@ -17,11 +17,11 @@ typedef BYTE ZapRelocationType; // IMAGE_REL_XXX enum // IMAGE_REL_BASED_PTR is architecture specific reloc of virtual address -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ #define IMAGE_REL_BASED_PTR IMAGE_REL_BASED_DIR64 -#else +#else // !_TARGET_64BIT_ #define IMAGE_REL_BASED_PTR IMAGE_REL_BASED_HIGHLOW -#endif +#endif // !_TARGET_64BIT_ // Special NGEN-specific relocation type for relative pointer (used to make NGen relocation section smaller) #define IMAGE_REL_BASED_RELPTR 0x7D diff --git a/src/vm/dllimport.cpp b/src/vm/dllimport.cpp index 345b3d6a70..d0196317f0 100644 --- a/src/vm/dllimport.cpp +++ b/src/vm/dllimport.cpp @@ -1373,7 +1373,7 @@ public: // convert 'this' to COM IP and the target method entry point m_slIL.EmitLoadRCWThis(pcsDispatch, m_dwStubFlags); -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ if (SF_IsWinRTDelegateStub(m_dwStubFlags)) { // write the stub context (EEImplMethodDesc representing the Invoke) @@ -1386,7 +1386,7 @@ public: pcsDispatch->EmitCALL(METHOD__STUBHELPERS__GET_STUB_CONTEXT, 0, 1); } else -#endif // _WIN64 +#endif // _TARGET_64BIT_ { m_slIL.EmitLoadStubContext(pcsDispatch, dwStubFlags); } @@ -2235,15 +2235,15 @@ void NDirectStubLinker::DoNDirect(ILCodeStream *pcsEmit, DWORD dwStubFlags, Meth // get the delegate unmanaged target - we call a helper instead of just grabbing // the _methodPtrAux field because we may need to intercept the call for host, MDA, etc. pcsEmit->EmitLoadThis(); -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ // on AMD64 GetDelegateTarget will return address of the generic stub for host when we are hosted // and update the secret argument with real target - the secret arg will be embedded in the // InlinedCallFrame by the JIT and fetched via TLS->Thread->Frame->Datum by the stub for host pcsEmit->EmitCALL(METHOD__STUBHELPERS__GET_STUB_CONTEXT_ADDR, 0, 1); -#else // _WIN64 +#else // !_TARGET_64BIT_ // we don't need to do this on x86 because stub for host is generated dynamically per target pcsEmit->EmitLDNULL(); -#endif // _WIN64 +#endif // !_TARGET_64BIT_ pcsEmit->EmitCALL(METHOD__STUBHELPERS__GET_DELEGATE_TARGET, 2, 1); } else // direct invocation diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h index 460ebf6451..4c69609255 100644 --- a/src/vm/ecalllist.h +++ b/src/vm/ecalllist.h @@ -1159,9 +1159,9 @@ FCFuncStart(gStubHelperFuncs) FCFuncElement("ValidateByref", StubHelpers::ValidateByref) FCFuncElement("LogPinnedArgument", StubHelpers::LogPinnedArgument) FCIntrinsic("GetStubContext", StubHelpers::GetStubContext, CORINFO_INTRINSIC_StubHelpers_GetStubContext) -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ FCIntrinsic("GetStubContextAddr", StubHelpers::GetStubContextAddr, CORINFO_INTRINSIC_StubHelpers_GetStubContextAddr) -#endif // _WIN64 +#endif // _TARGET_64BIT_ #ifdef MDA_SUPPORTED FCFuncElement("TriggerGCForMDA", StubHelpers::TriggerGCForMDA) #endif // MDA_SUPPORTED diff --git a/src/vm/methodtablebuilder.cpp b/src/vm/methodtablebuilder.cpp index 179a42da53..6464e5849e 100644 --- a/src/vm/methodtablebuilder.cpp +++ b/src/vm/methodtablebuilder.cpp @@ -8087,17 +8087,17 @@ VOID MethodTableBuilder::PlaceInstanceFields(MethodTable ** pByValueClassCach // value classes could have GC pointers in them, which need to be pointer-size aligned // so do this if it has not been done already -#if !defined(_WIN64) && (DATA_ALIGNMENT > 4) +#if !defined(_TARGET_64BIT_) && (DATA_ALIGNMENT > 4) dwCumulativeInstanceFieldPos = (DWORD)ALIGN_UP(dwCumulativeInstanceFieldPos, (pByValueMT->GetNumInstanceFieldBytes() >= DATA_ALIGNMENT) ? DATA_ALIGNMENT : TARGET_POINTER_SIZE); -#else // !(!defined(_WIN64) && (DATA_ALIGNMENT > 4)) +#else // !(!defined(_TARGET_64BIT_) && (DATA_ALIGNMENT > 4)) #ifdef FEATURE_64BIT_ALIGNMENT if (pByValueMT->RequiresAlign8()) dwCumulativeInstanceFieldPos = (DWORD)ALIGN_UP(dwCumulativeInstanceFieldPos, 8); else #endif // FEATURE_64BIT_ALIGNMENT dwCumulativeInstanceFieldPos = (DWORD)ALIGN_UP(dwCumulativeInstanceFieldPos, TARGET_POINTER_SIZE); -#endif // !(!defined(_WIN64) && (DATA_ALIGNMENT > 4)) +#endif // !(!defined(_TARGET_64BIT_) && (DATA_ALIGNMENT > 4)) pFieldDescList[i].SetOffset(dwCumulativeInstanceFieldPos - dwOffsetBias); dwCumulativeInstanceFieldPos += pByValueMT->GetAlignedNumInstanceFieldBytes(); diff --git a/src/vm/mscorlib.h b/src/vm/mscorlib.h index 528f2d9b41..0af6c94bc9 100644 --- a/src/vm/mscorlib.h +++ b/src/vm/mscorlib.h @@ -1058,9 +1058,9 @@ DEFINE_METHOD(STUBHELPERS, VALIDATE_OBJECT, Validate DEFINE_METHOD(STUBHELPERS, VALIDATE_BYREF, ValidateByref, SM_IntPtr_IntPtr_Obj_RetVoid) DEFINE_METHOD(STUBHELPERS, GET_STUB_CONTEXT, GetStubContext, SM_RetIntPtr) DEFINE_METHOD(STUBHELPERS, LOG_PINNED_ARGUMENT, LogPinnedArgument, SM_IntPtr_IntPtr_RetVoid) -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ DEFINE_METHOD(STUBHELPERS, GET_STUB_CONTEXT_ADDR, GetStubContextAddr, SM_RetIntPtr) -#endif // _WIN64 +#endif // _TARGET_64BIT_ #ifdef MDA_SUPPORTED DEFINE_METHOD(STUBHELPERS, TRIGGER_GC_FOR_MDA, TriggerGCForMDA, SM_RetVoid) #endif diff --git a/src/vm/object.h b/src/vm/object.h index e6e0c02041..04e6c46f3c 100644 --- a/src/vm/object.h +++ b/src/vm/object.h @@ -601,9 +601,9 @@ private: // Object::GetSize() looks at m_NumComponents even though it may not be an array (the // values is shifted out if not an array, so it's ok). DWORD m_NumComponents; -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ DWORD pad; -#endif // _WIN64 +#endif // _TARGET_64BIT_ SVAL_DECL(INT32, s_arrayBoundsZero); // = 0 diff --git a/src/vm/pefile.cpp b/src/vm/pefile.cpp index 306a52269c..88ecf44148 100644 --- a/src/vm/pefile.cpp +++ b/src/vm/pefile.cpp @@ -286,7 +286,7 @@ void PEFile::LoadLibrary(BOOL allowNativeSkip/*=TRUE*/) // if allowNativeSkip==F RETURN; } -#if !defined(_WIN64) +#if !defined(_TARGET_64BIT_) if (!HasNativeImage() && (!GetILimage()->Has32BitNTHeaders()) && !IsIntrospectionOnly()) { // Tried to load 64-bit assembly on 32-bit platform. diff --git a/src/vm/stubhelpers.cpp b/src/vm/stubhelpers.cpp index ead312d042..071c87966e 100644 --- a/src/vm/stubhelpers.cpp +++ b/src/vm/stubhelpers.cpp @@ -1912,7 +1912,7 @@ FCIMPL2(void, StubHelpers::LogPinnedArgument, MethodDesc *target, Object *pinned } FCIMPLEND -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ FCIMPL0(void*, StubHelpers::GetStubContextAddr) { FCALL_CONTRACT; @@ -1921,7 +1921,7 @@ FCIMPL0(void*, StubHelpers::GetStubContextAddr) UNREACHABLE_MSG("This is a JIT intrinsic!"); } FCIMPLEND -#endif // _WIN64 +#endif // _TARGET_64BIT_ #ifdef MDA_SUPPORTED FCIMPL0(void, StubHelpers::TriggerGCForMDA) diff --git a/src/vm/stubhelpers.h b/src/vm/stubhelpers.h index 70fb529cff..4c4bc8b71c 100644 --- a/src/vm/stubhelpers.h +++ b/src/vm/stubhelpers.h @@ -115,9 +115,9 @@ public: static FCDECL2(void, MarshalToManagedVaListInternal, va_list va, VARARGS* pArgIterator); static FCDECL0(void*, GetStubContext); static FCDECL2(void, LogPinnedArgument, MethodDesc *localDesc, Object *nativeArg); -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ static FCDECL0(void*, GetStubContextAddr); -#endif // _WIN64 +#endif // _TARGET_64BIT_ static FCDECL1(DWORD, CalcVaListSize, VARARGS *varargs); static FCDECL3(void, ValidateObject, Object *pObjUNSAFE, MethodDesc *pMD, Object *pThisUNSAFE); static FCDECL3(void, ValidateByref, void *pByref, MethodDesc *pMD, Object *pThisUNSAFE); diff --git a/src/zap/zapimage.cpp b/src/zap/zapimage.cpp index b2e779cb2a..07e512c49b 100644 --- a/src/zap/zapimage.cpp +++ b/src/zap/zapimage.cpp @@ -1243,7 +1243,7 @@ void ZapImage::CalculateZapBaseAddress() #if defined(_TARGET_X86_) // We use 30000000 for an exe baseAddress = 0x30000000; -#elif defined(_WIN64) +#elif defined(_TARGET_64BIT_) // We use 04000000 for an exe // which is remapped to 0x642`88000000 on x64 baseAddress = 0x04000000; @@ -1254,7 +1254,7 @@ void ZapImage::CalculateZapBaseAddress() #if defined(_TARGET_X86_) // We start a 31000000 for the main assembly with the manifest baseAddress = 0x31000000; -#elif defined(_WIN64) +#elif defined(_TARGET_64BIT_) // We start a 05000000 for the main assembly with the manifest // which is remapped to 0x642`8A000000 on x64 baseAddress = 0x05000000; @@ -1306,7 +1306,7 @@ void ZapImage::CalculateZapBaseAddress() // upper address range used on 64-bit platforms // #if USE_UPPER_ADDRESS -#if defined(_WIN64) +#if defined(_TARGET_64BIT_) if (baseAddress < 0x80000000) { if (baseAddress < 0x40000000) @@ -1520,7 +1520,7 @@ void ZapImage::OutputTables() { USHORT dllCharacteristics = 0; -#ifndef _WIN64 +#ifndef _TARGET_64BIT_ dllCharacteristics |= IMAGE_DLLCHARACTERISTICS_NO_SEH; #endif @@ -1550,7 +1550,7 @@ void ZapImage::OutputTables() SetSizeOfStackCommit(m_ModuleDecoder.GetSizeOfStackCommit()); } -#if defined(FEATURE_PAL) && !defined(BIT64) +#if defined(FEATURE_PAL) && !defined(_TARGET_64BIT_) // To minimize wasted VA space on 32 bit systems align file to page bounaries (presumed to be 4K). SetFileAlignment(0x1000); #elif defined(_TARGET_ARM_) && defined(FEATURE_CORESYSTEM) diff --git a/src/zap/zapimage.h b/src/zap/zapimage.h index 582c9a3e88..4687d75003 100644 --- a/src/zap/zapimage.h +++ b/src/zap/zapimage.h @@ -54,7 +54,7 @@ class ZapperStats; #define DEFAULT_CODE_BUFFER_INIT 0 #endif -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ // Optimize for speed #define DEFAULT_CODE_ALIGN 16 #else diff --git a/src/zap/zaprelocs.h b/src/zap/zaprelocs.h index 3d8033d989..501972ff19 100644 --- a/src/zap/zaprelocs.h +++ b/src/zap/zaprelocs.h @@ -26,7 +26,7 @@ typedef BYTE ZapRelocationType; // IMAGE_REL_XXX enum #define IMAGE_REL_INVALID 0xFF // IMAGE_REL_BASED_PTR is architecture specific reloc of virtual address -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ #define IMAGE_REL_BASED_PTR IMAGE_REL_BASED_DIR64 #else #define IMAGE_REL_BASED_PTR IMAGE_REL_BASED_HIGHLOW diff --git a/src/zap/zapwriter.cpp b/src/zap/zapwriter.cpp index d91a5653b1..4ec0c5a582 100644 --- a/src/zap/zapwriter.cpp +++ b/src/zap/zapwriter.cpp @@ -55,7 +55,7 @@ void ZapWriter::Initialize() m_FileAlignment = 0x200; } -#if defined(FEATURE_PAL) && defined(BIT64) +#if defined(FEATURE_PAL) && defined(_TARGET_64BIT_) #define SECTION_ALIGNMENT m_FileAlignment #define PAL_MAX_PAGE_SIZE 0x10000 #else diff --git a/src/zap/zapwriter.h b/src/zap/zapwriter.h index e31af2a5f1..05b573822b 100644 --- a/src/zap/zapwriter.h +++ b/src/zap/zapwriter.h @@ -312,11 +312,11 @@ class ZapWriter : public IStream BOOL Is64Bit() { -#ifdef _WIN64 +#ifdef _TARGET_64BIT_ return TRUE; -#else +#else // !_TARGET_64BIT_ return FALSE; -#endif +#endif // !_TARGET_64BIT_ } USHORT GetMachine() -- cgit v1.2.3