[Wasm64] futex fixes (#20116)

Author: dakenf

system/lib/pthread/emscripten_futex_wait.c

@@ -100,7 +100,7 @@ static int futex_wait_main_browser_thread(volatile void* addr,
     // here and return, it's the same is if what happened on the main thread
     // was the same as calling _emscripten_yield()
     // a few times before calling emscripten_futex_wait().
-    if (__c11_atomic_load((_Atomic uintptr_t*)addr, __ATOMIC_SEQ_CST) != val) {
+    if (__c11_atomic_load((_Atomic uint32_t*)addr, __ATOMIC_SEQ_CST) != val) {
       return -EWOULDBLOCK;
     }
 

test/pthread/test_pthread_atomics.cpp

@@ -129,7 +129,7 @@ void RunTest(int test)
 
 	for(int i = 0; i < NUM_THREADS; ++i)
 	{
-		int status = 1;
+		intptr_t status = 1;
 		int rc = pthread_join(thread[i], (void**)&status);
 		assert(rc == 0);
 		assert(status == 0);

test/pthread/test_pthread_sbrk.cpp

@@ -40,8 +40,8 @@ static void *thread_start(void *arg)
   pthread_mutex_unlock( &mutex );
 #endif
 
-  int id = (int)(intptr_t)(arg)+1;
-  int return_code = RESULT_OK;
+  intptr_t id = (intptr_t)(arg)+1;
+  intptr_t return_code = RESULT_OK;
 
   uint8_t *allocated_buffers[NUM_ALLOCATIONS] = {};
 
@@ -73,7 +73,7 @@ static void *thread_start(void *arg)
       {
         ++return_code; // Failed! (but run to completion so that the barriers will all properly proceed without hanging)
         if (!reported_once) {
-          emscripten_errf("Memory corrupted! mem[i]: %d != %d, i: %d, j: %d", allocated_buffers[i][j], id, i, j);
+          emscripten_errf("Memory corrupted! mem[i]: %d != %ld, i: %d, j: %d", allocated_buffers[i][j], id, i, j);
           reported_once = 1; // Avoid print flood that makes debugging hard.
         }
       }
@@ -111,7 +111,7 @@ int main()
   assert(ret == 0);
 
   pthread_t thr[8/*NUM_THREADS*/];
-  for(int i = 0; i < NUM_THREADS; ++i)
+  for(intptr_t i = 0; i < NUM_THREADS; ++i)
   {
     pthread_attr_t attr;
     pthread_attr_init(&attr);