Mint APE Loader v1.10

jart · Dec 31, 2023 · 81949f0 · 81949f0
1 parent c9550af
commit 81949f0
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/ape/ape-m1.c b/ape/ape-m1.c
@@ -35,7 +35,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#define pagesz         16384
+#define pagesz 16384
 /* maximum path size that cosmo can take */
 #define PATHSIZE       (PATH_MAX < 1024 ? PATH_MAX : 1024)
 #define SYSLIB_MAGIC   ('s' | 'l' << 8 | 'i' << 16 | 'b' << 24)
@@ -726,7 +726,7 @@ __attribute__((__noreturn__)) static void Spawn(const char *exe, int fd,
 
   register long *x0 __asm__("x0") = sp;
   register char *x2 __asm__("x2") = path;
-  register int   x3 __asm__("x3") = 8;  /* _HOSTXNU */
+  register int x3 __asm__("x3") = 8; /* _HOSTXNU */
   register struct Syslib *x15 __asm__("x15") = lib;
   register long x16 __asm__("x16") = e->e_entry;
   __asm__ volatile("mov\tx1,#0\n\t"
@@ -1012,8 +1012,8 @@ int main(int argc, char **argv, char **envp) {
     Emit("usage: ape   PROG [ARGV1,ARGV2,...]\n"
          "       ape - PROG [ARGV0,ARGV1,...]\n"
          "  ($0 = PROG.ape) [ARGV1,ARGV2,...]\n"
-         "actually portable executable loader silicon 1.9\n"
-         "copyright 2023 justine alexandra roberts tunney\n"
+         "actually portable executable loader silicon 1.10\n"
+         "copyrights 2023 justine alexandra roberts tunney\n"
          "https://justine.lol/ape.html\n");
     _exit(1);
   } else {

diff --git a/ape/ape.h b/ape/ape.h
@@ -2,7 +2,7 @@
 #define COSMOPOLITAN_APE_APE_H_
 
 #define APE_VERSION_MAJOR 1
-#define APE_VERSION_MINOR 9
+#define APE_VERSION_MINOR 10
 #define APE_VERSION_STR   APE_VERSION_STR_(APE_VERSION_MAJOR, APE_VERSION_MINOR)
 #define APE_VERSION_NOTE  APE_VERSION_NOTE_(APE_VERSION_MAJOR, APE_VERSION_MINOR)
 

diff --git a/ape/apeuninstall.sh b/ape/apeuninstall.sh
@@ -54,6 +54,7 @@ for x in .ape \
          .ape-1.7 \
          .ape-1.8 \
          .ape-1.9 \
+         .ape-1.10 \
          .ape-blink-0.9.2 \
          .ape-blink-1.0.0; do
   rm -f \

diff --git a/build/bootstrap/ape.aarch64 b/build/bootstrap/ape.aarch64
diff --git a/build/bootstrap/ape.elf b/build/bootstrap/ape.elf
diff --git a/build/bootstrap/ape.macho b/build/bootstrap/ape.macho
diff --git a/tool/cosmocc/README.md b/tool/cosmocc/README.md
@@ -108,7 +108,7 @@ On Apple Silicon, `aarch64-unknown-cosmo-cc` produces ELF binaries. If
 you build a hello world program, then you need to say `ape ./hello`. If
 you don't have an `ape` command then run `cc -o ape bin/ape-m1.c` which
 should be moved to `/usr/local/bin/ape`. Your APE interpreter might
-already exist under a path like `$TMPDIR/.ape-1.9`. It's important to
+already exist under a path like `$TMPDIR/.ape-1.10`. It's important to
 note this is only a gotcha for the cross compiler. Your `cosmocc`
 compiler wraps the actual ELF binaries with a shell script that'll
 extract and compile an APE loader automatically, as needed. This also