git subrepo pull (merge) --force deps/lightning

[pcsx_rearmed.git] / deps / lightning / check / catomic.c

diff --git a/deps/lightning/check/catomic.c b/deps/lightning/check/catomic.c
index ef09076..50ddd0d 100644 (file)
--- a/deps/lightning/check/catomic.c
+++ b/deps/lightning/check/catomic.c
@@ -4,6 +4,43 @@
 #include <unistd.h>
 #include <signal.h>
 
+/* FIXME Remove the "0 &&"  below to make the test pass.
+ * This should not be a Lightning issue. It is crashing
+ * like this at exit:
+ *     Thread 2 "catomic" received signal SIGSEGV, Segmentation fault.
+ *     [Switching to Thread 0xf6acc480 (LWP 2561)]
+ *     _IO_acquire_lock_fct (p=<synthetic pointer>) at libioP.h:797
+ *     797     libioP.h: No such file or directory.
+ *     (gdb) bt
+ *     #0  _IO_acquire_lock_fct (p=<synthetic pointer>) at libioP.h:797
+ *     #1  _IO_puts (str=0x1 <error: Cannot access memory at address 0x1>)
+ *         at ioputs.c:36
+ *     #2  0xf8eca180 in ?? ()
+ * unless using these hacks, to not use stdio.
+ * Note that the problem will still happen on purpose, to not risk hiding
+ * a problem.
+ */
+#if 0 && defined(__hppa__)
+#  if DEBUG
+#    define DEBUG 0
+#  define PRINT_OK()                                           \
+    do {                                                       \
+       jit_prepare();                                          \
+       jit_pushargi(STDOUT_FILENO);                            \
+       jit_pushargi((jit_word_t)"ok\n");                       \
+       jit_pushargri(3);                                       \
+       jit_finishi(write);                                     \
+    } while (0)
+#  endif
+#else
+#  define PRINT_OK()                                           \
+    do {                                                       \
+       jit_prepare();                                          \
+       jit_pushargi((jit_word_t)"ok");                         \
+       jit_finishi(puts);                                      \
+    } while (0)
+#endif
+
 #if DEBUG
 volatile
 #endif
@@ -106,11 +143,7 @@ main(int argc, char *argv[])
      * while holding the lock */                               \
     jit_pushargi(10000);                                       \
     jit_finishi(usleep);                                       \
-    jit_prepare();                                             \
-    /* for make check, just print "ok" */                      \
-    jit_pushargi((jit_word_t)"ok");                            \
-    /*jit_pushargi((jit_word_t)#name);*/                       \
-    jit_finishi(puts);                                         \
+    PRINT_OK();                                                        \
     /* release lock */                                         \
     DEBUG_UNLOCK();                                            \
     jit_movi(JIT_V1, 0);                                       \
@@ -150,7 +183,10 @@ main(int argc, char *argv[])
 #define join(tid)                                              \
     /* load pthread_t value in JIT_R0 */                       \
     jit_movi(JIT_R0, (jit_word_t)tids);                                \
-    jit_ldxi(JIT_R0, JIT_R0, tid * sizeof(pthread_t));         \
+    if (__WORDSIZE == 64 && sizeof(pthread_t) == 4)            \
+       jit_ldxi_i(JIT_R0, JIT_R0, tid * sizeof(pthread_t));    \
+    else                                                       \
+       jit_ldxi(JIT_R0, JIT_R0, tid * sizeof(pthread_t));      \
     jit_prepare();                                             \
     jit_pushargr(JIT_R0);                                      \
     jit_pushargi((jit_word_t)NULL);                            \
@@ -161,9 +197,7 @@ main(int argc, char *argv[])
     join(2);
     join(3);
 
-    jit_prepare();
-    jit_pushargi((jit_word_t)"ok");
-    jit_finishi(puts);
+    PRINT_OK();
 
     jit_ret();
     jit_epilog();