diff options
author | David Wrighton <davidwr@microsoft.com> | 2017-09-13 14:50:39 -0700 |
---|---|---|
committer | David Wrighton <davidwr@microsoft.com> | 2017-09-13 14:50:39 -0700 |
commit | d68f0916d0a2bf3787bc85261ef4a4f1f27f1f24 (patch) | |
tree | 6c21ac239ae268096f20d98a8db16a4b80394fd9 /src/jit/target.h | |
parent | 96fa98525e0d64459148228cde5211c475b0c25c (diff) | |
parent | e866d072042f4ad9e0811aa36e338dac781c09a5 (diff) | |
download | coreclr-d68f0916d0a2bf3787bc85261ef4a4f1f27f1f24.tar.gz coreclr-d68f0916d0a2bf3787bc85261ef4a4f1f27f1f24.tar.bz2 coreclr-d68f0916d0a2bf3787bc85261ef4a4f1f27f1f24.zip |
Merge branch 'master' into update_from_master
Diffstat (limited to 'src/jit/target.h')
-rw-r--r-- | src/jit/target.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/jit/target.h b/src/jit/target.h index 9d7608a2bc..68b27f22f9 100644 --- a/src/jit/target.h +++ b/src/jit/target.h @@ -834,6 +834,13 @@ typedef unsigned short regPairNoSmall; // arm: need 12 bits #define RBM_FLT_CALLEE_SAVED (0) #define RBM_FLT_CALLEE_TRASH (RBM_XMM0|RBM_XMM1|RBM_XMM2|RBM_XMM3|RBM_XMM4|RBM_XMM5|RBM_XMM6|RBM_XMM7| \ RBM_XMM8|RBM_XMM9|RBM_XMM10|RBM_XMM11|RBM_XMM12|RBM_XMM13|RBM_XMM14|RBM_XMM15) + #define REG_PROFILER_ENTER_ARG_0 REG_R14 + #define RBM_PROFILER_ENTER_ARG_0 RBM_R14 + #define REG_PROFILER_ENTER_ARG_1 REG_R15 + #define RBM_PROFILER_ENTER_ARG_1 RBM_R15 + + #define REG_DEFAULT_PROFILER_CALL_TARGET REG_R11 + #else // !UNIX_AMD64_ABI #define MIN_ARG_AREA_FOR_CALL (4 * REGSIZE_BYTES) // Minimum required outgoing argument space for a call. @@ -980,7 +987,7 @@ typedef unsigned short regPairNoSmall; // arm: need 12 bits // profiler. #define REG_DEFAULT_HELPER_CALL_TARGET REG_RAX - // GenericPInvokeCalliHelper VASigCookie Parameter + // GenericPInvokeCalliHelper VASigCookie Parameter #define REG_PINVOKE_COOKIE_PARAM REG_R11 #define RBM_PINVOKE_COOKIE_PARAM RBM_R11 #define PREDICT_REG_PINVOKE_COOKIE_PARAM PREDICT_REG_R11 |