diff options
| author | Steve MacLean <sdmaclea.qdt@qualcommdatacenter.com> | 2017-06-12 17:14:12 -0400 |
|---|---|---|
| committer | Maoni Stephens <Maoni0@users.noreply.github.com> | 2017-06-12 14:14:12 -0700 |
| commit | 0ee3b5e64a98dc71aefed2304fe4bcf7f66ca9f5 (patch) | |
| tree | 8f099e2391d8990de1c7d0f4ca4c3fcae6839e4d /src/vm/peimagelayout.cpp | |
| parent | c655981474be1d3aa0165408e5c3914c5cfc35a1 (diff) | |
| download | coreclr-0ee3b5e64a98dc71aefed2304fe4bcf7f66ca9f5.tar.gz coreclr-0ee3b5e64a98dc71aefed2304fe4bcf7f66ca9f5.tar.bz2 coreclr-0ee3b5e64a98dc71aefed2304fe4bcf7f66ca9f5.zip | |
[Arm64/Unix] Add 64K page support (#10981)
* [Arm64/Unix] Support 64K pages
* GC move GCToOSInterface::Initialize() into InitializeGarbageCollector()
Diffstat (limited to 'src/vm/peimagelayout.cpp')
| -rw-r--r-- | src/vm/peimagelayout.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vm/peimagelayout.cpp b/src/vm/peimagelayout.cpp index 34ba4d8215..93ab77cc78 100644 --- a/src/vm/peimagelayout.cpp +++ b/src/vm/peimagelayout.cpp @@ -637,7 +637,7 @@ bool PEImageLayout::ConvertILOnlyPE32ToPE64Worker() + VAL16(pHeader32->FileHeader.NumberOfSections)); // On AMD64, used for a 12-byte jump thunk + the original entry point offset. - if (((pEnd32 + IMAGE_HEADER_3264_SIZE_DIFF /* delta in headers to compute end of 64bit header */) - pImage) > OS_PAGE_SIZE ) { + if (((pEnd32 + IMAGE_HEADER_3264_SIZE_DIFF /* delta in headers to compute end of 64bit header */) - pImage) > GetOsPageSize() ) { // This should never happen. An IL_ONLY image should at most 3 sections. _ASSERTE(!"ConvertILOnlyPE32ToPE64Worker: Insufficient room to rewrite headers as PE64"); return false; @@ -693,7 +693,7 @@ bool PEImageLayout::ConvertILOnlyPE32ToPE64() PBYTE pageBase = (PBYTE)GetBase(); DWORD oldProtect; - if (!ClrVirtualProtect(pageBase, OS_PAGE_SIZE, PAGE_READWRITE, &oldProtect)) + if (!ClrVirtualProtect(pageBase, GetOsPageSize(), PAGE_READWRITE, &oldProtect)) { // We are not going to be able to update header. return false; @@ -702,7 +702,7 @@ bool PEImageLayout::ConvertILOnlyPE32ToPE64() fConvertedToPE64 = ConvertILOnlyPE32ToPE64Worker(); DWORD ignore; - if (!ClrVirtualProtect(pageBase, OS_PAGE_SIZE, oldProtect, &ignore)) + if (!ClrVirtualProtect(pageBase, GetOsPageSize(), oldProtect, &ignore)) { // This is not so bad; just ignore it } |