bootstrap::mlibc: remove qsort_r

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

patches/mlibc/mlibc.patch

@@ -1,20 +1,20 @@
-From 6350f126765046a3a97d6acf40dc7d85ccddffad Mon Sep 17 00:00:00 2001
+From fb1766aa2abfb310b6c1b0904f849f5d6c8fb62b Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <[email protected]>
-Date: Sat, 11 Mar 2023 15:20:58 +1100
+Date: Sat, 11 Mar 2023 16:55:47 +1100
 Subject: [PATCH] <xxx>
 
 ---
- .gitignore                            |   2 +
- options/ansi/generic/stdlib-stubs.cpp | 183 +++++++++++++++++++++++++-
- options/glibc/generic/execinfo.cpp    |   5 +-
- options/rtdl/generic/linker.cpp       |   2 +-
- sysdeps/aero/generic/aero.cpp         |  77 +++++++----
- sysdeps/aero/generic/filesystem.cpp   |  51 ++++++-
- sysdeps/aero/generic/sockets.cpp      |  96 +++++++++++++-
- sysdeps/aero/generic/time.cpp         |  24 ++++
- sysdeps/aero/include/aero/syscall.h   |  11 ++
- sysdeps/aero/meson.build              |   1 +
- 10 files changed, 406 insertions(+), 46 deletions(-)
+ .gitignore                            |  2 +
+ options/ansi/generic/stdlib-stubs.cpp |  6 +-
+ options/glibc/generic/execinfo.cpp    |  5 +-
+ options/rtdl/generic/linker.cpp       |  2 +-
+ sysdeps/aero/generic/aero.cpp         | 77 +++++++++++++--------
+ sysdeps/aero/generic/filesystem.cpp   | 51 ++++++++++++--
+ sysdeps/aero/generic/sockets.cpp      | 96 ++++++++++++++++++++++++++-
+ sysdeps/aero/generic/time.cpp         | 24 +++++++
+ sysdeps/aero/include/aero/syscall.h   | 11 +++
+ sysdeps/aero/meson.build              |  1 +
+ 10 files changed, 234 insertions(+), 41 deletions(-)
  create mode 100644 sysdeps/aero/generic/time.cpp
 
 diff --git a/.gitignore b/.gitignore
@@ -28,204 +28,19 @@ index fdd60a0..9f811f4 100644
 +# clangd cache files:
 +.cache
 diff --git a/options/ansi/generic/stdlib-stubs.cpp b/options/ansi/generic/stdlib-stubs.cpp
-index c0e54fe..b988dea 100644
+index c0e54fe..ddeec8a 100644
 --- a/options/ansi/generic/stdlib-stubs.cpp
 +++ b/options/ansi/generic/stdlib-stubs.cpp
-@@ -319,13 +319,182 @@ void qsort(void *base, size_t count, size_t size,
- 	}
- }
- 
--void qsort_r(void *, size_t, size_t,
--		int (*compare)(const void *, const void *, void *),
--		void *) {
--	(void) compare;
--	__ensure(!"Not implemented");
--	__builtin_unreachable();
-+
-+// ---------------- QSORT START ----------------
-+/*
-+ * Adapted from https://github.com/noporpoise/sort_r, original
-+ * copyright follows:
-+ *
-+ * Isaac Turner 29 April 2014 Public Domain
-+ */
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#define SORT_R_SWAP(a,b,tmp) ((tmp) = (a), (a) = (b), (b) = (tmp))
-+
-+/* swap a and b */
-+/* a and b must not be equal! */
-+static void sort_r_swap(char *__restrict a, char *__restrict b,
-+			size_t w)
-+{
-+	char tmp, *end = a+w;
-+	for(; a < end; a++, b++) { SORT_R_SWAP(*a, *b, tmp); }
-+}
-+
-+/* swap a, b iff a>b */
-+/* a and b must not be equal! */
-+/* __restrict is same as restrict but better support on old machines */
-+static int sort_r_cmpswap(char *__restrict a,
-+			  char *__restrict b, size_t w,
-+			  int (*compar)(const void *_a,
-+					const void *_b,
-+					void *_arg),
-+			  void *arg)
-+{
-+	if(compar(a, b, arg) > 0) {
-+		sort_r_swap(a, b, w);
-+		return 1;
-+	}
-+	return 0;
-+}
-+
-+/*
-+  Swap consecutive blocks of bytes of size na and nb starting at memory addr ptr,
-+  with the smallest swap so that the blocks are in the opposite order. Blocks may
-+  be internally re-ordered e.g.
-+  12345ab  ->   ab34512
-+  123abc   ->   abc123
-+  12abcde  ->   deabc12
-+*/
-+static void sort_r_swap_blocks(char *ptr, size_t na, size_t nb)
-+{
-+	if(na > 0 && nb > 0) {
-+		if(na > nb) { sort_r_swap(ptr, ptr+na, nb); }
-+		else { sort_r_swap(ptr, ptr+nb, na); }
-+	}
-+}
-+
-+/* Implement recursive quicksort ourselves */
-+/* Note: quicksort is not stable, equivalent values may be swapped */
-+void qsort_r(void *base, size_t nel, size_t w,
-+	     int (*compar)(const void *_a,
-+			   const void *_b,
-+			   void *_arg),
-+	     void *arg)
-+{
-+	char *b = (char *)base, *end = b + nel*w;
-+
-+	/* for(size_t i=0; i<nel; i++) {printf("%4i", *(int*)(b + i*sizeof(int)));}
-+	   printf("\n"); */
-+
-+	if(nel < 10) {
-+		/* Insertion sort for arbitrarily small inputs */
-+		char *pi, *pj;
-+		for(pi = b+w; pi < end; pi += w) {
-+			for(pj = pi; pj > b && sort_r_cmpswap(pj-w,pj,w,compar,arg); pj -= w) {}
-+		}
-+	}
-+	else
-+	{
-+		/* nel > 6; Quicksort */
-+
-+		int cmp;
-+		char *pl, *ple, *pr, *pre, *pivot;
-+		char *last = b+w*(nel-1), *tmp;
-+
-+		/*
-+		  Use median of second, middle and second-last items as pivot.
-+		  First and last may have been swapped with pivot and therefore be extreme
-+		*/
-+		char *l[3];
-+		l[0] = b + w;
-+		l[1] = b+w*(nel/2);
-+		l[2] = last - w;
-+
-+		/* printf("pivots: %i, %i, %i\n", *(int*)l[0], *(int*)l[1], *(int*)l[2]); */
-+
-+		if(compar(l[0],l[1],arg) > 0) { SORT_R_SWAP(l[0], l[1], tmp); }
-+		if(compar(l[1],l[2],arg) > 0) {
-+			SORT_R_SWAP(l[1], l[2], tmp);
-+			if(compar(l[0],l[1],arg) > 0) { SORT_R_SWAP(l[0], l[1], tmp); }
-+		}
-+
-+		/* swap mid value (l[1]), and last element to put pivot as last element */
-+		if(l[1] != last) { sort_r_swap(l[1], last, w); }
-+
-+		/*
-+		  pl is the next item on the left to be compared to the pivot
-+		  pr is the last item on the right that was compared to the pivot
-+		  ple is the left position to put the next item that equals the pivot
-+		  ple is the last right position where we put an item that equals the pivot
-+		  v- end (beyond the array)
-+		  EEEEEELLLLLLLLuuuuuuuuGGGGGGGEEEEEEEE.
-+		  ^- b  ^- ple  ^- pl   ^- pr  ^- pre ^- last (where the pivot is)
-+		  Pivot comparison key:
-+		  E = equal, L = less than, u = unknown, G = greater than, E = equal
-+		*/
-+		pivot = last;
-+		ple = pl = b;
-+		pre = pr = last;
-+
-+		/*
-+		  Strategy:
-+		  Loop into the list from the left and right at the same time to find:
-+		  - an item on the left that is greater than the pivot
-+		  - an item on the right that is less than the pivot
-+		  Once found, they are swapped and the loop continues.
-+		  Meanwhile items that are equal to the pivot are moved to the edges of the
-+		  array.
-+		*/
-+		while(pl < pr) {
-+			/* Move left hand items which are equal to the pivot to the far left.
-+			   break when we find an item that is greater than the pivot */
-+			for(; pl < pr; pl += w) {
-+				cmp = compar(pl, pivot, arg);
-+				if(cmp > 0) { break; }
-+				else if(cmp == 0) {
-+					if(ple < pl) { sort_r_swap(ple, pl, w); }
-+					ple += w;
-+				}
-+			}
-+			/* break if last batch of left hand items were equal to pivot */
-+			if(pl >= pr) { break; }
-+			/* Move right hand items which are equal to the pivot to the far right.
-+			   break when we find an item that is less than the pivot */
-+			for(; pl < pr; ) {
-+				pr -= w; /* Move right pointer onto an unprocessed item */
-+				cmp = compar(pr, pivot, arg);
-+				if(cmp == 0) {
-+					pre -= w;
-+					if(pr < pre) { sort_r_swap(pr, pre, w); }
-+				}
-+				else if(cmp < 0) {
-+					if(pl < pr) { sort_r_swap(pl, pr, w); }
-+					pl += w;
-+					break;
-+				}
-+			}
-+		}
-+
-+		pl = pr; /* pr may have gone below pl */
-+
-+		/*
-+		  Now we need to go from: EEELLLGGGGEEEE
-+		  to: LLLEEEEEEEGGGG
-+		  Pivot comparison key:
-+		  E = equal, L = less than, u = unknown, G = greater than, E = equal
-+		*/
-+		sort_r_swap_blocks(b, ple-b, pl-ple);
-+		sort_r_swap_blocks(pr, pre-pr, end-pre);
-+
-+		/*for(size_t i=0; i<nel; i++) {printf("%4i", *(int*)(b + i*sizeof(int)));}
-+		  printf("\n");*/
-+
-+		qsort_r(b, (pl-ple)/w, w, compar, arg);
-+		qsort_r(end-(pre-pr), (pre-pr)/w, w, compar, arg);
-+	}
- }
-+// ---------------- QSORT END ----------------
- 
- int abs(int num) {
- 	return num < 0 ? -num : num;
-@@ -392,7 +561,7 @@ int mbtowc(wchar_t *__restrict wc, const char *__restrict mb, size_t max_size) {
+@@ -391,8 +391,10 @@ int mbtowc(wchar_t *__restrict wc, const char *__restrict mb, size_t max_size) {
+ 			mlibc::code_seq<wchar_t> wseq{wc, wc + 1};
  			mlibc::code_seq<const char> nseq{mb, mb + max_size};
  			auto e = cc->decode_wtranscode(nseq, wseq, mbtowc_state);
- 			if (e != mlibc::charcode_error::null)
+-			if (e != mlibc::charcode_error::null)
 -				__ensure(!"decode_wtranscode() errors are not handled");
++			if (e != mlibc::charcode_error::null) {
++				errno = EILSEQ;
 +				return -1;
++			}
 
  			return nseq.it - mb;
  		} else {