bootstrap: update mlibc and fix ABI breakage

Signed-off-by: Andy-Python-Programmer <andypythonappdeveloper@gmail.com>

Author: Andy-Python-Programmer

bootstrap.yml

@@ -48,14 +48,8 @@ sources:
 
   - name: mlibc
     subdir: 'bundled'
-    # git: 'https://github.com/managarm/mlibc'
-    git: 'https://github.com/Andy-Python-Programmer/mlibc'
-    # 452: The functions FD_{CLR,ISSET,SET,ZERO} were renamed to __FD_{CLR,ISSET,SET,ZERO} and replaced by macros to match Wine's assumptions.
-    # 511: Musl's regex engine was added, implementing regcomp and regexec. This required some changes to the regex_t struct.
-    # 504, #580: In both the mlibc and Linux ABIs, a domainname member was added to struct utsname, which is a glibc extension.
-    # 311: Added all necessary fields in pthread_attr_t required for implementing all pthread_attr functions.
-    branch: 'abi-break'
-    commit: '58ceb6648eefd801a774ba5e87b032706105243d'
+    git: 'https://github.com/managarm/mlibc'
+    branch: 'master'
 
   - name: tzcode
     subdir: 'bundled'
@@ -91,7 +85,6 @@ sources:
     subdir: 'bundled'
     git: 'https://github.com/Andy-Python-Programmer/libc.git'
     branch: 'master'
-    commit: '54d72b34bd614f0081e0da01e6323c7c69f45395'
 
   - name: rust-num-cpus
     subdir: 'bundled'

patches/mlibc/mlibc.patch

@@ -1,21 +1,20 @@
-From 0eb5403c389aaa7144d6bea297aac57d442bc9f6 Mon Sep 17 00:00:00 2001
+From 52be7281e3becafe49603ed6bbc01c0ded64d9e1 Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <andypythonappdeveloper@gmail.com>
 Date: Fri, 8 Jul 2022 12:32:32 +1000
 Subject: [PATCH] yes
 
 Signed-off-by: Andy-Python-Programmer <andypythonappdeveloper@gmail.com>
 ---
- .gitignore                            |   2 +
- options/ansi/generic/stdlib-stubs.cpp | 142 +++++++++++++++++++++-----
- options/glibc/generic/execinfo.cpp    |   5 +-
- options/rtdl/generic/linker.cpp       |   2 +-
- sysdeps/aero/generic/aero.cpp         |  38 +++----
- sysdeps/aero/generic/filesystem.cpp   |  25 ++++-
- sysdeps/aero/generic/sockets.cpp      |  77 +++++++++++++-
- sysdeps/aero/generic/time.cpp         |  24 +++++
- sysdeps/aero/include/aero/syscall.h   |   6 ++
- sysdeps/aero/meson.build              |   1 +
- 10 files changed, 268 insertions(+), 54 deletions(-)
+ .gitignore                          |  2 +
+ options/glibc/generic/execinfo.cpp  |  5 +-
+ options/rtdl/generic/linker.cpp     |  2 +-
+ sysdeps/aero/generic/aero.cpp       | 38 +++++++-------
+ sysdeps/aero/generic/filesystem.cpp | 25 ++++++++--
+ sysdeps/aero/generic/sockets.cpp    | 77 ++++++++++++++++++++++++++++-
+ sysdeps/aero/generic/time.cpp       | 24 +++++++++
+ sysdeps/aero/include/aero/syscall.h |  6 +++
+ sysdeps/aero/meson.build            |  1 +
+ 9 files changed, 152 insertions(+), 28 deletions(-)
  create mode 100644 sysdeps/aero/generic/time.cpp
 
 diff --git a/.gitignore b/.gitignore
@@ -28,159 +27,6 @@ index fdd60a00..9f811f47 100644
  .vscode
 +# clangd cache files:
 +.cache
-diff --git a/options/ansi/generic/stdlib-stubs.cpp b/options/ansi/generic/stdlib-stubs.cpp
-index 4836391e..2a73c6d0 100644
---- a/options/ansi/generic/stdlib-stubs.cpp
-+++ b/options/ansi/generic/stdlib-stubs.cpp
-@@ -375,32 +375,122 @@ int mblen(const char *mbs, size_t mb_limit) {
- 	return nseq.it - mbs;
- }
- 
--int mbtowc(wchar_t *__restrict wc, const char *__restrict mb, size_t max_size) {
--	auto cc = mlibc::current_charcode();
--	__ensure(max_size);
--
--	if (mb) {
--		if (*mb) {
--			// If wc is NULL, decode into a single local character which we discard
--			// to obtain the length.
--			wchar_t tmp_wc;
--			if (!wc)
--				wc = &tmp_wc;
--
--			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)
--				__ensure(!"decode_wtranscode() errors are not handled");
--
--			return nseq.it - mb;
--		} else {
--			return 0; // When mbs is a null byte, return 0
--		}
--	} else {
--		mblen_state = __MLIBC_MBSTATE_INITIALIZER;
--		return cc->has_shift_states;
--	}
-+// int mbtowc(wchar_t *__restrict wc, const char *__restrict mb, size_t max_size) {
-+// 	auto cc = mlibc::current_charcode();
-+// 	__ensure(max_size);
-+//
-+// 	if (mb) {
-+// 		if (*mb) {
-+// 			// If wc is NULL, decode into a single local character which we discard
-+// 			// to obtain the length.
-+// 			wchar_t tmp_wc;
-+// 			if (!wc)
-+// 				wc = &tmp_wc;
-+//
-+// 			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)
-+// 				__ensure(!"decode_wtranscode() errors are not handled");
-+//
-+// 			return nseq.it - mb;
-+// 		} else {
-+// 			return 0; // When mbs is a null byte, return 0
-+// 		}
-+// 	} else {
-+// 		mblen_state = __MLIBC_MBSTATE_INITIALIZER;
-+// 		return cc->has_shift_states;
-+// 	}
-+// }
-+
-+// Upper 6 state bits are a negative integer offset to bound-check next byte
-+//    equivalent to: ( (b-0x80) | (b+offset) ) & ~0x3f
-+#define OOB(c, b) (((((b) >> 3) - 0x10) | (((b) >> 3) + ((int32_t)(c) >> 26))) & ~7)
-+
-+// Interval [a,b]. Either a must be 80 or b must be c0, lower 3 bits clear.
-+#define R(a, b) ((uint32_t)((a == 0x80 ? 0x40u - b : 0u - a) << 23))
-+#define FAILSTATE R(0x80, 0x80)
-+
-+#define SA 0xc2u
-+#define SB 0xf4u
-+
-+// Arbitrary encoding for representing code units instead of characters.
-+#define CODEUNIT(c) (0xdfff & (signed char)(c))
-+#define IS_CODEUNIT(c) ((unsigned)(c)-0xdf80 < 0x80)
-+
-+#define C(x) ( x<2 ? -1 : ( R(0x80,0xc0) | x ) )
-+#define D(x) C((x+16))
-+#define E(x) ( ( x==0 ? R(0xa0,0xc0) : \
-+                 x==0xd ? R(0x80,0xa0) : \
-+                 R(0x80,0xc0) ) \
-+             | ( R(0x80,0xc0) >> 6 ) \
-+             | x )
-+#define F(x) ( ( x>=5 ? 0 : \
-+                 x==0 ? R(0x90,0xc0) : \
-+                 x==4 ? R(0x80,0xa0) : \
-+                 R(0x80,0xc0) ) \
-+             | ( R(0x80,0xc0) >> 6 ) \
-+             | ( R(0x80,0xc0) >> 12 ) \
-+             | x )
-+
-+const uint32_t bittab[] = {
-+	C(0x2),C(0x3),C(0x4),C(0x5),C(0x6),C(0x7),
-+	C(0x8),C(0x9),C(0xa),C(0xb),C(0xc),C(0xd),C(0xe),C(0xf),
-+	D(0x0),D(0x1),D(0x2),D(0x3),D(0x4),D(0x5),D(0x6),D(0x7),
-+	D(0x8),D(0x9),D(0xa),D(0xb),D(0xc),D(0xd),D(0xe),D(0xf),
-+	E(0x0),E(0x1),E(0x2),E(0x3),E(0x4),E(0x5),E(0x6),E(0x7),
-+	E(0x8),E(0x9),E(0xa),E(0xb),E(0xc),E(0xd),E(0xe),E(0xf),
-+	F(0x0),F(0x1),F(0x2),F(0x3),F(0x4)
-+};
-+
-+// Converts a multibyte sequence to a wide character.
-+//
-+// Credits - MUSL
-+int mbtowc(wchar_t *__restrict wc, const char *__restrict src, size_t n) {
-+	unsigned c;
-+	const unsigned char *s = static_cast<const unsigned char *>((const void *)src);
-+	wchar_t dummy;
-+
-+  	if (!s) return 0;
-+  	if (!n) goto ilseq;
-+  	if (!wc) wc = &dummy;
-+
-+  	if (*s < 0x80) return !!(*wc = *s);
-+	if (MB_CUR_MAX == 1) return (*wc = CODEUNIT(*s)), 1;
-+  	if (*s - SA > SB - SA) goto ilseq;
-+  	
-+	c = bittab[*s++ - SA];
-+
-+  	// Avoid excessive checks against n: If shifting the state n-1
-+	// times does not clear the high bit, then the value of n is
-+	// insufficient to read a character.
-+  	if (n < 4 && ((c << (6 * n - 6)) & (1U << 31))) goto ilseq;
-+  	if (OOB(c, *s)) goto ilseq;
-+  	
-+	c = c << 6 | (*s++ - 0x80);
-+  	
-+	if (!(c & (1U << 31))) {
-+    	*wc = c;
-+    	return 2;
-+  	}
-+
-+  	if (*s - 0x80u >= 0x40) goto ilseq;
-+  	
-+	c = c << 6 | (*s++ - 0x80);
-+  	
-+	if (!(c & (1U << 31))) {
-+    	*wc = c;
-+    	return 3;
-+  	}
-+
-+  	if (*s - 0x80u >= 0x40) goto ilseq;
-+	
-+	*wc = c << 6 | (*s++ - 0x80);
-+	return 4;
-+
-+ilseq:
-+	errno = EILSEQ;
-+	return -1;
- }
- 
- int wctomb(char *, wchar_t) {
 diff --git a/options/glibc/generic/execinfo.cpp b/options/glibc/generic/execinfo.cpp
 index 3474615e..10a2109e 100644
 --- a/options/glibc/generic/execinfo.cpp
@@ -199,10 +45,10 @@ index 3474615e..10a2109e 100644
 
  char **backtrace_symbols(void *const *, int) {
 diff --git a/options/rtdl/generic/linker.cpp b/options/rtdl/generic/linker.cpp
-index 6716ef4f..e5ec8cff 100644
+index f51a543f..74f4e96a 100644
 --- a/options/rtdl/generic/linker.cpp
 +++ b/options/rtdl/generic/linker.cpp
-@@ -15,7 +15,7 @@ uintptr_t libraryBase = 0x41000000;
+@@ -16,7 +16,7 @@ uintptr_t libraryBase = 0x41000000;
 
  constexpr bool verbose = false;
  constexpr bool stillSlightlyVerbose = false;
@@ -477,7 +323,7 @@ index 12f8dc61..03001c46 100644
  // Invalid syscall used to trigger a log error in the kernel (as a hint)
  // so, that we can implement the syscall in the kernel.
 diff --git a/sysdeps/aero/meson.build b/sysdeps/aero/meson.build
-index 3ca8463e..f1d80139 100644
+index 14975990..8e30aa3a 100644
 --- a/sysdeps/aero/meson.build
 +++ b/sysdeps/aero/meson.build
 @@ -11,6 +11,7 @@ libc_sources += files(

rust-toolchain

@@ -1,3 +1,4 @@
 [toolchain]
-channel = "nightly"
+# https://github.com/rust-lang/rust/pull/101988#issuecomment-1272407248
+channel = "nightly-2022-10-07"
 components = ["rust-src", "rustfmt", "clippy"]

src/aero_kernel/src/drivers/tty.rs

@@ -43,7 +43,7 @@ lazy_static::lazy_static! {
         c_cflag: aero_syscall::TermiosCFlag::empty(),
         c_lflag: aero_syscall::TermiosLFlag::ECHO | aero_syscall::TermiosLFlag::ICANON,
         c_line: 0,
-        c_cc: [0; 11],
+        c_cc: [0; 32],
         c_ispeed: 0,
         c_ospeed: 0,
     });

src/aero_kernel/src/syscall/process.rs

@@ -65,7 +65,7 @@ pub fn uname(buffer: &mut Utsname) -> Result<usize, SyscallError> {
         fixed[..len].copy_from_slice(init_bytes)
     }
 
-    init_array(&mut buffer.name, "Aero");
+    init_array(&mut buffer.sysname, "Aero");
     init_array(&mut buffer.nodename, "unknown");
     init_array(&mut buffer.version, env!("CARGO_PKG_VERSION"));
     init_array(