diff options
author | dotnet bot <dotnet-bot@dotnetfoundation.org> | 2017-12-15 03:51:07 +0300 |
---|---|---|
committer | Ahson Khan <ahkha@microsoft.com> | 2017-12-15 03:51:07 +0300 |
commit | d6c2c0869740b1a15553b222d634b1f99cf9caeb (patch) | |
tree | d1c0b302c367b09fc49ab7cf03b4d027617d025e /src/Native/Runtime/amd64 | |
parent | bcb053d3260b03ba086258b73bb6728463296b1e (diff) |
[tfs-changeset: 1683889] (#5116)
Diffstat (limited to 'src/Native/Runtime/amd64')
-rw-r--r-- | src/Native/Runtime/amd64/AsmOffsetsCpu.h | 4 | ||||
-rw-r--r-- | src/Native/Runtime/amd64/GcProbe.asm | 18 | ||||
-rw-r--r-- | src/Native/Runtime/amd64/PInvoke.S | 2 | ||||
-rw-r--r-- | src/Native/Runtime/amd64/PInvoke.asm | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/Native/Runtime/amd64/AsmOffsetsCpu.h b/src/Native/Runtime/amd64/AsmOffsetsCpu.h index 606509220..aa7d4416c 100644 --- a/src/Native/Runtime/amd64/AsmOffsetsCpu.h +++ b/src/Native/Runtime/amd64/AsmOffsetsCpu.h @@ -22,7 +22,7 @@ PLAT_ASM_OFFSET(250, ExInfo, m_notifyDebuggerSP) PLAT_ASM_OFFSET(0, PInvokeTransitionFrame, m_RIP) PLAT_ASM_OFFSET(8, PInvokeTransitionFrame, m_FramePointer) PLAT_ASM_OFFSET(10, PInvokeTransitionFrame, m_pThread) -PLAT_ASM_OFFSET(18, PInvokeTransitionFrame, m_dwFlags) +PLAT_ASM_OFFSET(18, PInvokeTransitionFrame, m_Flags) PLAT_ASM_OFFSET(20, PInvokeTransitionFrame, m_PreservedRegs) PLAT_ASM_SIZEOF(230, StackFrameIterator) @@ -83,7 +83,7 @@ PLAT_ASM_OFFSET(198, ExInfo, m_notifyDebuggerSP) PLAT_ASM_OFFSET(0, PInvokeTransitionFrame, m_RIP) PLAT_ASM_OFFSET(8, PInvokeTransitionFrame, m_FramePointer) PLAT_ASM_OFFSET(10, PInvokeTransitionFrame, m_pThread) -PLAT_ASM_OFFSET(18, PInvokeTransitionFrame, m_dwFlags) +PLAT_ASM_OFFSET(18, PInvokeTransitionFrame, m_Flags) PLAT_ASM_OFFSET(20, PInvokeTransitionFrame, m_PreservedRegs) PLAT_ASM_SIZEOF(178, StackFrameIterator) diff --git a/src/Native/Runtime/amd64/GcProbe.asm b/src/Native/Runtime/amd64/GcProbe.asm index 0b91f4546..a07e08a08 100644 --- a/src/Native/Runtime/amd64/GcProbe.asm +++ b/src/Native/Runtime/amd64/GcProbe.asm @@ -232,7 +232,7 @@ NESTED_ENTRY RhpGcProbe, _TEXT WaitForGCCompletion mov rax, [rbx + OFFSETOF__Thread__m_pHackPInvokeTunnel] - test dword ptr [rax + OFFSETOF__PInvokeTransitionFrame__m_dwFlags], PTFF_THREAD_ABORT + test dword ptr [rax + OFFSETOF__PInvokeTransitionFrame__m_Flags], PTFF_THREAD_ABORT jnz Abort POP_PROBE_FRAME 0 ret @@ -579,7 +579,7 @@ NESTED_ENTRY RhpLoopHijack, _TEXT ;; [rsp + 20] -> m_RIP -------| ;; [rsp + 28] -> m_FramePointer | ;; [rsp + 30] -> m_pThread | - ;; [rsp + 38] -> m_dwFlags / m_dwAlignPad2 | + ;; [rsp + 38] -> m_Flags / m_dwAlignPad2 | ;; [rsp + 40] -> rbx save | ;; [rsp + 48] -> rsi save | ;; [rsp + 50] -> rdi save | @@ -659,7 +659,7 @@ NESTED_ENTRY RhpLoopHijack, _TEXT push_nonvol_reg rdi push_nonvol_reg rsi push_nonvol_reg rbx - push_vol_reg PROBE_SAVE_FLAGS_EVERYTHING ; m_dwFlags / m_dwAlignPad2 + push_vol_reg PROBE_SAVE_FLAGS_EVERYTHING ; m_Flags / m_dwAlignPad2 ;; rdx <- GetThread(), TRASHES rcx INLINE_GETTHREAD rdx, rcx @@ -781,12 +781,12 @@ endif ;; FEATURE_GC_STRESS DontRestoreXmmAgain: add rsp, sizeof_OutgoingScratchSpace - mov eax, [rsp + OFFSETOF__PInvokeTransitionFrame__m_dwFlags] + mov eax, [rsp + OFFSETOF__PInvokeTransitionFrame__m_Flags] test eax, PTFF_THREAD_ABORT pop rax ; m_RIP pop rbp ; m_FramePointer pop rax ; m_pThread - pop rax ; m_dwFlags / m_dwAlign2 + pop rax ; m_Flags / m_dwAlign2 pop rbx pop rsi pop rdi @@ -861,7 +861,7 @@ NESTED_ENTRY RhpTrapToGC, _TEXT ;; [rsp + 20] -> m_RIP -------| ;; [rsp + 28] -> m_FramePointer | ;; [rsp + 30] -> m_pThread | - ;; [rsp + 38] -> m_dwFlags / m_dwAlignPad2 | + ;; [rsp + 38] -> m_Flags / m_dwAlignPad2 | ;; [rsp + 40] -> rbx save | ;; [rsp + 48] -> rsi save | ;; [rsp + 50] -> rdi save | @@ -940,7 +940,7 @@ NESTED_ENTRY RhpTrapToGC, _TEXT push_nonvol_reg rdi push_nonvol_reg rsi push_nonvol_reg rbx - push_vol_reg PROBE_SAVE_FLAGS_EVERYTHING ; m_dwFlags / m_dwAlignPad2 + push_vol_reg PROBE_SAVE_FLAGS_EVERYTHING ; m_Flags / m_dwAlignPad2 ;; rdx <- GetThread(), TRASHES rcx INLINE_GETTHREAD rdx, rcx @@ -1049,12 +1049,12 @@ endif ;; FEATURE_GC_STRESS DontRestoreXmmAgain: add rsp, sizeof_OutgoingScratchSpace - mov eax, [rsp + OFFSETOF__PInvokeTransitionFrame__m_dwFlags] + mov eax, [rsp + OFFSETOF__PInvokeTransitionFrame__m_Flags] test eax, PTFF_THREAD_ABORT pop rax ; m_RIP pop rbp ; m_FramePointer pop rax ; m_pThread - pop rax ; m_dwFlags / m_dwAlign2 + pop rax ; m_Flags / m_dwAlign2 pop rbx pop rsi pop rdi diff --git a/src/Native/Runtime/amd64/PInvoke.S b/src/Native/Runtime/amd64/PInvoke.S index 0a8cbbde0..bf623819d 100644 --- a/src/Native/Runtime/amd64/PInvoke.S +++ b/src/Native/Runtime/amd64/PInvoke.S @@ -28,7 +28,7 @@ NESTED_ENTRY RhpPInvoke, _TEXT, NoHandler mov qword ptr [rbx + OFFSETOF__PInvokeTransitionFrame__m_RIP], r11 lea r11, [rsp + 0x10] // r11 <- caller SP - mov dword ptr [rbx + OFFSETOF__PInvokeTransitionFrame__m_dwFlags], PTFF_SAVE_RSP + mov dword ptr [rbx + OFFSETOF__PInvokeTransitionFrame__m_Flags], PTFF_SAVE_RSP mov qword ptr [rbx + OFFSETOF__PInvokeTransitionFrame__m_PreservedRegs], r11 mov qword ptr [rax + OFFSETOF__Thread__m_pTransitionFrame], rbx diff --git a/src/Native/Runtime/amd64/PInvoke.asm b/src/Native/Runtime/amd64/PInvoke.asm index 762b3d1dc..b4435852d 100644 --- a/src/Native/Runtime/amd64/PInvoke.asm +++ b/src/Native/Runtime/amd64/PInvoke.asm @@ -114,7 +114,7 @@ NESTED_ENTRY RhpWaitForGC, _TEXT NoWait: test [RhpTrapThreads], TrapThreadsFlags_AbortInProgress jz Done - test dword ptr [rbx + OFFSETOF__PInvokeTransitionFrame__m_dwFlags], PTFF_THREAD_ABORT + test dword ptr [rbx + OFFSETOF__PInvokeTransitionFrame__m_Flags], PTFF_THREAD_ABORT jz Done mov rcx, STATUS_REDHAWK_THREAD_ABORT @@ -293,7 +293,7 @@ LEAF_ENTRY RhpPInvoke, _TEXT mov qword ptr [rcx + OFFSETOF__PInvokeTransitionFrame__m_RIP], r11 lea r11, [rsp + 8] ; r11 <- caller SP - mov dword ptr [rcx + OFFSETOF__PInvokeTransitionFrame__m_dwFlags], PTFF_SAVE_RSP + mov dword ptr [rcx + OFFSETOF__PInvokeTransitionFrame__m_Flags], PTFF_SAVE_RSP mov qword ptr [rcx + OFFSETOF__PInvokeTransitionFrame__m_PreservedRegs], r11 mov qword ptr [r10 + OFFSETOF__Thread__m_pTransitionFrame], rcx |