diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-06-15 00:42:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 00:42:17 +0300 |
| commit | e040c8ea6c31ff38228e9865cabaab0e39d2869d (patch) | |
| tree | 4a3fca71fe0871032418e070205a9d9daf4fbe22 | |
| parent | 04413edd6016a893376a4de61fb7d94690b83e44 (diff) | |
| parent | 5a706a2aaf4d390bc1a47a8ccc32105b491a2ba4 (diff) | |
Merge pull request #3886 from dotnet-bot/from-tfs
Merge changes from TFS
| -rw-r--r-- | src/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/CallingConventions.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/CallingConventions.cs b/src/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/CallingConventions.cs index 6265741b9..d06c1018f 100644 --- a/src/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/CallingConventions.cs +++ b/src/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/CallingConventions.cs @@ -866,7 +866,7 @@ namespace Internal.Runtime.CallConverter case CallingConvention.ManagedStatic: case CallingConvention.ManagedInstance: _numRegistersUsed = numRegistersUsed; - // DESKTOP BEHAVIOR m_curOfs = (int)(TransitionBlock.GetOffsetOfArgs() + SizeOfArgStack()); + // DESKTOP BEHAVIOR _curOfs = (int)(TransitionBlock.GetOffsetOfArgs() + SizeOfArgStack()); _curOfs = (int)(TransitionBlock.GetOffsetOfArgs() + initialArgOffset); break; @@ -875,16 +875,16 @@ namespace Internal.Runtime.CallConverter break; } #else - m_numRegistersUsed = numRegistersUsed; -// DESKTOP BEHAVIOR m_curOfs = (int)(TransitionBlock.GetOffsetOfArgs() + SizeOfArgStack()); - m_curOfs = (int)(TransitionBlock.GetOffsetOfArgs() + initialArgOffset); + _numRegistersUsed = numRegistersUsed; +// DESKTOP BEHAVIOR _curOfs = (int)(TransitionBlock.GetOffsetOfArgs() + SizeOfArgStack()); + _curOfs = (int)(TransitionBlock.GetOffsetOfArgs() + initialArgOffset); #endif #elif _TARGET_AMD64_ #if UNIX_AMD64_ABI - m_idxGenReg = numRegistersUsed; - m_idxStack = 0; - m_idxFPReg = 0; + _idxGenReg = numRegistersUsed; + _idxStack = 0; + _idxFPReg = 0; #else _curOfs = TransitionBlock.GetOffsetOfArgs() + numRegistersUsed * IntPtr.Size; #endif @@ -942,8 +942,8 @@ namespace Internal.Runtime.CallConverter return TransitionBlock.GetOffsetOfArgumentRegisters() + (ArchitectureConstants.NUM_ARGUMENT_REGISTERS - _numRegistersUsed) * IntPtr.Size; } - // DESKTOP BEHAVIOR m_curOfs -= ArchitectureConstants.StackElemSize(argSize); - // DESKTOP BEHAVIOR return m_curOfs; + // DESKTOP BEHAVIOR _curOfs -= ArchitectureConstants.StackElemSize(argSize); + // DESKTOP BEHAVIOR return _curOfs; argOfs = _curOfs; _curOfs += ArchitectureConstants.StackElemSize(argSize); Debug.Assert(argOfs >= TransitionBlock.GetOffsetOfArgs()); @@ -1588,9 +1588,9 @@ namespace Internal.Runtime.CallConverter #if _TARGET_AMD64_ #if UNIX_AMD64_ABI - int m_idxGenReg; - int m_idxStack; - int m_idxFPReg; + int _idxGenReg; + int _idxStack; + int _idxFPReg; #else private int _curOfs; // Current position of the stack iterator #endif |