diff options
author | Andrew Knight <andrew.knight@digia.com> | 2013-11-06 00:23:44 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-06 09:07:08 +0100 |
commit | eeabbf554880f61979fa0a9ecf87ba380cd70863 (patch) | |
tree | 2801ba1223fba1c46cd3bc26a7881cfe8196052f /src/3rdparty/masm/wtf | |
parent | 3a61da32e485621c9afbd453d22cbe1f6c25479e (diff) |
Fix build on WinRT
Disable JIT and avoid unsupported functions under WinRT.
Also add MSVC's ARM flag to the double conversion white list.
Change-Id: I22ec340a20b113fdeefb802ac61812f78a527895
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/3rdparty/masm/wtf')
-rw-r--r-- | src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp | 66 | ||||
-rw-r--r-- | src/3rdparty/masm/wtf/PageBlock.cpp | 4 | ||||
-rw-r--r-- | src/3rdparty/masm/wtf/Platform.h | 5 |
3 files changed, 75 insertions, 0 deletions
diff --git a/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp b/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp new file mode 100644 index 0000000000..f851087eb2 --- /dev/null +++ b/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2010 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "OSAllocator.h" + +#if OS(WINRT) + +#include "windows.h" +#include <wtf/Assertions.h> + +namespace WTF { + +void* OSAllocator::reserveUncommitted(size_t bytes, Usage, bool, bool, bool) +{ + void* result = _aligned_malloc(bytes, 16); + if (!result) + CRASH(); + return result; +} + +void* OSAllocator::reserveAndCommit(size_t bytes, Usage usage, bool writable, bool executable, bool) +{ + return reserveUncommitted(bytes, usage, writable, executable); +} + +void OSAllocator::commit(void* address, size_t bytes, bool writable, bool executable) +{ + CRASH(); // Unimplemented +} + +void OSAllocator::decommit(void* address, size_t) +{ + _aligned_free(address); +} + +void OSAllocator::releaseDecommitted(void* address, size_t bytes) +{ + decommit(address, bytes); +} + +} // namespace WTF + +#endif // OS(WINRT) diff --git a/src/3rdparty/masm/wtf/PageBlock.cpp b/src/3rdparty/masm/wtf/PageBlock.cpp index 8bbd7eb600..a6f5585925 100644 --- a/src/3rdparty/masm/wtf/PageBlock.cpp +++ b/src/3rdparty/masm/wtf/PageBlock.cpp @@ -53,7 +53,11 @@ inline size_t systemPageSize() { static size_t size = 0; SYSTEM_INFO system_info; +#if OS(WINRT) + GetNativeSystemInfo(&system_info); +#else GetSystemInfo(&system_info); +#endif size = system_info.dwPageSize; return size; } diff --git a/src/3rdparty/masm/wtf/Platform.h b/src/3rdparty/masm/wtf/Platform.h index c81a9fe40f..c845f5e23c 100644 --- a/src/3rdparty/masm/wtf/Platform.h +++ b/src/3rdparty/masm/wtf/Platform.h @@ -404,6 +404,11 @@ #define WTF_OS_WINCE 1 #endif +/* OS(WINCE) - Windows Runtime; note that for this platform OS(WINDOWS) is also defined */ +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP) +#define WTF_OS_WINRT 1 +#endif + /* OS(WINDOWS) - Any version of Windows */ #if defined(WIN32) || defined(_WIN32) #define WTF_OS_WINDOWS 1 |