From 615916cc6e883d0fe9590821dbab01718c39cd9d Mon Sep 17 00:00:00 2001 From: "Steve MacLean, Qualcomm Datacenter Technologies Inc" Date: Mon, 24 Jul 2017 13:30:01 -0400 Subject: [PATCH] [Arm64] Pass ResolveCacheElem in DispatchToken to match AMD64 --- src/vm/arm64/asmhelpers.S | 1 + src/vm/arm64/asmhelpers.asm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vm/arm64/asmhelpers.S b/src/vm/arm64/asmhelpers.S index 2e1d029..7a64665 100644 --- a/src/vm/arm64/asmhelpers.S +++ b/src/vm/arm64/asmhelpers.S @@ -1112,6 +1112,7 @@ LOCAL_LABEL(Promote): mov x16, #256 str x16, [x13] // be quick to reset the counter so we don't get a bunch of contending threads orr x11, x11, #PROMOTE_CHAIN_FLAG // set PROMOTE_CHAIN_FLAG + mov x12, x9 // We pass the ResolveCacheElem to ResolveWorkerAsmStub instead of the DispatchToken LOCAL_LABEL(Fail): b ResolveWorkerAsmStub // call the ResolveWorkerAsmStub method to transition into the VM diff --git a/src/vm/arm64/asmhelpers.asm b/src/vm/arm64/asmhelpers.asm index 8da2151..edd40f7 100644 --- a/src/vm/arm64/asmhelpers.asm +++ b/src/vm/arm64/asmhelpers.asm @@ -1198,8 +1198,9 @@ Success Promote ; Move this entry to head postion of the chain mov x16, #256 - str x16, [x13] ; be quick to reset the counter so we don't get a bunch of contending threads + str x16, [x13] ; be quick to reset the counter so we don't get a bunch of contending threads orr x11, x11, #PROMOTE_CHAIN_FLAG ; set PROMOTE_CHAIN_FLAG + mov x12, x9 ; We pass the ResolveCacheElem to ResolveWorkerAsmStub instead of the DispatchToken Fail b ResolveWorkerAsmStub ; call the ResolveWorkerAsmStub method to transition into the VM -- 2.7.4