a

Author: bratpiorka

src/critnib/critnib.c

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -148,7 +148,7 @@ static void load64(uint64_t *src, uint64_t *dst) {
  * atomic store
  */
 static void store(void *dst, void *src) {
-    utils_atomic_store_release((word *)dst, (word)src);
+    utils_atomic_store_release((word *)dst, src);
 }
 
 /*

src/utils/utils_concurrency.h

@@ -98,12 +98,12 @@ static __inline unsigned char utils_mssb_index(long long value) {
 }
 
 void utils_atomic_load_acquire(void *ptr, void *dest);
-void utils_atomic_store_release(void *ptr, long long desired);
-void utils_atomic_increment(void *ptr);
-void utils_atomic_decrement(void *ptr);
-void utils_fetch_and_add64(void *ptr, long long value);
+void utils_atomic_store_release(void *ptr, void *desired);
+long long utils_atomic_increment(void *ptr);
+long long utils_atomic_decrement(void *ptr);
+long long utils_fetch_and_add64(void *ptr, long long value);
 // NOTE: windows version have different order of args
-void utils_compare_exchange(void *ptr, void *desired, void *expected)
+void utils_compare_exchange(void *ptr, void *desired, void *expected);
 
 #else // !defined(_WIN32)
 

src/utils/utils_windows_concurrency.c

@@ -73,33 +73,34 @@ void utils_atomic_load_acquire(void *ptr, void *dest) {
     *(long long *)dest = InterlockedOr64Acquire((long long volatile *)ptr, 0);
 }
 
-void utils_atomic_store_release(void *ptr, long long desired) {
+void utils_atomic_store_release(void *ptr, void *desired) {
     ASSERT_IS_ALIGNED((uintptr_t)ptr, 64);
-    InterlockedExchange64((long long volatile *)ptr, desired);
+    InterlockedExchange64((long long volatile *)ptr, (long long)desired);
 }
 
-void utils_atomic_increment(void *ptr) {
+long long utils_atomic_increment(void *ptr) {
     ASSERT_IS_ALIGNED((uintptr_t)ptr, 64);
-    InterlockedIncrement64((long long volatile *)ptr)
+    return InterlockedIncrement64((long long volatile *)ptr);
 }
 
-void utils_atomic_decrement(void *ptr) {
+long long utils_atomic_decrement(void *ptr) {
     ASSERT_IS_ALIGNED((uintptr_t)ptr, 64);
-    InterlockedDecrement64((long long volatile *)ptr)
+    return InterlockedDecrement64((long long volatile *)ptr);
 }
 
-void utils_fetch_and_add64(void *ptr, long long value) {
+long long utils_fetch_and_add64(void *ptr, long long value) {
     ASSERT_IS_ALIGNED((uintptr_t)ptr, 64);
-    InterlockedExchangeAdd64((long long volatile *)(ptr), value);
+    // returns the val of *ptr before the operation
+    return InterlockedExchangeAdd64((long long volatile *)(ptr), value);
 }
 
 // NOTE: windows version have different order of args
 void utils_compare_exchange(void *ptr, void *desired, void *expected) {
     ASSERT_IS_ALIGNED((uintptr_t)ptr, 64);
     ASSERT_IS_ALIGNED((uintptr_t)desired, 64);
     ASSERT_IS_ALIGNED((uintptr_t)expected, 64);
-    InterlockedCompareExchange64((long long volatile *)ptr, *expected,
-                                 *desired);
+    InterlockedCompareExchange64((long long volatile *)ptr,
+                                 *(long long *)expected, *(long long *)desired);
 }
 
 static BOOL CALLBACK initOnceCb(PINIT_ONCE InitOnce, PVOID Parameter,