OMR::VirtualMachine* classes are now TR::VirtualMachine* classes

Signed-off-by: Mark Stoodley <[email protected]>
eclipse-omr · May 1, 2018 · 10101dc · 10101dc
1 parent aa6a752
commit 10101dc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/fvtest/jitbuildertest/WorklistTest.cpp b/fvtest/jitbuildertest/WorklistTest.cpp
@@ -117,7 +117,7 @@ DEFINE_BUILDER( WorklistTestMethod,
    for (int32_t i=0;i < 20;i++)
       builders[i] = OrphanBytecodeBuilder(i, (char *)bcName[i]);
 
-   OMR::VirtualMachineState *vmState = new OMR::VirtualMachineState();
+   TR::VirtualMachineState *vmState = new TR::VirtualMachineState();
    setVMState(vmState);
 
    Store("result",

diff --git a/jitbuilder/release/src/OperandArrayTests.cpp b/jitbuilder/release/src/OperandArrayTests.cpp
@@ -371,7 +371,7 @@ OperandArrayTestMethod::OperandArrayTestMethod(TR::TypeDictionary *d)
    }
 
 // convenience macros
-#define STACK(b)         ((OMR::VirtualMachineOperandArray *)(b)->vmState())
+#define STACK(b)         ((TR::VirtualMachineOperandArray *)(b)->vmState())
 #define UPDATEARRAY(b,s) (STACK(b)->UpdateArray(b, s))
 #define COMMIT(b)        (STACK(b)->Commit(b))
 #define RELOAD(b)        (STACK(b)->Reload(b))
@@ -511,8 +511,8 @@ OperandArrayTestMethod::buildIL()
    Call("createArray", 0);
 
    TR::IlValue *arrayBaseAddress = ConstAddress(&_realArray);
-   OMR::VirtualMachineRegister *arrayBase = new OMR::VirtualMachineRegister(this, "ARRAY", pElementType, sizeof(ARRAYVALUETYPE), arrayBaseAddress);
-   OMR::VirtualMachineOperandArray *array = new OMR::VirtualMachineOperandArray(this, _realArrayLength, _valueType, arrayBase);
+   TR::VirtualMachineRegister *arrayBase = new TR::VirtualMachineRegister(this, "ARRAY", pElementType, sizeof(ARRAYVALUETYPE), arrayBaseAddress);
+   TR::VirtualMachineOperandArray *array = new TR::VirtualMachineOperandArray(this, _realArrayLength, _valueType, arrayBase);
 
    setVMState(array);
 
@@ -539,8 +539,8 @@ OperandArrayTestUsingFalseMethod::buildIL()
    Call("createArray", 0);
 
    TR::IlValue *arrayBaseAddress = ConstAddress(&_realArray);
-   OMR::VirtualMachineRegister *arrayBase = new OMR::VirtualMachineRegister(this, "ARRAY", pElementType, sizeof(ARRAYVALUETYPE), arrayBaseAddress);
-   OMR::VirtualMachineOperandArray *array = new OMR::VirtualMachineOperandArray(this, _realArrayLength, _valueType, arrayBase);
+   TR::VirtualMachineRegister *arrayBase = new TR::VirtualMachineRegister(this, "ARRAY", pElementType, sizeof(ARRAYVALUETYPE), arrayBaseAddress);
+   TR::VirtualMachineOperandArray *array = new TR::VirtualMachineOperandArray(this, _realArrayLength, _valueType, arrayBase);
 
    setVMState(array);
 

diff --git a/jitbuilder/release/src/OperandStackTests.cpp b/jitbuilder/release/src/OperandStackTests.cpp
@@ -46,17 +46,17 @@ typedef struct Thread
    STACKVALUETYPE *sp;
    } Thread;
 
-class TestState : public OMR::VirtualMachineState
+class TestState : public TR::VirtualMachineState
    {
    public:
    TestState()
-      : OMR::VirtualMachineState(),
+      : TR::VirtualMachineState(),
       _stack(NULL),
       _stackTop(NULL)
       { }
 
-   TestState(OMR::VirtualMachineOperandStack *stack, OMR::VirtualMachineRegister *stackTop)
-      : OMR::VirtualMachineState(),
+   TestState(TR::VirtualMachineOperandStack *stack, TR::VirtualMachineRegister *stackTop)
+      : TR::VirtualMachineState(),
       _stack(stack),
       _stackTop(stackTop)
       {
@@ -77,8 +77,8 @@ class TestState : public OMR::VirtualMachineState
    virtual VirtualMachineState *MakeCopy()
       {
       TestState *newState = new TestState();
-      newState->_stack = (OMR::VirtualMachineOperandStack *)_stack->MakeCopy();
-      newState->_stackTop = (OMR::VirtualMachineRegister *) _stackTop->MakeCopy();
+      newState->_stack = (TR::VirtualMachineOperandStack *)_stack->MakeCopy();
+      newState->_stackTop = (TR::VirtualMachineRegister *) _stackTop->MakeCopy();
       return newState;
       }
 
@@ -89,8 +89,8 @@ class TestState : public OMR::VirtualMachineState
       _stackTop->MergeInto(((TestState *)other)->_stackTop, b);
       }
 
-   OMR::VirtualMachineOperandStack * _stack;
-   OMR::VirtualMachineRegister     * _stackTop;
+   TR::VirtualMachineOperandStack * _stack;
+   TR::VirtualMachineRegister     * _stackTop;
    };
 
 static bool verbose = false;
@@ -567,8 +567,8 @@ OperandStackTestMethod::buildIL()
    Call("createStack", 0);
 
    TR::IlValue *realStackTopAddress = ConstAddress(&_realStackTop);
-   OMR::VirtualMachineRegister *stackTop = new OMR::VirtualMachineRegister(this, "SP", pElementType, sizeof(STACKVALUETYPE), realStackTopAddress);
-   OMR::VirtualMachineOperandStack *stack = new OMR::VirtualMachineOperandStack(this, 1, _valueType, stackTop);
+   TR::VirtualMachineRegister *stackTop = new TR::VirtualMachineRegister(this, "SP", pElementType, sizeof(STACKVALUETYPE), realStackTopAddress);
+   TR::VirtualMachineOperandStack *stack = new TR::VirtualMachineOperandStack(this, 1, _valueType, stackTop);
 
    TestState *vmState = new TestState(stack, stackTop);
    setVMState(vmState);
@@ -601,8 +601,8 @@ OperandStackTestUsingStructMethod::buildIL()
    {
    Call("createStack", 0);
 
-   OMR::VirtualMachineRegisterInStruct *stackTop = new OMR::VirtualMachineRegisterInStruct(this, "Thread", "thread", "sp", "SP");
-   OMR::VirtualMachineOperandStack *stack = new OMR::VirtualMachineOperandStack(this, 1, _valueType, stackTop);
+   TR::VirtualMachineRegisterInStruct *stackTop = new TR::VirtualMachineRegisterInStruct(this, "Thread", "thread", "sp", "SP");
+   TR::VirtualMachineOperandStack *stack = new TR::VirtualMachineOperandStack(this, 1, _valueType, stackTop);
 
    TestState *vmState = new TestState(stack, stackTop);
    setVMState(vmState);

diff --git a/jitbuilder/release/src/Worklist.cpp b/jitbuilder/release/src/Worklist.cpp
@@ -203,7 +203,7 @@ WorklistMethod::buildIL()
    for (int32_t i=0;i < 20;i++)
       builders[i] = OrphanBytecodeBuilder(i, (char *)bcName[i]);
 
-   OMR::VirtualMachineState *vmState = new OMR::VirtualMachineState();
+   TR::VirtualMachineState *vmState = new TR::VirtualMachineState();
    setVMState(vmState);
 
    Store("result",