From 89d3250ab16223279c0026dd20b455416a709b9a Mon Sep 17 00:00:00 2001 From: KONNO Kazuhiro Date: Tue, 8 Oct 2024 08:54:36 +0900 Subject: [PATCH] Remove helper symbols for String.compress() and some other methods This commit removes the following helper symbols for p and x platforms: - compressString - compressStringNoCheck - compressStringJ - compressStringNoCheckJ - andORString Signed-off-by: KONNO Kazuhiro --- compiler/ras/Debug.cpp | 18 ------- compiler/runtime/Helpers.inc | 99 +++++++++++++++--------------------- 2 files changed, 42 insertions(+), 75 deletions(-) diff --git a/compiler/ras/Debug.cpp b/compiler/ras/Debug.cpp index 935642f74c7..98b4431f136 100644 --- a/compiler/ras/Debug.cpp +++ b/compiler/ras/Debug.cpp @@ -3827,12 +3827,6 @@ TR_Debug::getRuntimeHelperName(int32_t index) case TR_IA32double2LongSSE: return "__SSEdouble2LongIA32"; case TR_IA32jitCollapseJNIReferenceFrame: return "_jitCollapseJNIReferenceFrame"; - case TR_IA32compressString: return "_compressString"; - case TR_IA32compressStringNoCheck: return "_compressStringNoCheck"; - case TR_IA32compressStringJ: return "_compressStringJ"; - case TR_IA32compressStringNoCheckJ: return "_compressStringNoCheckJ"; - case TR_IA32andORString: return "_andORString"; - case TR_IA32samplingRecompileMethod: return "__samplingRecompileMethod"; case TR_IA32countingRecompileMethod: return "__countingRecompileMethod"; case TR_IA32samplingPatchCallSite: return "__samplingPatchCallSite"; @@ -3854,12 +3848,6 @@ TR_Debug::getRuntimeHelperName(int32_t index) case TR_AMD64icallVMprJavaSendVirtualD: return "_icallVMprJavaSendVirtualD"; case TR_AMD64jitCollapseJNIReferenceFrame: return "_jitCollapseJNIReferenceFrame"; - case TR_AMD64compressString: return "_compressString"; - case TR_AMD64compressStringNoCheck: return "_compressStringNoCheck"; - case TR_AMD64compressStringJ: return "_compressStringJ"; - case TR_AMD64compressStringNoCheckJ: return "_compressStringNoCheckJ"; - case TR_AMD64andORString: return "_andORString"; - case TR_AMD64samplingRecompileMethod: return "__samplingRecompileMethod"; case TR_AMD64countingRecompileMethod: return "__countingRecompileMethod"; case TR_AMD64samplingPatchCallSite: return "__samplingPatchCallSite"; @@ -3953,12 +3941,6 @@ TR_Debug::getRuntimeHelperName(int32_t index) case TR_PPCencodeUTF16Big: return "__encodeUTF16Big"; case TR_PPCencodeUTF16Little: return "__encodeUTF16Little"; - case TR_PPCcompressString: return "__compressString"; - case TR_PPCcompressStringNoCheck: return "__compressStringNoCheck"; - case TR_PPCcompressStringJ: return "__compressStringJ"; - case TR_PPCcompressStringNoCheckJ: return "__compressStringNoCheckJ"; - case TR_PPCandORString: return "__andORString"; - case TR_PPCreferenceArrayCopy: return "__referenceArrayCopy"; case TR_PPCgeneralArrayCopy: return "__generalArrayCopy"; case TR_PPCsamplingRecompileMethod: return "__samplingRecompileMethod"; diff --git a/compiler/runtime/Helpers.inc b/compiler/runtime/Helpers.inc index 927b8565b53..6740d70c45d 100644 --- a/compiler/runtime/Helpers.inc +++ b/compiler/runtime/Helpers.inc @@ -199,17 +199,12 @@ SETVAL(TR_IA32JitMethodMonitorEnterPreservingReservation,TR_LXRH+25) SETVAL(TR_IA32JitMethodMonitorExitPreservingReservation,TR_LXRH+26) SETVAL(TR_IA32JitMethodMonitorExitReservedPrimitive,TR_LXRH+27) SETVAL(TR_IA32JitMethodMonitorExitReserved,TR_LXRH+28) -SETVAL(TR_IA32compressString, TR_LXRH+29) -SETVAL(TR_IA32compressStringNoCheck, TR_LXRH+30) -SETVAL(TR_IA32compressStringJ, TR_LXRH+31) -SETVAL(TR_IA32compressStringNoCheckJ, TR_LXRH+32) -SETVAL(TR_IA32andORString, TR_LXRH+33) -SETVAL(TR_IA32arrayTranslateTRTO, TR_LXRH+34) -SETVAL(TR_IA32arrayTranslateTROTNoBreak, TR_LXRH+35) -SETVAL(TR_IA32arrayTranslateTROT, TR_LXRH+36) -SETVAL(TR_IA32encodeUTF16Big,TR_LXRH+37) -SETVAL(TR_IA32encodeUTF16Little,TR_LXRH+38) -SETVAL(TR_IA32numRuntimeHelpers,TR_LXRH+39) +SETVAL(TR_IA32arrayTranslateTRTO, TR_LXRH+29) +SETVAL(TR_IA32arrayTranslateTROTNoBreak, TR_LXRH+30) +SETVAL(TR_IA32arrayTranslateTROT, TR_LXRH+31) +SETVAL(TR_IA32encodeUTF16Big,TR_LXRH+32) +SETVAL(TR_IA32encodeUTF16Little,TR_LXRH+33) +SETVAL(TR_IA32numRuntimeHelpers,TR_LXRH+34) SETVAL(TR_AMD64floatRemainder,TR_LXRH+0) SETVAL(TR_AMD64doubleRemainder,TR_LXRH+1) @@ -238,20 +233,15 @@ SETVAL(TR_AMD64JitMethodMonitorExitPreservingReservation,TR_LXRH+23) SETVAL(TR_AMD64JitMethodMonitorExitReservedPrimitive,TR_LXRH+24) SETVAL(TR_AMD64JitMethodMonitorExitReserved,TR_LXRH+25) SETVAL(TR_AMD64clockGetTime,TR_LXRH+26) -SETVAL(TR_AMD64compressString, TR_LXRH+27) -SETVAL(TR_AMD64compressStringNoCheck, TR_LXRH+28) -SETVAL(TR_AMD64compressStringJ, TR_LXRH+29) -SETVAL(TR_AMD64compressStringNoCheckJ, TR_LXRH+30) -SETVAL(TR_AMD64andORString, TR_LXRH+31) -SETVAL(TR_AMD64arrayTranslateTRTO, TR_LXRH+32) -SETVAL(TR_AMD64arrayTranslateTROTNoBreak, TR_LXRH+33) -SETVAL(TR_AMD64arrayTranslateTROT, TR_LXRH+34) -SETVAL(TR_AMD64encodeUTF16Big,TR_LXRH+35) -SETVAL(TR_AMD64encodeUTF16Little,TR_LXRH+36) -SETVAL(TR_AMD64doAESENCEncrypt,TR_LXRH+37) -SETVAL(TR_AMD64doAESENCDecrypt,TR_LXRH+38) -SETVAL(TR_AMD64java_util_zip_CRC32C_updateBytes,TR_LXRH+39) -SETVAL(TR_AMD64numRuntimeHelpers,TR_LXRH+40) +SETVAL(TR_AMD64arrayTranslateTRTO, TR_LXRH+27) +SETVAL(TR_AMD64arrayTranslateTROTNoBreak, TR_LXRH+28) +SETVAL(TR_AMD64arrayTranslateTROT, TR_LXRH+29) +SETVAL(TR_AMD64encodeUTF16Big,TR_LXRH+30) +SETVAL(TR_AMD64encodeUTF16Little,TR_LXRH+31) +SETVAL(TR_AMD64doAESENCEncrypt,TR_LXRH+32) +SETVAL(TR_AMD64doAESENCDecrypt,TR_LXRH+33) +SETVAL(TR_AMD64java_util_zip_CRC32C_updateBytes,TR_LXRH+34) +SETVAL(TR_AMD64numRuntimeHelpers,TR_LXRH+35) SETVAL(TR_PPClongDivide,TR_FSRH) SETVAL(TR_PPCnativeStaticHelper,TR_FSRH+1) @@ -320,38 +310,33 @@ SETVAL(TR_PPCarrayCmp,TR_FSRH+63) SETVAL(TR_PPCoverlapArrayCopy,TR_FSRH+64) SETVAL(TR_PPClongDivideEP,TR_FSRH+65) SETVAL(TR_PPCunsignedLongDivideEP,TR_FSRH+66) -SETVAL(TR_PPCcompressString, TR_FSRH+67) -SETVAL(TR_PPCcompressStringNoCheck, TR_FSRH+68) -SETVAL(TR_PPCcompressStringJ, TR_FSRH+69) -SETVAL(TR_PPCcompressStringNoCheckJ, TR_FSRH+70) -SETVAL(TR_PPCandORString, TR_FSRH+71) -SETVAL(TR_PPCnativeStaticHelperForUnresolvedGlue,TR_FSRH+72) -SETVAL(TR_PPCarrayTranslateTRTO,TR_FSRH+73) -SETVAL(TR_PPCarrayTranslateTRTO255,TR_FSRH+74) -SETVAL(TR_PPCarrayTranslateTROT255,TR_FSRH+75) -SETVAL(TR_PPCarrayTranslateTROT,TR_FSRH+76) -SETVAL(TR_PPCAESKeyExpansion, TR_FSRH+77) -SETVAL(TR_PPCAESEncryptVMX, TR_FSRH+78) -SETVAL(TR_PPCAESDecryptVMX, TR_FSRH+79) -SETVAL(TR_PPCAESEncrypt, TR_FSRH+80) -SETVAL(TR_PPCAESDecrypt, TR_FSRH+81) -SETVAL(TR_PPCquadWordArrayCopy_vsx, TR_FSRH+82) -SETVAL(TR_PPCforwardQuadWordArrayCopy_vsx, TR_FSRH+83) -SETVAL(TR_PPCpostP10ForwardCopy, TR_FSRH+84) -SETVAL(TR_PPCpostP10GenericCopy, TR_FSRH+85) -SETVAL(TR_PPCencodeUTF16Big, TR_FSRH+86) -SETVAL(TR_PPCencodeUTF16Little, TR_FSRH+87) -SETVAL(TR_PPCP256Multiply, TR_FSRH+88) -SETVAL(TR_PPCP256Mod, TR_FSRH+89) -SETVAL(TR_PPCP256addNoMod, TR_FSRH+90) -SETVAL(TR_PPCP256subNoMod, TR_FSRH+91) -SETVAL(TR_PPCAESCBCDecrypt, TR_FSRH+92) -SETVAL(TR_PPCAESCBCEncrypt, TR_FSRH+93) -SETVAL(TR_PPCinterpreterUnresolvedConstantDynamicGlue, TR_FSRH+94) -SETVAL(TR_PPCcrc32_vpmsum, TR_FSRH+95) -SETVAL(TR_PPCcrc32_no_vpmsum, TR_FSRH+96) -SETVAL(TR_PPCcrc32_oneByte, TR_FSRH+97) -SETVAL(TR_PPCnumRuntimeHelpers,TR_FSRH+98) +SETVAL(TR_PPCnativeStaticHelperForUnresolvedGlue,TR_FSRH+67) +SETVAL(TR_PPCarrayTranslateTRTO,TR_FSRH+68) +SETVAL(TR_PPCarrayTranslateTRTO255,TR_FSRH+69) +SETVAL(TR_PPCarrayTranslateTROT255,TR_FSRH+70) +SETVAL(TR_PPCarrayTranslateTROT,TR_FSRH+71) +SETVAL(TR_PPCAESKeyExpansion, TR_FSRH+72) +SETVAL(TR_PPCAESEncryptVMX, TR_FSRH+73) +SETVAL(TR_PPCAESDecryptVMX, TR_FSRH+74) +SETVAL(TR_PPCAESEncrypt, TR_FSRH+75) +SETVAL(TR_PPCAESDecrypt, TR_FSRH+76) +SETVAL(TR_PPCquadWordArrayCopy_vsx, TR_FSRH+77) +SETVAL(TR_PPCforwardQuadWordArrayCopy_vsx, TR_FSRH+78) +SETVAL(TR_PPCpostP10ForwardCopy, TR_FSRH+79) +SETVAL(TR_PPCpostP10GenericCopy, TR_FSRH+80) +SETVAL(TR_PPCencodeUTF16Big, TR_FSRH+81) +SETVAL(TR_PPCencodeUTF16Little, TR_FSRH+82) +SETVAL(TR_PPCP256Multiply, TR_FSRH+83) +SETVAL(TR_PPCP256Mod, TR_FSRH+84) +SETVAL(TR_PPCP256addNoMod, TR_FSRH+85) +SETVAL(TR_PPCP256subNoMod, TR_FSRH+86) +SETVAL(TR_PPCAESCBCDecrypt, TR_FSRH+87) +SETVAL(TR_PPCAESCBCEncrypt, TR_FSRH+88) +SETVAL(TR_PPCinterpreterUnresolvedConstantDynamicGlue, TR_FSRH+89) +SETVAL(TR_PPCcrc32_vpmsum, TR_FSRH+90) +SETVAL(TR_PPCcrc32_no_vpmsum, TR_FSRH+91) +SETVAL(TR_PPCcrc32_oneByte, TR_FSRH+92) +SETVAL(TR_PPCnumRuntimeHelpers,TR_FSRH+93) SETVAL(TR_ARMdouble2Long,TR_FSRH) SETVAL(TR_ARMdoubleRemainder,TR_FSRH+1)