Skip to content

[NativeAOT] Some cleanup of assembly helpers in hijack area.#72542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VSadov merged 17 commits into from
Jul 22, 2022
Merged

[NativeAOT] Some cleanup of assembly helpers in hijack area. #72542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
dd9382e
remove RhpReversePInvokeAttachOrTrapThread (dead code)
VSadov Jul 18, 2022
c60f01f
remove RhpWaitForGC
VSadov Jul 18, 2022
45dfbfc
removing some dead code
VSadov Jul 19, 2022
eaf6eff
remove unused extraStack parameter to PUSH_PROBE_FRAME
VSadov Jul 20, 2022
1f29db1
make all working variants of RhpGcProbeHijack to have the same shape
VSadov Jul 20, 2022
7d66dd2
fix Unix build, tweak some comments
VSadov Jul 20, 2022
23fdd0a
check the trap flag in RhpGcProbeHijack
VSadov Jul 20, 2022
8c23ae6
add a stub for RhpGcStressHijack on Unix
VSadov Jul 20, 2022
8faffe2
save flags for windows x64 should not have rdx
VSadov Jul 21, 2022
75a01b9
not saving scratch registers on win-arm64
VSadov Jul 21, 2022
c321a96
PUSH_PROBE_FRAME on arm64
VSadov Jul 21, 2022
e8eea2b
couple comments
VSadov Jul 21, 2022
d305471
make RhpGcProbeHijack responsible for setting PTFF_SAVE_ bits
VSadov Jul 21, 2022
bc03016
revert `RhpReversePInvokeAttachOrTrapThread2` change
VSadov Jul 22, 2022
7b260ac
fix indentation
VSadov Jul 22, 2022
38e9c17
made 32bit RhpGcStressHijack similar to 64bit counterparts
VSadov Jul 22, 2022
f16bb29
Renamed `RhpGcProbe` --> `RhpWaitForGC`
VSadov Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/coreclr/nativeaot/Runtime/ICodeManager.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,9 @@ C_ASSERT(PTFF_X1_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 32));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
if (returnKind == GCRK_Scalar)
return 0;

return PTFF_SAVE_X0 | PTFF_SAVE_X1 | ((uint64_t)returnKind << 32);
// just need to report gc ref bits here.
// appropriate PTFF_SAVE_ bits will be added by the frame building routine.
return ((uint64_t)returnKind << 32);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand All@@ -76,10 +75,9 @@ C_ASSERT(PTFF_RDX_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 16));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
if (returnKind == GCRK_Scalar)
return 0;

return PTFF_SAVE_RAX | PTFF_SAVE_RDX | ((uint64_t)returnKind << 16);
// just need to report gc ref bits here.
// appropriate PTFF_SAVE_ bits will be added by the frame building routine.
return ((uint64_t)returnKind << 16);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/nativeaot/Runtime/amd64/AsmMacros.inc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,7 +396,6 @@ EXTERN RhpGcAlloc : PROC
EXTERN RhpValidateExInfoPop : PROC
EXTERN RhDebugBreak : PROC
EXTERN RhpWaitForGC2 : PROC
EXTERN RhpReversePInvokeAttachOrTrapThread2 : PROC
EXTERN RhExceptionHandling_FailedAllocation : PROC
EXTERN RhThrowHwEx : PROC
EXTERN RhThrowEx : PROC
Expand Down
100 changes: 18 additions & 82 deletions src/coreclr/nativeaot/Runtime/amd64/GcProbe.S
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,24 +67,6 @@
pop rdx
.endm

//
// Macro to clear the hijack state. This is safe to do because the suspension code will not Unhijack this
// thread if it finds it at an IP that isn`t managed code.
//
// Register state on entry:
// R11: thread pointer
//
// Register state on exit:
// R9: trashed
//
.macro ClearHijackState
xor r9, r9
mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm


//
// The prolog for all GC suspension hijacks (normal and stress). Fixes up the hijacked return address, and
// clears the hijack state.
Expand All@@ -98,7 +80,7 @@
// RAX, RDX preserved, other volatile regs trashed
//
.macro FixupHijackedCallstack
// preserve RAX, RDX as they may contain retuvalues
// preserve RAX, RDX as they may contain return values
push rax
push rdx

Expand All@@ -109,88 +91,43 @@
pop rdx
pop rax

//
// Fix the stack by pushing the original return address
//
mov rcx, [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress]
push rcx

// Fetch the return address flags
mov rcx, [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags]

ClearHijackState
.endm

//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// RhpWaitForGCNoAbort -- rare path for WaitForGCCompletion
//
//
// INPUT: RDI: transition frame
//
// TRASHES: RCX, RDI, R8, R9, R10, R11
//
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
NESTED_ENTRY RhpWaitForGCNoAbort, _TEXT, NoHandler
END_PROLOGUE

mov rdx, [rdi + OFFSETOF__PInvokeTransitionFrame__m_pThread]

test dword ptr [rdx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_DoNotTriggerGc
jnz Done

// passing transition frame pointer in rdi
call C_FUNC(RhpWaitForGC2)

Done:
ret

NESTED_END RhpWaitForGCNoAbort, _TEXT

//
// Set the Thread state and wait for a GC to complete.
//
// Register state on entry:
// RBX: thread pointer
//
// Register state on exit:
// RBX: thread pointer
// All other registers trashed
//

.macro WaitForGCCompletion
test dword ptr [rbx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_SuppressGcStress + TSF_DoNotTriggerGc
jnz LOCAL_LABEL(NoWait)

mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
call C_FUNC(RhpWaitForGCNoAbort)
LOCAL_LABEL(NoWait):

// Clear hijack state
xor r9, r9
mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm

//
//
//
// GC Probe Hijack target
//
//

NESTED_ENTRY RhpGcProbeHijack, _TEXT, NoHandler
END_PROLOGUE
FixupHijackedCallstack
or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
jmp C_FUNC(RhpGcProbe)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpGcProbe, _TEXT, NoHandler
test dword ptr [C_VAR(RhpTrapThreads)], TrapThreadsFlags_TrapThreads
jnz LOCAL_LABEL(RhpGcProbe_Trap)
jnz LOCAL_LABEL(WaitForGC)
ret
LOCAL_LABEL(RhpGcProbe_Trap):

LOCAL_LABEL(WaitForGC):
or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
jmp C_FUNC(RhpWaitForGC)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpWaitForGC, _TEXT, NoHandler
PUSH_PROBE_FRAME r11, rax, rcx
END_PROLOGUE

mov rbx, r11
WaitForGCCompletion
mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
call C_FUNC(RhpWaitForGC2)

mov rax, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
test dword ptr [rax + OFFSETOF__PInvokeTransitionFrame__m_Flags], PTFF_THREAD_ABORT
Expand All@@ -203,7 +140,7 @@ LOCAL_LABEL(Abort):
pop rdx // return address as exception RIP
jmp C_FUNC(RhpThrowHwEx) // Throw the ThreadAbortException as a special kind of hardware exception

NESTED_END RhpGcProbe, _TEXT
NESTED_END RhpWaitForGC, _TEXT


LEAF_ENTRY RhpGcPoll, _TEXT
Expand All@@ -212,7 +149,6 @@ LEAF_ENTRY RhpGcPoll, _TEXT
ret
LOCAL_LABEL(RhpGcPoll_RarePath):
jmp C_FUNC(RhpGcPollRare)

LEAF_END RhpGcPoll, _TEXT

NESTED_ENTRY RhpGcPollRare, _TEXT, NoHandler
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[NativeAOT] Some cleanup of assembly helpers in hijack area. by VSadov · Pull Request #72542 · dotnet/runtime · GitHub
Skip to content
[NativeAOT] Some cleanup of assembly helpers in hijack area.#72542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

VSadov
merged 17 commits into

from

Jul 22, 2022
 Merged


[NativeAOT] Some cleanup of assembly helpers in hijack area.
#72542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
dd9382e

remove RhpReversePInvokeAttachOrTrapThread (dead code)


VSadov Jul 18, 2022
c60f01f

remove RhpWaitForGC


VSadov Jul 18, 2022
45dfbfc

removing some dead code


VSadov Jul 19, 2022
eaf6eff

remove unused extraStack parameter to PUSH_PROBE_FRAME


VSadov Jul 20, 2022
1f29db1

make all working variants of RhpGcProbeHijack to have the same shape


VSadov Jul 20, 2022
7d66dd2

fix Unix build, tweak some comments


VSadov Jul 20, 2022
23fdd0a

check the trap flag in RhpGcProbeHijack


VSadov Jul 20, 2022
8c23ae6

add a stub for RhpGcStressHijack on Unix


VSadov Jul 20, 2022
8faffe2

save flags for windows x64 should not have rdx


VSadov Jul 21, 2022
75a01b9

not saving scratch registers on win-arm64


VSadov Jul 21, 2022
c321a96

PUSH_PROBE_FRAME on arm64


VSadov Jul 21, 2022
e8eea2b

couple comments


VSadov Jul 21, 2022
d305471

make RhpGcProbeHijack responsible for setting PTFF_SAVE_ bits


VSadov Jul 21, 2022
bc03016

revert `RhpReversePInvokeAttachOrTrapThread2` change


VSadov Jul 22, 2022
7b260ac

fix indentation


VSadov Jul 22, 2022
38e9c17

made 32bit RhpGcStressHijack similar to 64bit counterparts


VSadov Jul 22, 2022
f16bb29

Renamed `RhpGcProbe` --> `RhpWaitForGC`


VSadov Jul 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 6 additions & 8 deletions
src/coreclr/nativeaot/Runtime/ICodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,9 @@ C_ASSERT(PTFF_X1_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 32));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_X0 | PTFF_SAVE_X1 | ((uint64_t)returnKind << 32);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 32);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand All@@ -76,10 +75,9 @@ C_ASSERT(PTFF_RDX_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 16));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_RAX | PTFF_SAVE_RDX | ((uint64_t)returnKind << 16);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 16);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/amd64/AsmMacros.inc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,7 +396,6 @@ EXTERN RhpGcAlloc : PROC
EXTERN RhpValidateExInfoPop : PROC
EXTERN RhDebugBreak : PROC
EXTERN RhpWaitForGC2 : PROC
EXTERN RhpReversePInvokeAttachOrTrapThread2 : PROC
EXTERN RhExceptionHandling_FailedAllocation : PROC
EXTERN RhThrowHwEx : PROC
EXTERN RhThrowEx : PROC
Expand Down

100 changes: 18 additions & 82 deletions
src/coreclr/nativeaot/Runtime/amd64/GcProbe.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,24 +67,6 @@
 pop rdx
.endm

//
// Macro to clear the hijack state. This is safe to do because the suspension code will not Unhijack this
// thread if it finds it at an IP that isn`t managed code.
//
// Register state on entry:
// R11: thread pointer
//
// Register state on exit:
// R9: trashed
//
.macro ClearHijackState
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm


//
// The prolog for all GC suspension hijacks (normal and stress). Fixes up the hijacked return address, and
// clears the hijack state.
Expand All@@ -98,7 +80,7 @@
// RAX, RDX preserved, other volatile regs trashed
//
.macro FixupHijackedCallstack
 // preserve RAX, RDX as they may contain retuvalues
 // preserve RAX, RDX as they may contain return values
 push rax
 push rdx

Expand All@@ -109,88 +91,43 @@
 pop rdx
 pop rax

 //
 // Fix the stack by pushing the original return address
 //
 mov rcx, [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress]
 push rcx

 // Fetch the return address flags
 mov rcx, [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags]

 ClearHijackState
.endm

//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// RhpWaitForGCNoAbort -- rare path for WaitForGCCompletion
//
//
// INPUT: RDI: transition frame
//
// TRASHES: RCX, RDI, R8, R9, R10, R11
//
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
NESTED_ENTRY RhpWaitForGCNoAbort, _TEXT, NoHandler
 END_PROLOGUE

 mov rdx, [rdi + OFFSETOF__PInvokeTransitionFrame__m_pThread]

 test dword ptr [rdx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_DoNotTriggerGc
 jnz Done

 // passing transition frame pointer in rdi
 call C_FUNC(RhpWaitForGC2)

Done:
 ret

NESTED_END RhpWaitForGCNoAbort, _TEXT

//
// Set the Thread state and wait for a GC to complete.
//
// Register state on entry:
// RBX: thread pointer
//
// Register state on exit:
// RBX: thread pointer
// All other registers trashed
//

.macro WaitForGCCompletion
 test dword ptr [rbx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_SuppressGcStress + TSF_DoNotTriggerGc
 jnz LOCAL_LABEL(NoWait)

 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGCNoAbort)
LOCAL_LABEL(NoWait):

 // Clear hijack state
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm

//
//
//
// GC Probe Hijack target
//
//

NESTED_ENTRY RhpGcProbeHijack, _TEXT, NoHandler
 END_PROLOGUE
 FixupHijackedCallstack
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpGcProbe)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpGcProbe, _TEXT, NoHandler
 test dword ptr [C_VAR(RhpTrapThreads)], TrapThreadsFlags_TrapThreads
 jnz LOCAL_LABEL(RhpGcProbe_Trap)
 jnz LOCAL_LABEL(WaitForGC)
 ret
LOCAL_LABEL(RhpGcProbe_Trap):

LOCAL_LABEL(WaitForGC):
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpWaitForGC)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpWaitForGC, _TEXT, NoHandler
 PUSH_PROBE_FRAME r11, rax, rcx
 END_PROLOGUE

 mov rbx, r11
 WaitForGCCompletion
 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGC2)

 mov rax, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 test dword ptr [rax + OFFSETOF__PInvokeTransitionFrame__m_Flags], PTFF_THREAD_ABORT
Expand All@@ -203,7 +140,7 @@ LOCAL_LABEL(Abort):
 pop rdx // return address as exception RIP
 jmp C_FUNC(RhpThrowHwEx) // Throw the ThreadAbortException as a special kind of hardware exception

NESTED_END RhpGcProbe, _TEXT
NESTED_END RhpWaitForGC, _TEXT


LEAF_ENTRY RhpGcPoll, _TEXT
Expand All@@ -212,7 +149,6 @@ LEAF_ENTRY RhpGcPoll, _TEXT
 ret
LOCAL_LABEL(RhpGcPoll_RarePath):
 jmp C_FUNC(RhpGcPollRare)

LEAF_END RhpGcPoll, _TEXT

NESTED_ENTRY RhpGcPollRare, _TEXT, NoHandler
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[NativeAOT] Some cleanup of assembly helpers in hijack area. by VSadov · Pull Request #72542 · dotnet/runtime · GitHub
Skip to content
[NativeAOT] Some cleanup of assembly helpers in hijack area.#72542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

VSadov
merged 17 commits into

from

Jul 22, 2022
 Merged


[NativeAOT] Some cleanup of assembly helpers in hijack area.
#72542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
dd9382e

remove RhpReversePInvokeAttachOrTrapThread (dead code)


VSadov Jul 18, 2022
c60f01f

remove RhpWaitForGC


VSadov Jul 18, 2022
45dfbfc

removing some dead code


VSadov Jul 19, 2022
eaf6eff

remove unused extraStack parameter to PUSH_PROBE_FRAME


VSadov Jul 20, 2022
1f29db1

make all working variants of RhpGcProbeHijack to have the same shape


VSadov Jul 20, 2022
7d66dd2

fix Unix build, tweak some comments


VSadov Jul 20, 2022
23fdd0a

check the trap flag in RhpGcProbeHijack


VSadov Jul 20, 2022
8c23ae6

add a stub for RhpGcStressHijack on Unix


VSadov Jul 20, 2022
8faffe2

save flags for windows x64 should not have rdx


VSadov Jul 21, 2022
75a01b9

not saving scratch registers on win-arm64


VSadov Jul 21, 2022
c321a96

PUSH_PROBE_FRAME on arm64


VSadov Jul 21, 2022
e8eea2b

couple comments


VSadov Jul 21, 2022
d305471

make RhpGcProbeHijack responsible for setting PTFF_SAVE_ bits


VSadov Jul 21, 2022
bc03016

revert `RhpReversePInvokeAttachOrTrapThread2` change


VSadov Jul 22, 2022
7b260ac

fix indentation


VSadov Jul 22, 2022
38e9c17

made 32bit RhpGcStressHijack similar to 64bit counterparts


VSadov Jul 22, 2022
f16bb29

Renamed `RhpGcProbe` --> `RhpWaitForGC`


VSadov Jul 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 6 additions & 8 deletions
src/coreclr/nativeaot/Runtime/ICodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,9 @@ C_ASSERT(PTFF_X1_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 32));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_X0 | PTFF_SAVE_X1 | ((uint64_t)returnKind << 32);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 32);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand All@@ -76,10 +75,9 @@ C_ASSERT(PTFF_RDX_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 16));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_RAX | PTFF_SAVE_RDX | ((uint64_t)returnKind << 16);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 16);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/amd64/AsmMacros.inc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,7 +396,6 @@ EXTERN RhpGcAlloc : PROC
EXTERN RhpValidateExInfoPop : PROC
EXTERN RhDebugBreak : PROC
EXTERN RhpWaitForGC2 : PROC
EXTERN RhpReversePInvokeAttachOrTrapThread2 : PROC
EXTERN RhExceptionHandling_FailedAllocation : PROC
EXTERN RhThrowHwEx : PROC
EXTERN RhThrowEx : PROC
Expand Down

100 changes: 18 additions & 82 deletions
src/coreclr/nativeaot/Runtime/amd64/GcProbe.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,24 +67,6 @@
 pop rdx
.endm

//
// Macro to clear the hijack state. This is safe to do because the suspension code will not Unhijack this
// thread if it finds it at an IP that isn`t managed code.
//
// Register state on entry:
// R11: thread pointer
//
// Register state on exit:
// R9: trashed
//
.macro ClearHijackState
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm


//
// The prolog for all GC suspension hijacks (normal and stress). Fixes up the hijacked return address, and
// clears the hijack state.
Expand All@@ -98,7 +80,7 @@
// RAX, RDX preserved, other volatile regs trashed
//
.macro FixupHijackedCallstack
 // preserve RAX, RDX as they may contain retuvalues
 // preserve RAX, RDX as they may contain return values
 push rax
 push rdx

Expand All@@ -109,88 +91,43 @@
 pop rdx
 pop rax

 //
 // Fix the stack by pushing the original return address
 //
 mov rcx, [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress]
 push rcx

 // Fetch the return address flags
 mov rcx, [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags]

 ClearHijackState
.endm

//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// RhpWaitForGCNoAbort -- rare path for WaitForGCCompletion
//
//
// INPUT: RDI: transition frame
//
// TRASHES: RCX, RDI, R8, R9, R10, R11
//
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
NESTED_ENTRY RhpWaitForGCNoAbort, _TEXT, NoHandler
 END_PROLOGUE

 mov rdx, [rdi + OFFSETOF__PInvokeTransitionFrame__m_pThread]

 test dword ptr [rdx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_DoNotTriggerGc
 jnz Done

 // passing transition frame pointer in rdi
 call C_FUNC(RhpWaitForGC2)

Done:
 ret

NESTED_END RhpWaitForGCNoAbort, _TEXT

//
// Set the Thread state and wait for a GC to complete.
//
// Register state on entry:
// RBX: thread pointer
//
// Register state on exit:
// RBX: thread pointer
// All other registers trashed
//

.macro WaitForGCCompletion
 test dword ptr [rbx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_SuppressGcStress + TSF_DoNotTriggerGc
 jnz LOCAL_LABEL(NoWait)

 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGCNoAbort)
LOCAL_LABEL(NoWait):

 // Clear hijack state
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm

//
//
//
// GC Probe Hijack target
//
//

NESTED_ENTRY RhpGcProbeHijack, _TEXT, NoHandler
 END_PROLOGUE
 FixupHijackedCallstack
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpGcProbe)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpGcProbe, _TEXT, NoHandler
 test dword ptr [C_VAR(RhpTrapThreads)], TrapThreadsFlags_TrapThreads
 jnz LOCAL_LABEL(RhpGcProbe_Trap)
 jnz LOCAL_LABEL(WaitForGC)
 ret
LOCAL_LABEL(RhpGcProbe_Trap):

LOCAL_LABEL(WaitForGC):
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpWaitForGC)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpWaitForGC, _TEXT, NoHandler
 PUSH_PROBE_FRAME r11, rax, rcx
 END_PROLOGUE

 mov rbx, r11
 WaitForGCCompletion
 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGC2)

 mov rax, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 test dword ptr [rax + OFFSETOF__PInvokeTransitionFrame__m_Flags], PTFF_THREAD_ABORT
Expand All@@ -203,7 +140,7 @@ LOCAL_LABEL(Abort):
 pop rdx // return address as exception RIP
 jmp C_FUNC(RhpThrowHwEx) // Throw the ThreadAbortException as a special kind of hardware exception

NESTED_END RhpGcProbe, _TEXT
NESTED_END RhpWaitForGC, _TEXT


LEAF_ENTRY RhpGcPoll, _TEXT
Expand All@@ -212,7 +149,6 @@ LEAF_ENTRY RhpGcPoll, _TEXT
 ret
LOCAL_LABEL(RhpGcPoll_RarePath):
 jmp C_FUNC(RhpGcPollRare)

LEAF_END RhpGcPoll, _TEXT

NESTED_ENTRY RhpGcPollRare, _TEXT, NoHandler
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[NativeAOT] Some cleanup of assembly helpers in hijack area. by VSadov · Pull Request #72542 · dotnet/runtime · GitHub
Skip to content
[NativeAOT] Some cleanup of assembly helpers in hijack area.#72542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

VSadov
merged 17 commits into

from

Jul 22, 2022
 Merged


[NativeAOT] Some cleanup of assembly helpers in hijack area.
#72542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
dd9382e

remove RhpReversePInvokeAttachOrTrapThread (dead code)


VSadov Jul 18, 2022
c60f01f

remove RhpWaitForGC


VSadov Jul 18, 2022
45dfbfc

removing some dead code


VSadov Jul 19, 2022
eaf6eff

remove unused extraStack parameter to PUSH_PROBE_FRAME


VSadov Jul 20, 2022
1f29db1

make all working variants of RhpGcProbeHijack to have the same shape


VSadov Jul 20, 2022
7d66dd2

fix Unix build, tweak some comments


VSadov Jul 20, 2022
23fdd0a

check the trap flag in RhpGcProbeHijack


VSadov Jul 20, 2022
8c23ae6

add a stub for RhpGcStressHijack on Unix


VSadov Jul 20, 2022
8faffe2

save flags for windows x64 should not have rdx


VSadov Jul 21, 2022
75a01b9

not saving scratch registers on win-arm64


VSadov Jul 21, 2022
c321a96

PUSH_PROBE_FRAME on arm64


VSadov Jul 21, 2022
e8eea2b

couple comments


VSadov Jul 21, 2022
d305471

make RhpGcProbeHijack responsible for setting PTFF_SAVE_ bits


VSadov Jul 21, 2022
bc03016

revert `RhpReversePInvokeAttachOrTrapThread2` change


VSadov Jul 22, 2022
7b260ac

fix indentation


VSadov Jul 22, 2022
38e9c17

made 32bit RhpGcStressHijack similar to 64bit counterparts


VSadov Jul 22, 2022
f16bb29

Renamed `RhpGcProbe` --> `RhpWaitForGC`


VSadov Jul 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 6 additions & 8 deletions
src/coreclr/nativeaot/Runtime/ICodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,9 @@ C_ASSERT(PTFF_X1_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 32));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_X0 | PTFF_SAVE_X1 | ((uint64_t)returnKind << 32);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 32);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand All@@ -76,10 +75,9 @@ C_ASSERT(PTFF_RDX_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 16));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_RAX | PTFF_SAVE_RDX | ((uint64_t)returnKind << 16);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 16);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/amd64/AsmMacros.inc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,7 +396,6 @@ EXTERN RhpGcAlloc : PROC
EXTERN RhpValidateExInfoPop : PROC
EXTERN RhDebugBreak : PROC
EXTERN RhpWaitForGC2 : PROC
EXTERN RhpReversePInvokeAttachOrTrapThread2 : PROC
EXTERN RhExceptionHandling_FailedAllocation : PROC
EXTERN RhThrowHwEx : PROC
EXTERN RhThrowEx : PROC
Expand Down

100 changes: 18 additions & 82 deletions
src/coreclr/nativeaot/Runtime/amd64/GcProbe.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,24 +67,6 @@
 pop rdx
.endm

//
// Macro to clear the hijack state. This is safe to do because the suspension code will not Unhijack this
// thread if it finds it at an IP that isn`t managed code.
//
// Register state on entry:
// R11: thread pointer
//
// Register state on exit:
// R9: trashed
//
.macro ClearHijackState
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm


//
// The prolog for all GC suspension hijacks (normal and stress). Fixes up the hijacked return address, and
// clears the hijack state.
Expand All@@ -98,7 +80,7 @@
// RAX, RDX preserved, other volatile regs trashed
//
.macro FixupHijackedCallstack
 // preserve RAX, RDX as they may contain retuvalues
 // preserve RAX, RDX as they may contain return values
 push rax
 push rdx

Expand All@@ -109,88 +91,43 @@
 pop rdx
 pop rax

 //
 // Fix the stack by pushing the original return address
 //
 mov rcx, [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress]
 push rcx

 // Fetch the return address flags
 mov rcx, [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags]

 ClearHijackState
.endm

//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// RhpWaitForGCNoAbort -- rare path for WaitForGCCompletion
//
//
// INPUT: RDI: transition frame
//
// TRASHES: RCX, RDI, R8, R9, R10, R11
//
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
NESTED_ENTRY RhpWaitForGCNoAbort, _TEXT, NoHandler
 END_PROLOGUE

 mov rdx, [rdi + OFFSETOF__PInvokeTransitionFrame__m_pThread]

 test dword ptr [rdx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_DoNotTriggerGc
 jnz Done

 // passing transition frame pointer in rdi
 call C_FUNC(RhpWaitForGC2)

Done:
 ret

NESTED_END RhpWaitForGCNoAbort, _TEXT

//
// Set the Thread state and wait for a GC to complete.
//
// Register state on entry:
// RBX: thread pointer
//
// Register state on exit:
// RBX: thread pointer
// All other registers trashed
//

.macro WaitForGCCompletion
 test dword ptr [rbx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_SuppressGcStress + TSF_DoNotTriggerGc
 jnz LOCAL_LABEL(NoWait)

 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGCNoAbort)
LOCAL_LABEL(NoWait):

 // Clear hijack state
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm

//
//
//
// GC Probe Hijack target
//
//

NESTED_ENTRY RhpGcProbeHijack, _TEXT, NoHandler
 END_PROLOGUE
 FixupHijackedCallstack
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpGcProbe)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpGcProbe, _TEXT, NoHandler
 test dword ptr [C_VAR(RhpTrapThreads)], TrapThreadsFlags_TrapThreads
 jnz LOCAL_LABEL(RhpGcProbe_Trap)
 jnz LOCAL_LABEL(WaitForGC)
 ret
LOCAL_LABEL(RhpGcProbe_Trap):

LOCAL_LABEL(WaitForGC):
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpWaitForGC)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpWaitForGC, _TEXT, NoHandler
 PUSH_PROBE_FRAME r11, rax, rcx
 END_PROLOGUE

 mov rbx, r11
 WaitForGCCompletion
 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGC2)

 mov rax, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 test dword ptr [rax + OFFSETOF__PInvokeTransitionFrame__m_Flags], PTFF_THREAD_ABORT
Expand All@@ -203,7 +140,7 @@ LOCAL_LABEL(Abort):
 pop rdx // return address as exception RIP
 jmp C_FUNC(RhpThrowHwEx) // Throw the ThreadAbortException as a special kind of hardware exception

NESTED_END RhpGcProbe, _TEXT
NESTED_END RhpWaitForGC, _TEXT


LEAF_ENTRY RhpGcPoll, _TEXT
Expand All@@ -212,7 +149,6 @@ LEAF_ENTRY RhpGcPoll, _TEXT
 ret
LOCAL_LABEL(RhpGcPoll_RarePath):
 jmp C_FUNC(RhpGcPollRare)

LEAF_END RhpGcPoll, _TEXT

NESTED_ENTRY RhpGcPollRare, _TEXT, NoHandler
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[NativeAOT] Some cleanup of assembly helpers in hijack area. by VSadov · Pull Request #72542 · dotnet/runtime · GitHub
Skip to content
[NativeAOT] Some cleanup of assembly helpers in hijack area.#72542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

VSadov
merged 17 commits into

from

Jul 22, 2022
 Merged


[NativeAOT] Some cleanup of assembly helpers in hijack area.
#72542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
dd9382e

remove RhpReversePInvokeAttachOrTrapThread (dead code)


VSadov Jul 18, 2022
c60f01f

remove RhpWaitForGC


VSadov Jul 18, 2022
45dfbfc

removing some dead code


VSadov Jul 19, 2022
eaf6eff

remove unused extraStack parameter to PUSH_PROBE_FRAME


VSadov Jul 20, 2022
1f29db1

make all working variants of RhpGcProbeHijack to have the same shape


VSadov Jul 20, 2022
7d66dd2

fix Unix build, tweak some comments


VSadov Jul 20, 2022
23fdd0a

check the trap flag in RhpGcProbeHijack


VSadov Jul 20, 2022
8c23ae6

add a stub for RhpGcStressHijack on Unix


VSadov Jul 20, 2022
8faffe2

save flags for windows x64 should not have rdx


VSadov Jul 21, 2022
75a01b9

not saving scratch registers on win-arm64


VSadov Jul 21, 2022
c321a96

PUSH_PROBE_FRAME on arm64


VSadov Jul 21, 2022
e8eea2b

couple comments


VSadov Jul 21, 2022
d305471

make RhpGcProbeHijack responsible for setting PTFF_SAVE_ bits


VSadov Jul 21, 2022
bc03016

revert `RhpReversePInvokeAttachOrTrapThread2` change


VSadov Jul 22, 2022
7b260ac

fix indentation


VSadov Jul 22, 2022
38e9c17

made 32bit RhpGcStressHijack similar to 64bit counterparts


VSadov Jul 22, 2022
f16bb29

Renamed `RhpGcProbe` --> `RhpWaitForGC`


VSadov Jul 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 6 additions & 8 deletions
src/coreclr/nativeaot/Runtime/ICodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,9 @@ C_ASSERT(PTFF_X1_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 32));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_X0 | PTFF_SAVE_X1 | ((uint64_t)returnKind << 32);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 32);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand All@@ -76,10 +75,9 @@ C_ASSERT(PTFF_RDX_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 16));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_RAX | PTFF_SAVE_RDX | ((uint64_t)returnKind << 16);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 16);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/amd64/AsmMacros.inc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,7 +396,6 @@ EXTERN RhpGcAlloc : PROC
EXTERN RhpValidateExInfoPop : PROC
EXTERN RhDebugBreak : PROC
EXTERN RhpWaitForGC2 : PROC
EXTERN RhpReversePInvokeAttachOrTrapThread2 : PROC
EXTERN RhExceptionHandling_FailedAllocation : PROC
EXTERN RhThrowHwEx : PROC
EXTERN RhThrowEx : PROC
Expand Down

100 changes: 18 additions & 82 deletions
src/coreclr/nativeaot/Runtime/amd64/GcProbe.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,24 +67,6 @@
 pop rdx
.endm

//
// Macro to clear the hijack state. This is safe to do because the suspension code will not Unhijack this
// thread if it finds it at an IP that isn`t managed code.
//
// Register state on entry:
// R11: thread pointer
//
// Register state on exit:
// R9: trashed
//
.macro ClearHijackState
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm


//
// The prolog for all GC suspension hijacks (normal and stress). Fixes up the hijacked return address, and
// clears the hijack state.
Expand All@@ -98,7 +80,7 @@
// RAX, RDX preserved, other volatile regs trashed
//
.macro FixupHijackedCallstack
 // preserve RAX, RDX as they may contain retuvalues
 // preserve RAX, RDX as they may contain return values
 push rax
 push rdx

Expand All@@ -109,88 +91,43 @@
 pop rdx
 pop rax

 //
 // Fix the stack by pushing the original return address
 //
 mov rcx, [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress]
 push rcx

 // Fetch the return address flags
 mov rcx, [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags]

 ClearHijackState
.endm

//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// RhpWaitForGCNoAbort -- rare path for WaitForGCCompletion
//
//
// INPUT: RDI: transition frame
//
// TRASHES: RCX, RDI, R8, R9, R10, R11
//
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
NESTED_ENTRY RhpWaitForGCNoAbort, _TEXT, NoHandler
 END_PROLOGUE

 mov rdx, [rdi + OFFSETOF__PInvokeTransitionFrame__m_pThread]

 test dword ptr [rdx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_DoNotTriggerGc
 jnz Done

 // passing transition frame pointer in rdi
 call C_FUNC(RhpWaitForGC2)

Done:
 ret

NESTED_END RhpWaitForGCNoAbort, _TEXT

//
// Set the Thread state and wait for a GC to complete.
//
// Register state on entry:
// RBX: thread pointer
//
// Register state on exit:
// RBX: thread pointer
// All other registers trashed
//

.macro WaitForGCCompletion
 test dword ptr [rbx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_SuppressGcStress + TSF_DoNotTriggerGc
 jnz LOCAL_LABEL(NoWait)

 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGCNoAbort)
LOCAL_LABEL(NoWait):

 // Clear hijack state
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm

//
//
//
// GC Probe Hijack target
//
//

NESTED_ENTRY RhpGcProbeHijack, _TEXT, NoHandler
 END_PROLOGUE
 FixupHijackedCallstack
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpGcProbe)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpGcProbe, _TEXT, NoHandler
 test dword ptr [C_VAR(RhpTrapThreads)], TrapThreadsFlags_TrapThreads
 jnz LOCAL_LABEL(RhpGcProbe_Trap)
 jnz LOCAL_LABEL(WaitForGC)
 ret
LOCAL_LABEL(RhpGcProbe_Trap):

LOCAL_LABEL(WaitForGC):
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpWaitForGC)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpWaitForGC, _TEXT, NoHandler
 PUSH_PROBE_FRAME r11, rax, rcx
 END_PROLOGUE

 mov rbx, r11
 WaitForGCCompletion
 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGC2)

 mov rax, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 test dword ptr [rax + OFFSETOF__PInvokeTransitionFrame__m_Flags], PTFF_THREAD_ABORT
Expand All@@ -203,7 +140,7 @@ LOCAL_LABEL(Abort):
 pop rdx // return address as exception RIP
 jmp C_FUNC(RhpThrowHwEx) // Throw the ThreadAbortException as a special kind of hardware exception

NESTED_END RhpGcProbe, _TEXT
NESTED_END RhpWaitForGC, _TEXT


LEAF_ENTRY RhpGcPoll, _TEXT
Expand All@@ -212,7 +149,6 @@ LEAF_ENTRY RhpGcPoll, _TEXT
 ret
LOCAL_LABEL(RhpGcPoll_RarePath):
 jmp C_FUNC(RhpGcPollRare)

LEAF_END RhpGcPoll, _TEXT

NESTED_ENTRY RhpGcPollRare, _TEXT, NoHandler
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[NativeAOT] Some cleanup of assembly helpers in hijack area. by VSadov · Pull Request #72542 · dotnet/runtime · GitHub
Skip to content
[NativeAOT] Some cleanup of assembly helpers in hijack area.#72542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

VSadov
merged 17 commits into

from

Jul 22, 2022
 Merged


[NativeAOT] Some cleanup of assembly helpers in hijack area.
#72542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
dd9382e

remove RhpReversePInvokeAttachOrTrapThread (dead code)


VSadov Jul 18, 2022
c60f01f

remove RhpWaitForGC


VSadov Jul 18, 2022
45dfbfc

removing some dead code


VSadov Jul 19, 2022
eaf6eff

remove unused extraStack parameter to PUSH_PROBE_FRAME


VSadov Jul 20, 2022
1f29db1

make all working variants of RhpGcProbeHijack to have the same shape


VSadov Jul 20, 2022
7d66dd2

fix Unix build, tweak some comments


VSadov Jul 20, 2022
23fdd0a

check the trap flag in RhpGcProbeHijack


VSadov Jul 20, 2022
8c23ae6

add a stub for RhpGcStressHijack on Unix


VSadov Jul 20, 2022
8faffe2

save flags for windows x64 should not have rdx


VSadov Jul 21, 2022
75a01b9

not saving scratch registers on win-arm64


VSadov Jul 21, 2022
c321a96

PUSH_PROBE_FRAME on arm64


VSadov Jul 21, 2022
e8eea2b

couple comments


VSadov Jul 21, 2022
d305471

make RhpGcProbeHijack responsible for setting PTFF_SAVE_ bits


VSadov Jul 21, 2022
bc03016

revert `RhpReversePInvokeAttachOrTrapThread2` change


VSadov Jul 22, 2022
7b260ac

fix indentation


VSadov Jul 22, 2022
38e9c17

made 32bit RhpGcStressHijack similar to 64bit counterparts


VSadov Jul 22, 2022
f16bb29

Renamed `RhpGcProbe` --> `RhpWaitForGC`


VSadov Jul 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 6 additions & 8 deletions
src/coreclr/nativeaot/Runtime/ICodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,9 @@ C_ASSERT(PTFF_X1_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 32));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_X0 | PTFF_SAVE_X1 | ((uint64_t)returnKind << 32);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 32);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand All@@ -76,10 +75,9 @@ C_ASSERT(PTFF_RDX_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 16));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_RAX | PTFF_SAVE_RDX | ((uint64_t)returnKind << 16);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 16);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/amd64/AsmMacros.inc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,7 +396,6 @@ EXTERN RhpGcAlloc : PROC
EXTERN RhpValidateExInfoPop : PROC
EXTERN RhDebugBreak : PROC
EXTERN RhpWaitForGC2 : PROC
EXTERN RhpReversePInvokeAttachOrTrapThread2 : PROC
EXTERN RhExceptionHandling_FailedAllocation : PROC
EXTERN RhThrowHwEx : PROC
EXTERN RhThrowEx : PROC
Expand Down

100 changes: 18 additions & 82 deletions
src/coreclr/nativeaot/Runtime/amd64/GcProbe.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,24 +67,6 @@
 pop rdx
.endm

//
// Macro to clear the hijack state. This is safe to do because the suspension code will not Unhijack this
// thread if it finds it at an IP that isn`t managed code.
//
// Register state on entry:
// R11: thread pointer
//
// Register state on exit:
// R9: trashed
//
.macro ClearHijackState
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm


//
// The prolog for all GC suspension hijacks (normal and stress). Fixes up the hijacked return address, and
// clears the hijack state.
Expand All@@ -98,7 +80,7 @@
// RAX, RDX preserved, other volatile regs trashed
//
.macro FixupHijackedCallstack
 // preserve RAX, RDX as they may contain retuvalues
 // preserve RAX, RDX as they may contain return values
 push rax
 push rdx

Expand All@@ -109,88 +91,43 @@
 pop rdx
 pop rax

 //
 // Fix the stack by pushing the original return address
 //
 mov rcx, [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress]
 push rcx

 // Fetch the return address flags
 mov rcx, [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags]

 ClearHijackState
.endm

//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// RhpWaitForGCNoAbort -- rare path for WaitForGCCompletion
//
//
// INPUT: RDI: transition frame
//
// TRASHES: RCX, RDI, R8, R9, R10, R11
//
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
NESTED_ENTRY RhpWaitForGCNoAbort, _TEXT, NoHandler
 END_PROLOGUE

 mov rdx, [rdi + OFFSETOF__PInvokeTransitionFrame__m_pThread]

 test dword ptr [rdx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_DoNotTriggerGc
 jnz Done

 // passing transition frame pointer in rdi
 call C_FUNC(RhpWaitForGC2)

Done:
 ret

NESTED_END RhpWaitForGCNoAbort, _TEXT

//
// Set the Thread state and wait for a GC to complete.
//
// Register state on entry:
// RBX: thread pointer
//
// Register state on exit:
// RBX: thread pointer
// All other registers trashed
//

.macro WaitForGCCompletion
 test dword ptr [rbx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_SuppressGcStress + TSF_DoNotTriggerGc
 jnz LOCAL_LABEL(NoWait)

 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGCNoAbort)
LOCAL_LABEL(NoWait):

 // Clear hijack state
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm

//
//
//
// GC Probe Hijack target
//
//

NESTED_ENTRY RhpGcProbeHijack, _TEXT, NoHandler
 END_PROLOGUE
 FixupHijackedCallstack
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpGcProbe)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpGcProbe, _TEXT, NoHandler
 test dword ptr [C_VAR(RhpTrapThreads)], TrapThreadsFlags_TrapThreads
 jnz LOCAL_LABEL(RhpGcProbe_Trap)
 jnz LOCAL_LABEL(WaitForGC)
 ret
LOCAL_LABEL(RhpGcProbe_Trap):

LOCAL_LABEL(WaitForGC):
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpWaitForGC)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpWaitForGC, _TEXT, NoHandler
 PUSH_PROBE_FRAME r11, rax, rcx
 END_PROLOGUE

 mov rbx, r11
 WaitForGCCompletion
 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGC2)

 mov rax, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 test dword ptr [rax + OFFSETOF__PInvokeTransitionFrame__m_Flags], PTFF_THREAD_ABORT
Expand All@@ -203,7 +140,7 @@ LOCAL_LABEL(Abort):
 pop rdx // return address as exception RIP
 jmp C_FUNC(RhpThrowHwEx) // Throw the ThreadAbortException as a special kind of hardware exception

NESTED_END RhpGcProbe, _TEXT
NESTED_END RhpWaitForGC, _TEXT


LEAF_ENTRY RhpGcPoll, _TEXT
Expand All@@ -212,7 +149,6 @@ LEAF_ENTRY RhpGcPoll, _TEXT
 ret
LOCAL_LABEL(RhpGcPoll_RarePath):
 jmp C_FUNC(RhpGcPollRare)

LEAF_END RhpGcPoll, _TEXT

NESTED_ENTRY RhpGcPollRare, _TEXT, NoHandler
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[NativeAOT] Some cleanup of assembly helpers in hijack area. by VSadov · Pull Request #72542 · dotnet/runtime · GitHub
Skip to content
[NativeAOT] Some cleanup of assembly helpers in hijack area.#72542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

VSadov
merged 17 commits into

from

Jul 22, 2022
 Merged


[NativeAOT] Some cleanup of assembly helpers in hijack area.
#72542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
dd9382e

remove RhpReversePInvokeAttachOrTrapThread (dead code)


VSadov Jul 18, 2022
c60f01f

remove RhpWaitForGC


VSadov Jul 18, 2022
45dfbfc

removing some dead code


VSadov Jul 19, 2022
eaf6eff

remove unused extraStack parameter to PUSH_PROBE_FRAME


VSadov Jul 20, 2022
1f29db1

make all working variants of RhpGcProbeHijack to have the same shape


VSadov Jul 20, 2022
7d66dd2

fix Unix build, tweak some comments


VSadov Jul 20, 2022
23fdd0a

check the trap flag in RhpGcProbeHijack


VSadov Jul 20, 2022
8c23ae6

add a stub for RhpGcStressHijack on Unix


VSadov Jul 20, 2022
8faffe2

save flags for windows x64 should not have rdx


VSadov Jul 21, 2022
75a01b9

not saving scratch registers on win-arm64


VSadov Jul 21, 2022
c321a96

PUSH_PROBE_FRAME on arm64


VSadov Jul 21, 2022
e8eea2b

couple comments


VSadov Jul 21, 2022
d305471

make RhpGcProbeHijack responsible for setting PTFF_SAVE_ bits


VSadov Jul 21, 2022
bc03016

revert `RhpReversePInvokeAttachOrTrapThread2` change


VSadov Jul 22, 2022
7b260ac

fix indentation


VSadov Jul 22, 2022
38e9c17

made 32bit RhpGcStressHijack similar to 64bit counterparts


VSadov Jul 22, 2022
f16bb29

Renamed `RhpGcProbe` --> `RhpWaitForGC`


VSadov Jul 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 6 additions & 8 deletions
src/coreclr/nativeaot/Runtime/ICodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,9 @@ C_ASSERT(PTFF_X1_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 32));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_X0 | PTFF_SAVE_X1 | ((uint64_t)returnKind << 32);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 32);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand All@@ -76,10 +75,9 @@ C_ASSERT(PTFF_RDX_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 16));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_RAX | PTFF_SAVE_RDX | ((uint64_t)returnKind << 16);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 16);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/amd64/AsmMacros.inc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,7 +396,6 @@ EXTERN RhpGcAlloc : PROC
EXTERN RhpValidateExInfoPop : PROC
EXTERN RhDebugBreak : PROC
EXTERN RhpWaitForGC2 : PROC
EXTERN RhpReversePInvokeAttachOrTrapThread2 : PROC
EXTERN RhExceptionHandling_FailedAllocation : PROC
EXTERN RhThrowHwEx : PROC
EXTERN RhThrowEx : PROC
Expand Down

100 changes: 18 additions & 82 deletions
src/coreclr/nativeaot/Runtime/amd64/GcProbe.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,24 +67,6 @@
 pop rdx
.endm

//
// Macro to clear the hijack state. This is safe to do because the suspension code will not Unhijack this
// thread if it finds it at an IP that isn`t managed code.
//
// Register state on entry:
// R11: thread pointer
//
// Register state on exit:
// R9: trashed
//
.macro ClearHijackState
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm


//
// The prolog for all GC suspension hijacks (normal and stress). Fixes up the hijacked return address, and
// clears the hijack state.
Expand All@@ -98,7 +80,7 @@
// RAX, RDX preserved, other volatile regs trashed
//
.macro FixupHijackedCallstack
 // preserve RAX, RDX as they may contain retuvalues
 // preserve RAX, RDX as they may contain return values
 push rax
 push rdx

Expand All@@ -109,88 +91,43 @@
 pop rdx
 pop rax

 //
 // Fix the stack by pushing the original return address
 //
 mov rcx, [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress]
 push rcx

 // Fetch the return address flags
 mov rcx, [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags]

 ClearHijackState
.endm

//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// RhpWaitForGCNoAbort -- rare path for WaitForGCCompletion
//
//
// INPUT: RDI: transition frame
//
// TRASHES: RCX, RDI, R8, R9, R10, R11
//
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
NESTED_ENTRY RhpWaitForGCNoAbort, _TEXT, NoHandler
 END_PROLOGUE

 mov rdx, [rdi + OFFSETOF__PInvokeTransitionFrame__m_pThread]

 test dword ptr [rdx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_DoNotTriggerGc
 jnz Done

 // passing transition frame pointer in rdi
 call C_FUNC(RhpWaitForGC2)

Done:
 ret

NESTED_END RhpWaitForGCNoAbort, _TEXT

//
// Set the Thread state and wait for a GC to complete.
//
// Register state on entry:
// RBX: thread pointer
//
// Register state on exit:
// RBX: thread pointer
// All other registers trashed
//

.macro WaitForGCCompletion
 test dword ptr [rbx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_SuppressGcStress + TSF_DoNotTriggerGc
 jnz LOCAL_LABEL(NoWait)

 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGCNoAbort)
LOCAL_LABEL(NoWait):

 // Clear hijack state
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm

//
//
//
// GC Probe Hijack target
//
//

NESTED_ENTRY RhpGcProbeHijack, _TEXT, NoHandler
 END_PROLOGUE
 FixupHijackedCallstack
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpGcProbe)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpGcProbe, _TEXT, NoHandler
 test dword ptr [C_VAR(RhpTrapThreads)], TrapThreadsFlags_TrapThreads
 jnz LOCAL_LABEL(RhpGcProbe_Trap)
 jnz LOCAL_LABEL(WaitForGC)
 ret
LOCAL_LABEL(RhpGcProbe_Trap):

LOCAL_LABEL(WaitForGC):
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpWaitForGC)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpWaitForGC, _TEXT, NoHandler
 PUSH_PROBE_FRAME r11, rax, rcx
 END_PROLOGUE

 mov rbx, r11
 WaitForGCCompletion
 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGC2)

 mov rax, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 test dword ptr [rax + OFFSETOF__PInvokeTransitionFrame__m_Flags], PTFF_THREAD_ABORT
Expand All@@ -203,7 +140,7 @@ LOCAL_LABEL(Abort):
 pop rdx // return address as exception RIP
 jmp C_FUNC(RhpThrowHwEx) // Throw the ThreadAbortException as a special kind of hardware exception

NESTED_END RhpGcProbe, _TEXT
NESTED_END RhpWaitForGC, _TEXT


LEAF_ENTRY RhpGcPoll, _TEXT
Expand All@@ -212,7 +149,6 @@ LEAF_ENTRY RhpGcPoll, _TEXT
 ret
LOCAL_LABEL(RhpGcPoll_RarePath):
 jmp C_FUNC(RhpGcPollRare)

LEAF_END RhpGcPoll, _TEXT

NESTED_ENTRY RhpGcPollRare, _TEXT, NoHandler
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[NativeAOT] Some cleanup of assembly helpers in hijack area. by VSadov · Pull Request #72542 · dotnet/runtime · GitHub
Skip to content
[NativeAOT] Some cleanup of assembly helpers in hijack area.#72542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

VSadov
merged 17 commits into

from

Jul 22, 2022
 Merged


[NativeAOT] Some cleanup of assembly helpers in hijack area.
#72542
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
dd9382e

remove RhpReversePInvokeAttachOrTrapThread (dead code)


VSadov Jul 18, 2022
c60f01f

remove RhpWaitForGC


VSadov Jul 18, 2022
45dfbfc

removing some dead code


VSadov Jul 19, 2022
eaf6eff

remove unused extraStack parameter to PUSH_PROBE_FRAME


VSadov Jul 20, 2022
1f29db1

make all working variants of RhpGcProbeHijack to have the same shape


VSadov Jul 20, 2022
7d66dd2

fix Unix build, tweak some comments


VSadov Jul 20, 2022
23fdd0a

check the trap flag in RhpGcProbeHijack


VSadov Jul 20, 2022
8c23ae6

add a stub for RhpGcStressHijack on Unix


VSadov Jul 20, 2022
8faffe2

save flags for windows x64 should not have rdx


VSadov Jul 21, 2022
75a01b9

not saving scratch registers on win-arm64


VSadov Jul 21, 2022
c321a96

PUSH_PROBE_FRAME on arm64


VSadov Jul 21, 2022
e8eea2b

couple comments


VSadov Jul 21, 2022
d305471

make RhpGcProbeHijack responsible for setting PTFF_SAVE_ bits


VSadov Jul 21, 2022
bc03016

revert `RhpReversePInvokeAttachOrTrapThread2` change


VSadov Jul 22, 2022
7b260ac

fix indentation


VSadov Jul 22, 2022
38e9c17

made 32bit RhpGcStressHijack similar to 64bit counterparts


VSadov Jul 22, 2022
f16bb29

Renamed `RhpGcProbe` --> `RhpWaitForGC`


VSadov Jul 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 6 additions & 8 deletions
src/coreclr/nativeaot/Runtime/ICodeManager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,9 @@ C_ASSERT(PTFF_X1_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 32));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_X0 | PTFF_SAVE_X1 | ((uint64_t)returnKind << 32);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 32);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand All@@ -76,10 +75,9 @@ C_ASSERT(PTFF_RDX_IS_BYREF == ((uint64_t)GCRK_Scalar_Byref << 16));

inline uint64_t ReturnKindToTransitionFrameFlags(GCRefKind returnKind)
{
 if (returnKind == GCRK_Scalar)
 return 0;

 return PTFF_SAVE_RAX | PTFF_SAVE_RDX | ((uint64_t)returnKind << 16);
 // just need to report gc ref bits here.
 // appropriate PTFF_SAVE_ bits will be added by the frame building routine.
 return ((uint64_t)returnKind << 16);
}

inline GCRefKind TransitionFrameFlagsToReturnKind(uint64_t transFrameFlags)
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/amd64/AsmMacros.inc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,7 +396,6 @@ EXTERN RhpGcAlloc : PROC
EXTERN RhpValidateExInfoPop : PROC
EXTERN RhDebugBreak : PROC
EXTERN RhpWaitForGC2 : PROC
EXTERN RhpReversePInvokeAttachOrTrapThread2 : PROC
EXTERN RhExceptionHandling_FailedAllocation : PROC
EXTERN RhThrowHwEx : PROC
EXTERN RhThrowEx : PROC
Expand Down

100 changes: 18 additions & 82 deletions
src/coreclr/nativeaot/Runtime/amd64/GcProbe.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,24 +67,6 @@
 pop rdx
.endm

//
// Macro to clear the hijack state. This is safe to do because the suspension code will not Unhijack this
// thread if it finds it at an IP that isn`t managed code.
//
// Register state on entry:
// R11: thread pointer
//
// Register state on exit:
// R9: trashed
//
.macro ClearHijackState
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm


//
// The prolog for all GC suspension hijacks (normal and stress). Fixes up the hijacked return address, and
// clears the hijack state.
Expand All@@ -98,7 +80,7 @@
// RAX, RDX preserved, other volatile regs trashed
//
.macro FixupHijackedCallstack
 // preserve RAX, RDX as they may contain retuvalues
 // preserve RAX, RDX as they may contain return values
 push rax
 push rdx

Expand All@@ -109,88 +91,43 @@
 pop rdx
 pop rax

 //
 // Fix the stack by pushing the original return address
 //
 mov rcx, [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress]
 push rcx

 // Fetch the return address flags
 mov rcx, [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags]

 ClearHijackState
.endm

//////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// RhpWaitForGCNoAbort -- rare path for WaitForGCCompletion
//
//
// INPUT: RDI: transition frame
//
// TRASHES: RCX, RDI, R8, R9, R10, R11
//
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
NESTED_ENTRY RhpWaitForGCNoAbort, _TEXT, NoHandler
 END_PROLOGUE

 mov rdx, [rdi + OFFSETOF__PInvokeTransitionFrame__m_pThread]

 test dword ptr [rdx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_DoNotTriggerGc
 jnz Done

 // passing transition frame pointer in rdi
 call C_FUNC(RhpWaitForGC2)

Done:
 ret

NESTED_END RhpWaitForGCNoAbort, _TEXT

//
// Set the Thread state and wait for a GC to complete.
//
// Register state on entry:
// RBX: thread pointer
//
// Register state on exit:
// RBX: thread pointer
// All other registers trashed
//

.macro WaitForGCCompletion
 test dword ptr [rbx + OFFSETOF__Thread__m_ThreadStateFlags], TSF_SuppressGcStress + TSF_DoNotTriggerGc
 jnz LOCAL_LABEL(NoWait)

 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGCNoAbort)
LOCAL_LABEL(NoWait):

 // Clear hijack state
 xor r9, r9
 mov [r11 + OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation], r9
 mov [r11 + OFFSETOF__Thread__m_pvHijackedReturnAddress], r9
 mov [r11 + OFFSETOF__Thread__m_uHijackedReturnValueFlags], r9
.endm

//
//
//
// GC Probe Hijack target
//
//

NESTED_ENTRY RhpGcProbeHijack, _TEXT, NoHandler
 END_PROLOGUE
 FixupHijackedCallstack
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpGcProbe)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpGcProbe, _TEXT, NoHandler
 test dword ptr [C_VAR(RhpTrapThreads)], TrapThreadsFlags_TrapThreads
 jnz LOCAL_LABEL(RhpGcProbe_Trap)
 jnz LOCAL_LABEL(WaitForGC)
 ret
LOCAL_LABEL(RhpGcProbe_Trap):

LOCAL_LABEL(WaitForGC):
 or ecx, DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_RAX + PTFF_SAVE_RDX
 jmp C_FUNC(RhpWaitForGC)
NESTED_END RhpGcProbeHijack, _TEXT

NESTED_ENTRY RhpWaitForGC, _TEXT, NoHandler
 PUSH_PROBE_FRAME r11, rax, rcx
 END_PROLOGUE

 mov rbx, r11
 WaitForGCCompletion
 mov rdi, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 call C_FUNC(RhpWaitForGC2)

 mov rax, [rbx + OFFSETOF__Thread__m_pDeferredTransitionFrame]
 test dword ptr [rax + OFFSETOF__PInvokeTransitionFrame__m_Flags], PTFF_THREAD_ABORT
Expand All@@ -203,7 +140,7 @@ LOCAL_LABEL(Abort):
 pop rdx // return address as exception RIP
 jmp C_FUNC(RhpThrowHwEx) // Throw the ThreadAbortException as a special kind of hardware exception

NESTED_END RhpGcProbe, _TEXT
NESTED_END RhpWaitForGC, _TEXT


LEAF_ENTRY RhpGcPoll, _TEXT
Expand All@@ -212,7 +149,6 @@ LEAF_ENTRY RhpGcPoll, _TEXT
 ret
LOCAL_LABEL(RhpGcPoll_RarePath):
 jmp C_FUNC(RhpGcPollRare)

LEAF_END RhpGcPoll, _TEXT

NESTED_ENTRY RhpGcPollRare, _TEXT, NoHandler
Expand Down
Loading