153 lines
4.1 KiB
Diff
153 lines
4.1 KiB
Diff
diff -u -r ../swipl-7.3.6/src/pl-dict.c ./src/pl-dict.c
|
|
--- ../swipl-7.3.6/src/pl-dict.c 2015-08-25 05:55:13.000000000 -0400
|
|
+++ ./src/pl-dict.c 2015-09-16 19:10:55.212457701 -0400
|
|
@@ -113,10 +113,148 @@
|
|
|
|
#if (defined _GNU_SOURCE || defined __GNU__ || defined __linux__)
|
|
|
|
+#ifdef __ANDROID__
|
|
+#include <stdlib.h>
|
|
+
|
|
+typedef int cmp_t(void *, const void *, const void *);
|
|
+static inline char *med3(char *, char *, char *, cmp_t *, void *);
|
|
+static inline void swapfunc(char *, char *, int, int);
|
|
+
|
|
+#define min(a, b) (a) < (b) ? a : b
|
|
+
|
|
+/*
|
|
+ * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
|
|
+ */
|
|
+#define swapcode(TYPE, parmi, parmj, n) { \
|
|
+ long i = (n) / sizeof (TYPE); \
|
|
+ TYPE *pi = (TYPE *) (parmi); \
|
|
+ TYPE *pj = (TYPE *) (parmj); \
|
|
+ do { \
|
|
+ TYPE t = *pi; \
|
|
+ *pi++ = *pj; \
|
|
+ *pj++ = t; \
|
|
+ } while (--i > 0); \
|
|
+}
|
|
+
|
|
+#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
|
|
+ es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
|
|
+
|
|
+ static inline void
|
|
+swapfunc(char *a, char *b, int n, int swaptype)
|
|
+{
|
|
+ if(swaptype <= 1)
|
|
+ swapcode(long, a, b, n)
|
|
+ else
|
|
+ swapcode(char, a, b, n)
|
|
+}
|
|
+
|
|
+#define swap(a, b) \
|
|
+ if (swaptype == 0) { \
|
|
+ long t = *(long *)(a); \
|
|
+ *(long *)(a) = *(long *)(b); \
|
|
+ *(long *)(b) = t; \
|
|
+ } else \
|
|
+swapfunc(a, b, es, swaptype)
|
|
+
|
|
+#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype)
|
|
+
|
|
+#define CMP(t, x, y) (cmp((t), (x), (y)))
|
|
+
|
|
+ static inline char *
|
|
+med3(char *a, char *b, char *c, cmp_t *cmp, void *thunk)
|
|
+{
|
|
+ return CMP(thunk, a, b) < 0 ?
|
|
+ (CMP(thunk, b, c) < 0 ? b : (CMP(thunk, a, c) < 0 ? c : a ))
|
|
+ :(CMP(thunk, b, c) > 0 ? b : (CMP(thunk, a, c) < 0 ? a : c ));
|
|
+}
|
|
+
|
|
+void qsort_r(void *a, size_t n, size_t es, void *thunk, cmp_t *cmp)
|
|
+{
|
|
+ char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
|
|
+ size_t d, r;
|
|
+ int cmp_result;
|
|
+ int swaptype, swap_cnt;
|
|
+
|
|
+loop: SWAPINIT(a, es);
|
|
+ swap_cnt = 0;
|
|
+ if (n < 7) {
|
|
+ for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es)
|
|
+ for (pl = pm;
|
|
+ pl > (char *)a && CMP(thunk, pl - es, pl) > 0;
|
|
+ pl -= es)
|
|
+ swap(pl, pl - es);
|
|
+ return;
|
|
+ }
|
|
+ pm = (char *)a + (n / 2) * es;
|
|
+ if (n > 7) {
|
|
+ pl = a;
|
|
+ pn = (char *)a + (n - 1) * es;
|
|
+ if (n > 40) {
|
|
+ d = (n / 8) * es;
|
|
+ pl = med3(pl, pl + d, pl + 2 * d, cmp, thunk);
|
|
+ pm = med3(pm - d, pm, pm + d, cmp, thunk);
|
|
+ pn = med3(pn - 2 * d, pn - d, pn, cmp, thunk);
|
|
+ }
|
|
+ pm = med3(pl, pm, pn, cmp, thunk);
|
|
+ }
|
|
+ swap(a, pm);
|
|
+ pa = pb = (char *)a + es;
|
|
+
|
|
+ pc = pd = (char *)a + (n - 1) * es;
|
|
+ for (;;) {
|
|
+ while (pb <= pc && (cmp_result = CMP(thunk, pb, a)) <= 0) {
|
|
+ if (cmp_result == 0) {
|
|
+ swap_cnt = 1;
|
|
+ swap(pa, pb);
|
|
+ pa += es;
|
|
+ }
|
|
+ pb += es;
|
|
+ }
|
|
+ while (pb <= pc && (cmp_result = CMP(thunk, pc, a)) >= 0) {
|
|
+ if (cmp_result == 0) {
|
|
+ swap_cnt = 1;
|
|
+ swap(pc, pd);
|
|
+ pd -= es;
|
|
+ }
|
|
+ pc -= es;
|
|
+ }
|
|
+ if (pb > pc)
|
|
+ break;
|
|
+ swap(pb, pc);
|
|
+ swap_cnt = 1;
|
|
+ pb += es;
|
|
+ pc -= es;
|
|
+ }
|
|
+ if (swap_cnt == 0) { /* Switch to insertion sort */
|
|
+ for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es)
|
|
+ for (pl = pm;
|
|
+ pl > (char *)a && CMP(thunk, pl - es, pl) > 0;
|
|
+ pl -= es)
|
|
+ swap(pl, pl - es);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ pn = (char *)a + n * es;
|
|
+ r = min(pa - (char *)a, pb - pa);
|
|
+ vecswap(a, pb - r, r);
|
|
+ r = min(pd - pc, pn - pd - es);
|
|
+ vecswap(pb, pn - r, r);
|
|
+ if ((r = pb - pa) > es)
|
|
+ qsort_r(a, r / es, es, thunk, cmp);
|
|
+ if ((r = pd - pc) > es) {
|
|
+ /* Iterate rather than recurse to save stack space */
|
|
+ a = pn - r;
|
|
+ n = r / es;
|
|
+ goto loop;
|
|
+ }
|
|
+}
|
|
+
|
|
+# else
|
|
typedef int(* __compar_d_fn_t)(const void *, const void *, void *);
|
|
extern void qsort_r (void *__base, size_t __nmemb, size_t __size,
|
|
__compar_d_fn_t __compar, void *__arg)
|
|
__nonnull ((1, 4));
|
|
+#endif
|
|
|
|
#endif
|
|
|