diff --git a/cef_paths2.gypi b/cef_paths2.gypi index e8016cb82..28d26ddb8 100644 --- a/cef_paths2.gypi +++ b/cef_paths2.gypi @@ -71,6 +71,7 @@ 'include/wrapper/cef_library_loader.h', ], 'includes_win': [ + 'include/base/internal/cef_atomicops_arm64_msvc.h', 'include/base/internal/cef_atomicops_x86_msvc.h', 'include/base/internal/cef_bind_internal_win.h', 'include/cef_sandbox_win.h', diff --git a/include/base/cef_atomicops.h b/include/base/cef_atomicops.h index c8796c10b..2972a3bac 100644 --- a/include/base/cef_atomicops.h +++ b/include/base/cef_atomicops.h @@ -178,6 +178,8 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); // Include our platform specific implementation. #if defined(OS_WIN) && defined(COMPILER_MSVC) && defined(ARCH_CPU_X86_FAMILY) #include "include/base/internal/cef_atomicops_x86_msvc.h" +#elif defined(OS_WIN) && defined(__ARM_ARCH_ISA_A64) +#include "include/base/internal/cef_atomicops_arm64_msvc.h" #elif defined(OS_MACOSX) #include "include/base/internal/cef_atomicops_mac.h" #elif defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY) diff --git a/include/base/internal/cef_atomicops_arm64_msvc.h b/include/base/internal/cef_atomicops_arm64_msvc.h new file mode 100644 index 000000000..86d950f54 --- /dev/null +++ b/include/base/internal/cef_atomicops_arm64_msvc.h @@ -0,0 +1,197 @@ +// Copyright (c) 2008 Google 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: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * 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. +// * Neither the name of Google Inc. nor the name Chromium Embedded +// Framework nor the names of its contributors may be used to endorse +// or promote products derived from this software without specific prior +// written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT +// OWNER OR 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. + +// Do not include this header file directly. Use base/cef_atomicops.h +// instead. + +#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM64_MSVC_H_ +#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM64_MSVC_H_ + +#include + +#include + +#include "include/base/cef_macros.h" + +namespace base { +namespace subtle { + +inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, + Atomic32 old_value, + Atomic32 new_value) { + LONG result = _InterlockedCompareExchange( + reinterpret_cast(ptr), static_cast(new_value), + static_cast(old_value)); + return static_cast(result); +} + +inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, + Atomic32 new_value) { + LONG result = _InterlockedExchange(reinterpret_cast(ptr), + static_cast(new_value)); + return static_cast(result); +} + +inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, + Atomic32 increment) { + return _InterlockedExchangeAdd(reinterpret_cast(ptr), + static_cast(increment)) + + increment; +} + +inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, + Atomic32 increment) { + return Barrier_AtomicIncrement(ptr, increment); +} + +#if !(defined(_MSC_VER) && _MSC_VER >= 1400) +#error "We require at least vs2005 for MemoryBarrier" +#endif + +inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr, + Atomic32 old_value, + Atomic32 new_value) { + return NoBarrier_CompareAndSwap(ptr, old_value, new_value); +} + +inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr, + Atomic32 old_value, + Atomic32 new_value) { + return NoBarrier_CompareAndSwap(ptr, old_value, new_value); +} + +inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) { + *ptr = value; +} + +inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { + NoBarrier_AtomicExchange(ptr, value); + // acts as a barrier in this implementation +} + +inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) { + *ptr = value; + // See comments in Atomic64 version of Release_Store() below. +} + +inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) { + return *ptr; +} + +inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) { + Atomic32 value = *ptr; + return value; +} + +inline Atomic32 Release_Load(volatile const Atomic32* ptr) { + MemoryBarrier(); + return *ptr; +} + +#if defined(_WIN64) + +// 64-bit low-level operations on 64-bit platform. + +COMPILE_ASSERT(sizeof(Atomic64) == sizeof(PVOID), atomic_word_is_atomic); + +inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr, + Atomic64 old_value, + Atomic64 new_value) { + PVOID result = InterlockedCompareExchangePointer( + reinterpret_cast(ptr), + reinterpret_cast(new_value), reinterpret_cast(old_value)); + return reinterpret_cast(result); +} + +inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr, + Atomic64 new_value) { + PVOID result = + InterlockedExchangePointer(reinterpret_cast(ptr), + reinterpret_cast(new_value)); + return reinterpret_cast(result); +} + +inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr, + Atomic64 increment) { + return InterlockedExchangeAdd64(reinterpret_cast(ptr), + static_cast(increment)) + + increment; +} + +inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr, + Atomic64 increment) { + return Barrier_AtomicIncrement(ptr, increment); +} + +inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) { + *ptr = value; +} + +inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) { + NoBarrier_AtomicExchange(ptr, value); + // acts as a barrier in this implementation +} + +inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) { + *ptr = value; +} + +inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) { + return *ptr; +} + +inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) { + Atomic64 value = *ptr; + return value; +} + +inline Atomic64 Release_Load(volatile const Atomic64* ptr) { + MemoryBarrier(); + return *ptr; +} + +inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr, + Atomic64 old_value, + Atomic64 new_value) { + return NoBarrier_CompareAndSwap(ptr, old_value, new_value); +} + +inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr, + Atomic64 old_value, + Atomic64 new_value) { + return NoBarrier_CompareAndSwap(ptr, old_value, new_value); +} + +#endif // defined(_WIN64) + +} // namespace base::subtle +} // namespace base + +#endif // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM64_MSVC_H_ + diff --git a/include/base/internal/cef_bind_internal_win.h b/include/base/internal/cef_bind_internal_win.h index 4a363def8..2d98fd1ca 100644 --- a/include/base/internal/cef_bind_internal_win.h +++ b/include/base/internal/cef_bind_internal_win.h @@ -38,7 +38,8 @@ // In the x64 architecture in Windows, __fastcall, __stdcall, etc, are all // the same as __cdecl which would turn the following specializations into // multiple definitions. -#if !defined(ARCH_CPU_X86_64) +#if defined(ARCH_CPU_X86_FAMILY) +#if defined(ARCH_CPU_32_BITS) namespace base { namespace cef_internal { @@ -391,6 +392,7 @@ class RunnableAdapter { } // namespace cef_internal } // namespace base -#endif // !defined(ARCH_CPU_X86_64) +#endif // defined(ARCH_CPU_32_BITS) +#endif // defined(ARCH_CPU_X86_FAMILY) #endif // CEF_INCLUDE_BASE_INTERNAL_CEF_BIND_INTERNAL_WIN_H_ diff --git a/tests/cefclient/browser/osr_d3d11_win.cc b/tests/cefclient/browser/osr_d3d11_win.cc index 5e336c738..f4a1cd9af 100644 --- a/tests/cefclient/browser/osr_d3d11_win.cc +++ b/tests/cefclient/browser/osr_d3d11_win.cc @@ -18,6 +18,9 @@ #include // For std::setw. +#if OS_WIN && ARCH_CPU_ARM_FAMILY +#define __prefetch(x) x +#endif #include #include @@ -928,4 +931,4 @@ void FrameBuffer::on_paint(void* shared_handle) { } } // namespace d3d11 -} // namespace client \ No newline at end of file +} // namespace client diff --git a/tools/automate/automate-git.py b/tools/automate/automate-git.py index a8c7f36c7..72fa908d4 100644 --- a/tools/automate/automate-git.py +++ b/tools/automate/automate-git.py @@ -1063,8 +1063,8 @@ if use_gn: sys.exit() if options.arm64build: - if platform != 'linux': - print 'The ARM64 build option is only supported on Linux.' + if platform != 'linux' and platform != 'windows': + print 'The ARM64 build option is only supported on Linux and Windows.' sys.exit() if not branch_is_newer_than_2840: diff --git a/tools/gn_args.py b/tools/gn_args.py index d8cc754e5..3d33ce278 100644 --- a/tools/gn_args.py +++ b/tools/gn_args.py @@ -316,7 +316,8 @@ def ValidateArgs(args): if platform == 'macosx': assert target_cpu == 'x64', 'target_cpu must be "x64"' elif platform == 'windows': - assert target_cpu in ('x86', 'x64'), 'target_cpu must be "x86" or "x64"' + assert target_cpu in ( + 'x86', 'x64', 'arm64'), 'target_cpu must be "x86", "x64" or "arm64"' elif platform == 'linux': assert target_cpu in ( 'x86', 'x64', 'arm', @@ -521,7 +522,7 @@ def GetAllPlatformConfigs(build_args): else: supported_cpus = ['x64'] elif platform == 'windows': - supported_cpus = ['x86', 'x64'] + supported_cpus = ['x86', 'x64', 'arm64'] elif platform == 'macosx': supported_cpus = ['x64'] else: