diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-01-25 05:29:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 05:29:07 +0300 |
| commit | 4b10ccca968cce29e00f208d085a51ab56b6c484 (patch) | |
| tree | cefcae946d2c90c623eb2e0bc596619ab3cb45e4 /src/Native/Runtime/amd64 | |
| parent | 1ad77be1dfb03fadc2bda84f6719f9c44f7f028f (diff) | |
| parent | be140841e01f8758ca39701d377f7636da52d570 (diff) | |
Merge pull request #2578 from dotnet/nmirror
Merge nmirror to master
Diffstat (limited to 'src/Native/Runtime/amd64')
| -rw-r--r-- | src/Native/Runtime/amd64/ExceptionHandling.S | 8 | ||||
| -rw-r--r-- | src/Native/Runtime/amd64/ExceptionHandling.asm | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/Native/Runtime/amd64/ExceptionHandling.S b/src/Native/Runtime/amd64/ExceptionHandling.S index 360f5bbae..a1a9c43ce 100644 --- a/src/Native/Runtime/amd64/ExceptionHandling.S +++ b/src/Native/Runtime/amd64/ExceptionHandling.S @@ -26,14 +26,6 @@ NESTED_ENTRY RhpThrowHwEx, _TEXT, NoHandler // Align the stack towards zero and rsp, -16 - add rsi, 1 // 'faulting IP' += 1, we do this because everywhere else we treat the faulting IP as - // a return-address and optionally subtract one when doing EH-related things (but not - // subtracting 1 when doing GC-related things). The fault IP here will be the start - // of the faulting instruction, so +1 will point to either the next instruction or the - // middle of this instruction. Either way, when the dispatch / stackwalk code deals - // with this address it'll apply a -1 for EH range checks and the GC-related operations - // don't need to be precise here because the fault location isn't a GC safe point - xor rdx, rdx // struct PAL_LIMITED_CONTEXT diff --git a/src/Native/Runtime/amd64/ExceptionHandling.asm b/src/Native/Runtime/amd64/ExceptionHandling.asm index baf89e9ea..a8ba9ef77 100644 --- a/src/Native/Runtime/amd64/ExceptionHandling.asm +++ b/src/Native/Runtime/amd64/ExceptionHandling.asm @@ -40,14 +40,6 @@ NESTED_ENTRY RhpThrowHwEx, _TEXT ; Tell the unwinder that the frame is there now .pushframe - add rdx, 1 ;; 'faulting IP' += 1, we do this because everywhere else we treat the faulting IP as - ;; a return-address and optionally subtract one when doing EH-related things (but not - ;; subtracting 1 when doing GC-related things). The fault IP here will be the start - ;; of the faulting instruction, so +1 will point to either the next instruction or the - ;; middle of this instruction. Either way, when the dispatch / stackwalk code deals - ;; with this address it'll apply a -1 for EH range checks and the GC-related operations - ;; don't need to be precise here because the fault location isn't a GC safe point - alloc_stack SIZEOF_XmmSaves + 8h ;; reserve stack for the xmm saves (+8h to realign stack) push_vol_reg r8 ;; padding push_nonvol_reg r15 |