diff options
| author | Pankaj Gode <pgode.qdt@qualcommdatacenter.com> | 2017-09-12 20:02:49 +0530 |
|---|---|---|
| committer | Pankaj Gode <pgode.qdt@qualcommdatacenter.com> | 2017-09-12 20:02:49 +0530 |
| commit | 3cf7416d05c41c81677d379706a48194590c0a81 (patch) | |
| tree | f477189ec35dcbcb0c35532ae7e0027449eef293 /src/vm | |
| parent | 9b0ba4188ac7161c4b04b30fed5eaa117d72eaed (diff) | |
| download | coreclr-3cf7416d05c41c81677d379706a48194590c0a81.tar.gz coreclr-3cf7416d05c41c81677d379706a48194590c0a81.tar.bz2 coreclr-3cf7416d05c41c81677d379706a48194590c0a81.zip | |
[ARM64/Windows] Corrected stack overflow in JIT_Stelem_ref
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/arm64/asmhelpers.asm | 4 | ||||
| -rw-r--r-- | src/vm/arm64/cgencpu.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/vm/arm64/asmhelpers.asm b/src/vm/arm64/asmhelpers.asm index 2605a67f73..a725b26d42 100644 --- a/src/vm/arm64/asmhelpers.asm +++ b/src/vm/arm64/asmhelpers.asm @@ -1467,8 +1467,8 @@ NeedFrame bl ArrayStoreCheck ; ArrayStoreCheck(&val, &array) DoWrite - ldp x0, x1, [sp], #16 - ldr x2, [sp], #32 + ldp x0, x1, [sp, #16] + ldr x2, [sp, #32] EPILOG_RESTORE_REG_PAIR fp, lr, #0x48! EPILOG_BRANCH JIT_Stelem_DoWrite NESTED_END diff --git a/src/vm/arm64/cgencpu.h b/src/vm/arm64/cgencpu.h index 90e871a16d..8abe4de6ab 100644 --- a/src/vm/arm64/cgencpu.h +++ b/src/vm/arm64/cgencpu.h @@ -79,7 +79,6 @@ typedef INT64 StackElemType; // !! This expression assumes STACK_ELEM_SIZE is a power of 2. #define StackElemSize(parmSize) (((parmSize) + STACK_ELEM_SIZE - 1) & ~((ULONG)(STACK_ELEM_SIZE - 1))) -#ifdef FEATURE_PAL // TODO-ARM64-WINDOWS Add JIT_Stelem_Ref support // // JIT HELPERS. // @@ -87,7 +86,6 @@ typedef INT64 StackElemType; // // optimized static helpers #define JIT_Stelem_Ref JIT_Stelem_Ref -#endif //********************************************************************** // Frames |