Skip to content

Commit

Permalink
OMR changes to move J9 specific Call Snippet part
Browse files Browse the repository at this point in the history 
This commit cleans up the J9 specific part from the S390CallSnippet
class.

Signed-off-by: Rahil Shah <rahil@ca.ibm.com>
  • Loading branch information
@r30shah
r30shah committed Dec 14, 2020
1 parent d255f37 commit 317fde3
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 476 deletions.
12 changes: 1 addition & 11 deletions compiler/ras/Debug.cpp
View file
Expand Up @@ -3967,7 +3967,6 @@ TR_Debug::getRuntimeHelperName(int32_t index)
case TR_S390longUShiftRight: return "__longUShiftRight";
case TR_S390interpreterUnresolvedStaticGlue: return "_interpreterUnresolvedStaticGlue";
case TR_S390interpreterUnresolvedSpecialGlue: return "_interpreterUnresolvedSpecialGlue";
case TR_S390interpreterUnresolvedDirectVirtualGlue: return "_interpreterUnresolvedDirectVirtualGlue";
case TR_S390interpreterUnresolvedClassGlue: return "_interpreterUnresolvedClassGlue";
case TR_S390interpreterUnresolvedClassGlue2: return "_interpreterUnresolvedClassGlue2";
case TR_S390interpreterUnresolvedStringGlue: return "_interpreterUnresolvedStringGlue";
Expand All @@ -3984,16 +3983,7 @@ TR_Debug::getRuntimeHelperName(int32_t index)
case TR_S390icallVMprJavaSendVirtualJ: return "icallVMprJavaSendVirtualJ";
case TR_S390icallVMprJavaSendVirtualF: return "icallVMprJavaSendVirtualF";
case TR_S390icallVMprJavaSendVirtualD: return "icallVMprJavaSendVirtualD";
case TR_S390interpreterVoidStaticGlue: return "_interpreterVoidStaticGlue";
case TR_S390interpreterIntStaticGlue: return "_interpreterIntStaticGlue";
case TR_S390interpreterLongStaticGlue: return "_interpreterLongStaticGlue";
case TR_S390interpreterFloatStaticGlue: return "_interpreterFloatStaticGlue";
case TR_S390interpreterDoubleStaticGlue: return "_interpreterDoubleStaticGlue";
case TR_S390interpreterSyncVoidStaticGlue: return "_interpreterSyncVoidStaticGlue";
case TR_S390interpreterSyncIntStaticGlue: return "_interpreterSyncIntStaticGlue";
case TR_S390interpreterSyncLongStaticGlue: return "_interpreterSyncLongStaticGlue";
case TR_S390interpreterSyncFloatStaticGlue: return "_interpreterSyncFloatStaticGlue";
case TR_S390interpreterSyncDoubleStaticGlue: return "_interpreterSyncDoubleStaticGlue";
case TR_S390interpreterStaticSpecialCallGlue: return "_interpreterStaticSpecialCallGlue";
case TR_S390jitLookupInterfaceMethod: return "__jitLookupInterfaceMethod";
case TR_S390jitMethodIsNative: return "__jitMethodIsNative";
case TR_S390jitMethodIsSync: return "__jitMethodIsSync";
Expand Down
2 changes: 1 addition & 1 deletion compiler/ras/Debug.hpp
View file
Expand Up @@ -326,6 +326,7 @@ namespace TR { class S390IEInstruction; }
#ifdef J9_PROJECT_SPECIFIC
namespace TR { class S390ForceRecompilationSnippet; }
namespace TR { class S390ForceRecompilationDataSnippet; }
namespace TR { class S390J9CallSnippet; }
namespace TR { class S390UnresolvedCallSnippet; }
namespace TR { class S390VirtualSnippet; }
namespace TR { class S390VirtualUnresolvedSnippet; }
Expand Down Expand Up @@ -1077,7 +1078,6 @@ class TR_Debug
uint8_t * printS390ArgumentsFlush(TR::FILE *, TR::Node *, uint8_t *, int32_t);

void printz(TR::FILE *, TR::Snippet *);
void print(TR::FILE *, TR::S390CallSnippet *);

void print(TR::FILE *, TR::S390ConstantDataSnippet *);

Expand Down
3 changes: 2 additions & 1 deletion compiler/runtime/Helpers.inc
View file
Expand Up @@ -606,6 +606,7 @@ SETVAL(TR_S390jitResolveHandleMethod,TR_FSRH+96)
SETVAL(TR_S390jitResolveConstantDynamic, TR_FSRH+97)
SETVAL(TR_S390jitResolveConstantDynamicGlue, TR_FSRH+98)
SETVAL(TR_S390jitResolvedFieldIsVolatile, TR_FSRH+99)
SETVAL(TR_S390numRuntimeHelpers,TR_FSRH+100)
SETVAL(TR_S390interpreterStaticSpecialCallGlue, TR_FSRH+100)
SETVAL(TR_S390numRuntimeHelpers,TR_FSRH+101)

SETVAL(TR_RISCVnumRuntimeHelpers,TR_FSRH+1)

0 comments on commit 317fde3

Please sign in to comment.