BUILD: remove obsolete support for -mregparm / USE_REGPARM
This used to be a minor optimization on ix86 where registers are scarce
and the calling convention not very efficient, but this platform is not
relevant enough anymore to warrant all this dirt in the code for the sake
of saving 1 or 2% of performance. Modern platforms don't use this at all
since their calling convention already defaults to using several registers
so better get rid of this once for all.
diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index bbba0ec..5122510 100644
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -45,7 +45,7 @@
* send us events even though this process closed the fd (see man 7 epoll,
* "Questions and answers", Q 6).
*/
-REGPRM1 static void __fd_clo(int fd)
+static void __fd_clo(int fd)
{
if (unlikely(fdtab[fd].cloned)) {
unsigned long m = polled_mask[fd].poll_recv | polled_mask[fd].poll_send;
@@ -134,7 +134,7 @@
/*
* Linux epoll() poller
*/
-REGPRM3 static void _do_poll(struct poller *p, int exp, int wake)
+static void _do_poll(struct poller *p, int exp, int wake)
{
int status;
int fd;
@@ -283,7 +283,7 @@
* Returns 0 in case of failure, non-zero in case of success. If it fails, it
* disables the poller by setting its pref to 0.
*/
-REGPRM1 static int _do_init(struct poller *p)
+static int _do_init(struct poller *p)
{
p->private = NULL;
@@ -305,7 +305,7 @@
* Termination of the epoll() poller.
* Memory is released and the poller is marked as unselectable.
*/
-REGPRM1 static void _do_term(struct poller *p)
+static void _do_term(struct poller *p)
{
if (epoll_fd[tid] >= 0) {
close(epoll_fd[tid]);
@@ -320,7 +320,7 @@
* Check that the poller works.
* Returns 1 if OK, otherwise 0.
*/
-REGPRM1 static int _do_test(struct poller *p)
+static int _do_test(struct poller *p)
{
int fd;
@@ -337,7 +337,7 @@
* epoll_fd. Some side effects were encountered because of this, such
* as epoll_wait() returning an FD which was previously deleted.
*/
-REGPRM1 static int _do_fork(struct poller *p)
+static int _do_fork(struct poller *p)
{
if (epoll_fd[tid] >= 0)
close(epoll_fd[tid]);
diff --git a/src/ev_evports.c b/src/ev_evports.c
index 2aea201..23591d2 100644
--- a/src/ev_evports.c
+++ b/src/ev_evports.c
@@ -114,7 +114,7 @@
* "src/fd.c" for more information.
*/
-REGPRM3 static void _do_poll(struct poller *p, int exp, int wake)
+static void _do_poll(struct poller *p, int exp, int wake)
{
int i;
int wait_time;
@@ -330,7 +330,7 @@
* Initialisation of the event ports poller.
* Returns 0 in case of failure, non-zero in case of success.
*/
-REGPRM1 static int _do_init(struct poller *p)
+static int _do_init(struct poller *p)
{
p->private = NULL;
@@ -352,7 +352,7 @@
* Termination of the event ports poller.
* All resources are released and the poller is marked as inoperative.
*/
-REGPRM1 static void _do_term(struct poller *p)
+static void _do_term(struct poller *p)
{
if (evports_fd[tid] != -1) {
close(evports_fd[tid]);
@@ -372,7 +372,7 @@
* the poller to function correctly.
* Returns 1 on success, otherwise 0.
*/
-REGPRM1 static int _do_test(struct poller *p)
+static int _do_test(struct poller *p)
{
int fd;
@@ -389,7 +389,7 @@
* otherwise 0. If this function fails, "_do_term()" must be called to
* clean up the poller.
*/
-REGPRM1 static int _do_fork(struct poller *p)
+static int _do_fork(struct poller *p)
{
if (evports_fd[tid] != -1) {
close(evports_fd[tid]);
diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index 3514f2d..852fa6e 100644
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -89,7 +89,7 @@
/*
* kqueue() poller
*/
-REGPRM3 static void _do_poll(struct poller *p, int exp, int wake)
+static void _do_poll(struct poller *p, int exp, int wake)
{
int status;
int count, fd, wait_time;
@@ -261,7 +261,7 @@
* Returns 0 in case of failure, non-zero in case of success. If it fails, it
* disables the poller by setting its pref to 0.
*/
-REGPRM1 static int _do_init(struct poller *p)
+static int _do_init(struct poller *p)
{
p->private = NULL;
@@ -294,7 +294,7 @@
* Termination of the kqueue() poller.
* Memory is released and the poller is marked as unselectable.
*/
-REGPRM1 static void _do_term(struct poller *p)
+static void _do_term(struct poller *p)
{
if (kqueue_fd[tid] >= 0) {
close(kqueue_fd[tid]);
@@ -313,7 +313,7 @@
* Check that the poller works.
* Returns 1 if OK, otherwise 0.
*/
-REGPRM1 static int _do_test(struct poller *p)
+static int _do_test(struct poller *p)
{
int fd;
@@ -329,7 +329,7 @@
* otherwise 0. Note that some pollers need to be reopened after a fork()
* (such as kqueue), and some others may fail to do so in a chroot.
*/
-REGPRM1 static int _do_fork(struct poller *p)
+static int _do_fork(struct poller *p)
{
kqueue_fd[tid] = kqueue();
if (kqueue_fd[tid] < 0)
diff --git a/src/ev_poll.c b/src/ev_poll.c
index 47ce14b..538f070 100644
--- a/src/ev_poll.c
+++ b/src/ev_poll.c
@@ -41,7 +41,7 @@
static THREAD_LOCAL int nbfd = 0;
static THREAD_LOCAL struct pollfd *poll_events = NULL;
-REGPRM1 static void __fd_clo(int fd)
+static void __fd_clo(int fd)
{
hap_fd_clr(fd, fd_evts[DIR_RD]);
hap_fd_clr(fd, fd_evts[DIR_WR]);
@@ -98,7 +98,7 @@
/*
* Poll() poller
*/
-REGPRM3 static void _do_poll(struct poller *p, int exp, int wake)
+static void _do_poll(struct poller *p, int exp, int wake)
{
int status;
int fd;
@@ -265,7 +265,7 @@
* Returns 0 in case of failure, non-zero in case of success. If it fails, it
* disables the poller by setting its pref to 0.
*/
-REGPRM1 static int _do_init(struct poller *p)
+static int _do_init(struct poller *p)
{
__label__ fail_swevt, fail_srevt;
int fd_evts_bytes;
@@ -295,7 +295,7 @@
* Termination of the poll() poller.
* Memory is released and the poller is marked as unselectable.
*/
-REGPRM1 static void _do_term(struct poller *p)
+static void _do_term(struct poller *p)
{
free(fd_evts[DIR_WR]);
free(fd_evts[DIR_RD]);
@@ -307,7 +307,7 @@
* Check that the poller works.
* Returns 1 if OK, otherwise 0.
*/
-REGPRM1 static int _do_test(struct poller *p)
+static int _do_test(struct poller *p)
{
return 1;
}
diff --git a/src/ev_select.c b/src/ev_select.c
index dc66e71..ab021b9 100644
--- a/src/ev_select.c
+++ b/src/ev_select.c
@@ -32,7 +32,7 @@
static THREAD_LOCAL fd_set *tmp_evts[2];
/* Immediately remove the entry upon close() */
-REGPRM1 static void __fd_clo(int fd)
+static void __fd_clo(int fd)
{
hap_fd_clr(fd, fd_evts[DIR_RD]);
hap_fd_clr(fd, fd_evts[DIR_WR]);
@@ -89,7 +89,7 @@
/*
* Select() poller
*/
-REGPRM3 static void _do_poll(struct poller *p, int exp, int wake)
+static void _do_poll(struct poller *p, int exp, int wake)
{
int status;
int fd, i;
@@ -247,7 +247,7 @@
* Returns 0 in case of failure, non-zero in case of success. If it fails, it
* disables the poller by setting its pref to 0.
*/
-REGPRM1 static int _do_init(struct poller *p)
+static int _do_init(struct poller *p)
{
__label__ fail_swevt, fail_srevt, fail_revt;
int fd_set_bytes;
@@ -283,7 +283,7 @@
* Termination of the select() poller.
* Memory is released and the poller is marked as unselectable.
*/
-REGPRM1 static void _do_term(struct poller *p)
+static void _do_term(struct poller *p)
{
free(fd_evts[DIR_WR]);
free(fd_evts[DIR_RD]);
@@ -295,7 +295,7 @@
* Check that the poller works.
* Returns 1 if OK, otherwise 0.
*/
-REGPRM1 static int _do_test(struct poller *p)
+static int _do_test(struct poller *p)
{
if (global.maxsock > FD_SETSIZE)
return 0;
diff --git a/src/time.c b/src/time.c
index 1a18c76..8e3afda 100644
--- a/src/time.c
+++ b/src/time.c
@@ -38,7 +38,7 @@
/*
* adds <ms> ms to <from>, set the result to <tv> and returns a pointer <tv>
*/
-REGPRM3 struct timeval *_tv_ms_add(struct timeval *tv, const struct timeval *from, int ms)
+struct timeval *_tv_ms_add(struct timeval *tv, const struct timeval *from, int ms)
{
tv->tv_usec = from->tv_usec + (ms % 1000) * 1000;
tv->tv_sec = from->tv_sec + (ms / 1000);
@@ -53,7 +53,7 @@
* compares <tv1> and <tv2> modulo 1ms: returns 0 if equal, -1 if tv1 < tv2, 1 if tv1 > tv2
* Must not be used when either argument is eternity. Use tv_ms_cmp2() for that.
*/
-REGPRM2 int _tv_ms_cmp(const struct timeval *tv1, const struct timeval *tv2)
+int _tv_ms_cmp(const struct timeval *tv1, const struct timeval *tv2)
{
return __tv_ms_cmp(tv1, tv2);
}
@@ -62,7 +62,7 @@
* compares <tv1> and <tv2> modulo 1 ms: returns 0 if equal, -1 if tv1 < tv2, 1 if tv1 > tv2,
* assuming that TV_ETERNITY is greater than everything.
*/
-REGPRM2 int _tv_ms_cmp2(const struct timeval *tv1, const struct timeval *tv2)
+int _tv_ms_cmp2(const struct timeval *tv1, const struct timeval *tv2)
{
return __tv_ms_cmp2(tv1, tv2);
}
@@ -73,7 +73,7 @@
* TV_ETERNITY, and always assumes that tv2 != TV_ETERNITY. Designed to replace
* occurrences of (tv_ms_cmp2(tv,now) <= 0).
*/
-REGPRM2 int _tv_ms_le2(const struct timeval *tv1, const struct timeval *tv2)
+int _tv_ms_le2(const struct timeval *tv1, const struct timeval *tv2)
{
return __tv_ms_le2(tv1, tv2);
}
@@ -83,7 +83,7 @@
* if tv2 is passed, 0 is returned.
* Must not be used when either argument is eternity.
*/
-REGPRM2 unsigned long _tv_ms_remain(const struct timeval *tv1, const struct timeval *tv2)
+unsigned long _tv_ms_remain(const struct timeval *tv1, const struct timeval *tv2)
{
return __tv_ms_remain(tv1, tv2);
}
@@ -93,7 +93,7 @@
* if tv2 is passed, 0 is returned.
* Returns TIME_ETERNITY if tv2 is eternity.
*/
-REGPRM2 unsigned long _tv_ms_remain2(const struct timeval *tv1, const struct timeval *tv2)
+unsigned long _tv_ms_remain2(const struct timeval *tv1, const struct timeval *tv2)
{
if (tv_iseternity(tv2))
return TIME_ETERNITY;
@@ -105,7 +105,7 @@
* Returns the time in ms elapsed between tv1 and tv2, assuming that tv1<=tv2.
* Must not be used when either argument is eternity.
*/
-REGPRM2 unsigned long _tv_ms_elapsed(const struct timeval *tv1, const struct timeval *tv2)
+unsigned long _tv_ms_elapsed(const struct timeval *tv1, const struct timeval *tv2)
{
return __tv_ms_elapsed(tv1, tv2);
}
@@ -113,7 +113,7 @@
/*
* adds <inc> to <from>, set the result to <tv> and returns a pointer <tv>
*/
-REGPRM3 struct timeval *_tv_add(struct timeval *tv, const struct timeval *from, const struct timeval *inc)
+struct timeval *_tv_add(struct timeval *tv, const struct timeval *from, const struct timeval *inc)
{
return __tv_add(tv, from, inc);
}
@@ -122,7 +122,7 @@
* If <inc> is set, then add it to <from> and set the result to <tv>, then
* return 1, otherwise return 0. It is meant to be used in if conditions.
*/
-REGPRM3 int _tv_add_ifset(struct timeval *tv, const struct timeval *from, const struct timeval *inc)
+int _tv_add_ifset(struct timeval *tv, const struct timeval *from, const struct timeval *inc)
{
return __tv_add_ifset(tv, from, inc);
}
@@ -131,7 +131,7 @@
* Computes the remaining time between tv1=now and event=tv2. if tv2 is passed,
* 0 is returned. The result is stored into tv.
*/
-REGPRM3 struct timeval *_tv_remain(const struct timeval *tv1, const struct timeval *tv2, struct timeval *tv)
+struct timeval *_tv_remain(const struct timeval *tv1, const struct timeval *tv2, struct timeval *tv)
{
return __tv_remain(tv1, tv2, tv);
}
@@ -141,19 +141,19 @@
* 0 is returned. The result is stored into tv. Returns ETERNITY if tv2 is
* eternity.
*/
-REGPRM3 struct timeval *_tv_remain2(const struct timeval *tv1, const struct timeval *tv2, struct timeval *tv)
+struct timeval *_tv_remain2(const struct timeval *tv1, const struct timeval *tv2, struct timeval *tv)
{
return __tv_remain2(tv1, tv2, tv);
}
/* tv_isle: compares <tv1> and <tv2> : returns 1 if tv1 <= tv2, otherwise 0 */
-REGPRM2 int _tv_isle(const struct timeval *tv1, const struct timeval *tv2)
+int _tv_isle(const struct timeval *tv1, const struct timeval *tv2)
{
return __tv_isle(tv1, tv2);
}
/* tv_isgt: compares <tv1> and <tv2> : returns 1 if tv1 > tv2, otherwise 0 */
-REGPRM2 int _tv_isgt(const struct timeval *tv1, const struct timeval *tv2)
+int _tv_isgt(const struct timeval *tv1, const struct timeval *tv2)
{
return __tv_isgt(tv1, tv2);
}
@@ -175,7 +175,7 @@
* microsecond adjustment. We cannot use a timeval for this since it's never
* clearly specified whether a timeval may hold negative values or not.
*/
-REGPRM2 void tv_update_date(int max_wait, int interrupted)
+void tv_update_date(int max_wait, int interrupted)
{
struct timeval adjusted, deadline, tmp_now, tmp_adj;
unsigned int curr_sec_ms; /* millisecond of current second (0..999) */