diff options
| author | David Wrighton <davidwr@microsoft.com> | 2018-05-07 20:48:30 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2018-05-07 20:48:30 -0700 |
| commit | d7e91fc59bbc8f0ffa4aee0ac8f517abc607ca4c (patch) | |
| tree | 0f3dfcd5e7da78acacb507651f05642baa99e7c6 /src/vm/arm64 | |
| parent | 8de6d4c887957d2eb6a9cbf1cc107df04463a637 (diff) | |
| download | coreclr-d7e91fc59bbc8f0ffa4aee0ac8f517abc607ca4c.tar.gz coreclr-d7e91fc59bbc8f0ffa4aee0ac8f517abc607ca4c.tar.bz2 coreclr-d7e91fc59bbc8f0ffa4aee0ac8f517abc607ca4c.zip | |
Arm64 debugger step into behavior (#17912)
- Fix #ifdef in StubManagerHelpers::StubGetSecondArg that erroneously referred to TARGET_ARM instead of TARGET_ARM64
- Add condition in StubManagerHelpers::GetTailCallTarget to refer to X12 as is used by the various helpers that can pause in the midst of stepping
- Fix StubDispatchFixupStub to use X12 as tail call register instead of X9 to match the other tail-calling stubs
Diffstat (limited to 'src/vm/arm64')
| -rw-r--r-- | src/vm/arm64/asmhelpers.S | 6 | ||||
| -rw-r--r-- | src/vm/arm64/asmhelpers.asm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/vm/arm64/asmhelpers.S b/src/vm/arm64/asmhelpers.S index e7f2af790c..23f591fccc 100644 --- a/src/vm/arm64/asmhelpers.S +++ b/src/vm/arm64/asmhelpers.S @@ -1270,7 +1270,7 @@ DynamicHelper DynamicHelperFrameFlags_ObjectArg | DynamicHelperFrameFlags_Object #ifdef FEATURE_PREJIT // ------------------------------------------------------------------ -// void StubDispatchFixupStub(args in regs x0-x7 & stack and possibly retbuff arg in x8, x11:IndirectionCellAndFlags, x12:DispatchToken) +// void StubDispatchFixupStub(args in regs x0-x7 & stack and possibly retbuff arg in x8, x11:IndirectionCellAndFlags) // // The stub dispatch thunk which transfers control to StubDispatchFixupWorker. NESTED_ENTRY StubDispatchFixupStub, _TEXT, NoHandler @@ -1282,11 +1282,11 @@ NESTED_ENTRY StubDispatchFixupStub, _TEXT, NoHandler mov x2, #0 // sectionIndex mov x3, #0 // pModule bl C_FUNC(StubDispatchFixupWorker) - mov x9, x0 + mov x12, x0 EPILOG_WITH_TRANSITION_BLOCK_TAILCALL PATCH_LABEL StubDispatchFixupPatchLabel - EPILOG_BRANCH_REG x9 + EPILOG_BRANCH_REG x12 NESTED_END StubDispatchFixupStub, _TEXT #endif diff --git a/src/vm/arm64/asmhelpers.asm b/src/vm/arm64/asmhelpers.asm index b384f9ebd2..376bbbcec7 100644 --- a/src/vm/arm64/asmhelpers.asm +++ b/src/vm/arm64/asmhelpers.asm @@ -1278,7 +1278,7 @@ Fail #ifdef FEATURE_PREJIT ;; ------------------------------------------------------------------ -;; void StubDispatchFixupStub(args in regs x0-x7 & stack and possibly retbuff arg in x8, x11:IndirectionCellAndFlags, x12:DispatchToken) +;; void StubDispatchFixupStub(args in regs x0-x7 & stack and possibly retbuff arg in x8, x11:IndirectionCellAndFlags) ;; ;; The stub dispatch thunk which transfers control to StubDispatchFixupWorker. NESTED_ENTRY StubDispatchFixupStub @@ -1290,11 +1290,11 @@ Fail mov x2, #0 ; sectionIndex mov x3, #0 ; pModule bl StubDispatchFixupWorker - mov x9, x0 + mov x12, x0 EPILOG_WITH_TRANSITION_BLOCK_TAILCALL PATCH_LABEL StubDispatchFixupPatchLabel - EPILOG_BRANCH_REG x9 + EPILOG_BRANCH_REG x12 NESTED_END #endif |