Simplify memory manager

libc/runtime/getpagesize.c

@@ -1,27 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2023 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/runtime/runtime.h"
-
-/**
- * Returns granularity of memory manager.
- * @see sysconf(_SC_PAGE_SIZE) which is portable
- */
-int getpagesize(void) {
-  return __granularity();
-}

libc/runtime/isstackoverflow.c

@@ -35,5 +35,5 @@ char __is_stack_overflow(siginfo_t *si, void *arg) {
     return false;
   intptr_t sp = uc->uc_mcontext.SP;
   intptr_t fp = (intptr_t)si->si_addr;
-  return ABS(fp - sp) < getauxval(AT_PAGESZ);
+  return ABS(fp - sp) < getpagesize();
 }

libc/runtime/opensymboltable.greg.c

@@ -49,7 +49,7 @@ static struct SymbolTable *OpenSymbolTableImpl(const char *filename) {
   size_t n, m, tsz, size;
   const Elf64_Sym *symtab, *sym;
   ptrdiff_t names_offset, name_base_offset, stp_offset;
-  long pagesz = getauxval(AT_PAGESZ);
+  long pagesz = getpagesize();
   map = MAP_FAILED;
   if ((fd = open(filename, O_RDONLY | O_CLOEXEC)) == -1)
     return 0;

libc/runtime/runtime.h

@@ -53,7 +53,7 @@ int sethostid(long) libcesque;
 char *getlogin(void) libcesque;
 int getlogin_r(char *, size_t) libcesque;
 int login_tty(int) libcesque;
-int getpagesize(void) libcesque;
+int getpagesize(void) pureconst libcesque;
 int syncfs(int) dontthrow libcesque;
 int vhangup(void) libcesque;
 int getdtablesize(void) libcesque;

libc/runtime/sysconf.c

@@ -22,10 +22,10 @@
 #include "libc/calls/struct/sysinfo.h"
 #include "libc/calls/struct/sysinfo.internal.h"
 #include "libc/dce.h"
+#include "libc/intrin/maps.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/clktck.h"
-#include "libc/intrin/maps.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/sysconf.h"
 #include "libc/sysv/consts/_posix.h"
@@ -60,7 +60,7 @@ long sysconf(int name) {
     case _SC_CLK_TCK:
       return CLK_TCK;
     case _SC_PAGESIZE:
-      return __granularity();
+      return getpagesize();
     case _SC_ARG_MAX:
       return __get_arg_max();
     case _SC_SIGSTKSZ:

libc/runtime/winmain.greg.c

@@ -38,6 +38,8 @@
 #include "libc/nt/process.h"
 #include "libc/nt/runtime.h"
 #include "libc/nt/signals.h"
+#include "libc/nt/struct/systeminfo.h"
+#include "libc/nt/systeminfo.h"
 #include "libc/nt/thunk/msabi.h"
 #include "libc/runtime/internal.h"
 #include "libc/runtime/memtrack.internal.h"
@@ -64,6 +66,7 @@ __msabi extern typeof(GetEnvironmentStrings) *const __imp_GetEnvironmentStringsW
 __msabi extern typeof(GetEnvironmentVariable) *const __imp_GetEnvironmentVariableW;
 __msabi extern typeof(GetFileAttributes) *const __imp_GetFileAttributesW;
 __msabi extern typeof(GetStdHandle) *const __imp_GetStdHandle;
+__msabi extern typeof(GetSystemInfo) *const __imp_GetSystemInfo;
 __msabi extern typeof(GetUserName) *const __imp_GetUserNameW;
 __msabi extern typeof(MapViewOfFileEx) *const __imp_MapViewOfFileEx;
 __msabi extern typeof(SetConsoleCP) *const __imp_SetConsoleCP;
@@ -209,8 +212,12 @@ static abi wontreturn void WinInit(const char16_t *cmdline) {
   uint32_t oldattr;
   __imp_VirtualProtect(stackaddr, GetGuardSize(),
                        kNtPageReadwrite | kNtPageGuard, &oldattr);
-  if (_weaken(__maps_stack))
-    _weaken(__maps_stack)(stackaddr, 4096, stacksize, stackprot, stackhand);
+  if (_weaken(__maps_stack)) {
+    struct NtSystemInfo si;
+    __imp_GetSystemInfo(&si);
+    _weaken(__maps_stack)(stackaddr, si.dwPageSize, GetGuardSize(), stacksize,
+                          stackprot, stackhand);
+  }
   struct WinArgs *wa =
       (struct WinArgs *)(stackaddr + (stacksize - sizeof(struct WinArgs)));
 

libc/runtime/zipos-get.c

@@ -128,7 +128,7 @@ static void __zipos_init(void) {
         if (!fstat(fd, &st) && (map = mmap(0, st.st_size, PROT_READ, MAP_SHARED,
                                            fd, 0)) != MAP_FAILED) {
           if ((cdir = GetZipEocd(map, st.st_size, &err))) {
-            long pagesz = getauxval(AT_PAGESZ);
+            long pagesz = getpagesize();
             __zipos_dismiss(map, cdir, pagesz);
             __zipos.map = map;
             __zipos.cdir = cdir;