Compare text

Find the difference between two text files

Real-time editor

Hide unchanged lines

Disable line wrap

Layout

Diff precision

Syntax highlighting

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 2 years agoDiff never expires

2 removals

Lines
Total
Removed

Characters
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

69 lines

35 additions

Lines
Total
Added

Characters
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

89 lines

LEAF_ENTRY RhpByRefAssignRef, _TEXT

LEAF_ENTRY RhpByRefAssignRefBatch, _TEXT

ALTERNATE_ENTRY RhpByRefAssignRefAVLocation1

LOCAL_LABEL(RhpByRefAssignRefBatch_NextByref):

ALTERNATE_ENTRY RhpByRefAssignRefBatchAVLocation1

mov rcx, [rsi]

ALTERNATE_ENTRY RhpByRefAssignRefAVLocation2

ALTERNATE_ENTRY RhpByRefAssignRefBatchAVLocation2

mov [rdi], rcx

// Check whether the writes were even into the heap. If not there's no card update required.

cmp rdi, [C_VAR(g_lowest_address)]

jb LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired)

jb LOCAL_LABEL(RhpByRefAssignRefBatch_NotInHeap)

cmp rdi, [C_VAR(g_highest_address)]

jae LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired)

jae LOCAL_LABEL(RhpByRefAssignRefBatch_NotInHeap)

// Update the shadow copy of the heap with the same value just written to the same heap. (A no-op unless

// we're in a debug build and write barrier checking has been enabled).

UPDATE_GC_SHADOW BASENAME, rcx, rdi

#ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP

mov r11, [C_VAR(g_write_watch_table)]

cmp r11, 0x0

je LOCAL_LABEL(RhpByRefAssignRef_CheckCardTable)

je LOCAL_LABEL(RhpByRefAssignRefBatch_CheckCardTable)

mov r10, rdi

shr r10, 0xC // SoftwareWriteWatch::AddressToTableByteIndexShift

add r10, r11

cmp byte ptr [r10], 0x0

jne LOCAL_LABEL(RhpByRefAssignRef_CheckCardTable)

jne LOCAL_LABEL(RhpByRefAssignRefBatch_CheckCardTable)

mov byte ptr [r10], 0xFF

#endif

LOCAL_LABEL(RhpByRefAssignRef_CheckCardTable):

LOCAL_LABEL(RhpByRefAssignRefBatch_CheckCardTable):

// If the reference is to an object that's not in an ephemeral generation we have no need to track it

// (since the object won't be collected or moved by an ephemeral collection).

cmp rcx, [C_VAR(g_ephemeral_low)]

jb LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired)

jb LOCAL_LABEL(RhpByRefAssignRefBatch_NoBarrierRequired)

cmp rcx, [C_VAR(g_ephemeral_high)]

jae LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired)

jae LOCAL_LABEL(RhpByRefAssignRefBatch_NoBarrierRequired)

// move current rdi value into rcx, we need to keep rdi and eventually increment by 8

mov rcx, rdi

// We have a location on the GC heap being updated with a reference to an ephemeral object so we must

// track this write. The location address is translated into an offset in the card table bitmap. We set

// an entire byte in the card table since it's quicker than messing around with bitmasks and we only write

// the byte if it hasn't already been done since writes are expensive and impact scaling.

shr rcx, 0x0B

mov r10, [C_VAR(g_card_table)]

cmp byte ptr [rcx + r10], 0x0FF

je LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired)

je LOCAL_LABEL(RhpByRefAssignRefBatch_NoBarrierRequired)

// We get here if it's necessary to update the card table.

mov byte ptr [rcx + r10], 0xFF

#ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES

// Shift rcx by 0x0A more to get the card bundle byte (we shifted by 0x0B already)

shr rcx, 0x0A

add rcx, [C_VAR(g_card_bundle_table)]

cmp byte ptr [rcx], 0xFF

je LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired)

je LOCAL_LABEL(RhpByRefAssignRefBatch_NoBarrierRequired)

mov byte ptr [rcx], 0xFF

#endif

LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired):

LOCAL_LABEL(RhpByRefAssignRefBatch_NotInHeap):

// At least one write is already done, increment the pointers

add rdi, 0x8

add rsi, 0x8

dec r8d

je LOCAL_LABEL(RhpByRefAssignRefBatch_NotInHeapExit)

// Now we can do the rest of the writes without checking the heap

LOCAL_LABEL(RhpByRefAssignRefBatch_NextByrefUnchecked):

mov rcx, [rsi]

mov [rdi], rcx

add rdi, 0x8

add rsi, 0x8

dec r8d

jne LOCAL_LABEL(RhpByRefAssignRefBatch_NextByrefUnchecked)

LOCAL_LABEL(RhpByRefAssignRefBatch_NotInHeapExit):

ret

LOCAL_LABEL(RhpByRefAssignRefBatch_NoBarrierRequired):

// Increment the pointers before leaving

add rdi, 0x8

add rsi, 0x8

dec r8d

jne LOCAL_LABEL(RhpByRefAssignRefBatch_NextByref)

ret

LEAF_END RhpByRefAssignRef, _TEXT

LEAF_END RhpByRefAssignRefBatch, _TEXT

Saved diffs

Original text

Open file

LEAF_ENTRY RhpByRefAssignRef, _TEXT
ALTERNATE_ENTRY RhpByRefAssignRefAVLocation1
    mov     rcx, [rsi]
ALTERNATE_ENTRY RhpByRefAssignRefAVLocation2
    mov     [rdi], rcx

// Check whether the writes were even into the heap. If not there's no card update required.
    cmp     rdi, [C_VAR(g_lowest_address)]
    jb      LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired)
    cmp     rdi, [C_VAR(g_highest_address)]
    jae     LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired)

// Update the shadow copy of the heap with the same value just written to the same heap. (A no-op unless
    // we're in a debug build and write barrier checking has been enabled).
    UPDATE_GC_SHADOW BASENAME, rcx, rdi

#ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP
    mov     r11, [C_VAR(g_write_watch_table)]
    cmp     r11, 0x0
    je      LOCAL_LABEL(RhpByRefAssignRef_CheckCardTable)

mov     r10, rdi
    shr     r10, 0xC // SoftwareWriteWatch::AddressToTableByteIndexShift
    add     r10, r11
    cmp     byte ptr [r10], 0x0
    jne     LOCAL_LABEL(RhpByRefAssignRef_CheckCardTable)
    mov     byte ptr [r10], 0xFF
#endif

LOCAL_LABEL(RhpByRefAssignRef_CheckCardTable):

// If the reference is to an object that's not in an ephemeral generation we have no need to track it
    // (since the object won't be collected or moved by an ephemeral collection).
    cmp     rcx, [C_VAR(g_ephemeral_low)]
    jb      LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired)
    cmp     rcx, [C_VAR(g_ephemeral_high)]
    jae     LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired)

// move current rdi value into rcx, we need to keep rdi and eventually increment by 8
    mov     rcx, rdi

// We have a location on the GC heap being updated with a reference to an ephemeral object so we must
    // track this write. The location address is translated into an offset in the card table bitmap. We set
    // an entire byte in the card table since it's quicker than messing around with bitmasks and we only write
    // the byte if it hasn't already been done since writes are expensive and impact scaling.
    shr     rcx, 0x0B
    mov     r10, [C_VAR(g_card_table)]
    cmp     byte ptr [rcx + r10], 0x0FF
    je      LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired)

// We get here if it's necessary to update the card table.
    mov     byte ptr [rcx + r10], 0xFF

#ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
    // Shift rcx by 0x0A more to get the card bundle byte (we shifted by 0x0B already)
    shr     rcx, 0x0A
    add     rcx, [C_VAR(g_card_bundle_table)]
    cmp     byte ptr [rcx], 0xFF
    je      LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired)

mov     byte ptr [rcx], 0xFF
#endif

LOCAL_LABEL(RhpByRefAssignRef_NoBarrierRequired):
    // Increment the pointers before leaving
    add     rdi, 0x8
    add     rsi, 0x8
    ret
LEAF_END RhpByRefAssignRef, _TEXT

Changed text

Open file

LEAF_ENTRY RhpByRefAssignRefBatch, _TEXT
LOCAL_LABEL(RhpByRefAssignRefBatch_NextByref):
ALTERNATE_ENTRY RhpByRefAssignRefBatchAVLocation1
    mov     rcx, [rsi]
ALTERNATE_ENTRY RhpByRefAssignRefBatchAVLocation2
    mov     [rdi], rcx

// Check whether the writes were even into the heap. If not there's no card update required.
    cmp     rdi, [C_VAR(g_lowest_address)]
    jb      LOCAL_LABEL(RhpByRefAssignRefBatch_NotInHeap)
    cmp     rdi, [C_VAR(g_highest_address)]
    jae     LOCAL_LABEL(RhpByRefAssignRefBatch_NotInHeap)

#ifdef FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP
    mov     r11, [C_VAR(g_write_watch_table)]
    cmp     r11, 0x0
    je      LOCAL_LABEL(RhpByRefAssignRefBatch_CheckCardTable)

mov     r10, rdi
    shr     r10, 0xC // SoftwareWriteWatch::AddressToTableByteIndexShift
    add     r10, r11
    cmp     byte ptr [r10], 0x0
    jne     LOCAL_LABEL(RhpByRefAssignRefBatch_CheckCardTable)
    mov     byte ptr [r10], 0xFF
#endif

LOCAL_LABEL(RhpByRefAssignRefBatch_CheckCardTable):

// If the reference is to an object that's not in an ephemeral generation we have no need to track it
    // (since the object won't be collected or moved by an ephemeral collection).
    cmp     rcx, [C_VAR(g_ephemeral_low)]
    jb      LOCAL_LABEL(RhpByRefAssignRefBatch_NoBarrierRequired)
    cmp     rcx, [C_VAR(g_ephemeral_high)]
    jae     LOCAL_LABEL(RhpByRefAssignRefBatch_NoBarrierRequired)

// move current rdi value into rcx, we need to keep rdi and eventually increment by 8
    mov     rcx, rdi

// We get here if it's necessary to update the card table.
    mov     byte ptr [rcx + r10], 0xFF

mov     byte ptr [rcx], 0xFF
#endif

LOCAL_LABEL(RhpByRefAssignRefBatch_NotInHeap):
    // At least one write is already done, increment the pointers
    add     rdi, 0x8
    add     rsi, 0x8
    dec     r8d
    je      LOCAL_LABEL(RhpByRefAssignRefBatch_NotInHeapExit)
    // Now we can do the rest of the writes without checking the heap
LOCAL_LABEL(RhpByRefAssignRefBatch_NextByrefUnchecked):
    mov     rcx, [rsi]
    mov     [rdi], rcx
    add     rdi, 0x8
    add     rsi, 0x8
    dec     r8d
    jne     LOCAL_LABEL(RhpByRefAssignRefBatch_NextByrefUnchecked)
LOCAL_LABEL(RhpByRefAssignRefBatch_NotInHeapExit):
    ret

LOCAL_LABEL(RhpByRefAssignRefBatch_NoBarrierRequired):
    // Increment the pointers before leaving
    add     rdi, 0x8
    add     rsi, 0x8
    dec     r8d
    jne     LOCAL_LABEL(RhpByRefAssignRefBatch_NextByref)
    ret
LEAF_END RhpByRefAssignRefBatch, _TEXT