Skip to content

Fix hijacking on arm32 #124831

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
MichalStrehovsky merged 1 commit into from
Feb 25, 2026
+2 −3
Merged

Fix hijacking on arm32 #124831

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions src/coreclr/nativeaot/Runtime/arm/GcProbe.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@
.endm

NESTED_ENTRY RhpWaitForGC, _TEXT, NoHandler
PUSH_PROBE_FRAME r2, r3, r12
PUSH_PROBE_FRAME r3, r2, r12

ldr r0, [r2, #OFFSETOF__Thread__m_pDeferredTransitionFrame]
ldr r0, [r3, #OFFSETOF__Thread__m_pDeferredTransitionFrame]
bl RhpWaitForGC2

POP_PROBE_FRAME
Expand Down Expand Up @@ -124,7 +124,6 @@ NESTED_ENTRY RhpGcProbeHijack, _TEXT, NoHandler
bne LOCAL_LABEL(WaitForGC)
bx lr
LOCAL_LABEL(WaitForGC):
mov r2, r3 // Move thread pointer to r2 for RhpWaitForGC
mov r12, #(DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_R0 + PTFF_SAVE_R1 + PTFF_SAVE_R2)
orr r12, r12, #PTFF_THREAD_HIJACK
b RhpWaitForGC
Expand Down
Loading