diff options
Diffstat (limited to 'src/3rdparty/masm/stubs/ExecutableAllocator.h')
-rw-r--r-- | src/3rdparty/masm/stubs/ExecutableAllocator.h | 117 |
1 files changed, 81 insertions, 36 deletions
diff --git a/src/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h index 5f7d5678ab..5a3939b7b2 100644 --- a/src/3rdparty/masm/stubs/ExecutableAllocator.h +++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h @@ -1,31 +1,37 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtQml module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -33,6 +39,11 @@ #ifndef MASM_EXECUTABLEALLOCATOR_H #define MASM_EXECUTABLEALLOCATOR_H +// Defined via mkspec +#if _MSC_VER >= 1900 +#include <windows.h> +#endif + #include <RefPtr.h> #include <RefCounted.h> #include <wtf/PageBlock.h> @@ -46,6 +57,10 @@ #include <unistd.h> #endif +#ifdef __QNXNTO__ +using std::perror; +#endif + namespace JSC { class JSGlobalData; @@ -89,15 +104,34 @@ struct ExecutableAllocator { return adoptRef(new ExecutableMemoryHandle(realAllocator, size)); } - static void makeWritable(void* addr, int size) + static void makeWritable(void* addr, size_t size) { -#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) - size_t pageSize = WTF::pageSize(); - size_t iaddr = reinterpret_cast<size_t>(addr); - size_t roundAddr = iaddr & ~(pageSize - static_cast<size_t>(1)); + quintptr pageSize = WTF::pageSize(); + quintptr iaddr = reinterpret_cast<quintptr>(addr); + quintptr roundAddr = iaddr & ~(pageSize - 1); + size = size + (iaddr - roundAddr); + addr = reinterpret_cast<void*>(roundAddr); +#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) +# if OS(WINDOWS) + DWORD oldProtect; +# if !OS(WINRT) + VirtualProtect(addr, size, PAGE_READWRITE, &oldProtect); +# elif _MSC_VER >= 1900 + bool hr = VirtualProtectFromApp(addr, size, PAGE_READWRITE, &oldProtect); + if (!hr) { + Q_UNREACHABLE(); + } +# else + (void)oldProtect; +# endif +# else int mode = PROT_READ | PROT_WRITE; - mprotect(reinterpret_cast<void*>(roundAddr), size + (iaddr - roundAddr), mode); + if (mprotect(addr, size, mode) != 0) { + perror("mprotect failed in ExecutableAllocator::makeWritable"); + Q_UNREACHABLE(); + } +# endif #else // We assume we already have RWX (void)addr; // suppress unused parameter warning @@ -105,25 +139,36 @@ struct ExecutableAllocator { #endif } - static void makeExecutable(void* addr, int size) + static void makeExecutable(void* addr, size_t size) { - size_t pageSize = WTF::pageSize(); - size_t iaddr = reinterpret_cast<size_t>(addr); - size_t roundAddr = iaddr & ~(pageSize - static_cast<size_t>(1)); -#if OS(WINDOWS) -#if !OS(WINRT) + quintptr pageSize = WTF::pageSize(); + quintptr iaddr = reinterpret_cast<quintptr>(addr); + quintptr roundAddr = iaddr & ~(pageSize - 1); + size = size + (iaddr - roundAddr); + addr = reinterpret_cast<void*>(roundAddr); + +#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) +# if OS(WINDOWS) DWORD oldProtect; - VirtualProtect(reinterpret_cast<void*>(roundAddr), size + (iaddr - roundAddr), PAGE_EXECUTE_READWRITE, &oldProtect); -#else - (void)size; // suppress unused parameter warning - (void)roundAddr; // suppress unused parameter warning -#endif -#else +# if !OS(WINRT) + VirtualProtect(addr, size, PAGE_EXECUTE_READ, &oldProtect); +# elif _MSC_VER >= 1900 + bool hr = VirtualProtectFromApp(addr, size, PAGE_EXECUTE_READ, &oldProtect); + if (!hr) { + Q_UNREACHABLE(); + } +# else + (void)oldProtect; +# endif +# else int mode = PROT_READ | PROT_EXEC; -#if !ENABLE(ASSEMBLER_WX_EXCLUSIVE) - mode |= PROT_WRITE; -#endif - mprotect(reinterpret_cast<void*>(roundAddr), size + (iaddr - roundAddr), mode); + if (mprotect(addr, size, mode) != 0) { + perror("mprotect failed in ExecutableAllocator::makeExecutable"); + Q_UNREACHABLE(); + } +# endif +#else +# error "Only W^X is supported" #endif } |