From 8c9dcac3b3f297990010268a5abf4271d7627aa3 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Tue, 28 Feb 2017 19:36:55 +0900 Subject: [PATCH] Use BIT64 instead of _WIN64 for LONG helpers (dotnet/coreclr#9845) Commit migrated from https://github.com/dotnet/coreclr/commit/5118a077796a0aeab826ee5702b254026e97f458 --- src/coreclr/src/inc/jithelpers.h | 6 +++--- src/coreclr/src/vm/jithelpers.cpp | 5 ++--- src/coreclr/src/vm/jitinterface.h | 15 +++++++++------ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/coreclr/src/inc/jithelpers.h b/src/coreclr/src/inc/jithelpers.h index 15e6d2c..5f01a1b 100644 --- a/src/coreclr/src/inc/jithelpers.h +++ b/src/coreclr/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). -#if !defined(_WIN64) +#ifndef BIT64 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 +#else // !BIT64 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 +#endif // BIT64 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/coreclr/src/vm/jithelpers.cpp b/src/coreclr/src/vm/jithelpers.cpp index 1f73a40..b46ac98 100644 --- a/src/coreclr/src/vm/jithelpers.cpp +++ b/src/coreclr/src/vm/jithelpers.cpp @@ -454,7 +454,7 @@ HCIMPL2_VV(UINT64, JIT_ULMod, UINT64 dividend, UINT64 divisor) } HCIMPLEND -#if !defined(_WIN64) && !defined(_TARGET_X86_) +#if !defined(BIT64) && !defined(_TARGET_X86_) /*********************************************************************/ HCIMPL2_VV(UINT64, JIT_LLsh, UINT64 num, int shift) { @@ -478,8 +478,7 @@ HCIMPL2_VV(UINT64, JIT_LRsz, UINT64 num, int shift) return num >> shift; } HCIMPLEND - -#endif +#endif // !BIT64 && !_TARGET_X86_ #include diff --git a/src/coreclr/src/vm/jitinterface.h b/src/coreclr/src/vm/jitinterface.h index 978be03..3e4f496 100644 --- a/src/coreclr/src/vm/jitinterface.h +++ b/src/coreclr/src/vm/jitinterface.h @@ -343,20 +343,23 @@ EXTERN_C FCDECL1_V(INT32, JIT_Dbl2IntOvf, double val); EXTERN_C FCDECL2_VV(float, JIT_FltRem, float dividend, float divisor); EXTERN_C FCDECL2_VV(double, JIT_DblRem, double dividend, double divisor); -#if !defined(_WIN64) && !defined(_TARGET_X86_) +#ifndef BIT64 +#ifdef _TARGET_X86_ +// JIThelp.asm +EXTERN_C void STDCALL JIT_LLsh(); +EXTERN_C void STDCALL JIT_LRsh(); +EXTERN_C void STDCALL JIT_LRsz(); +#else // _TARGET_X86_ EXTERN_C FCDECL2_VV(UINT64, JIT_LLsh, UINT64 num, int shift); EXTERN_C FCDECL2_VV(INT64, JIT_LRsh, INT64 num, int shift); EXTERN_C FCDECL2_VV(UINT64, JIT_LRsz, UINT64 num, int shift); -#endif +#endif // !_TARGET_X86_ +#endif // !BIT64 #ifdef _TARGET_X86_ extern "C" { - void STDCALL JIT_LLsh(); // JIThelp.asm - void STDCALL JIT_LRsh(); // JIThelp.asm - void STDCALL JIT_LRsz(); // JIThelp.asm - void STDCALL JIT_CheckedWriteBarrierEAX(); // JIThelp.asm/JIThelp.s void STDCALL JIT_CheckedWriteBarrierEBX(); // JIThelp.asm/JIThelp.s void STDCALL JIT_CheckedWriteBarrierECX(); // JIThelp.asm/JIThelp.s -- 2.7.4