summaryrefslogtreecommitdiff
path: root/src/vm/amd64
diff options
context:
space:
mode:
authorAditya Mandaleeka <adityam@microsoft.com>2017-02-27 12:47:05 -0800
committerAditya Mandaleeka <adityam@microsoft.com>2017-02-28 15:52:41 -0800
commit6b7fec4f171c4840d772ce3c608018474a9c24ae (patch)
tree2c1c465576870c5b91fc4ea13af5c0c836fd5073 /src/vm/amd64
parent9ae6ed25affc42343a3f88f147ff4a5fbd1e9727 (diff)
downloadcoreclr-6b7fec4f171c4840d772ce3c608018474a9c24ae.tar.gz
coreclr-6b7fec4f171c4840d772ce3c608018474a9c24ae.tar.bz2
coreclr-6b7fec4f171c4840d772ce3c608018474a9c24ae.zip
Add 6 byte NOP instruction.
Diffstat (limited to 'src/vm/amd64')
-rw-r--r--src/vm/amd64/jithelpers_fast.S3
-rw-r--r--src/vm/amd64/jithelpers_fastwritebarriers.S9
2 files changed, 4 insertions, 8 deletions
diff --git a/src/vm/amd64/jithelpers_fast.S b/src/vm/amd64/jithelpers_fast.S
index 975e488f7c..0ec63f7c5c 100644
--- a/src/vm/amd64/jithelpers_fast.S
+++ b/src/vm/amd64/jithelpers_fast.S
@@ -187,8 +187,7 @@ LEAF_ENTRY JIT_WriteBarrier, _TEXT
mov byte ptr [rdi + rax], 0FFh
#ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
- NOP_3_BYTE // padding for alignment of constant
- NOP_3_BYTE // padding for alignment of constant
+ NOP_6_BYTE // padding for alignment of constant
movabs rax, 0xF0F0F0F0F0F0F0F0
diff --git a/src/vm/amd64/jithelpers_fastwritebarriers.S b/src/vm/amd64/jithelpers_fastwritebarriers.S
index eff33cd890..23c1115165 100644
--- a/src/vm/amd64/jithelpers_fastwritebarriers.S
+++ b/src/vm/amd64/jithelpers_fastwritebarriers.S
@@ -47,8 +47,7 @@ PATCH_LABEL JIT_WriteBarrier_PreGrow64_Patch_Label_CardTable
mov byte ptr [rdi + rax], 0FFh
#ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
- NOP_3_BYTE // padding for alignment of constant
- NOP_3_BYTE // padding for alignment of constant
+ NOP_6_BYTE // padding for alignment of constant
PATCH_LABEL JIT_WriteBarrier_PreGrow64_Patch_Label_CardBundleTable
movabs rax, 0xF0F0F0F0F0F0F0F0
@@ -133,8 +132,7 @@ PATCH_LABEL JIT_WriteBarrier_PostGrow64_Patch_Label_CardTable
mov byte ptr [rdi + rax], 0FFh
#ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
- NOP_3_BYTE // padding for alignment of constant
- NOP_3_BYTE // padding for alignment of constant
+ NOP_6_BYTE // padding for alignment of constant
PATCH_LABEL JIT_WriteBarrier_PostGrow64_Patch_Label_CardBundleTable
movabs rax, 0xF0F0F0F0F0F0F0F0
@@ -193,8 +191,7 @@ PATCH_LABEL JIT_WriteBarrier_SVR64_PatchLabel_CardTable
mov byte ptr [rdi + rax], 0FFh
#ifdef FEATURE_MANUALLY_MANAGED_CARD_BUNDLES
- NOP_3_BYTE // padding for alignment of constant
- NOP_3_BYTE // padding for alignment of constant
+ NOP_6_BYTE // padding for alignment of constant
PATCH_LABEL JIT_WriteBarrier_SVR64_PatchLabel_CardBundleTable
movabs rax, 0xF0F0F0F0F0F0F0F0