Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 5 additions & 39 deletions src/coreclr/jit/codegens390x.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -768,9 +768,9 @@ void CodeGen::genCodeForTreeNode(GenTree* treeNode)
genPutArgStk(treeNode->AsPutArgStk());
break;

// case GT_PUTARG_REG:
// genPutArgReg(treeNode->AsOp());
// break;
case GT_PUTARG_REG:
genPutArgReg(treeNode->AsOp());
break;
//
// case GT_PUTARG_SPLIT:
// genPutArgSplit(treeNode->AsPutArgSplit());
Expand Down Expand Up @@ -1115,8 +1115,6 @@ void CodeGen::genIntrinsic(GenTreeIntrinsic* treeNode)
//
void CodeGen::genPutArgReg(GenTreeOp* tree)
{
_ASSERTE(!"NYI");
#if 0
assert(tree->OperIs(GT_PUTARG_REG));

var_types targetType = tree->TypeGet();
Expand All @@ -1131,7 +1129,6 @@ void CodeGen::genPutArgReg(GenTreeOp* tree)
inst_Mov(targetType, targetReg, op1->GetRegNum(), /* canSkip */ true);

genProduceReg(tree);
#endif
}

//---------------------------------------------------------------------
Expand Down Expand Up @@ -2995,21 +2992,7 @@ void CodeGen::genCall(GenTreeCall* call)
genConsumeReg(argNode);
regNumber sourceReg = argNode->GetRegNum();

if (sourceReg != argReg)
{
var_types argType = argNode->TypeGet();

if (varTypeIsFloating(argType))
{
instruction moveIns = (argType == TYP_FLOAT) ? INS_ler : INS_ldr;
GetEmitter()->emitIns_R_R(moveIns, emitTypeSize(argType),
argReg, sourceReg);
}
else
{
GetEmitter()->emitIns_R_R(INS_lgr, EA_8BYTE, argReg, sourceReg);
}
}
inst_Mov(genActualType(argNode), argReg, sourceReg, /* canSkip */ true);

argRegsUsed |= genRegMask(argReg);
}
Expand Down Expand Up @@ -3143,24 +3126,7 @@ void CodeGen::genCall(GenTreeCall* call)
if (targetReg != REG_NA)
{
// move to target register if different
if (targetReg != returnReg)
{
instruction moveIns;
emitAttr size;

if (varTypeIsFloating(returnType))
{
moveIns = (returnType == TYP_FLOAT) ? INS_ler : INS_ldr;
size = emitTypeSize(returnType);
}
else
{
moveIns = INS_lgr;
size = EA_8BYTE;
}

GetEmitter()->emitIns_R_R(moveIns, size, targetReg, returnReg);
}
inst_Mov(returnType, targetReg, returnReg, /* canSkip */ true);

// Update GC tracking for return value
if (varTypeIsGC(returnType))
Expand Down
3 changes: 3 additions & 0 deletions src/coreclr/jit/emit.h
Original file line number Diff line number Diff line change
Expand Up @@ -1200,6 +1200,9 @@ class emitter
case INS_or:
case INS_xr:
case INS_break:
case INS_ler:
case INS_ldr:
case INS_lr:
size = 2;
break;
case INS_lgfi:
Expand Down
Loading