Update vector load/store evaluators to use LoadStoreHandler

Signed-off-by: Ben Thomas <ben@benthomas.ca>
eclipse · Feb 11, 2021 · f3996d5 · f3996d5
1 parent 4e41f4c
commit f3996d5
Showing 1 changed file with 3 additions and 35 deletions.
diff --git a/compiler/p/codegen/OMRTreeEvaluator.cpp b/compiler/p/codegen/OMRTreeEvaluator.cpp
@@ -929,25 +929,10 @@ TR::Register *OMR::Power::TreeEvaluator::vloadEvaluator(TR::Node *node, TR::Code
      }
 
    TR::Register *dstReg = cg->allocateRegister(kind);
-   node->setRegister(dstReg);
-
-   TR::MemoryReference *srcMemRef = TR::MemoryReference::createWithRootLoadOrStore(cg, node, 16);
-   if (srcMemRef->hasDelayedOffset())
-      {
-      TR::Register *tmpReg = cg->allocateRegister();
-      generateTrg1MemInstruction(cg, TR::InstOpCode::addi2, node, tmpReg, srcMemRef);
 
-      TR::MemoryReference *tmpMemRef = TR::MemoryReference::createWithIndexReg(cg, NULL, tmpReg, 16);
-      generateTrg1MemInstruction(cg, opcode, node, dstReg, tmpMemRef);
-      tmpMemRef->decNodeReferenceCounts(cg);
-      }
-   else
-      {
-      srcMemRef->forceIndexedForm(node, cg);
-      generateTrg1MemInstruction(cg, opcode, node, dstReg, srcMemRef);
-      }
+   TR::LoadStoreHandler::generateLoadNodeSequence(cg, dstReg, node, opcode, 16, true);
 
-   srcMemRef->decNodeReferenceCounts(cg);
+   node->setRegister(dstReg);
    return dstReg;
    }
 
@@ -971,26 +956,9 @@ TR::Register *OMR::Power::TreeEvaluator::vstoreEvaluator(TR::Node *node, TR::Cod
    TR::Node *valueChild = node->getOpCode().isStoreDirect() ? node->getFirstChild() : node->getSecondChild();
    TR::Register *valueReg = cg->evaluate(valueChild);
 
-   TR::MemoryReference *srcMemRef = TR::MemoryReference::createWithRootLoadOrStore(cg, node, 16);
+   TR::LoadStoreHandler::generateStoreNodeSequence(cg, valueReg, node, opcode, 16, true);
 
-   if (srcMemRef->hasDelayedOffset())
-      {
-      TR::Register *tmpReg = cg->allocateRegister();
-      generateTrg1MemInstruction(cg, TR::InstOpCode::addi2, node, tmpReg, srcMemRef);
-      TR::MemoryReference *tmpMemRef = TR::MemoryReference::createWithIndexReg(cg, NULL, tmpReg, 16);
-
-      generateMemSrc1Instruction(cg, opcode, node, tmpMemRef, valueReg);
-      tmpMemRef->decNodeReferenceCounts(cg);
-      }
-   else
-      {
-      srcMemRef->forceIndexedForm(node, cg);
-      generateMemSrc1Instruction(cg, opcode, node, srcMemRef, valueReg);
-      }
-
-   srcMemRef->decNodeReferenceCounts(cg);
    cg->decReferenceCount(valueChild);
-
    return NULL;
    }