Skip to content

Commit

Permalink
Merge pull request #2167 from 0dvictor/arraycopy
Browse files Browse the repository at this point in the history 
Remove deprecated code related to ArrayCopy
  • Loading branch information
@vijaysun-omr
vijaysun-omr authored Jan 5, 2018
2 parents a6a902e + 0ab0584 commit 47bb8f3
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 3,179 deletions.
45 changes: 2 additions & 43 deletions compiler/ras/Debug.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1063,11 +1063,8 @@ TR_Debug::nodePrintAllFlags(TR::Node *node, TR_PrettyPrinterString &output)
output.append(format, node->printIsBackwardArrayCopy());
output.append(format, node->printIsRarePathForwardArrayCopy());
output.append(format, node->printIsNoArrayStoreCheckArrayCopy());
if (!inDebugExtension())
output.append(format, node->printIsReferenceArrayCopy());
else
output.append(format, node->printIsReferenceArrayCopy());
output.append(format, node->printIsHalfWordElementArrayCopy ());
output.append(format, node->printIsReferenceArrayCopy());
output.append(format, node->printIsHalfWordElementArrayCopy());
output.append(format, node->printIsWordElementArrayCopy());
output.append(format, node->printIsHeapObjectWrtBar());
output.append(format, node->printIsNonHeapObjectWrtBar());
Expand Down Expand Up @@ -4046,21 +4043,6 @@ TR_Debug::getRuntimeHelperName(int32_t index)

case TR_IA32jitThrowCurrentException: return "_jitThrowCurrentException";
case TR_IA32jitCollapseJNIReferenceFrame: return "_jitCollapseJNIReferenceFrame";
case TR_IA32arrayCopy: return "__arrayCopy";
case TR_IA32wordArrayCopy: return "__wordAarrayCopy";
case TR_IA32halfWordArrayCopy: return "__halfWordArrayCopy";
case TR_IA32forwardArrayCopy: return "__forwardArrayCopy";
case TR_IA32forwardWordArrayCopy: return "__forwardWordArrayCopy";
case TR_IA32forwardHalfWordArrayCopy: return "__forwardHalfWordArrayCopy";

case TR_IA32shortArrayCopy: return "__shortArrayCopy";
case TR_IA32forwardSSEArrayCopy: return "__forwardSSEArrayCopy";
case TR_IA32forwardSSEArrayCopyNoAlignCheck: return "__forwardSSEArrayCopyNoAlignCheck";
case TR_IA32forwardArrayCopy2: return "__forwardArrayCopy2";
case TR_IA32SSEforwardArrayCopy: return "_SSEforwardArrayCopy";
case TR_IA32SSEforwardHalfWordArrayCopy: return "_SSEforwardHalfWordArrayCopy";
case TR_IA32SSEforwardArrayCopyAMDOpteron: return "_SSEforwardArrayCopyAMDOpteron";
case TR_IA32SSEforwardArrayCopyAggressive: return "_SSEforwardArrayCopyAggressive";

case TR_IA32compressString: return "_compressString";
case TR_IA32compressStringNoCheck: return "_compressStringNoCheck";
Expand All @@ -4074,11 +4056,7 @@ TR_Debug::getRuntimeHelperName(int32_t index)
case TR_IA32countingPatchCallSite: return "__countingPatchCallSite";
case TR_IA32induceRecompilation: return "__induceRecompilation";

case TR_IA32arrayXor: return "arrayxor";
case TR_IA32arrayOr: return "arrayor";
case TR_IA32arrayAnd: return "arrayand";
case TR_IA32arrayCmp: return "arraycmp";
case TR_IA32overlapArrayCopy: return "overlapArrayCopy";
case TR_IA32getTimeOfDay: return "gettimeofday";
}
}
Expand All @@ -4096,15 +4074,6 @@ TR_Debug::getRuntimeHelperName(int32_t index)
case TR_AMD64icallVMprJavaSendVirtualD: return "_icallVMprJavaSendVirtualD";
case TR_AMD64jitThrowCurrentException: return "_jitThrowCurrentException";
case TR_AMD64jitCollapseJNIReferenceFrame: return "_jitCollapseJNIReferenceFrame";
case TR_AMD64arrayCopy: return "__arrayCopy";
case TR_AMD64BCarrayCopy: return "__BC_arrayCopy";
case TR_AMD64byteArrayCopy: return "__byteArrayCopy";
case TR_AMD64wordArrayCopy: return "__wordArrayCopy";
case TR_AMD64halfWordArrayCopy: return "__halfWordArrayCopy";
case TR_AMD64forwardArrayCopy: return "__forwardArrayCopy";
case TR_AMD64forwardWordArrayCopy: return "__forwardWordArrayCopy";
case TR_AMD64forwardHalfWordArrayCopy: return "__forwardHalfWordArrayCopy";
case TR_AMD64forwardArrayCopyAMDOpteron: return "_forwardArrayCopyAMDOpteron";

case TR_AMD64compressString: return "_compressString";
case TR_AMD64compressStringNoCheck: return "_compressStringNoCheck";
Expand All @@ -4117,17 +4086,7 @@ TR_Debug::getRuntimeHelperName(int32_t index)
case TR_AMD64samplingPatchCallSite: return "__samplingPatchCallSite";
case TR_AMD64countingPatchCallSite: return "__countingPatchCallSite";
case TR_AMD64induceRecompilation: return "__induceRecompilation";
case TR_AMD64arrayXor: return "arrayxor";
case TR_AMD64arrayOr: return "arrayor";
case TR_AMD64arrayAnd: return "arrayand";
case TR_AMD64noOverlapArrayXor: return "noOverlapArrayXor";
case TR_AMD64noOverlapArrayOr: return "noOverlapArrayOr";
case TR_AMD64noOverlapArrayAnd: return "noOverlapArrayAnd";
case TR_AMD64overlapArrayXor: return "overlapArrayXor";
case TR_AMD64overlapArrayOr: return "overlapArrayOr";
case TR_AMD64overlapArrayAnd: return "overlapArrayAnd";
case TR_AMD64arrayCmp: return "arraycmp";
case TR_AMD64overlapArrayCopy: return "overlapArrayCopy";
case TR_AMD64doAESENCDecrypt: return "doAESDecrypt";
case TR_AMD64doAESENCEncrypt: return "doAESEncrypt";
}
Expand Down
188 changes: 71 additions & 117 deletions compiler/runtime/Helpers.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,61 +439,40 @@ SETVAL(TR_IA32floatToLong,TR_LXRH+8)
SETVAL(TR_IA32floatToInt,TR_LXRH+9)
SETVAL(TR_IA32jitThrowCurrentException,TR_LXRH+10)
SETVAL(TR_IA32jitCollapseJNIReferenceFrame,TR_LXRH+11)
SETVAL(TR_IA32arrayCopy,TR_LXRH+12)
SETVAL(TR_IA32wordArrayCopy,TR_LXRH+13)
SETVAL(TR_IA32halfWordArrayCopy,TR_LXRH+14)
SETVAL(TR_IA32forwardArrayCopy,TR_LXRH+15)
SETVAL(TR_IA32forwardWordArrayCopy,TR_LXRH+16)
SETVAL(TR_IA32forwardHalfWordArrayCopy,TR_LXRH+17)
SETVAL(TR_IA32shortArrayCopy,TR_LXRH+18)
SETVAL(TR_IA32forwardSSEArrayCopy,TR_LXRH+19)
SETVAL(TR_IA32forwardSSEArrayCopyNoAlignCheck,TR_LXRH+20)
SETVAL(TR_IA32forwardArrayCopy2,TR_LXRH+21)
SETVAL(TR_IA32countingRecompileMethod,TR_LXRH+22)
SETVAL(TR_IA32samplingRecompileMethod,TR_LXRH+23)
SETVAL(TR_IA32countingPatchCallSite,TR_LXRH+24)
SETVAL(TR_IA32samplingPatchCallSite,TR_LXRH+25)
SETVAL(TR_IA32induceRecompilation,TR_LXRH+26)
SETVAL(TR_IA32double2LongSSE,TR_LXRH+27)
SETVAL(TR_IA32GetTickCount,TR_LXRH+28)
SETVAL(TR_IA32JitMonitorEnterReserved,TR_LXRH+29)
SETVAL(TR_IA32JitMonitorEnterReservedPrimitive,TR_LXRH+30)
SETVAL(TR_IA32JitMonitorEnterPreservingReservation,TR_LXRH+31)
SETVAL(TR_IA32JitMonitorExitReserved,TR_LXRH+32)
SETVAL(TR_IA32JitMonitorExitReservedPrimitive,TR_LXRH+33)
SETVAL(TR_IA32JitMonitorExitPreservingReservation,TR_LXRH+34)
SETVAL(TR_IA32JitMethodMonitorEnterReserved,TR_LXRH+35)
SETVAL(TR_IA32JitMethodMonitorEnterReservedPrimitive,TR_LXRH+36)
SETVAL(TR_IA32JitMethodMonitorEnterPreservingReservation,TR_LXRH+37)
SETVAL(TR_IA32JitMethodMonitorExitPreservingReservation,TR_LXRH+38)
SETVAL(TR_IA32JitMethodMonitorExitReservedPrimitive,TR_LXRH+39)
SETVAL(TR_IA32JitMethodMonitorExitReserved,TR_LXRH+40)
SETVAL(TR_IA32SSEforwardArrayCopy,TR_LXRH+41)
SETVAL(TR_IA32SSEforwardHalfWordArrayCopy,TR_LXRH+42)
SETVAL(TR_IA32interpreterUnresolvedVTableSlotGlue,TR_LXRH+43)
SETVAL(TR_IA32arrayXor,TR_LXRH+44)
SETVAL(TR_IA32arrayOr,TR_LXRH+45)
SETVAL(TR_IA32arrayAnd,TR_LXRH+46)
SETVAL(TR_IA32arrayCmp,TR_LXRH+47)
SETVAL(TR_IA32overlapArrayCopy,TR_LXRH+48)
SETVAL(TR_IA32SSEforwardArrayCopyAMDOpteron,TR_LXRH+49)
SETVAL(TR_IA32compressString, TR_LXRH+50)
SETVAL(TR_IA32compressStringNoCheck, TR_LXRH+51)
SETVAL(TR_IA32compressStringJ, TR_LXRH+52)
SETVAL(TR_IA32compressStringNoCheckJ, TR_LXRH+53)
SETVAL(TR_IA32andORString, TR_LXRH+54)
SETVAL(TR_IA32arrayTranslateTRTO, TR_LXRH+55)
SETVAL(TR_IA32arrayTranslateTROTNoBreak, TR_LXRH+56)
SETVAL(TR_IA32arrayTranslateTROT, TR_LXRH+57)
SETVAL(TR_IA32SSEforwardArrayCopyAggressive,TR_LXRH+58)
SETVAL(TR_IA32arrayCopyAggressive,TR_LXRH+59)
SETVAL(TR_IA32wordArrayCopyAggressive,TR_LXRH+60)
SETVAL(TR_IA32halfWordArrayCopyAggressive,TR_LXRH+61)
SETVAL(TR_IA32getTimeOfDay,TR_LXRH+62)
SETVAL(TR_IA32GetSystemTimeAsFileTime,TR_LXRH+63)
SETVAL(TR_IA32encodeUTF16Big,TR_LXRH+64)
SETVAL(TR_IA32encodeUTF16Little,TR_LXRH+65)
SETVAL(TR_IA32numRuntimeHelpers,TR_LXRH+66)
SETVAL(TR_IA32countingRecompileMethod,TR_LXRH+12)
SETVAL(TR_IA32samplingRecompileMethod,TR_LXRH+13)
SETVAL(TR_IA32countingPatchCallSite,TR_LXRH+14)
SETVAL(TR_IA32samplingPatchCallSite,TR_LXRH+15)
SETVAL(TR_IA32induceRecompilation,TR_LXRH+16)
SETVAL(TR_IA32double2LongSSE,TR_LXRH+17)
SETVAL(TR_IA32GetTickCount,TR_LXRH+18)
SETVAL(TR_IA32JitMonitorEnterReserved,TR_LXRH+19)
SETVAL(TR_IA32JitMonitorEnterReservedPrimitive,TR_LXRH+20)
SETVAL(TR_IA32JitMonitorEnterPreservingReservation,TR_LXRH+21)
SETVAL(TR_IA32JitMonitorExitReserved,TR_LXRH+22)
SETVAL(TR_IA32JitMonitorExitReservedPrimitive,TR_LXRH+23)
SETVAL(TR_IA32JitMonitorExitPreservingReservation,TR_LXRH+24)
SETVAL(TR_IA32JitMethodMonitorEnterReserved,TR_LXRH+25)
SETVAL(TR_IA32JitMethodMonitorEnterReservedPrimitive,TR_LXRH+26)
SETVAL(TR_IA32JitMethodMonitorEnterPreservingReservation,TR_LXRH+27)
SETVAL(TR_IA32JitMethodMonitorExitPreservingReservation,TR_LXRH+28)
SETVAL(TR_IA32JitMethodMonitorExitReservedPrimitive,TR_LXRH+29)
SETVAL(TR_IA32JitMethodMonitorExitReserved,TR_LXRH+30)
SETVAL(TR_IA32interpreterUnresolvedVTableSlotGlue,TR_LXRH+31)
SETVAL(TR_IA32arrayCmp,TR_LXRH+32)
SETVAL(TR_IA32compressString, TR_LXRH+33)
SETVAL(TR_IA32compressStringNoCheck, TR_LXRH+34)
SETVAL(TR_IA32compressStringJ, TR_LXRH+35)
SETVAL(TR_IA32compressStringNoCheckJ, TR_LXRH+36)
SETVAL(TR_IA32andORString, TR_LXRH+37)
SETVAL(TR_IA32arrayTranslateTRTO, TR_LXRH+38)
SETVAL(TR_IA32arrayTranslateTROTNoBreak, TR_LXRH+39)
SETVAL(TR_IA32arrayTranslateTROT, TR_LXRH+40)
SETVAL(TR_IA32getTimeOfDay,TR_LXRH+41)
SETVAL(TR_IA32GetSystemTimeAsFileTime,TR_LXRH+42)
SETVAL(TR_IA32encodeUTF16Big,TR_LXRH+43)
SETVAL(TR_IA32encodeUTF16Little,TR_LXRH+44)
SETVAL(TR_IA32numRuntimeHelpers,TR_LXRH+45)

SETVAL(TR_AMD64floatRemainder,TR_LXRH+0)
SETVAL(TR_AMD64doubleRemainder,TR_LXRH+1)
Expand All @@ -509,68 +488,43 @@ SETVAL(TR_AMD64icallVMprJavaSendVirtualF,TR_LXRH+10)
SETVAL(TR_AMD64icallVMprJavaSendVirtualD,TR_LXRH+11)
SETVAL(TR_AMD64jitThrowCurrentException,TR_LXRH+12)
SETVAL(TR_AMD64jitCollapseJNIReferenceFrame,TR_LXRH+13)
SETVAL(TR_AMD64arrayCopy,TR_LXRH+14)
SETVAL(TR_AMD64halfWordArrayCopy,TR_LXRH+15)
SETVAL(TR_AMD64wordArrayCopy,TR_LXRH+16)
SETVAL(TR_AMD64longArrayCopy,TR_LXRH+17)
SETVAL(TR_AMD64forwardArrayCopy,TR_LXRH+18)
SETVAL(TR_AMD64forwardHalfWordArrayCopy,TR_LXRH+19)
SETVAL(TR_AMD64forwardWordArrayCopy,TR_LXRH+20)
SETVAL(TR_AMD64forwardLongArrayCopy,TR_LXRH+21)
SETVAL(TR_AMD64countingRecompileMethod,TR_LXRH+22)
SETVAL(TR_AMD64samplingRecompileMethod,TR_LXRH+23)
SETVAL(TR_AMD64countingPatchCallSite,TR_LXRH+24)
SETVAL(TR_AMD64samplingPatchCallSite,TR_LXRH+25)
SETVAL(TR_AMD64induceRecompilation,TR_LXRH+26)
SETVAL(TR_AMD64getTimeOfDay,TR_LXRH+27)
SETVAL(TR_AMD64GetSystemTimeAsFileTime,TR_LXRH+28)
SETVAL(TR_AMD64currentTimeMillis,TR_LXRH+29)
SETVAL(TR_AMD64QueryPerformanceCounter,TR_LXRH+30)
SETVAL(TR_AMD64GetTickCount,TR_LXRH+31)
SETVAL(TR_AMD64JitMonitorEnterReserved,TR_LXRH+32)
SETVAL(TR_AMD64JitMonitorEnterReservedPrimitive,TR_LXRH+33)
SETVAL(TR_AMD64JitMonitorEnterPreservingReservation,TR_LXRH+34)
SETVAL(TR_AMD64JitMonitorExitReserved,TR_LXRH+35)
SETVAL(TR_AMD64JitMonitorExitReservedPrimitive,TR_LXRH+36)
SETVAL(TR_AMD64JitMonitorExitPreservingReservation,TR_LXRH+37)
SETVAL(TR_AMD64JitMethodMonitorEnterReserved,TR_LXRH+38)
SETVAL(TR_AMD64JitMethodMonitorEnterReservedPrimitive,TR_LXRH+39)
SETVAL(TR_AMD64JitMethodMonitorEnterPreservingReservation,TR_LXRH+40)
SETVAL(TR_AMD64JitMethodMonitorExitPreservingReservation,TR_LXRH+41)
SETVAL(TR_AMD64JitMethodMonitorExitReservedPrimitive,TR_LXRH+42)
SETVAL(TR_AMD64JitMethodMonitorExitReserved,TR_LXRH+43)
SETVAL(TR_AMD64overlapArrayCopy,TR_LXRH+44)
SETVAL(TR_AMD64arrayXor,TR_LXRH+45)
SETVAL(TR_AMD64arrayOr,TR_LXRH+46)
SETVAL(TR_AMD64arrayAnd,TR_LXRH+47)
SETVAL(TR_AMD64noOverlapArrayXor,TR_LXRH+48)
SETVAL(TR_AMD64noOverlapArrayOr,TR_LXRH+49)
SETVAL(TR_AMD64noOverlapArrayAnd,TR_LXRH+50)
SETVAL(TR_AMD64overlapArrayXor,TR_LXRH+51)
SETVAL(TR_AMD64overlapArrayOr,TR_LXRH+52)
SETVAL(TR_AMD64overlapArrayAnd,TR_LXRH+53)
SETVAL(TR_AMD64arrayCmp,TR_LXRH+54)
SETVAL(TR_AMD64byteArrayCopy,TR_LXRH+55)
SETVAL(TR_AMD64BCarrayCopy,TR_LXRH+56)
SETVAL(TR_AMD64forwardArrayCopyAMDOpteron,TR_LXRH+57)
SETVAL(TR_AMD64clockGetTime,TR_LXRH+58)
SETVAL(TR_AMD64compressString, TR_LXRH+59)
SETVAL(TR_AMD64compressStringNoCheck, TR_LXRH+60)
SETVAL(TR_AMD64compressStringJ, TR_LXRH+61)
SETVAL(TR_AMD64compressStringNoCheckJ, TR_LXRH+62)
SETVAL(TR_AMD64andORString, TR_LXRH+63)
SETVAL(TR_AMD64arrayTranslateTRTO, TR_LXRH+64)
SETVAL(TR_AMD64arrayTranslateTROTNoBreak, TR_LXRH+65)
SETVAL(TR_AMD64arrayTranslateTROT, TR_LXRH+66)
SETVAL(TR_AMD64SSEforwardArrayCopyAggressive,TR_LXRH+67)
SETVAL(TR_AMD64arrayCopyAggressive,TR_LXRH+68)
SETVAL(TR_AMD64wordArrayCopyAggressive,TR_LXRH+69)
SETVAL(TR_AMD64halfWordArrayCopyAggressive,TR_LXRH+70)
SETVAL(TR_AMD64encodeUTF16Big,TR_LXRH+71)
SETVAL(TR_AMD64encodeUTF16Little,TR_LXRH+72)
SETVAL(TR_AMD64doAESENCEncrypt,TR_LXRH+73)
SETVAL(TR_AMD64doAESENCDecrypt,TR_LXRH+74)
SETVAL(TR_AMD64numRuntimeHelpers,TR_LXRH+75)
SETVAL(TR_AMD64countingRecompileMethod,TR_LXRH+14)
SETVAL(TR_AMD64samplingRecompileMethod,TR_LXRH+15)
SETVAL(TR_AMD64countingPatchCallSite,TR_LXRH+16)
SETVAL(TR_AMD64samplingPatchCallSite,TR_LXRH+17)
SETVAL(TR_AMD64induceRecompilation,TR_LXRH+18)
SETVAL(TR_AMD64getTimeOfDay,TR_LXRH+19)
SETVAL(TR_AMD64GetSystemTimeAsFileTime,TR_LXRH+20)
SETVAL(TR_AMD64currentTimeMillis,TR_LXRH+21)
SETVAL(TR_AMD64QueryPerformanceCounter,TR_LXRH+22)
SETVAL(TR_AMD64GetTickCount,TR_LXRH+23)
SETVAL(TR_AMD64JitMonitorEnterReserved,TR_LXRH+24)
SETVAL(TR_AMD64JitMonitorEnterReservedPrimitive,TR_LXRH+25)
SETVAL(TR_AMD64JitMonitorEnterPreservingReservation,TR_LXRH+26)
SETVAL(TR_AMD64JitMonitorExitReserved,TR_LXRH+27)
SETVAL(TR_AMD64JitMonitorExitReservedPrimitive,TR_LXRH+28)
SETVAL(TR_AMD64JitMonitorExitPreservingReservation,TR_LXRH+29)
SETVAL(TR_AMD64JitMethodMonitorEnterReserved,TR_LXRH+30)
SETVAL(TR_AMD64JitMethodMonitorEnterReservedPrimitive,TR_LXRH+31)
SETVAL(TR_AMD64JitMethodMonitorEnterPreservingReservation,TR_LXRH+32)
SETVAL(TR_AMD64JitMethodMonitorExitPreservingReservation,TR_LXRH+33)
SETVAL(TR_AMD64JitMethodMonitorExitReservedPrimitive,TR_LXRH+34)
SETVAL(TR_AMD64JitMethodMonitorExitReserved,TR_LXRH+35)
SETVAL(TR_AMD64arrayCmp,TR_LXRH+36)
SETVAL(TR_AMD64clockGetTime,TR_LXRH+37)
SETVAL(TR_AMD64compressString, TR_LXRH+38)
SETVAL(TR_AMD64compressStringNoCheck, TR_LXRH+39)
SETVAL(TR_AMD64compressStringJ, TR_LXRH+40)
SETVAL(TR_AMD64compressStringNoCheckJ, TR_LXRH+41)
SETVAL(TR_AMD64andORString, TR_LXRH+42)
SETVAL(TR_AMD64arrayTranslateTRTO, TR_LXRH+43)
SETVAL(TR_AMD64arrayTranslateTROTNoBreak, TR_LXRH+44)
SETVAL(TR_AMD64arrayTranslateTROT, TR_LXRH+45)
SETVAL(TR_AMD64encodeUTF16Big,TR_LXRH+46)
SETVAL(TR_AMD64encodeUTF16Little,TR_LXRH+47)
SETVAL(TR_AMD64doAESENCEncrypt,TR_LXRH+48)
SETVAL(TR_AMD64doAESENCDecrypt,TR_LXRH+49)
SETVAL(TR_AMD64numRuntimeHelpers,TR_LXRH+50)

SETVAL(TR_PPClongDivide,TR_FSRH)
SETVAL(TR_PPCnativeStaticHelper,TR_FSRH+1)
Expand Down
Loading

0 comments on commit 47bb8f3

Please sign in to comment.