VSadov/Satori
1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-10 18:11:04 +09:00
Code Activity

Merge pull request dotnet/coreclr#191 from dotnet-bot/from-tfs

Browse source 
Merge changes from TFS

Commit migrated from 8b25afd481
This commit is contained in:
Sergiy Kuryata 2015-02-10 20:56:50 -08:00
commit 2920e4eb82
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/coreclr/src/jit/lclvars.cpp
View file

@ -507,7 +507,8 @@ void Compiler::lvaInitUserArgs(InitVarDscInfo * varDscInfo)
#if defined(_TARGET_X86_)
// Only (some of) the implicit args are enregistered for varargs
varDscInfo->maxIntRegArgNum = info.compIsVarArgs ? varDscInfo->intRegArgNum : MAX_REG_ARG;
#elif defined(_TARGET_AMD64_)
#elif defined(_TARGET_AMD64_) && !defined(UNIX_AMD64_ABI)
// On System V type environment the float registers are not indexed together with the int ones.
varDscInfo->floatRegArgNum = varDscInfo->intRegArgNum;
#endif // _TARGET_*
@ -3726,7 +3727,10 @@ void Compiler::lvaFixVirtualFrameOffsets()
}
}
#endif
#ifndef UNIX_AMD64_ABI
// On System V environments the stkOffs could be 0 for params passed in registers.
assert(codeGen->isFramePointerUsed() || varDsc->lvStkOffs >= 0); // Only EBP relative references can have negative offsets
#endif // !UNIX_AMD64_ABI
}
}
@ -4040,15 +4044,12 @@ int Compiler::lvaAssignVirtualFrameOffsetToArg(unsigned lclNum, unsigned argSize
#if defined(_TARGET_X86_)
argOffs += sizeof(void *);
#elif defined(_TARGET_AMD64_)
#ifdef UNIX_AMD64_ABI
// Reserve space on the stack only for OnFrame variables.
// No need to do that for OutgoingArg. No such thing on Linux.
if (varDsc->lvOnFrame)
#endif // UNIX_AMD64_ABI
{
varDsc->lvStkOffs = argOffs;
argOffs += sizeof(void *);
}
#ifndef UNIX_AMD64_ABI
// The offset for args need not to be set for System V.
// No outgoing args for callees. The spilled args offsets will be set later.
varDsc->lvStkOffs = argOffs;
argOffs += sizeof(void *);
#endif // !UNIX_AMD64_ABI
#elif defined(_TARGET_ARM64_)
// Register arguments don't take stack space.
#elif defined(_TARGET_ARM_)