[Arm64/Windows] Revert changes per dotnet#10260 & review

sdmaclea · Mar 17, 2017 · 15f2e26 · 15f2e26
1 parent a230fe2
commit 15f2e26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/vm/arm64/CallDescrWorkerARM64.asm b/src/vm/arm64/CallDescrWorkerARM64.asm
@@ -21,8 +21,7 @@
 ;;void CallDescrWorkerInternal(CallDescrData * pCallDescrData);
         NESTED_ENTRY CallDescrWorkerInternal,,CallDescrWorkerUnwindFrameChainHandler
         PROLOG_SAVE_REG_PAIR   fp, lr, #-32!
-        PROLOG_SAVE_REG        x19, #16
-        PROLOG_SAVE_REG        x0, #24
+        PROLOG_SAVE_REG        x19, #16   ;the stack slot at sp+24 is empty for 16 byte alligment
 
         mov     x19, x0 ; save pCallDescrData in x19
 
@@ -77,8 +76,6 @@ LNoFloatingPoint
         ldr     x9, [x19,#CallDescrData__pTarget]
         blr     x9
 
-        ldr     x19, [fp, 24] ; Fixup corrupted X19 callee preserved register
-
         ldr     w3, [x19,#CallDescrData__fpReturnSize]
 
         ;; Int return case

diff --git a/src/vm/arm64/calldescrworkerarm64.S b/src/vm/arm64/calldescrworkerarm64.S
@@ -69,7 +69,7 @@ LOCAL_LABEL(NoFloatingPoint):
     ldr     x9, [x19,#CallDescrData__pTarget]
     blr     x9
 
-    ldr     x19, [fp, 24] // Fixup corrupted X19 callee preserved register
+    ldr     x19, [fp, 24] // Fixup corrupted X19 caller preserved register
 
     ldr     w3, [x19,#CallDescrData__fpReturnSize]