- Removed the redefination in the atomicword_compat.h. Now Atomic32 will alwyas be intptr_t in 32bit platforms, the bridge is no longer needed. - Change NaCl 64bit to use intptr_t instead of int32 for Atomic32, otherwise AtmoicWord APIs will miss the definations. After this change, the AtmoicWord will always be either Atomic32 or Atmoic64 depending on the platforms.pull/3854/head
Jisi Liu
7 years ago
parent
1144768dd6
commit
181e284b55
4 changed files with 2 additions and 131 deletions
@ -1,122 +0,0 @@ |
||||
// Protocol Buffers - Google's data interchange format
|
||||
// Copyright 2012 Google Inc. All rights reserved.
|
||||
// https://developers.google.com/protocol-buffers/
|
||||
//
|
||||
// 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 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.
|
||||
|
||||
// This file is an internal atomic implementation, use atomicops.h instead.
|
||||
|
||||
#ifndef GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_ATOMICWORD_COMPAT_H_ |
||||
#define GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_ATOMICWORD_COMPAT_H_ |
||||
|
||||
// AtomicWord is a synonym for intptr_t, and Atomic32 is a synonym for int32,
|
||||
// which in turn means int. On some LP32 platforms, intptr_t is an int, but
|
||||
// on others, it's a long. When AtomicWord and Atomic32 are based on different
|
||||
// fundamental types, their pointers are incompatible.
|
||||
//
|
||||
// This file defines function overloads to allow both AtomicWord and Atomic32
|
||||
// data to be used with this interface.
|
||||
//
|
||||
// On LP64 platforms, AtomicWord and Atomic64 are both always long,
|
||||
// so this problem doesn't occur.
|
||||
|
||||
#if !defined(GOOGLE_PROTOBUF_ARCH_64_BIT) |
||||
|
||||
namespace google { |
||||
namespace protobuf { |
||||
namespace internal { |
||||
|
||||
inline AtomicWord NoBarrier_CompareAndSwap(volatile AtomicWord* ptr, |
||||
AtomicWord old_value, |
||||
AtomicWord new_value) { |
||||
return NoBarrier_CompareAndSwap( |
||||
reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value); |
||||
} |
||||
|
||||
inline AtomicWord NoBarrier_AtomicExchange(volatile AtomicWord* ptr, |
||||
AtomicWord new_value) { |
||||
return NoBarrier_AtomicExchange( |
||||
reinterpret_cast<volatile Atomic32*>(ptr), new_value); |
||||
} |
||||
|
||||
inline AtomicWord NoBarrier_AtomicIncrement(volatile AtomicWord* ptr, |
||||
AtomicWord increment) { |
||||
return NoBarrier_AtomicIncrement( |
||||
reinterpret_cast<volatile Atomic32*>(ptr), increment); |
||||
} |
||||
|
||||
inline AtomicWord Barrier_AtomicIncrement(volatile AtomicWord* ptr, |
||||
AtomicWord increment) { |
||||
return Barrier_AtomicIncrement( |
||||
reinterpret_cast<volatile Atomic32*>(ptr), increment); |
||||
} |
||||
|
||||
inline AtomicWord Acquire_CompareAndSwap(volatile AtomicWord* ptr, |
||||
AtomicWord old_value, |
||||
AtomicWord new_value) { |
||||
return Acquire_CompareAndSwap( |
||||
reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value); |
||||
} |
||||
|
||||
inline AtomicWord Release_CompareAndSwap(volatile AtomicWord* ptr, |
||||
AtomicWord old_value, |
||||
AtomicWord new_value) { |
||||
return Release_CompareAndSwap( |
||||
reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value); |
||||
} |
||||
|
||||
inline void NoBarrier_Store(volatile AtomicWord *ptr, AtomicWord value) { |
||||
NoBarrier_Store(reinterpret_cast<volatile Atomic32*>(ptr), value); |
||||
} |
||||
|
||||
inline void Acquire_Store(volatile AtomicWord* ptr, AtomicWord value) { |
||||
return Acquire_Store(reinterpret_cast<volatile Atomic32*>(ptr), value); |
||||
} |
||||
|
||||
inline void Release_Store(volatile AtomicWord* ptr, AtomicWord value) { |
||||
return Release_Store(reinterpret_cast<volatile Atomic32*>(ptr), value); |
||||
} |
||||
|
||||
inline AtomicWord NoBarrier_Load(volatile const AtomicWord *ptr) { |
||||
return NoBarrier_Load(reinterpret_cast<volatile const Atomic32*>(ptr)); |
||||
} |
||||
|
||||
inline AtomicWord Acquire_Load(volatile const AtomicWord* ptr) { |
||||
return Acquire_Load(reinterpret_cast<volatile const Atomic32*>(ptr)); |
||||
} |
||||
|
||||
inline AtomicWord Release_Load(volatile const AtomicWord* ptr) { |
||||
return Release_Load(reinterpret_cast<volatile const Atomic32*>(ptr)); |
||||
} |
||||
|
||||
} // namespace internal
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#endif // !defined(GOOGLE_PROTOBUF_ARCH_64_BIT)
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_ATOMICWORD_COMPAT_H_
|
||||
Loading…
Reference in new issue