diff options
author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-09-03 20:19:50 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-03 20:19:50 -0700 |
commit | b042edd2d3aab48fe9524381b8b445b910722d8d (patch) | |
tree | ddfe0d2dfdbc9415676a824a6c6993bf4631cfd5 /src/vm/callingconvention.h | |
parent | 0821f6f06f34146053356bf944d01aff086bb312 (diff) | |
download | coreclr-b042edd2d3aab48fe9524381b8b445b910722d8d.tar.gz coreclr-b042edd2d3aab48fe9524381b8b445b910722d8d.tar.bz2 coreclr-b042edd2d3aab48fe9524381b8b445b910722d8d.zip |
Deal with cross-bitness compilation warnings Pt.2 (#19781)
* Disable ASMCONSTANTS_C_ASSERT in cross-bitness scenario in src/vm/ceeload.cpp
* Adjust MAXFIELDMARSHALERSIZE for cross-bitness scenario in src/vm/arm/cgencpu.h
* Make ALLOC_ALIGN_CONSTANT host specific in src/inc/stdmacros.h
* Make PRECODE_ALIGNMENT host specific in src/vm/arm/cgencpu.h
* Disable unreachable code in src/vm/arm/stubs.cpp
* Adjust CorDBIPC_BUFFER_SIZE for cross-bitness scenario in src/debug/inc/dbgipcevents.h
* Disable warning C4359 in src/vm/arm/cgencpu.h
* Deal with warning C4267: 'initializing': conversion from 'size_t' to 'int' in src/vm/stublink.cpp
* Deal with warning C4267: 'initializing': conversion from 'size_t' to 'int' in src/vm/callingconvention.h
* Disable unreachable REGDISPLAY constructor in src/inc/regdisp.h
Diffstat (limited to 'src/vm/callingconvention.h')
-rw-r--r-- | src/vm/callingconvention.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vm/callingconvention.h b/src/vm/callingconvention.h index a653d8570f..c219d70e8b 100644 --- a/src/vm/callingconvention.h +++ b/src/vm/callingconvention.h @@ -1209,7 +1209,7 @@ int ArgIteratorTemplate<ARGITERATOR_BASE>::GetNextOffset() // Doubles or HFAs containing doubles need the stack aligned appropriately. if (fRequiresAlign64Bit) - m_idxStack = ALIGN_UP(m_idxStack, 2); + m_idxStack = (int)ALIGN_UP(m_idxStack, 2); // Indicate the stack location of the argument to the caller. int argOfs = TransitionBlock::GetOffsetOfArgs() + m_idxStack * 4; @@ -1231,7 +1231,7 @@ int ArgIteratorTemplate<ARGITERATOR_BASE>::GetNextOffset() { // The argument requires 64-bit alignment. Align either the next general argument register if // we have any left. See step C.3 in the algorithm in the ABI spec. - m_idxGenReg = ALIGN_UP(m_idxGenReg, 2); + m_idxGenReg = (int)ALIGN_UP(m_idxGenReg, 2); } int argOfs = TransitionBlock::GetOffsetOfArgumentRegisters() + m_idxGenReg * 4; @@ -1262,7 +1262,7 @@ int ArgIteratorTemplate<ARGITERATOR_BASE>::GetNextOffset() { // The argument requires 64-bit alignment. If it is going to be passed on the stack, align // the next stack slot. See step C.6 in the algorithm in the ABI spec. - m_idxStack = ALIGN_UP(m_idxStack, 2); + m_idxStack = (int)ALIGN_UP(m_idxStack, 2); } int argOfs = TransitionBlock::GetOffsetOfArgs() + m_idxStack * 4; |