src/hb-atomic-private.hh | 9 +--------
src/hb-object-private.hh | 4 ++--
2 files changed, 3 insertions(+), 10 deletions(-)
New commits:
commit e36cd1dfd36ed336f63883098dc870c56a5fc10d
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Thu May 31 19:31:39 2018 -0700
Remove trivial HB_ATOMIC_INT_INIT()
diff --git a/src/hb-atomic-private.hh b/src/hb-atomic-private.hh
index a7e9b11a..12caacaa 100644
--- a/src/hb-atomic-private.hh
+++ b/src/hb-atomic-private.hh
@@ -63,7 +63,6 @@ static inline void _HBMemoryBarrier (void) {
}
typedef LONG hb_atomic_int_impl_t;
-#define HB_ATOMIC_INT_IMPL_INIT(V) (V)
#define hb_atomic_int_impl_add(AI, V) InterlockedExchangeAdd (&(AI),
(V))
#define hb_atomic_ptr_impl_get(P) (_HBMemoryBarrier (), (void *)
*(P))
@@ -73,7 +72,6 @@ typedef LONG hb_atomic_int_impl_t;
#elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES)
typedef int hb_atomic_int_impl_t;
-#define HB_ATOMIC_INT_IMPL_INIT(V) (V)
#define hb_atomic_int_impl_add(AI, V) __sync_fetch_and_add (&(AI),
(V))
#define hb_atomic_ptr_impl_get(P) (void *) (__sync_synchronize
(), *(P))
@@ -86,7 +84,6 @@ typedef int hb_atomic_int_impl_t;
#include <mbarrier.h>
typedef unsigned int hb_atomic_int_impl_t;
-#define HB_ATOMIC_INT_IMPL_INIT(V) (V)
#define hb_atomic_int_impl_add(AI, V) ( ({__machine_rw_barrier ();}),
atomic_add_int_nv (&(AI), (V)) - (V))
#define hb_atomic_ptr_impl_get(P) ( ({__machine_rw_barrier ();}),
(void *) *(P))
@@ -104,7 +101,6 @@ typedef unsigned int hb_atomic_int_impl_t;
typedef int32_t hb_atomic_int_impl_t;
-#define HB_ATOMIC_INT_IMPL_INIT(V) (V)
#define hb_atomic_int_impl_add(AI, V) (OSAtomicAdd32Barrier ((V),
&(AI)) - (V))
#define hb_atomic_ptr_impl_get(P) (OSMemoryBarrier (), (void *)
*(P))
@@ -138,7 +134,6 @@ static inline int _hb_compare_and_swaplp(volatile long* P,
long O, long N) {
}
typedef int hb_atomic_int_impl_t;
-#define HB_ATOMIC_INT_IMPL_INIT(V) (V)
#define hb_atomic_int_impl_add(AI, V) _hb_fetch_and_add (&(AI), (V))
#define hb_atomic_ptr_impl_get(P) (__sync(), (void *) *(P))
@@ -149,7 +144,6 @@ typedef int hb_atomic_int_impl_t;
#define HB_ATOMIC_INT_NIL 1 /* Warn that fallback implementation is in use. */
typedef volatile int hb_atomic_int_impl_t;
-#define HB_ATOMIC_INT_IMPL_INIT(V) (V)
#define hb_atomic_int_impl_add(AI, V) (((AI) += (V)) - (V))
#define hb_atomic_ptr_impl_get(P) ((void *) *(P))
@@ -159,7 +153,6 @@ typedef volatile int hb_atomic_int_impl_t;
#else /* HB_NO_MT */
typedef int hb_atomic_int_impl_t;
-#define HB_ATOMIC_INT_IMPL_INIT(V) (V)
#define hb_atomic_int_impl_add(AI, V) (((AI) += (V)) - (V))
#define hb_atomic_ptr_impl_get(P) ((void *) *(P))
@@ -169,7 +162,7 @@ typedef int hb_atomic_int_impl_t;
#endif
-#define HB_ATOMIC_INT_INIT(V) {HB_ATOMIC_INT_IMPL_INIT(V)}
+#define HB_ATOMIC_INT_INIT(V) {V}
struct hb_atomic_int_t
{
diff --git a/src/hb-object-private.hh b/src/hb-object-private.hh
index 00939ed4..fc48a91b 100644
--- a/src/hb-object-private.hh
+++ b/src/hb-object-private.hh
@@ -43,7 +43,7 @@
#define HB_REFERENCE_COUNT_INERT_VALUE 0
#define HB_REFERENCE_COUNT_POISON_VALUE -0x0000DEAD
-#define HB_REFERENCE_COUNT_INIT
{HB_ATOMIC_INT_INIT(HB_REFERENCE_COUNT_INERT_VALUE)}
+#define HB_REFERENCE_COUNT_INIT {HB_ATOMIC_INT_INIT
(HB_REFERENCE_COUNT_INERT_VALUE)}
struct hb_reference_count_t
{
commit 550a70f8011c4c1cfd27d739469e79cb98bcdd6e
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Thu May 31 19:28:04 2018 -0700
Use 0 as inert object reference value instead of -1
Towards using Null object for nil objects.
diff --git a/src/hb-object-private.hh b/src/hb-object-private.hh
index 1f61dcea..00939ed4 100644
--- a/src/hb-object-private.hh
+++ b/src/hb-object-private.hh
@@ -41,7 +41,7 @@
/* reference_count */
-#define HB_REFERENCE_COUNT_INERT_VALUE -1
+#define HB_REFERENCE_COUNT_INERT_VALUE 0
#define HB_REFERENCE_COUNT_POISON_VALUE -0x0000DEAD
#define HB_REFERENCE_COUNT_INIT
{HB_ATOMIC_INT_INIT(HB_REFERENCE_COUNT_INERT_VALUE)}
_______________________________________________
HarfBuzz mailing list
HarfBuzz@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/harfbuzz
