Merge pull request #5208 from Akira1Saitoh/aarch64RegisterBitMask

AArch64: Make registerBitMask function available to outside of code generator
eclipse-openj9 · May 19, 2020 · ee8a991 · ee8a991
2 parents 656748a + c0d6ebf
commit ee8a991
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/compiler/aarch64/codegen/OMRCodeGenerator.cpp b/compiler/aarch64/codegen/OMRCodeGenerator.cpp
@@ -418,7 +418,8 @@ TR::Register *OMR::ARM64::CodeGenerator::gprClobberEvaluate(TR::Node *node)
       }
    }
 
-static uint32_t registerBitMask(int32_t reg)
+uint32_t
+OMR::ARM64::CodeGenerator::registerBitMask(int32_t reg)
    {
    return 1 << (reg-1);
    }
@@ -446,7 +447,7 @@ void OMR::ARM64::CodeGenerator::buildRegisterMapForInstruction(TR_GCStackMap *ma
                atlas->addPinningArrayPtrForInternalPtrReg(virtReg->getPinningArrayPointer());
                }
             else if (virtReg->containsCollectedReference())
-               map->setRegisterBits(registerBitMask(i));
+               map->setRegisterBits(self()->registerBitMask(i));
             }
          }
       }

diff --git a/compiler/aarch64/codegen/OMRCodeGenerator.hpp b/compiler/aarch64/codegen/OMRCodeGenerator.hpp
@@ -400,6 +400,14 @@ class OMR_EXTENSIBLE CodeGenerator : public OMR::CodeGenerator
     */
    TR::Instruction *generateNop(TR::Node *node, TR::Instruction *preced = 0);
 
+   /**
+    * @brief Returns bit mask for real register
+    * @param[in] reg: real register number
+    * 
+    * @return bit mask for real register
+    */
+   static uint32_t registerBitMask(int32_t reg);
+
    private:
 
    enum // flags