234 lines
8.9 KiB
Diff
234 lines
8.9 KiB
Diff
Link:
|
|
Subject: define atomicops for e2k
|
|
Bug: 111656
|
|
Tags: e2k
|
|
|
|
diff -Naur a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h
|
|
--- a/src/google/protobuf/stubs/atomicops.h 2021-10-08 18:27:43.735797517 +0300
|
|
+++ b/src/google/protobuf/stubs/atomicops.h 2021-10-10 23:21:26.239904740 +0300
|
|
@@ -184,6 +184,8 @@
|
|
#include <google/protobuf/stubs/atomicops_internals_mips_gcc.h>
|
|
#elif defined(__pnacl__)
|
|
#include <google/protobuf/stubs/atomicops_internals_pnacl.h>
|
|
+#elif defined(GOOGLE_PROTOBUF_ARCH_E2K)
|
|
+#include <google/protobuf/stubs/atomicops_internals_e2k_lcc.h>
|
|
#else
|
|
GOOGLE_PROTOBUF_ATOMICOPS_ERROR
|
|
#endif
|
|
diff -Naur a/src/google/protobuf/stubs/atomicops_internals_e2k_lcc.h b/src/google/protobuf/stubs/atomicops_internals_e2k_lcc.h
|
|
--- a/src/google/protobuf/stubs/atomicops_internals_e2k_lcc.h 1970-01-01 03:00:00.000000000 +0300
|
|
+++ b/src/google/protobuf/stubs/atomicops_internals_e2k_lcc.h 2021-10-10 23:21:53.999406082 +0300
|
|
@@ -0,0 +1,169 @@
|
|
+// Protocol Buffers - Google's data interchange format
|
|
+// Copyright 2021 AO MCST.
|
|
+// Copyright 2012 Google Inc. All rights reserved.
|
|
+// http://code.google.com/p/protobuf/
|
|
+//
|
|
+// 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_E2K_LCC_H_
|
|
+#define GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_E2K_LCC_H_
|
|
+
|
|
+namespace google {
|
|
+namespace protobuf {
|
|
+namespace internal {
|
|
+
|
|
+inline void MemoryBarrier() {
|
|
+ __sync_synchronize();
|
|
+}
|
|
+
|
|
+inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
|
|
+ Atomic32 old_value,
|
|
+ Atomic32 new_value) {
|
|
+ return __sync_val_compare_and_swap(ptr, old_value, new_value);
|
|
+}
|
|
+
|
|
+inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
|
|
+ Atomic32 new_value) {
|
|
+ return __sync_lock_test_and_set(ptr, new_value);
|
|
+}
|
|
+
|
|
+inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
|
|
+ Atomic32 increment) {
|
|
+ return __sync_add_and_fetch(ptr, increment);
|
|
+}
|
|
+
|
|
+inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
|
|
+ Atomic32 increment) {
|
|
+ return __sync_add_and_fetch(ptr, increment);
|
|
+}
|
|
+
|
|
+inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
|
|
+ Atomic32 old_value, Atomic32 new_value) {
|
|
+ return __sync_val_compare_and_swap(ptr, old_value, new_value);
|
|
+}
|
|
+
|
|
+inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
|
|
+ Atomic32 old_value, Atomic32 new_value) {
|
|
+ return __sync_val_compare_and_swap(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) {
|
|
+ *ptr = value;
|
|
+ MemoryBarrier();
|
|
+}
|
|
+
|
|
+inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
|
|
+ MemoryBarrier();
|
|
+ *ptr = value;
|
|
+}
|
|
+
|
|
+inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
|
|
+ return *ptr;
|
|
+}
|
|
+
|
|
+inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
|
|
+ Atomic32 value = *ptr;
|
|
+ MemoryBarrier();
|
|
+ return value;
|
|
+}
|
|
+
|
|
+inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
|
|
+ MemoryBarrier();
|
|
+ return *ptr;
|
|
+}
|
|
+
|
|
+inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
|
|
+ Atomic64 old_value,
|
|
+ Atomic64 new_value) {
|
|
+ return __sync_val_compare_and_swap(ptr, old_value, new_value);
|
|
+}
|
|
+
|
|
+inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
|
|
+ Atomic64 new_value) {
|
|
+ return __sync_lock_test_and_set(ptr, new_value);
|
|
+}
|
|
+
|
|
+inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
|
|
+ Atomic64 increment) {
|
|
+ return __sync_add_and_fetch(ptr, increment);
|
|
+}
|
|
+
|
|
+inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
|
|
+ Atomic64 increment) {
|
|
+ return __sync_add_and_fetch(ptr, increment);
|
|
+}
|
|
+
|
|
+inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
|
|
+ Atomic64 old_value, Atomic64 new_value) {
|
|
+ return __sync_val_compare_and_swap(ptr, old_value, new_value);
|
|
+}
|
|
+
|
|
+inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
|
|
+ Atomic64 old_value, Atomic64 new_value) {
|
|
+ return __sync_val_compare_and_swap(ptr, old_value, new_value);
|
|
+}
|
|
+
|
|
+inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
|
|
+ *ptr = value;
|
|
+}
|
|
+
|
|
+inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
|
|
+ *ptr = value;
|
|
+ MemoryBarrier();
|
|
+}
|
|
+
|
|
+inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
|
|
+ MemoryBarrier();
|
|
+ *ptr = value;
|
|
+}
|
|
+
|
|
+inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
|
|
+ return *ptr;
|
|
+}
|
|
+
|
|
+inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
|
|
+ Atomic64 data = *ptr;
|
|
+ MemoryBarrier();
|
|
+ return data;
|
|
+}
|
|
+
|
|
+inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
|
|
+ MemoryBarrier();
|
|
+ return *ptr;
|
|
+}
|
|
+
|
|
+} // namespace internal
|
|
+} // namespace protobuf
|
|
+} // namespace google
|
|
+
|
|
+#endif // GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_E2K_LCC_H_
|
|
diff -Naur a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h
|
|
--- a/src/google/protobuf/stubs/platform_macros.h 2021-10-08 18:28:04.735465849 +0300
|
|
+++ b/src/google/protobuf/stubs/platform_macros.h 2021-10-10 23:22:06.419182980 +0300
|
|
@@ -57,6 +57,9 @@
|
|
#elif defined(__ppc__)
|
|
#define GOOGLE_PROTOBUF_ARCH_PPC 1
|
|
#define GOOGLE_PROTOBUF_ARCH_32_BIT 1
|
|
+#elif defined(__e2k__)
|
|
+#define GOOGLE_PROTOBUF_ARCH_E2K 1
|
|
+#define GOOGLE_PROTOBUF_ARCH_64_BIT 1
|
|
#else
|
|
#error Host architecture was not detected as supported by protobuf
|
|
#endif
|
|
diff -Naur a/src/Makefile.am b/src/Makefile.am
|
|
--- a/src/Makefile.am 2013-02-26 21:56:43.000000000 +0400
|
|
+++ b/src/Makefile.am 2021-10-18 22:15:46.684943549 +0300
|
|
@@ -47,6 +47,7 @@
|
|
google/protobuf/stubs/atomicops_internals_pnacl.h \
|
|
google/protobuf/stubs/atomicops_internals_x86_gcc.h \
|
|
google/protobuf/stubs/atomicops_internals_x86_msvc.h \
|
|
+ google/protobuf/stubs/atomicops_internals_e2k_lcc.h \
|
|
google/protobuf/stubs/common.h \
|
|
google/protobuf/stubs/platform_macros.h \
|
|
google/protobuf/stubs/once.h \
|
|
diff -Naur a/src/Makefile.in b/src/Makefile.in
|
|
--- a/src/Makefile.in 2013-02-26 22:04:53.000000000 +0400
|
|
+++ b/src/Makefile.in 2021-10-18 22:15:20.996440542 +0300
|
|
@@ -314,6 +314,7 @@
|
|
google/protobuf/stubs/atomicops_internals_pnacl.h \
|
|
google/protobuf/stubs/atomicops_internals_x86_gcc.h \
|
|
google/protobuf/stubs/atomicops_internals_x86_msvc.h \
|
|
+ google/protobuf/stubs/atomicops_internals_e2k_lcc.h \
|
|
google/protobuf/stubs/common.h \
|
|
google/protobuf/stubs/platform_macros.h \
|
|
google/protobuf/stubs/once.h \
|
|
@@ -523,6 +524,7 @@
|
|
google/protobuf/stubs/atomicops_internals_pnacl.h \
|
|
google/protobuf/stubs/atomicops_internals_x86_gcc.h \
|
|
google/protobuf/stubs/atomicops_internals_x86_msvc.h \
|
|
+ google/protobuf/stubs/atomicops_internals_e2k_lcc.h \
|
|
google/protobuf/stubs/common.h \
|
|
google/protobuf/stubs/platform_macros.h \
|
|
google/protobuf/stubs/once.h \
|