From: Aditya Mandaleeka <adityam@microsoft.com>
Date: Fri, 27 Apr 2018 19:20:30 +0000 (-0700)
Subject: Use HiddenArg instead of hardcoded x12.
X-Git-Tag: accepted/tizen/unified/20190422.045933~2235^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11dfbc74dbf73e931c1263cd5c24392ca7e5995d;p=platform%2Fupstream%2Fcoreclr.git

Use HiddenArg instead of hardcoded x12.
---

diff --git a/src/vm/arm64/PInvokeStubs.asm b/src/vm/arm64/PInvokeStubs.asm
index 8e288cb..eb522d9 100644
--- a/src/vm/arm64/PInvokeStubs.asm
+++ b/src/vm/arm64/PInvokeStubs.asm
@@ -64,8 +64,8 @@ __PInvokeGenStubFuncName SETS "$__PInvokeGenStubFuncName":CC:"_RetBuffArg"
             ; The way we do this is to shift the managed target to the left by one bit and then set the
             ; least significant bit to 1.  This works because MethodDesc* are always 8-byte aligned.
             ;
-            lsl             x12, x12, #1
-            orr             x12, x12, #1
+            lsl             $HiddenArg, $HiddenArg, #1
+            orr             $HiddenArg, $HiddenArg, #1
         ENDIF
 
         EPILOG_BRANCH_REG   x9 
diff --git a/src/vm/arm64/pinvokestubs.S b/src/vm/arm64/pinvokestubs.S
index 674d723..2ff6a8d 100644
--- a/src/vm/arm64/pinvokestubs.S
+++ b/src/vm/arm64/pinvokestubs.S
@@ -38,8 +38,8 @@
             // The way we do this is to shift the managed target to the left by one bit and then set the
             // least significant bit to 1.  This works because MethodDesc* are always 8-byte aligned.
             //
-            lsl             x12, x12, #1
-            orr             x12, x12, #1
+            lsl             \HiddenArg, \HiddenArg, #1
+            orr             \HiddenArg, \HiddenArg, #1
         .endif
 
         EPILOG_BRANCH_REG   x9