android mt.c support wip

Author: bilam

jsrc/Android.mk

@@ -37,7 +37,7 @@ endif
 LOCAL_LDLIBS := -ldl -llog
 
 LOCAL_SRC_FILES := a.c ab.c aes-c.c aes-arm.c aes-sse2.c af.c ai.c am.c am1.c amn.c ao.c ap.c ar.c as.c au.c c.c ca.c cc.c cd.c cf.c cg.c ch.c cip.c cl.c cp.c cpdtsp.c cpuinfo.c cr.c crs.c \
-	ct.c cu.c cv.c cx.c d.c dc.c dss.c dstop.c dsusp.c dtoa.c f.c f2.c fbu.c gemm.c i.c io.c j.c jdlllic.c k.c m.c mbx.c p.c pv.c px.c r.c rl.c rt.c s.c sc.c sl.c \
+	ct.c cu.c cv.c cx.c d.c dc.c dss.c dstop.c dsusp.c dtoa.c f.c f2.c fbu.c gemm.c i.c io.c j.c jdlllic.c k.c m.c mbx.c mt.c p.c pv.c px.c r.c rl.c rt.c s.c sc.c sl.c \
 	sn.c t.c u.c v.c v0.c v1.c v2.c va1.c va1ss.c va2.c va2s.c va2ss.c vamultsp.c vb.c vbang.c vbit.c vcant.c vchar.c vcat.c vcatsp.c vcomp.c vcompsc.c vd.c vdx.c ve.c \
 	vf.c vfft.c vfrom.c  vfromsp.c vg.c vgauss.c vgcomp.c vgranking.c vgsort.c vgsp.c vi.c viavx.c viix.c visp.c vm.c vo.c vp.c vq.c vrand.c vrep.c vs.c vsb.c \
 	vt.c vu.c vx.c vz.c w.c wc.c wn.c ws.c x.c x15.c xa.c xaes.c xb.c xc.c xcrc.c xd.c xf.c xfmt.c xh.c xi.c xl.c xo.c xs.c xsha.c xt.c xu.c crc32c.c str.c \

jsrc/mt.c

@@ -30,15 +30,15 @@ I jtmdif(struct jtimespec w){
  R (w.tv_sec-t.tv_sec)*1000000000ull+w.tv_nsec-t.tv_nsec;}
 
 #if PYXES
-#ifdef __APPLE__
+#if defined(__APPLE__)
 void jfutex_wake1(UI4 *p){__ulock_wake(UL_COMPARE_AND_WAIT|ULF_NO_ERRNO,p,0);}
 void jfutex_wakea(UI4 *p){__ulock_wake(UL_COMPARE_AND_WAIT|ULF_NO_ERRNO|ULF_WAKE_ALL,p,0);}
 C jfutex_wait(UI4 *p,UI4 v){
  I r=__ulock_wait(UL_COMPARE_AND_WAIT|ULF_NO_ERRNO,p,v,0);
  if(r>=0)R 0;
  if(r==-EINTR||r==-EFAULT)R 0; //EFAULT means the address needed to be paged in, not that it wasn't mapped?
  R EVFACE;} //should never happen?
-#if __arm64__
+#if defined(__arm64__)||defined(__aarch64__)
 // wait2 takes an ns timeout, but it's only available from macos 11 onward; coincidentally, arm macs only support macos 11+
 // so we can count on having this
 I jfutex_waitn(UI4 *p,UI4 v,UI ns){
@@ -65,8 +65,10 @@ I jfutex_waitn(UI4 *p,UI4 v,UI ns){I r;
  if(r==-ENOMEM)R EVWSFULL;
  R EVFACE;}
 #endif
-#elif defined(__linux__)
+#elif defined(__linux__)&&!defined(ANDROID)
 //glibc 'syscall': stupid errno
+// ??? asm applicable to arm64
+// #if defined(__x86_64__)||defined(__i386__)||defined(_M_X64)||defined(_M_IX86)
 void jfutex_wake1(UI4 *p){
  __asm__ volatile("syscall" :: "a" (SYS_futex), //eax: syscall#
                                "D" (p), //rdi: ptr
@@ -102,6 +104,8 @@ I jfutex_waitn(UI4 *p,UI4 v,UI ns){
  if(r==-ETIMEDOUT)R -1;
  if(r==-EAGAIN||r==-EINTR)R 0;
  R EVFACE;}
+#elif defined(ANDROID)
+// TODO
 #elif defined(_WIN32)
 // defined in cd.c to avoid name collisions between j.h and windows.h
 #endif

jsrc/mt.h

@@ -25,9 +25,11 @@ I jtpthread_mutex_trylock(jtpthread_mutex_t*,I self); //0=success -1=failure pos
 C jtpthread_mutex_unlock(jtpthread_mutex_t*,I self); //0 or error code
 //note: self must be non-zero
 
-#if defined(__linux__)
+#if defined(__linux__)&&!defined(ANDROID)
 #include <linux/futex.h>
 #include <sys/syscall.h>
+#elif defined(ANDORID)
+#error no futex support for your platform
 #elif defined(__APPLE__)
 // ulock (~futex) junk from xnu.  timeout=0 means wait forever
 extern int __ulock_wait(uint32_t operation, void *addr, uint64_t value, uint32_t timeout);             // timeout in us