diff options
| author | Jonghyun Park <parjong@gmail.com> | 2016-09-29 16:53:15 +0900 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-09-29 00:53:15 -0700 |
| commit | 74967f89e0f43e156cf23cd88840e1f0fc94f997 (patch) | |
| tree | 3395157754f2b6cb1826b57308d4507646899200 /src/vm/arm | |
| parent | 8493c03a5f9e4d2aaf4e56e5c228642e221993bd (diff) | |
| download | coreclr-74967f89e0f43e156cf23cd88840e1f0fc94f997.tar.gz coreclr-74967f89e0f43e156cf23cd88840e1f0fc94f997.tar.bz2 coreclr-74967f89e0f43e156cf23cd88840e1f0fc94f997.zip | |
Set THUMB bit for RUNTIME_FIXUP_HELPER functions (#7373)
* Appends THUMB bit for RUNTIME_FIXUP_HELPER address
* Revise GetEEFuncEntryPoint (for ARM) and use it to set thumb bit
* Uses GetEEFuncEntryPoint instead of GFN_TADDR
Diffstat (limited to 'src/vm/arm')
| -rw-r--r-- | src/vm/arm/cgencpu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vm/arm/cgencpu.h b/src/vm/arm/cgencpu.h index 936fdabafb..63c578bb88 100644 --- a/src/vm/arm/cgencpu.h +++ b/src/vm/arm/cgencpu.h @@ -36,10 +36,12 @@ Stub * GenerateInitPInvokeFrameHelper(); EXTERN_C void checkStack(void); +#define THUMB_CODE 1 + #ifdef CROSSGEN_COMPILE #define GetEEFuncEntryPoint(pfn) 0x1001 #else -#define GetEEFuncEntryPoint(pfn) GFN_TADDR(pfn) +#define GetEEFuncEntryPoint(pfn) (GFN_TADDR(pfn) | THUMB_CODE) #endif //********************************************************************** @@ -306,8 +308,6 @@ inline PCODE decodeBackToBackJump(PCODE pBuffer) #include "stublink.h" struct ArrayOpScript; -#define THUMB_CODE 1 - inline BOOL IsThumbCode(PCODE pCode) { return (pCode & THUMB_CODE) != 0; |