Merge pull request #16458 from Akira1Saitoh/aarch64FixMemArg

AArch64: Save non-clobberable argument register when passed using the stack
eclipse-openj9 · Dec 13, 2022 · 9a997ba · 9a997ba
2 parents ec0f0d7 + 0859460
commit 9a997ba
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 32 deletions.
diff --git a/runtime/compiler/aarch64/codegen/ARM64JNILinkage.cpp b/runtime/compiler/aarch64/codegen/ARM64JNILinkage.cpp
@@ -549,17 +549,17 @@ size_t J9::ARM64::JNILinkage::buildJNIArgs(TR::Node *callNode, TR::RegisterDepen
             else
                argRegister = pushIntegerWordArg(child);
 
+            if (checkSplit && !cg()->canClobberNodesRegister(child, 0))
+               {
+               if (argRegister->containsCollectedReference())
+                  tempReg = cg()->allocateCollectedReferenceRegister();
+               else
+                  tempReg = cg()->allocateRegister();
+               generateMovInstruction(cg(), callNode, tempReg, argRegister);
+               argRegister = tempReg;
+               }
             if (numIntegerArgs < properties.getNumIntArgRegs())
                {
-               if (checkSplit && !cg()->canClobberNodesRegister(child, 0))
-                  {
-                  if (argRegister->containsCollectedReference())
-                     tempReg = cg()->allocateCollectedReferenceRegister();
-                  else
-                     tempReg = cg()->allocateRegister();
-                  generateMovInstruction(cg(), callNode, tempReg, argRegister);
-                  argRegister = tempReg;
-                  }
                if (numIntegerArgs == 0 &&
                   (resType.isAddress() || resType.isInt32() || resType.isInt64()))
                   {
@@ -624,15 +624,15 @@ size_t J9::ARM64::JNILinkage::buildJNIArgs(TR::Node *callNode, TR::RegisterDepen
             else
                argRegister = pushDoubleArg(child);
 
+            if (!cg()->canClobberNodesRegister(child, 0))
+               {
+               tempReg = cg()->allocateRegister(TR_FPR);
+               op = (childType == TR::Float) ? TR::InstOpCode::fmovs : TR::InstOpCode::fmovd;
+               generateTrg1Src1Instruction(cg(), op, callNode, tempReg, argRegister);
+               argRegister = tempReg;
+               }
             if (numFloatArgs < properties.getNumFloatArgRegs())
                {
-               if (!cg()->canClobberNodesRegister(child, 0))
-                  {
-                  tempReg = cg()->allocateRegister(TR_FPR);
-                  op = (childType == TR::Float) ? TR::InstOpCode::fmovs : TR::InstOpCode::fmovd;
-                  generateTrg1Src1Instruction(cg(), op, callNode, tempReg, argRegister);
-                  argRegister = tempReg;
-                  }
                if ((numFloatArgs == 0 && resType.isFloatingPoint()))
                   {
                   TR::Register *resultReg;

diff --git a/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.cpp b/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.cpp
@@ -1135,17 +1135,17 @@ int32_t J9::ARM64::PrivateLinkage::buildPrivateLinkageArgs(TR::Node *callNode,
             else
                {
                argSize += TR::Compiler->om.sizeofReferenceAddress() * ((childType == TR::Int64) ? 2 : 1);
+               if (!cg()->canClobberNodesRegister(child, 0))
+                  {
+                  if (argRegister->containsCollectedReference())
+                     tempReg = cg()->allocateCollectedReferenceRegister();
+                  else
+                     tempReg = cg()->allocateRegister();
+                  generateMovInstruction(cg(), callNode, tempReg, argRegister);
+                  argRegister = tempReg;
+                  }
                if (numIntegerArgs < numIntArgRegs)
                   {
-                  if (!cg()->canClobberNodesRegister(child, 0))
-                     {
-                     if (argRegister->containsCollectedReference())
-                        tempReg = cg()->allocateCollectedReferenceRegister();
-                     else
-                        tempReg = cg()->allocateRegister();
-                     generateMovInstruction(cg(), callNode, tempReg, argRegister);
-                     argRegister = tempReg;
-                     }
                   if (numIntegerArgs == firstExplicitArg)
                      {
                      // the first integer argument
@@ -1184,15 +1184,15 @@ int32_t J9::ARM64::PrivateLinkage::buildPrivateLinkageArgs(TR::Node *callNode,
                argSize += TR::Compiler->om.sizeofReferenceAddress() * 2;
                argRegister = pushDoubleArg(child);
                }
+            if (!cg()->canClobberNodesRegister(child, 0))
+               {
+               tempReg = cg()->allocateRegister(TR_FPR);
+               op = (childType == TR::Float) ? TR::InstOpCode::fmovs : TR::InstOpCode::fmovd;
+               generateTrg1Src1Instruction(cg(), op, callNode, tempReg, argRegister);
+               argRegister = tempReg;
+               }
             if (numFloatArgs < numFloatArgRegs)
                {
-               if (!cg()->canClobberNodesRegister(child, 0))
-                  {
-                  tempReg = cg()->allocateRegister(TR_FPR);
-                  op = (childType == TR::Float) ? TR::InstOpCode::fmovs : TR::InstOpCode::fmovd;
-                  generateTrg1Src1Instruction(cg(), op, callNode, tempReg, argRegister);
-                  argRegister = tempReg;
-                  }
                if (numFloatArgs == 0 && resType.isFloatingPoint())
                   {
                   TR::Register *resultReg;