Use entryPointFromCompiledMethod linkage API for recursive calls

Signed-off-by: Daryl Maier <maier@ca.ibm.com>
eclipse · Oct 20, 2020 · f9df260 · f9df260
1 parent 72240e2
commit f9df260
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 24 deletions.
diff --git a/compiler/arm/codegen/ARMBinaryEncoding.cpp b/compiler/arm/codegen/ARMBinaryEncoding.cpp
@@ -23,6 +23,7 @@
 #include "codegen/CodeGenerator.hpp"
 #include "il/Node.hpp"
 #include "il/Node_inlines.hpp"
+#include "codegen/Linkage.hpp"
 #include "codegen/Relocation.hpp"
 #include "codegen/Machine.hpp"
 #include "arm/codegen/ARMInstruction.hpp"
@@ -267,11 +268,8 @@ uint8_t *TR::ARMImmSymInstruction::generateBinaryEncoding()
 
       if (comp->isRecursiveMethodTarget(sym))
          {
-         uint32_t jitTojitStart = (uintptr_t) cg()->getCodeStart();
-
-         // reach for how many interp->jit argument loads to skip
-         jitTojitStart += ((*(int32_t *)(jitTojitStart - 4)) >> 16) & 0xFFFF;
-         *(int32_t *) cursor = (*(int32_t *)cursor) | encodeBranchDistance((uintptr_t)cursor, jitTojitStart);
+         intptr_t jitToJitStart = cg()->getLinkage()->entryPointFromCompiledMethod();
+         *(int32_t *) cursor = (*(int32_t *)cursor) | encodeBranchDistance((uintptr_t)cursor, (uint32_t)jitToJitStart);
          }
       else if (label != NULL)
          {

diff --git a/compiler/compile/OMRCompilation.cpp b/compiler/compile/OMRCompilation.cpp
@@ -34,6 +34,7 @@
 #include "codegen/CodeGenerator.hpp"
 #include "env/FrontEnd.hpp"
 #include "codegen/Instruction.hpp"
+#include "codegen/Linkage.hpp"
 #include "codegen/RecognizedMethods.hpp"
 #include "compile/Compilation.hpp"
 #include "compile/Compilation_inlines.hpp"
@@ -1250,12 +1251,11 @@ int32_t OMR::Compilation::compile()
 #if defined(AIXPPC) || defined(LINUXPPC)
    if (self()->getOption(TR_DebugOnEntry))
       {
-      intptr_t jitTojitStart = (intptr_t) self()->cg()->getCodeStart();
-      jitTojitStart += ((*(int32_t *)(jitTojitStart - 4)) >> 16) & 0x0000ffff;
+      intptr_t jitToJitStart = self()->cg()->getLinkage()->entryPointFromCompiledMethod();
 #if defined(AIXPPC)
-      self()->getDebug()->setupDebugger((void *)jitTojitStart);
+      self()->getDebug()->setupDebugger((void *)jitToJitStart);
 #else
-      self()->getDebug()->setupDebugger((void *)jitTojitStart, self()->cg()->getCodeEnd(), false);
+      self()->getDebug()->setupDebugger((void *)jitToJitStart, self()->cg()->getCodeEnd(), false);
 #endif /* defined(AIXPPC) */
       }
 #elif defined(LINUX) || defined(J9ZOS390) || defined(OMR_OS_WINDOWS)

diff --git a/compiler/p/codegen/OMRInstruction.cpp b/compiler/p/codegen/OMRInstruction.cpp
@@ -25,6 +25,7 @@
 #include "env/FrontEnd.hpp"
 #include "codegen/InstOpCode.hpp"
 #include "codegen/Instruction.hpp"
+#include "codegen/Linkage.hpp"
 #include "codegen/MemoryReference.hpp"
 #include "codegen/PPCInstruction.hpp"
 #include "codegen/RegisterConstants.hpp"
@@ -196,9 +197,8 @@ uint8_t *TR::PPCDepImmSymInstruction::generateBinaryEncoding()
       {
       if (cg()->comp()->isRecursiveMethodTarget(getSymbolReference()->getSymbol()))
          {
-         uint8_t *jitTojitStart = cg()->getCodeStart();
-         jitTojitStart += ((*(int32_t *)(jitTojitStart - 4)) >> 16) & 0x0000ffff;
-         distance = (intptr_t)(jitTojitStart - cursor);
+         intptr_t jitToJitStart = cg()->getLinkage()->entryPointFromCompiledMethod();
+         distance = jitToJitStart - reinterpret_cast<intptr_t>(cursor);
          }
       else
          {

diff --git a/compiler/p/codegen/PPCDebug.cpp b/compiler/p/codegen/PPCDebug.cpp
@@ -31,6 +31,7 @@ int jitDebugPPC;
 #include "codegen/GCRegisterMap.hpp"
 #include "codegen/InstOpCode.hpp"
 #include "codegen/Instruction.hpp"
+#include "codegen/Linkage.hpp"
 #include "codegen/Machine.hpp"
 #include "codegen/MemoryReference.hpp"
 #include "codegen/RealRegister.hpp"
@@ -419,10 +420,7 @@ TR_Debug::print(TR::FILE *pOutFile, TR::PPCDepImmSymInstruction * instr)
          }
       else if (targetAddress == 0)
          {
-         uint8_t *jitTojitStart = _cg->getCodeStart();
-
-         jitTojitStart += ((*(int32_t *)(jitTojitStart - 4)) >> 16) & 0x0000ffff;
-         targetAddress = (intptr_t)jitTojitStart;
+         targetAddress = _cg->getLinkage()->entryPointFromCompiledMethod();
          }
       else if (_cg->directCallRequiresTrampoline(targetAddress, (intptr_t)cursor))
          {

diff --git a/compiler/z/codegen/S390Instruction.cpp b/compiler/z/codegen/S390Instruction.cpp
@@ -2232,12 +2232,8 @@ TR::S390RILInstruction::generateBinaryEncoding()
 
          if (comp->isRecursiveMethodTarget(getTargetSymbol()))
             {
-            // call myself case
-            uint8_t * jitTojitStart = cg()->getCodeStart();
-
-            // Calculate jit-to-jit entry point
-            jitTojitStart += ((*(int32_t *) (jitTojitStart - 4)) >> 16) & 0x0000ffff;
-            *(int32_t *) (cursor + 2) = boi(((intptr_t) jitTojitStart - (intptr_t) cursor) / 2);
+            intptr_t jitToJitStart = cg()->getLinkage()->entryPointFromCompiledMethod();
+            *(int32_t *) (cursor + 2) = boi((jitToJitStart - (intptr_t) cursor) / 2);
             }
          else
             {
@@ -5079,7 +5075,7 @@ TR::S390AlignmentNopInstruction::generateBinaryEncoding()
       uint32_t nopsOfLength6ToAdd = (_alignment - currentMisalign) / 6;
       uint32_t nopsOfLength4ToAdd = ((_alignment - currentMisalign) % 6) / 4;
       uint32_t nopsOfLength2ToAdd = (((_alignment - currentMisalign) % 6) % 4) / 2;
-      
+
       if (trace)
          traceMsg(cg()->comp(), "Expanding alignment nop %p into %u instructions: [ ", self(), nopsOfLength6ToAdd + nopsOfLength4ToAdd + nopsOfLength2ToAdd);
 
@@ -5098,7 +5094,7 @@ TR::S390AlignmentNopInstruction::generateBinaryEncoding()
          if (trace)
             traceMsg(cg()->comp(), "%p ", nop);
          }
-      
+
       for (uint32_t i = 0; i < nopsOfLength6ToAdd; ++i)
          {
          TR::Instruction *nop = new (cg()->trHeapMemory()) TR::S390NOPInstruction(TR::InstOpCode::NOP, 6, getNode(), self(), cg());