Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance extensibility of JitBuilder classes #2515

Merged
merged 16 commits into from
Jun 27, 2018
Merged

Enhance extensibility of JitBuilder classes #2515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
764157f
Make IlBuilder into more extensible class
mstoodle Feb 14, 2018
26dd25e
Make MethodBuilder into a more extensible class
mstoodle Feb 14, 2018
d474849
Make BytecodeBuilder into a more extensible class
mstoodle Feb 15, 2018
c19247c
Separate IlType from TypeDictionary, make both into extensible classes
mstoodle Feb 15, 2018
153fd66
Make IlValue into a more extensible class
mstoodle Feb 15, 2018
d0995a3
Make ThunkBuilder into a more extensible class
mstoodle Feb 15, 2018
e64429f
Make VirtualMachineState into extensible class
mstoodle Feb 15, 2018
9b72737
Make VirtualMachineRegister more extensible
mstoodle Feb 15, 2018
fb16a54
Make VirtualMachineRegisterInStruct into extensible class
mstoodle May 1, 2018
846f9e6
Make VirtualMachineOperandArray more extensible
mstoodle Feb 15, 2018
1caaff0
Make VirtualMachineOperandStack more extensible
mstoodle Feb 15, 2018
276f3f0
Change OMRIlValue fields from private to protected
mstoodle Feb 16, 2018
1fae58b
Reorder CMakeLists files alphabetically
mstoodle May 1, 2018
a3f865b
Remove VirtualMachineOperand* files from jitbuilder CMakeList.txt
mstoodle May 1, 2018
94b98d4
Add empty TR_ALLOC to IlType,IlValue if not already defined
mstoodle May 1, 2018
902e227
OMR::VirtualMachine* classes are now TR::VirtualMachine* classes
mstoodle May 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 5 additions & 105 deletions compiler/ilgen/BytecodeBuilder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2017 IBM Corp. and others
* Copyright (c) 2000, 2018 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
Expand All @@ -19,108 +19,10 @@
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
*******************************************************************************/

#ifndef BYTECODE_BUILDER_INCL
#define BYTECODE_BUILDER_INCL
#ifndef TR_BYTECODEBUILDER_INCL
#define TR_BYTECODEBUILDER_INCL

#ifndef TR_BYTECODEBUILDER_DEFINED
#define TR_BYTECODEBUILDER_DEFINED
#define PUT_OMR_BYTECODEBUILDER_INTO_TR
#endif // !defined(TR_BYTECODEBUILDER_DEFINED)

#include "ilgen/IlBuilder.hpp"

namespace TR { class BytecodeBuilder; }
namespace TR { class MethodBuilder; }
namespace OMR { class VirtualMachineState; }

namespace OMR
{

class BytecodeBuilder : public TR::IlBuilder
{
public:
TR_ALLOC(TR_Memory::IlGenerator)

BytecodeBuilder(TR::MethodBuilder *methodBuilder, int32_t bcIndex, char *name=NULL);

virtual bool isBytecodeBuilder() { return true; }

/**
* @brief bytecode index for this builder object
*/
int32_t bcIndex() { return _bcIndex; }
virtual int32_t currentByteCodeIndex() { return _bcIndex; } // override from IlGenerator

/* @brief after calling this, all IL nodes created will have this BytecodeBuilder's _bcIndex */
void SetCurrentIlGenerator();

/* The name for this BytecodeBuilder. This can be very helpful for debug output */
char *name() { return _name; }

virtual uint32_t countBlocks();

void AddFallThroughBuilder(TR::BytecodeBuilder *ftb);

void AddSuccessorBuilders(uint32_t numBuilders, ...);
void AddSuccessorBuilder(TR::BytecodeBuilder **b) { AddSuccessorBuilders(1, b); }

OMR::VirtualMachineState *initialVMState() { return _initialVMState; }
OMR::VirtualMachineState *vmState() { return _vmState; }
void setVMState(OMR::VirtualMachineState *vmState) { _vmState = vmState; }

void propagateVMState(OMR::VirtualMachineState *fromVMState);

// The following control flow services are meant to hide the similarly named services
// provided by the IlBuilder class. The reason these implementations exist is to
// automatically manage the propagation of virtual machine states between bytecode
// builders. By using these services, and AddFallthroughBuilder(), users do not have
// to do anything to propagate VM states; it's all just taken care of under the covers.
void Goto(TR::BytecodeBuilder **dest);
void Goto(TR::BytecodeBuilder *dest);
void IfCmpEqual(TR::BytecodeBuilder **dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpEqual(TR::BytecodeBuilder *dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpEqualZero(TR::BytecodeBuilder **dest, TR::IlValue *c);
void IfCmpEqualZero(TR::BytecodeBuilder *dest, TR::IlValue *c);
void IfCmpNotEqual(TR::BytecodeBuilder **dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpNotEqual(TR::BytecodeBuilder *dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpNotEqualZero(TR::BytecodeBuilder **dest, TR::IlValue *c);
void IfCmpNotEqualZero(TR::BytecodeBuilder *dest, TR::IlValue *c);
void IfCmpLessThan(TR::BytecodeBuilder **dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpLessThan(TR::BytecodeBuilder *dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpUnsignedLessThan(TR::BytecodeBuilder **dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpUnsignedLessThan(TR::BytecodeBuilder *dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpLessOrEqual(TR::BytecodeBuilder **dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpLessOrEqual(TR::BytecodeBuilder *dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpUnsignedLessOrEqual(TR::BytecodeBuilder **dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpUnsignedLessOrEqual(TR::BytecodeBuilder *dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpGreaterThan(TR::BytecodeBuilder **dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpGreaterThan(TR::BytecodeBuilder *dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpUnsignedGreaterThan(TR::BytecodeBuilder **dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpUnsignedGreaterThan(TR::BytecodeBuilder *dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpGreaterOrEqual(TR::BytecodeBuilder **dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpGreaterOrEqual(TR::BytecodeBuilder *dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpUnsignedGreaterOrEqual(TR::BytecodeBuilder **dest, TR::IlValue *v1, TR::IlValue *v2);
void IfCmpUnsignedGreaterOrEqual(TR::BytecodeBuilder *dest, TR::IlValue *v1, TR::IlValue *v2);

protected:
TR::BytecodeBuilder * _fallThroughBuilder;
List<TR::BytecodeBuilder> * _successorBuilders;
int32_t _bcIndex;
char * _name;
OMR::VirtualMachineState * _initialVMState;
OMR::VirtualMachineState * _vmState;

virtual void appendBlock(TR::Block *block = 0, bool addEdge=true);
void addAllSuccessorBuildersToWorklist();
bool connectTrees();
virtual void setHandlerInfo(uint32_t catchType);
void transferVMState(TR::BytecodeBuilder **b);
};

} // namespace OMR


#if defined(PUT_OMR_BYTECODEBUILDER_INTO_TR)
#include "ilgen/OMRBytecodeBuilder.hpp"

namespace TR
{
Expand All @@ -138,6 +40,4 @@ namespace TR

} // namespace TR

#endif // defined(PUT_OMR_BYTECODEBUILDER_INTO_TR)

#endif // !defined(OMR_ILBUILDER_INCL)
#endif // !defined(TR_BYTECODEBUILDER_INCL)
17 changes: 10 additions & 7 deletions compiler/ilgen/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@

compiler_library(ilgen
${CMAKE_CURRENT_LIST_DIR}/IlGenRequest.cpp
${CMAKE_CURRENT_LIST_DIR}/IlBuilder.cpp
${CMAKE_CURRENT_LIST_DIR}/IlValue.cpp
${CMAKE_CURRENT_LIST_DIR}/IlInjector.cpp
${CMAKE_CURRENT_LIST_DIR}/MethodBuilder.cpp
${CMAKE_CURRENT_LIST_DIR}/BytecodeBuilder.cpp
${CMAKE_CURRENT_LIST_DIR}/TypeDictionary.cpp
${CMAKE_CURRENT_LIST_DIR}/ThunkBuilder.cpp
${CMAKE_CURRENT_LIST_DIR}/VirtualMachineOperandStack.cpp
${CMAKE_CURRENT_LIST_DIR}/OMRBytecodeBuilder.cpp
${CMAKE_CURRENT_LIST_DIR}/OMRIlBuilder.cpp
${CMAKE_CURRENT_LIST_DIR}/OMRIlType.cpp
${CMAKE_CURRENT_LIST_DIR}/OMRIlValue.cpp
${CMAKE_CURRENT_LIST_DIR}/OMRMethodBuilder.cpp
${CMAKE_CURRENT_LIST_DIR}/OMRThunkBuilder.cpp
${CMAKE_CURRENT_LIST_DIR}/OMRTypeDictionary.cpp
${CMAKE_CURRENT_LIST_DIR}/OMRVirtualMachineOperandArray.cpp
${CMAKE_CURRENT_LIST_DIR}/OMRVirtualMachineOperandStack.cpp
${CMAKE_CURRENT_LIST_DIR}/OMRVirtualMachineState.cpp
)
Loading