Merge pull request #7338 from knn-k/aarch64removeACHelpers

AArch64: Remove obsolete arraycopy helpers
eclipse-omr · May 17, 2024 · 76296e1 · 76296e1
2 parents 63c4bae + ae597ce
commit 76296e1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 39 deletions.
diff --git a/compiler/aarch64/runtime/ARM64arrayCopy.spp b/compiler/aarch64/runtime/ARM64arrayCopy.spp
@@ -38,24 +38,6 @@
 	.text
 	.align	2
 
-// Obsolete entry points to be removed
-FUNC_LABEL(__fwHalfWordArrayCopy):
-	ret
-FUNC_LABEL(__fwWordArrayCopy):
-	ret
-FUNC_LABEL(__fwDoubleWordArrayCopy):
-	ret
-FUNC_LABEL(__fwQuadWordArrayCopy):
-	ret
-FUNC_LABEL(__bwHalfWordArrayCopy):
-	ret
-FUNC_LABEL(__bwWordArrayCopy):
-	ret
-FUNC_LABEL(__bwDoubleWordArrayCopy):
-	ret
-FUNC_LABEL(__bwQuadWordArrayCopy):
-	ret
-
 // This is a generic entry point that will determine which direction(forward/backward) to copy as appropriate.
 //
 // in:    x0 - length in bytes

diff --git a/compiler/ras/Debug.cpp b/compiler/ras/Debug.cpp
@@ -4252,14 +4252,6 @@ TR_Debug::getRuntimeHelperName(int32_t index)
          case TR_ARM64arrayCopy:                                   return "__arrayCopy";
          case TR_ARM64forwardArrayCopy:                            return "__forwardArrayCopy";
          case TR_ARM64backwardArrayCopy:                           return "__backwardArrayCopy";
-         case TR_ARM64forwardQuadWordArrayCopy:                    return "__fwQuadWordArrayCopy";
-         case TR_ARM64forwardDoubleWordArrayCopy:                  return "__fwDoubleWordArrayCopy";
-         case TR_ARM64forwardWordArrayCopy:                        return "__fwWordArrayCopy";
-         case TR_ARM64forwardHalfWordArrayCopy:                    return "__fwHalfWordArrayCopy";
-         case TR_ARM64backwardQuadWordArrayCopy:                   return "__bwQuadWordArrayCopy";
-         case TR_ARM64backwardDoubleWordArrayCopy:                 return "__bwDoubleWordArrayCopy";
-         case TR_ARM64backwardWordArrayCopy:                       return "__bwWordArrayCopy";
-         case TR_ARM64backwardHalfWordArrayCopy:                   return "__bwHalfWordArrayCopy";
          case TR_ARM64interfaceCompleteSlot2:                      return "_interfaceCompleteSlot2";
          case TR_ARM64interfaceSlotsUnavailable:                   return "_interfaceSlotsUnavailable";
          case TR_ARM64PatchGCRHelper:                              return "_patchGCRHelper" ;

diff --git a/compiler/runtime/Helpers.inc b/compiler/runtime/Helpers.inc
@@ -507,19 +507,11 @@ SETVAL(TR_ARM64jitCollapseJNIReferenceFrame,TR_FSRH+38)
 SETVAL(TR_ARM64arrayCopy,TR_FSRH+39)
 SETVAL(TR_ARM64forwardArrayCopy,TR_FSRH+40)
 SETVAL(TR_ARM64backwardArrayCopy,TR_FSRH+41)
-SETVAL(TR_ARM64forwardQuadWordArrayCopy,TR_FSRH+42)
-SETVAL(TR_ARM64forwardDoubleWordArrayCopy,TR_FSRH+43)
-SETVAL(TR_ARM64forwardWordArrayCopy,TR_FSRH+44)
-SETVAL(TR_ARM64forwardHalfWordArrayCopy,TR_FSRH+45)
-SETVAL(TR_ARM64backwardQuadWordArrayCopy,TR_FSRH+46)
-SETVAL(TR_ARM64backwardDoubleWordArrayCopy,TR_FSRH+47)
-SETVAL(TR_ARM64backwardWordArrayCopy,TR_FSRH+48)
-SETVAL(TR_ARM64backwardHalfWordArrayCopy,TR_FSRH+49)
-SETVAL(TR_ARM64interfaceCompleteSlot2,TR_FSRH+50)
-SETVAL(TR_ARM64interfaceSlotsUnavailable,TR_FSRH+51)
-SETVAL(TR_ARM64PatchGCRHelper,TR_FSRH+52)
-SETVAL(TR_ARM64fieldWatchHelper,TR_FSRH+53)
-SETVAL(TR_ARM64numRuntimeHelpers,TR_FSRH+54)
+SETVAL(TR_ARM64interfaceCompleteSlot2,TR_FSRH+42)
+SETVAL(TR_ARM64interfaceSlotsUnavailable,TR_FSRH+43)
+SETVAL(TR_ARM64PatchGCRHelper,TR_FSRH+44)
+SETVAL(TR_ARM64fieldWatchHelper,TR_FSRH+45)
+SETVAL(TR_ARM64numRuntimeHelpers,TR_FSRH+46)
 
 SETVAL(TR_S390longDivide,TR_FSRH)
 SETVAL(TR_S390interfaceCallHelper,TR_FSRH+1)