diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-07-17 10:19:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-17 10:19:32 +0300 |
| commit | 05e94267e23f3f477b89f6f16fd728ecce7f21ca (patch) | |
| tree | 44145235d005b74e92608e57f0d0dbe6992adbbb /src/Native/Runtime/i386 | |
| parent | 37ab73b80d15d74d64f8115be022caea5f506a9d (diff) | |
Rewamp DebugBreak handling (#1534)
- Expand Debug.DebugBreak as IL intrinsic
- Implement RhDebugBreak JIT helper for IL break instruction
- Switch assembly code to use RhDebugBreak to avoid C++ name mangling goo
- Change PalDebugBreak to be inline to avoid extra frames under debugger
- Cleanup some left-over cruft in Unix PAL
Diffstat (limited to 'src/Native/Runtime/i386')
| -rw-r--r-- | src/Native/Runtime/i386/AsmMacros.inc | 4 | ||||
| -rw-r--r-- | src/Native/Runtime/i386/GcProbe.asm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Native/Runtime/i386/AsmMacros.inc b/src/Native/Runtime/i386/AsmMacros.inc index 69c262010..7c8f4d372 100644 --- a/src/Native/Runtime/i386/AsmMacros.inc +++ b/src/Native/Runtime/i386/AsmMacros.inc @@ -154,7 +154,7 @@ OFFSETOF__Thread__m_alloc_context__alloc_limit equ OFFSETOF__Thread__m_rgbA ;; CONSTANTS -- SYMBOLS ;; -PALDEBUGBREAK equ ?PalDebugBreak@@YGXXZ +RhDebugBreak equ @RhDebugBreak@0 RhpGcAlloc equ @RhpGcAlloc@16 G_LOWEST_ADDRESS equ _g_lowest_address G_HIGHEST_ADDRESS equ _g_highest_address @@ -176,7 +176,7 @@ endif ;; FEATURE_GC_STRESS ;; IMPORTS ;; EXTERN RhpGcAlloc : PROC -EXTERN PALDEBUGBREAK : PROC +EXTERN RhDebugBreak : PROC EXTERN RhpWaitForSuspend2 : PROC EXTERN RhpWaitForGC2 : PROC EXTERN RhpReversePInvokeAttachOrTrapThread2 : PROC diff --git a/src/Native/Runtime/i386/GcProbe.asm b/src/Native/Runtime/i386/GcProbe.asm index 3d156809b..96d685ec8 100644 --- a/src/Native/Runtime/i386/GcProbe.asm +++ b/src/Native/Runtime/i386/GcProbe.asm @@ -112,7 +112,7 @@ ifdef _DEBUG and eax, DEFAULT_PROBE_SAVE_FLAGS cmp eax, DEFAULT_PROBE_SAVE_FLAGS ; make sure we have at least the flags to match what the macro pushes je @F - call PALDEBUGBREAK + call RhDebugBreak @@: endif ;; _DEBUG push edx ; Thread * @@ -504,7 +504,7 @@ ifdef _DEBUG cmp [RhpTrapThreads], 0 jne @F - call PALDEBUGBREAK + call RhDebugBreak @@: endif ;; _DEBUG |