Split off patched code into separate .S file and disable subsections-via-symbols for it#92555

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
jkotas merged 3 commits into from
Sep 30, 2023
Merged

Split off patched code into separate .S file and disable subsections-via-symbols for it #92555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cac69aa
[amd64/arm64] Split off patched code into separate .S file and disabl…
filipnavara Sep 24, 2023
96068bb
[amd64/arm64] Split off patched code into separate .asm file
filipnavara Sep 24, 2023
8c96e83
Remove NO_SUBSECTIONS_VIA_SYMBOLS
filipnavara Sep 26, 2023
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
4 changes: 4 additions & 0 deletions src/coreclr/vm/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,7 @@ if(CLR_CMAKE_TARGET_ARCH_AMD64)
${ARCH_SOURCES_DIR}/JitHelpers_InlineGetThread.asm
${ARCH_SOURCES_DIR}/JitHelpers_SingleAppDomain.asm
${ARCH_SOURCES_DIR}/JitHelpers_Slow.asm
${ARCH_SOURCES_DIR}/patchedcode.asm
${ARCH_SOURCES_DIR}/PInvokeStubs.asm
${ARCH_SOURCES_DIR}/RedirectedHandledJITCase.asm
${ARCH_SOURCES_DIR}/ThePreStubAMD64.asm
Expand DownExpand Up@@ -683,6 +684,7 @@ elseif(CLR_CMAKE_TARGET_ARCH_ARM64)
${ARCH_SOURCES_DIR}/AsmHelpers.asm
${ARCH_SOURCES_DIR}/CallDescrWorkerARM64.asm
${ARCH_SOURCES_DIR}/CrtHelpers.asm
${ARCH_SOURCES_DIR}/patchedcode.asm
${ARCH_SOURCES_DIR}/PInvokeStubs.asm
${ARCH_SOURCES_DIR}/thunktemplates.asm
)
Expand All@@ -705,6 +707,7 @@ else(CLR_CMAKE_TARGET_WIN32)
${ARCH_SOURCES_DIR}/jithelpers_fastwritebarriers.S
${ARCH_SOURCES_DIR}/jithelpers_singleappdomain.S
${ARCH_SOURCES_DIR}/jithelpers_slow.S
${ARCH_SOURCES_DIR}/patchedcode.S
${ARCH_SOURCES_DIR}/pinvokestubs.S
${ARCH_SOURCES_DIR}/redirectedhandledjitcase.S
${ARCH_SOURCES_DIR}/theprestubamd64.S
Expand DownExpand Up@@ -738,6 +741,7 @@ else(CLR_CMAKE_TARGET_WIN32)
${ARCH_SOURCES_DIR}/asmhelpers.S
${ARCH_SOURCES_DIR}/calldescrworkerarm64.S
${ARCH_SOURCES_DIR}/crthelpers.S
${ARCH_SOURCES_DIR}/patchedcode.S
${ARCH_SOURCES_DIR}/pinvokestubs.S
${ARCH_SOURCES_DIR}/thunktemplates.S
)
Expand Down
182 changes: 0 additions & 182 deletions src/coreclr/vm/amd64/JitHelpers_Fast.asm
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,188 +50,6 @@ endif
extern JIT_InternalThrow:proc


; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeStart, _TEXT
ret
LEAF_END JIT_PatchedCodeStart, _TEXT


; This is used by the mechanism to hold either the JIT_WriteBarrier_PreGrow
; or JIT_WriteBarrier_PostGrow code (depending on the state of the GC). It _WILL_
; change at runtime as the GC changes. Initially it should simply be a copy of the
; larger of the two functions (JIT_WriteBarrier_PostGrow) to ensure we have created
; enough space to copy that code in.
LEAF_ENTRY JIT_WriteBarrier, _TEXT
align 16

ifdef _DEBUG
; In debug builds, this just contains jump to the debug version of the write barrier by default
mov rax, JIT_WriteBarrier_Debug
jmp rax
endif

ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP
; JIT_WriteBarrier_WriteWatch_PostGrow64

; Regarding patchable constants:
; - 64-bit constants have to be loaded into a register
; - The constants have to be aligned to 8 bytes so that they can be patched easily
; - The constant loads have been located to minimize NOP padding required to align the constants
; - Using different registers for successive constant loads helps pipeline better. Should we decide to use a special
; non-volatile calling convention, this should be changed to use just one register.

; Do the move into the GC . It is correct to take an AV here, the EH code
; figures out that this came from a WriteBarrier and correctly maps it back
; to the managed method which called the WriteBarrier (see setup in
; InitializeExceptionHandling, vm\exceptionhandling.cpp).
mov [rcx], rdx

; Update the write watch table if necessary
mov rax, rcx
mov r8, 0F0F0F0F0F0F0F0F0h
shr rax, 0Ch ; SoftwareWriteWatch::AddressToTableByteIndexShift
NOP_2_BYTE ; padding for alignment of constant
mov r9, 0F0F0F0F0F0F0F0F0h
add rax, r8
cmp byte ptr [rax], 0h
jne CheckCardTable
mov byte ptr [rax], 0FFh

NOP_3_BYTE ; padding for alignment of constant

; Check the lower and upper ephemeral region bounds
CheckCardTable:
cmp rdx, r9
jb Exit

NOP_3_BYTE ; padding for alignment of constant

mov r8, 0F0F0F0F0F0F0F0F0h

cmp rdx, r8
jae Exit

nop ; padding for alignment of constant

mov rax, 0F0F0F0F0F0F0F0F0h

; Touch the card table entry, if not already dirty.
shr rcx, 0Bh
cmp byte ptr [rcx + rax], 0FFh
jne UpdateCardTable
REPRET

UpdateCardTable:
mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
mov rax, 0F0F0F0F0F0F0F0F0h
shr rcx, 0Ah
cmp byte ptr [rcx + rax], 0FFh
jne UpdateCardBundleTable
REPRET

UpdateCardBundleTable:
mov byte ptr [rcx + rax], 0FFh
endif
ret

align 16
Exit:
REPRET

NOP_3_BYTE
NOP_3_BYTE
NOP_3_BYTE
NOP_3_BYTE
NOP_3_BYTE

NOP_3_BYTE
NOP_3_BYTE
NOP_3_BYTE
NOP_3_BYTE
NOP_3_BYTE

NOP_3_BYTE
NOP_3_BYTE
NOP_3_BYTE
NOP_3_BYTE
NOP_3_BYTE

NOP_3_BYTE
NOP_3_BYTE
NOP_3_BYTE
NOP_3_BYTE
NOP_3_BYTE

else
; JIT_WriteBarrier_PostGrow64

; Do the move into the GC . It is correct to take an AV here, the EH code
; figures out that this came from a WriteBarrier and correctly maps it back
; to the managed method which called the WriteBarrier (see setup in
; InitializeExceptionHandling, vm\exceptionhandling.cpp).
mov [rcx], rdx

NOP_3_BYTE ; padding for alignment of constant

; Can't compare a 64 bit immediate, so we have to move them into a
; register. Values of these immediates will be patched at runtime.
; By using two registers we can pipeline better. Should we decide to use
; a special non-volatile calling convention, this should be changed to
; just one.

mov rax, 0F0F0F0F0F0F0F0F0h

; Check the lower and upper ephemeral region bounds
cmp rdx, rax
jb Exit

nop ; padding for alignment of constant

mov r8, 0F0F0F0F0F0F0F0F0h

cmp rdx, r8
jae Exit

nop ; padding for alignment of constant

mov rax, 0F0F0F0F0F0F0F0F0h

; Touch the card table entry, if not already dirty.
shr rcx, 0Bh
cmp byte ptr [rcx + rax], 0FFh
jne UpdateCardTable
REPRET

UpdateCardTable:
mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
mov rax, 0F0F0F0F0F0F0F0F0h
shr rcx, 0Ah
cmp byte ptr [rcx + rax], 0FFh
jne UpdateCardBundleTable
REPRET

UpdateCardBundleTable:
mov byte ptr [rcx + rax], 0FFh
endif
ret

align 16
Exit:
REPRET
endif

; make sure this is bigger than any of the others
align 16
nop
LEAF_END_MARKED JIT_WriteBarrier, _TEXT

; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeLast, _TEXT
ret
LEAF_END JIT_PatchedCodeLast, _TEXT

; JIT_ByRefWriteBarrier has weird semantics, see usage in StubLinkerX86.cpp
;
; Entry:
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Split off patched code into separate .S file and disable subsections-via-symbols for it#92555

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

jkotas
merged 3 commits into

from

Sep 30, 2023
 Merged


Split off patched code into separate .S file and disable subsections-via-symbols for it
#92555
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
cac69aa

[amd64/arm64] Split off patched code into separate .S file and disabl…


filipnavara Sep 24, 2023
96068bb

[amd64/arm64] Split off patched code into separate .asm file


filipnavara Sep 24, 2023
8c96e83

Remove NO_SUBSECTIONS_VIA_SYMBOLS


filipnavara Sep 26, 2023

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


4 changes: 4 additions & 0 deletions
src/coreclr/vm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,7 @@ if(CLR_CMAKE_TARGET_ARCH_AMD64)
 ${ARCH_SOURCES_DIR}/JitHelpers_InlineGetThread.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_SingleAppDomain.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_Slow.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/RedirectedHandledJITCase.asm
 ${ARCH_SOURCES_DIR}/ThePreStubAMD64.asm
Expand DownExpand Up@@ -683,6 +684,7 @@ elseif(CLR_CMAKE_TARGET_ARCH_ARM64)
 ${ARCH_SOURCES_DIR}/AsmHelpers.asm
 ${ARCH_SOURCES_DIR}/CallDescrWorkerARM64.asm
 ${ARCH_SOURCES_DIR}/CrtHelpers.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/thunktemplates.asm
 )
Expand All@@ -705,6 +707,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/jithelpers_fastwritebarriers.S
 ${ARCH_SOURCES_DIR}/jithelpers_singleappdomain.S
 ${ARCH_SOURCES_DIR}/jithelpers_slow.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/redirectedhandledjitcase.S
 ${ARCH_SOURCES_DIR}/theprestubamd64.S
Expand DownExpand Up@@ -738,6 +741,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/asmhelpers.S
 ${ARCH_SOURCES_DIR}/calldescrworkerarm64.S
 ${ARCH_SOURCES_DIR}/crthelpers.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/thunktemplates.S
 )
Expand Down

182 changes: 0 additions & 182 deletions
src/coreclr/vm/amd64/JitHelpers_Fast.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,188 +50,6 @@ endif
extern JIT_InternalThrow:proc


; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeStart, _TEXT
 ret
LEAF_END JIT_PatchedCodeStart, _TEXT


; This is used by the mechanism to hold either the JIT_WriteBarrier_PreGrow
; or JIT_WriteBarrier_PostGrow code (depending on the state of the GC). It _WILL_
; change at runtime as the GC changes. Initially it should simply be a copy of the
; larger of the two functions (JIT_WriteBarrier_PostGrow) to ensure we have created
; enough space to copy that code in.
LEAF_ENTRY JIT_WriteBarrier, _TEXT
 align 16

ifdef _DEBUG
 ; In debug builds, this just contains jump to the debug version of the write barrier by default
 mov rax, JIT_WriteBarrier_Debug
 jmp rax
endif

ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP
 ; JIT_WriteBarrier_WriteWatch_PostGrow64

 ; Regarding patchable constants:
 ; - 64-bit constants have to be loaded into a register
 ; - The constants have to be aligned to 8 bytes so that they can be patched easily
 ; - The constant loads have been located to minimize NOP padding required to align the constants
 ; - Using different registers for successive constant loads helps pipeline better. Should we decide to use a special
 ; non-volatile calling convention, this should be changed to use just one register.

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 ; Update the write watch table if necessary
 mov rax, rcx
 mov r8, 0F0F0F0F0F0F0F0F0h
 shr rax, 0Ch ; SoftwareWriteWatch::AddressToTableByteIndexShift
 NOP_2_BYTE ; padding for alignment of constant
 mov r9, 0F0F0F0F0F0F0F0F0h
 add rax, r8
 cmp byte ptr [rax], 0h
 jne CheckCardTable
 mov byte ptr [rax], 0FFh

 NOP_3_BYTE ; padding for alignment of constant

 ; Check the lower and upper ephemeral region bounds
 CheckCardTable:
 cmp rdx, r9
 jb Exit

 NOP_3_BYTE ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

else
 ; JIT_WriteBarrier_PostGrow64

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 NOP_3_BYTE ; padding for alignment of constant

 ; Can't compare a 64 bit immediate, so we have to move them into a
 ; register. Values of these immediates will be patched at runtime.
 ; By using two registers we can pipeline better. Should we decide to use
 ; a special non-volatile calling convention, this should be changed to
 ; just one.

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Check the lower and upper ephemeral region bounds
 cmp rdx, rax
 jb Exit

 nop ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET
endif

 ; make sure this is bigger than any of the others
 align 16
 nop
LEAF_END_MARKED JIT_WriteBarrier, _TEXT

; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeLast, _TEXT
 ret
LEAF_END JIT_PatchedCodeLast, _TEXT

; JIT_ByRefWriteBarrier has weird semantics, see usage in StubLinkerX86.cpp
;
; Entry:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Split off patched code into separate .S file and disable subsections-via-symbols for it#92555

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

jkotas
merged 3 commits into

from

Sep 30, 2023
 Merged


Split off patched code into separate .S file and disable subsections-via-symbols for it
#92555
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
cac69aa

[amd64/arm64] Split off patched code into separate .S file and disabl…


filipnavara Sep 24, 2023
96068bb

[amd64/arm64] Split off patched code into separate .asm file


filipnavara Sep 24, 2023
8c96e83

Remove NO_SUBSECTIONS_VIA_SYMBOLS


filipnavara Sep 26, 2023

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


4 changes: 4 additions & 0 deletions
src/coreclr/vm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,7 @@ if(CLR_CMAKE_TARGET_ARCH_AMD64)
 ${ARCH_SOURCES_DIR}/JitHelpers_InlineGetThread.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_SingleAppDomain.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_Slow.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/RedirectedHandledJITCase.asm
 ${ARCH_SOURCES_DIR}/ThePreStubAMD64.asm
Expand DownExpand Up@@ -683,6 +684,7 @@ elseif(CLR_CMAKE_TARGET_ARCH_ARM64)
 ${ARCH_SOURCES_DIR}/AsmHelpers.asm
 ${ARCH_SOURCES_DIR}/CallDescrWorkerARM64.asm
 ${ARCH_SOURCES_DIR}/CrtHelpers.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/thunktemplates.asm
 )
Expand All@@ -705,6 +707,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/jithelpers_fastwritebarriers.S
 ${ARCH_SOURCES_DIR}/jithelpers_singleappdomain.S
 ${ARCH_SOURCES_DIR}/jithelpers_slow.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/redirectedhandledjitcase.S
 ${ARCH_SOURCES_DIR}/theprestubamd64.S
Expand DownExpand Up@@ -738,6 +741,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/asmhelpers.S
 ${ARCH_SOURCES_DIR}/calldescrworkerarm64.S
 ${ARCH_SOURCES_DIR}/crthelpers.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/thunktemplates.S
 )
Expand Down

182 changes: 0 additions & 182 deletions
src/coreclr/vm/amd64/JitHelpers_Fast.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,188 +50,6 @@ endif
extern JIT_InternalThrow:proc


; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeStart, _TEXT
 ret
LEAF_END JIT_PatchedCodeStart, _TEXT


; This is used by the mechanism to hold either the JIT_WriteBarrier_PreGrow
; or JIT_WriteBarrier_PostGrow code (depending on the state of the GC). It _WILL_
; change at runtime as the GC changes. Initially it should simply be a copy of the
; larger of the two functions (JIT_WriteBarrier_PostGrow) to ensure we have created
; enough space to copy that code in.
LEAF_ENTRY JIT_WriteBarrier, _TEXT
 align 16

ifdef _DEBUG
 ; In debug builds, this just contains jump to the debug version of the write barrier by default
 mov rax, JIT_WriteBarrier_Debug
 jmp rax
endif

ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP
 ; JIT_WriteBarrier_WriteWatch_PostGrow64

 ; Regarding patchable constants:
 ; - 64-bit constants have to be loaded into a register
 ; - The constants have to be aligned to 8 bytes so that they can be patched easily
 ; - The constant loads have been located to minimize NOP padding required to align the constants
 ; - Using different registers for successive constant loads helps pipeline better. Should we decide to use a special
 ; non-volatile calling convention, this should be changed to use just one register.

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 ; Update the write watch table if necessary
 mov rax, rcx
 mov r8, 0F0F0F0F0F0F0F0F0h
 shr rax, 0Ch ; SoftwareWriteWatch::AddressToTableByteIndexShift
 NOP_2_BYTE ; padding for alignment of constant
 mov r9, 0F0F0F0F0F0F0F0F0h
 add rax, r8
 cmp byte ptr [rax], 0h
 jne CheckCardTable
 mov byte ptr [rax], 0FFh

 NOP_3_BYTE ; padding for alignment of constant

 ; Check the lower and upper ephemeral region bounds
 CheckCardTable:
 cmp rdx, r9
 jb Exit

 NOP_3_BYTE ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

else
 ; JIT_WriteBarrier_PostGrow64

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 NOP_3_BYTE ; padding for alignment of constant

 ; Can't compare a 64 bit immediate, so we have to move them into a
 ; register. Values of these immediates will be patched at runtime.
 ; By using two registers we can pipeline better. Should we decide to use
 ; a special non-volatile calling convention, this should be changed to
 ; just one.

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Check the lower and upper ephemeral region bounds
 cmp rdx, rax
 jb Exit

 nop ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET
endif

 ; make sure this is bigger than any of the others
 align 16
 nop
LEAF_END_MARKED JIT_WriteBarrier, _TEXT

; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeLast, _TEXT
 ret
LEAF_END JIT_PatchedCodeLast, _TEXT

; JIT_ByRefWriteBarrier has weird semantics, see usage in StubLinkerX86.cpp
;
; Entry:
Expand Down
Loading

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

Skip to content
Split off patched code into separate .S file and disable subsections-via-symbols for it#92555

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

jkotas
merged 3 commits into

from

Sep 30, 2023
 Merged


Split off patched code into separate .S file and disable subsections-via-symbols for it
#92555
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
cac69aa

[amd64/arm64] Split off patched code into separate .S file and disabl…


filipnavara Sep 24, 2023
96068bb

[amd64/arm64] Split off patched code into separate .asm file


filipnavara Sep 24, 2023
8c96e83

Remove NO_SUBSECTIONS_VIA_SYMBOLS


filipnavara Sep 26, 2023

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


4 changes: 4 additions & 0 deletions
src/coreclr/vm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,7 @@ if(CLR_CMAKE_TARGET_ARCH_AMD64)
 ${ARCH_SOURCES_DIR}/JitHelpers_InlineGetThread.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_SingleAppDomain.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_Slow.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/RedirectedHandledJITCase.asm
 ${ARCH_SOURCES_DIR}/ThePreStubAMD64.asm
Expand DownExpand Up@@ -683,6 +684,7 @@ elseif(CLR_CMAKE_TARGET_ARCH_ARM64)
 ${ARCH_SOURCES_DIR}/AsmHelpers.asm
 ${ARCH_SOURCES_DIR}/CallDescrWorkerARM64.asm
 ${ARCH_SOURCES_DIR}/CrtHelpers.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/thunktemplates.asm
 )
Expand All@@ -705,6 +707,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/jithelpers_fastwritebarriers.S
 ${ARCH_SOURCES_DIR}/jithelpers_singleappdomain.S
 ${ARCH_SOURCES_DIR}/jithelpers_slow.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/redirectedhandledjitcase.S
 ${ARCH_SOURCES_DIR}/theprestubamd64.S
Expand DownExpand Up@@ -738,6 +741,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/asmhelpers.S
 ${ARCH_SOURCES_DIR}/calldescrworkerarm64.S
 ${ARCH_SOURCES_DIR}/crthelpers.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/thunktemplates.S
 )
Expand Down

182 changes: 0 additions & 182 deletions
src/coreclr/vm/amd64/JitHelpers_Fast.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,188 +50,6 @@ endif
extern JIT_InternalThrow:proc


; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeStart, _TEXT
 ret
LEAF_END JIT_PatchedCodeStart, _TEXT


; This is used by the mechanism to hold either the JIT_WriteBarrier_PreGrow
; or JIT_WriteBarrier_PostGrow code (depending on the state of the GC). It _WILL_
; change at runtime as the GC changes. Initially it should simply be a copy of the
; larger of the two functions (JIT_WriteBarrier_PostGrow) to ensure we have created
; enough space to copy that code in.
LEAF_ENTRY JIT_WriteBarrier, _TEXT
 align 16

ifdef _DEBUG
 ; In debug builds, this just contains jump to the debug version of the write barrier by default
 mov rax, JIT_WriteBarrier_Debug
 jmp rax
endif

ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP
 ; JIT_WriteBarrier_WriteWatch_PostGrow64

 ; Regarding patchable constants:
 ; - 64-bit constants have to be loaded into a register
 ; - The constants have to be aligned to 8 bytes so that they can be patched easily
 ; - The constant loads have been located to minimize NOP padding required to align the constants
 ; - Using different registers for successive constant loads helps pipeline better. Should we decide to use a special
 ; non-volatile calling convention, this should be changed to use just one register.

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 ; Update the write watch table if necessary
 mov rax, rcx
 mov r8, 0F0F0F0F0F0F0F0F0h
 shr rax, 0Ch ; SoftwareWriteWatch::AddressToTableByteIndexShift
 NOP_2_BYTE ; padding for alignment of constant
 mov r9, 0F0F0F0F0F0F0F0F0h
 add rax, r8
 cmp byte ptr [rax], 0h
 jne CheckCardTable
 mov byte ptr [rax], 0FFh

 NOP_3_BYTE ; padding for alignment of constant

 ; Check the lower and upper ephemeral region bounds
 CheckCardTable:
 cmp rdx, r9
 jb Exit

 NOP_3_BYTE ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

else
 ; JIT_WriteBarrier_PostGrow64

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 NOP_3_BYTE ; padding for alignment of constant

 ; Can't compare a 64 bit immediate, so we have to move them into a
 ; register. Values of these immediates will be patched at runtime.
 ; By using two registers we can pipeline better. Should we decide to use
 ; a special non-volatile calling convention, this should be changed to
 ; just one.

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Check the lower and upper ephemeral region bounds
 cmp rdx, rax
 jb Exit

 nop ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET
endif

 ; make sure this is bigger than any of the others
 align 16
 nop
LEAF_END_MARKED JIT_WriteBarrier, _TEXT

; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeLast, _TEXT
 ret
LEAF_END JIT_PatchedCodeLast, _TEXT

; JIT_ByRefWriteBarrier has weird semantics, see usage in StubLinkerX86.cpp
;
; Entry:
Expand Down
Loading

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

Skip to content
Split off patched code into separate .S file and disable subsections-via-symbols for it#92555

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

jkotas
merged 3 commits into

from

Sep 30, 2023
 Merged


Split off patched code into separate .S file and disable subsections-via-symbols for it
#92555
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
cac69aa

[amd64/arm64] Split off patched code into separate .S file and disabl…


filipnavara Sep 24, 2023
96068bb

[amd64/arm64] Split off patched code into separate .asm file


filipnavara Sep 24, 2023
8c96e83

Remove NO_SUBSECTIONS_VIA_SYMBOLS


filipnavara Sep 26, 2023

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


4 changes: 4 additions & 0 deletions
src/coreclr/vm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,7 @@ if(CLR_CMAKE_TARGET_ARCH_AMD64)
 ${ARCH_SOURCES_DIR}/JitHelpers_InlineGetThread.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_SingleAppDomain.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_Slow.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/RedirectedHandledJITCase.asm
 ${ARCH_SOURCES_DIR}/ThePreStubAMD64.asm
Expand DownExpand Up@@ -683,6 +684,7 @@ elseif(CLR_CMAKE_TARGET_ARCH_ARM64)
 ${ARCH_SOURCES_DIR}/AsmHelpers.asm
 ${ARCH_SOURCES_DIR}/CallDescrWorkerARM64.asm
 ${ARCH_SOURCES_DIR}/CrtHelpers.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/thunktemplates.asm
 )
Expand All@@ -705,6 +707,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/jithelpers_fastwritebarriers.S
 ${ARCH_SOURCES_DIR}/jithelpers_singleappdomain.S
 ${ARCH_SOURCES_DIR}/jithelpers_slow.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/redirectedhandledjitcase.S
 ${ARCH_SOURCES_DIR}/theprestubamd64.S
Expand DownExpand Up@@ -738,6 +741,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/asmhelpers.S
 ${ARCH_SOURCES_DIR}/calldescrworkerarm64.S
 ${ARCH_SOURCES_DIR}/crthelpers.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/thunktemplates.S
 )
Expand Down

182 changes: 0 additions & 182 deletions
src/coreclr/vm/amd64/JitHelpers_Fast.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,188 +50,6 @@ endif
extern JIT_InternalThrow:proc


; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeStart, _TEXT
 ret
LEAF_END JIT_PatchedCodeStart, _TEXT


; This is used by the mechanism to hold either the JIT_WriteBarrier_PreGrow
; or JIT_WriteBarrier_PostGrow code (depending on the state of the GC). It _WILL_
; change at runtime as the GC changes. Initially it should simply be a copy of the
; larger of the two functions (JIT_WriteBarrier_PostGrow) to ensure we have created
; enough space to copy that code in.
LEAF_ENTRY JIT_WriteBarrier, _TEXT
 align 16

ifdef _DEBUG
 ; In debug builds, this just contains jump to the debug version of the write barrier by default
 mov rax, JIT_WriteBarrier_Debug
 jmp rax
endif

ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP
 ; JIT_WriteBarrier_WriteWatch_PostGrow64

 ; Regarding patchable constants:
 ; - 64-bit constants have to be loaded into a register
 ; - The constants have to be aligned to 8 bytes so that they can be patched easily
 ; - The constant loads have been located to minimize NOP padding required to align the constants
 ; - Using different registers for successive constant loads helps pipeline better. Should we decide to use a special
 ; non-volatile calling convention, this should be changed to use just one register.

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 ; Update the write watch table if necessary
 mov rax, rcx
 mov r8, 0F0F0F0F0F0F0F0F0h
 shr rax, 0Ch ; SoftwareWriteWatch::AddressToTableByteIndexShift
 NOP_2_BYTE ; padding for alignment of constant
 mov r9, 0F0F0F0F0F0F0F0F0h
 add rax, r8
 cmp byte ptr [rax], 0h
 jne CheckCardTable
 mov byte ptr [rax], 0FFh

 NOP_3_BYTE ; padding for alignment of constant

 ; Check the lower and upper ephemeral region bounds
 CheckCardTable:
 cmp rdx, r9
 jb Exit

 NOP_3_BYTE ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

else
 ; JIT_WriteBarrier_PostGrow64

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 NOP_3_BYTE ; padding for alignment of constant

 ; Can't compare a 64 bit immediate, so we have to move them into a
 ; register. Values of these immediates will be patched at runtime.
 ; By using two registers we can pipeline better. Should we decide to use
 ; a special non-volatile calling convention, this should be changed to
 ; just one.

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Check the lower and upper ephemeral region bounds
 cmp rdx, rax
 jb Exit

 nop ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET
endif

 ; make sure this is bigger than any of the others
 align 16
 nop
LEAF_END_MARKED JIT_WriteBarrier, _TEXT

; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeLast, _TEXT
 ret
LEAF_END JIT_PatchedCodeLast, _TEXT

; JIT_ByRefWriteBarrier has weird semantics, see usage in StubLinkerX86.cpp
;
; Entry:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Split off patched code into separate .S file and disable subsections-via-symbols for it#92555

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

jkotas
merged 3 commits into

from

Sep 30, 2023
 Merged


Split off patched code into separate .S file and disable subsections-via-symbols for it
#92555
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
cac69aa

[amd64/arm64] Split off patched code into separate .S file and disabl…


filipnavara Sep 24, 2023
96068bb

[amd64/arm64] Split off patched code into separate .asm file


filipnavara Sep 24, 2023
8c96e83

Remove NO_SUBSECTIONS_VIA_SYMBOLS


filipnavara Sep 26, 2023

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


4 changes: 4 additions & 0 deletions
src/coreclr/vm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,7 @@ if(CLR_CMAKE_TARGET_ARCH_AMD64)
 ${ARCH_SOURCES_DIR}/JitHelpers_InlineGetThread.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_SingleAppDomain.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_Slow.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/RedirectedHandledJITCase.asm
 ${ARCH_SOURCES_DIR}/ThePreStubAMD64.asm
Expand DownExpand Up@@ -683,6 +684,7 @@ elseif(CLR_CMAKE_TARGET_ARCH_ARM64)
 ${ARCH_SOURCES_DIR}/AsmHelpers.asm
 ${ARCH_SOURCES_DIR}/CallDescrWorkerARM64.asm
 ${ARCH_SOURCES_DIR}/CrtHelpers.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/thunktemplates.asm
 )
Expand All@@ -705,6 +707,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/jithelpers_fastwritebarriers.S
 ${ARCH_SOURCES_DIR}/jithelpers_singleappdomain.S
 ${ARCH_SOURCES_DIR}/jithelpers_slow.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/redirectedhandledjitcase.S
 ${ARCH_SOURCES_DIR}/theprestubamd64.S
Expand DownExpand Up@@ -738,6 +741,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/asmhelpers.S
 ${ARCH_SOURCES_DIR}/calldescrworkerarm64.S
 ${ARCH_SOURCES_DIR}/crthelpers.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/thunktemplates.S
 )
Expand Down

182 changes: 0 additions & 182 deletions
src/coreclr/vm/amd64/JitHelpers_Fast.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,188 +50,6 @@ endif
extern JIT_InternalThrow:proc


; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeStart, _TEXT
 ret
LEAF_END JIT_PatchedCodeStart, _TEXT


; This is used by the mechanism to hold either the JIT_WriteBarrier_PreGrow
; or JIT_WriteBarrier_PostGrow code (depending on the state of the GC). It _WILL_
; change at runtime as the GC changes. Initially it should simply be a copy of the
; larger of the two functions (JIT_WriteBarrier_PostGrow) to ensure we have created
; enough space to copy that code in.
LEAF_ENTRY JIT_WriteBarrier, _TEXT
 align 16

ifdef _DEBUG
 ; In debug builds, this just contains jump to the debug version of the write barrier by default
 mov rax, JIT_WriteBarrier_Debug
 jmp rax
endif

ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP
 ; JIT_WriteBarrier_WriteWatch_PostGrow64

 ; Regarding patchable constants:
 ; - 64-bit constants have to be loaded into a register
 ; - The constants have to be aligned to 8 bytes so that they can be patched easily
 ; - The constant loads have been located to minimize NOP padding required to align the constants
 ; - Using different registers for successive constant loads helps pipeline better. Should we decide to use a special
 ; non-volatile calling convention, this should be changed to use just one register.

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 ; Update the write watch table if necessary
 mov rax, rcx
 mov r8, 0F0F0F0F0F0F0F0F0h
 shr rax, 0Ch ; SoftwareWriteWatch::AddressToTableByteIndexShift
 NOP_2_BYTE ; padding for alignment of constant
 mov r9, 0F0F0F0F0F0F0F0F0h
 add rax, r8
 cmp byte ptr [rax], 0h
 jne CheckCardTable
 mov byte ptr [rax], 0FFh

 NOP_3_BYTE ; padding for alignment of constant

 ; Check the lower and upper ephemeral region bounds
 CheckCardTable:
 cmp rdx, r9
 jb Exit

 NOP_3_BYTE ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

else
 ; JIT_WriteBarrier_PostGrow64

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 NOP_3_BYTE ; padding for alignment of constant

 ; Can't compare a 64 bit immediate, so we have to move them into a
 ; register. Values of these immediates will be patched at runtime.
 ; By using two registers we can pipeline better. Should we decide to use
 ; a special non-volatile calling convention, this should be changed to
 ; just one.

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Check the lower and upper ephemeral region bounds
 cmp rdx, rax
 jb Exit

 nop ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET
endif

 ; make sure this is bigger than any of the others
 align 16
 nop
LEAF_END_MARKED JIT_WriteBarrier, _TEXT

; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeLast, _TEXT
 ret
LEAF_END JIT_PatchedCodeLast, _TEXT

; JIT_ByRefWriteBarrier has weird semantics, see usage in StubLinkerX86.cpp
;
; Entry:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Split off patched code into separate .S file and disable subsections-via-symbols for it#92555

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

jkotas
merged 3 commits into

from

Sep 30, 2023
 Merged


Split off patched code into separate .S file and disable subsections-via-symbols for it
#92555
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
cac69aa

[amd64/arm64] Split off patched code into separate .S file and disabl…


filipnavara Sep 24, 2023
96068bb

[amd64/arm64] Split off patched code into separate .asm file


filipnavara Sep 24, 2023
8c96e83

Remove NO_SUBSECTIONS_VIA_SYMBOLS


filipnavara Sep 26, 2023

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


4 changes: 4 additions & 0 deletions
src/coreclr/vm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,7 @@ if(CLR_CMAKE_TARGET_ARCH_AMD64)
 ${ARCH_SOURCES_DIR}/JitHelpers_InlineGetThread.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_SingleAppDomain.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_Slow.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/RedirectedHandledJITCase.asm
 ${ARCH_SOURCES_DIR}/ThePreStubAMD64.asm
Expand DownExpand Up@@ -683,6 +684,7 @@ elseif(CLR_CMAKE_TARGET_ARCH_ARM64)
 ${ARCH_SOURCES_DIR}/AsmHelpers.asm
 ${ARCH_SOURCES_DIR}/CallDescrWorkerARM64.asm
 ${ARCH_SOURCES_DIR}/CrtHelpers.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/thunktemplates.asm
 )
Expand All@@ -705,6 +707,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/jithelpers_fastwritebarriers.S
 ${ARCH_SOURCES_DIR}/jithelpers_singleappdomain.S
 ${ARCH_SOURCES_DIR}/jithelpers_slow.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/redirectedhandledjitcase.S
 ${ARCH_SOURCES_DIR}/theprestubamd64.S
Expand DownExpand Up@@ -738,6 +741,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/asmhelpers.S
 ${ARCH_SOURCES_DIR}/calldescrworkerarm64.S
 ${ARCH_SOURCES_DIR}/crthelpers.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/thunktemplates.S
 )
Expand Down

182 changes: 0 additions & 182 deletions
src/coreclr/vm/amd64/JitHelpers_Fast.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,188 +50,6 @@ endif
extern JIT_InternalThrow:proc


; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeStart, _TEXT
 ret
LEAF_END JIT_PatchedCodeStart, _TEXT


; This is used by the mechanism to hold either the JIT_WriteBarrier_PreGrow
; or JIT_WriteBarrier_PostGrow code (depending on the state of the GC). It _WILL_
; change at runtime as the GC changes. Initially it should simply be a copy of the
; larger of the two functions (JIT_WriteBarrier_PostGrow) to ensure we have created
; enough space to copy that code in.
LEAF_ENTRY JIT_WriteBarrier, _TEXT
 align 16

ifdef _DEBUG
 ; In debug builds, this just contains jump to the debug version of the write barrier by default
 mov rax, JIT_WriteBarrier_Debug
 jmp rax
endif

ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP
 ; JIT_WriteBarrier_WriteWatch_PostGrow64

 ; Regarding patchable constants:
 ; - 64-bit constants have to be loaded into a register
 ; - The constants have to be aligned to 8 bytes so that they can be patched easily
 ; - The constant loads have been located to minimize NOP padding required to align the constants
 ; - Using different registers for successive constant loads helps pipeline better. Should we decide to use a special
 ; non-volatile calling convention, this should be changed to use just one register.

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 ; Update the write watch table if necessary
 mov rax, rcx
 mov r8, 0F0F0F0F0F0F0F0F0h
 shr rax, 0Ch ; SoftwareWriteWatch::AddressToTableByteIndexShift
 NOP_2_BYTE ; padding for alignment of constant
 mov r9, 0F0F0F0F0F0F0F0F0h
 add rax, r8
 cmp byte ptr [rax], 0h
 jne CheckCardTable
 mov byte ptr [rax], 0FFh

 NOP_3_BYTE ; padding for alignment of constant

 ; Check the lower and upper ephemeral region bounds
 CheckCardTable:
 cmp rdx, r9
 jb Exit

 NOP_3_BYTE ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

else
 ; JIT_WriteBarrier_PostGrow64

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 NOP_3_BYTE ; padding for alignment of constant

 ; Can't compare a 64 bit immediate, so we have to move them into a
 ; register. Values of these immediates will be patched at runtime.
 ; By using two registers we can pipeline better. Should we decide to use
 ; a special non-volatile calling convention, this should be changed to
 ; just one.

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Check the lower and upper ephemeral region bounds
 cmp rdx, rax
 jb Exit

 nop ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET
endif

 ; make sure this is bigger than any of the others
 align 16
 nop
LEAF_END_MARKED JIT_WriteBarrier, _TEXT

; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeLast, _TEXT
 ret
LEAF_END JIT_PatchedCodeLast, _TEXT

; JIT_ByRefWriteBarrier has weird semantics, see usage in StubLinkerX86.cpp
;
; Entry:
Expand Down
Loading

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

Skip to content
Split off patched code into separate .S file and disable subsections-via-symbols for it#92555

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

jkotas
merged 3 commits into

from

Sep 30, 2023
 Merged


Split off patched code into separate .S file and disable subsections-via-symbols for it
#92555
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
cac69aa

[amd64/arm64] Split off patched code into separate .S file and disabl…


filipnavara Sep 24, 2023
96068bb

[amd64/arm64] Split off patched code into separate .asm file


filipnavara Sep 24, 2023
8c96e83

Remove NO_SUBSECTIONS_VIA_SYMBOLS


filipnavara Sep 26, 2023

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


4 changes: 4 additions & 0 deletions
src/coreclr/vm/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,7 @@ if(CLR_CMAKE_TARGET_ARCH_AMD64)
 ${ARCH_SOURCES_DIR}/JitHelpers_InlineGetThread.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_SingleAppDomain.asm
 ${ARCH_SOURCES_DIR}/JitHelpers_Slow.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/RedirectedHandledJITCase.asm
 ${ARCH_SOURCES_DIR}/ThePreStubAMD64.asm
Expand DownExpand Up@@ -683,6 +684,7 @@ elseif(CLR_CMAKE_TARGET_ARCH_ARM64)
 ${ARCH_SOURCES_DIR}/AsmHelpers.asm
 ${ARCH_SOURCES_DIR}/CallDescrWorkerARM64.asm
 ${ARCH_SOURCES_DIR}/CrtHelpers.asm
 ${ARCH_SOURCES_DIR}/patchedcode.asm
 ${ARCH_SOURCES_DIR}/PInvokeStubs.asm
 ${ARCH_SOURCES_DIR}/thunktemplates.asm
 )
Expand All@@ -705,6 +707,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/jithelpers_fastwritebarriers.S
 ${ARCH_SOURCES_DIR}/jithelpers_singleappdomain.S
 ${ARCH_SOURCES_DIR}/jithelpers_slow.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/redirectedhandledjitcase.S
 ${ARCH_SOURCES_DIR}/theprestubamd64.S
Expand DownExpand Up@@ -738,6 +741,7 @@ else(CLR_CMAKE_TARGET_WIN32)
 ${ARCH_SOURCES_DIR}/asmhelpers.S
 ${ARCH_SOURCES_DIR}/calldescrworkerarm64.S
 ${ARCH_SOURCES_DIR}/crthelpers.S
 ${ARCH_SOURCES_DIR}/patchedcode.S
 ${ARCH_SOURCES_DIR}/pinvokestubs.S
 ${ARCH_SOURCES_DIR}/thunktemplates.S
 )
Expand Down

182 changes: 0 additions & 182 deletions
src/coreclr/vm/amd64/JitHelpers_Fast.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,188 +50,6 @@ endif
extern JIT_InternalThrow:proc


; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeStart, _TEXT
 ret
LEAF_END JIT_PatchedCodeStart, _TEXT


; This is used by the mechanism to hold either the JIT_WriteBarrier_PreGrow
; or JIT_WriteBarrier_PostGrow code (depending on the state of the GC). It _WILL_
; change at runtime as the GC changes. Initially it should simply be a copy of the
; larger of the two functions (JIT_WriteBarrier_PostGrow) to ensure we have created
; enough space to copy that code in.
LEAF_ENTRY JIT_WriteBarrier, _TEXT
 align 16

ifdef _DEBUG
 ; In debug builds, this just contains jump to the debug version of the write barrier by default
 mov rax, JIT_WriteBarrier_Debug
 jmp rax
endif

ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP
 ; JIT_WriteBarrier_WriteWatch_PostGrow64

 ; Regarding patchable constants:
 ; - 64-bit constants have to be loaded into a register
 ; - The constants have to be aligned to 8 bytes so that they can be patched easily
 ; - The constant loads have been located to minimize NOP padding required to align the constants
 ; - Using different registers for successive constant loads helps pipeline better. Should we decide to use a special
 ; non-volatile calling convention, this should be changed to use just one register.

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 ; Update the write watch table if necessary
 mov rax, rcx
 mov r8, 0F0F0F0F0F0F0F0F0h
 shr rax, 0Ch ; SoftwareWriteWatch::AddressToTableByteIndexShift
 NOP_2_BYTE ; padding for alignment of constant
 mov r9, 0F0F0F0F0F0F0F0F0h
 add rax, r8
 cmp byte ptr [rax], 0h
 jne CheckCardTable
 mov byte ptr [rax], 0FFh

 NOP_3_BYTE ; padding for alignment of constant

 ; Check the lower and upper ephemeral region bounds
 CheckCardTable:
 cmp rdx, r9
 jb Exit

 NOP_3_BYTE ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE
 NOP_3_BYTE

else
 ; JIT_WriteBarrier_PostGrow64

 ; Do the move into the GC . It is correct to take an AV here, the EH code
 ; figures out that this came from a WriteBarrier and correctly maps it back
 ; to the managed method which called the WriteBarrier (see setup in
 ; InitializeExceptionHandling, vm\exceptionhandling.cpp).
 mov [rcx], rdx

 NOP_3_BYTE ; padding for alignment of constant

 ; Can't compare a 64 bit immediate, so we have to move them into a
 ; register. Values of these immediates will be patched at runtime.
 ; By using two registers we can pipeline better. Should we decide to use
 ; a special non-volatile calling convention, this should be changed to
 ; just one.

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Check the lower and upper ephemeral region bounds
 cmp rdx, rax
 jb Exit

 nop ; padding for alignment of constant

 mov r8, 0F0F0F0F0F0F0F0F0h

 cmp rdx, r8
 jae Exit

 nop ; padding for alignment of constant

 mov rax, 0F0F0F0F0F0F0F0F0h

 ; Touch the card table entry, if not already dirty.
 shr rcx, 0Bh
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardTable
 REPRET

 UpdateCardTable:
 mov byte ptr [rcx + rax], 0FFh
ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
 mov rax, 0F0F0F0F0F0F0F0F0h
 shr rcx, 0Ah
 cmp byte ptr [rcx + rax], 0FFh
 jne UpdateCardBundleTable
 REPRET

 UpdateCardBundleTable:
 mov byte ptr [rcx + rax], 0FFh
endif
 ret

 align 16
 Exit:
 REPRET
endif

 ; make sure this is bigger than any of the others
 align 16
 nop
LEAF_END_MARKED JIT_WriteBarrier, _TEXT

; Mark start of the code region that we patch at runtime
LEAF_ENTRY JIT_PatchedCodeLast, _TEXT
 ret
LEAF_END JIT_PatchedCodeLast, _TEXT

; JIT_ByRefWriteBarrier has weird semantics, see usage in StubLinkerX86.cpp
;
; Entry:
Expand Down
Loading