eliminate explicit (long) casts when making syscalls

this practice came from very early, before internal/syscall.h defined
macros that could accept pointer arguments directly and handle them
correctly. aside from being ugly and unnecessary, it looks like it
will be problematic when we add support for 32-bit ABIs on archs where
registers (and syscall arguments) are 64-bit, e.g. x32 and mips n32.

diff --git a/src/thread/__wait.c b/src/thread/__wait.c
index 041a066..a1e4780 100644 (file)
--- a/src/thread/__wait.c
+++ b/src/thread/__wait.c
@@ -10,6 +10,6 @@ void __wait(volatile int *addr, volatile int *waiters, int val, int priv)
        }
        if (waiters) a_inc(waiters);
        while (*addr==val)
-               __syscall(SYS_futex, (long)addr, FUTEX_WAIT|priv, val, 0);
+               __syscall(SYS_futex, addr, FUTEX_WAIT|priv, val, 0);
        if (waiters) a_dec(waiters);
 }

diff --git a/src/time/timer_delete.c b/src/time/timer_delete.c
index c81f921..7c97eeb 100644 (file)
--- a/src/time/timer_delete.c
+++ b/src/time/timer_delete.c
@@ -10,5 +10,5 @@ int timer_delete(timer_t t)
                __wake(&td->timer_id, 1, 1);
                return 0;
        }
-       return __syscall(SYS_timer_delete, (long)t);
+       return __syscall(SYS_timer_delete, t);
 }

diff --git a/src/time/timer_getoverrun.c b/src/time/timer_getoverrun.c
index 5336128..e7f891e 100644 (file)
--- a/src/time/timer_getoverrun.c
+++ b/src/time/timer_getoverrun.c
@@ -8,5 +8,5 @@ int timer_getoverrun(timer_t t)
                pthread_t td = (void *)((uintptr_t)t << 1);
                t = (void *)(uintptr_t)(td->timer_id & INT_MAX);
        }
-       return syscall(SYS_timer_getoverrun, (long)t);
+       return syscall(SYS_timer_getoverrun, t);
 }

diff --git a/src/time/timer_gettime.c b/src/time/timer_gettime.c
index 1d90207..ed6d8d6 100644 (file)
--- a/src/time/timer_gettime.c
+++ b/src/time/timer_gettime.c
@@ -8,5 +8,5 @@ int timer_gettime(timer_t t, struct itimerspec *val)
                pthread_t td = (void *)((uintptr_t)t << 1);
                t = (void *)(uintptr_t)(td->timer_id & INT_MAX);
        }
-       return syscall(SYS_timer_gettime, (long)t, val);
+       return syscall(SYS_timer_gettime, t, val);
 }

diff --git a/src/time/timer_settime.c b/src/time/timer_settime.c
index f5f36fe..62631aa 100644 (file)
--- a/src/time/timer_settime.c
+++ b/src/time/timer_settime.c
@@ -8,5 +8,5 @@ int timer_settime(timer_t t, int flags, const struct itimerspec *restrict val, s
                pthread_t td = (void *)((uintptr_t)t << 1);
                t = (void *)(uintptr_t)(td->timer_id & INT_MAX);
        }
-       return syscall(SYS_timer_settime, (long)t, flags, val, old);
+       return syscall(SYS_timer_settime, t, flags, val, old);
 }