From 9513a70a985485966ecc2b795a06645b36b08d5c Mon Sep 17 00:00:00 2001
From: Alec Murphy <alec@checksum.fail>
Date: Sat, 7 Jun 2025 08:42:10 -0400
Subject: [PATCH 1/2] Meta: Update scripts/build-all

---
 scripts/build-all | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/build-all b/scripts/build-all
index 18db0d2..42c177d 100755
--- a/scripts/build-all
+++ b/scripts/build-all
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python3 -u
 from pathlib import Path
 import glob
 import os
@@ -22,9 +22,9 @@ jakt_runtime_path = home_path + 'cloned/jakt/runtime'
 jakt_lib_path = home_path + 'cloned/jakt/build/lib/x86_64-unknown-linux-unknown/'
 
 qemu_slipstream_iso_file = project_path + 'build/isoc/bootable.iso'
-qemu_virtio_disk_path = home_path + 'virtio-disk.qcow2'
+qemu_virtio_disk_path = home_path + 'slon/virtio-disk.qcow2'
 
-qemu_bin_path = home_path + "/Programs/qemu-9.1.2/build/qemu-system-x86_64"
+qemu_bin_path = "qemu-system-x86_64"
 qemu_display = "-display sdl,grab-mod=rctrl"
 
 templeos_iso_file = home_path + 'iso/TempleOS.ISO'
@@ -84,7 +84,7 @@ def transpile_net_to_sepples():
 def build_net():
     print("build-all: build-net")
     build_specific_options = '-Wno-invalid-offsetof -Wl,--section-start=.text=0x1404000 -Wl,--section-start=.plt=0x1402020 -no-pie'
-    res = os.system('cd ' + project_path + 'build/net && clang++-19 ' + build_specific_options + ' -O3 -I ' + jakt_runtime_path + ' -I ' + project_path + '/src/libtemple -fcolor-diagnostics -std=c++20 -fno-exceptions -Wno-user-defined-literals -Wno-deprecated-declarations -Wno-parentheses-equality -Wno-unqualified-std-cast-call -Wno-unknown-warning-option -Wno-int-to-pointer-cast -mno-red-zone -o ../bin/net *.cpp ../lib/libtemple.so ' + jakt_lib_path + 'libjakt_runtime_x86_64-unknown-linux-unknown.a ' + jakt_lib_path + 'libjakt_main_x86_64-unknown-linux-unknown.a && cd .. && rm -rf net')
+    res = os.system('cd ' + project_path + 'build/net && clang++-20 ' + build_specific_options + ' -O3 -I ' + jakt_runtime_path + ' -I ' + project_path + '/src/libtemple -fcolor-diagnostics -std=c++20 -fno-exceptions -Wno-user-defined-literals -Wno-deprecated-declarations -Wno-parentheses-equality -Wno-unqualified-std-cast-call -Wno-unknown-warning-option -Wno-int-to-pointer-cast -mno-red-zone -o ../bin/net *.cpp ../lib/libtemple.so ' + jakt_lib_path + 'libjakt_runtime_x86_64-unknown-linux-unknown.a ' + jakt_lib_path + 'libjakt_main_x86_64-unknown-linux-unknown.a && cd .. && rm -rf net')
     if res:
         raise ValueError("build-all: step 'build-net' failed, error code " + str(res))
 
@@ -199,4 +199,4 @@ def build_all():
     generate_slipstream_iso_file()
     run()
 
-build_all()
\ No newline at end of file
+build_all()

From 5c0c9814654b1999da1e487f5629d0f224d090b0 Mon Sep 17 00:00:00 2001
From: Alec Murphy <alec@checksum.fail>
Date: Sat, 7 Jun 2025 08:42:32 -0400
Subject: [PATCH 2/2] Meta: Run clang-format

---
 System/Api/Tcp.HC          | 9 +++------
 System/FFI/ELF64.HC        | 3 +--
 System/Libraries/String.HC | 3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/System/Api/Tcp.HC b/System/Api/Tcp.HC
index 2ab2d39..6ad40d7 100644
--- a/System/Api/Tcp.HC
+++ b/System/Api/Tcp.HC
@@ -25,12 +25,9 @@ class TcpSocket {
     U64 send_buffer_filled;
     U64 send_buffer_kick; // We set this to 1 when we have data available to net,
                           // Net sets back to 0 when ready to receive
-    U0(*close)
-    ();
-    U64(*receive)
-    (U64 buf, U64 length);
-    U0(*send)
-    (U64 buf, U64 length);
+    U0 (*close)();
+    U64 (*receive)(U64 buf, U64 length);
+    U0 (*send)(U64 buf, U64 length);
 };
 
 class TcpBind {
diff --git a/System/FFI/ELF64.HC b/System/FFI/ELF64.HC
index a88ee8b..9562b5d 100644
--- a/System/FFI/ELF64.HC
+++ b/System/FFI/ELF64.HC
@@ -76,8 +76,7 @@ class Elf {
     I64 symtab_size;
 };
 
-U0(*_start)
-();
+U0 (*_start)();
 
 U0 unimplemented_symbol()
 {
diff --git a/System/Libraries/String.HC b/System/Libraries/String.HC
index 5b3eeb0..0184d61 100644
--- a/System/Libraries/String.HC
+++ b/System/Libraries/String.HC
@@ -149,8 +149,7 @@ U0 @string_trim(U8* s, U8 ch = NULL, I64 mode = TRIM_BOTH)
 
 class @string
 {
-    U0(*Append)
-    (U8 * dst, U8 * fmt, ...);
+    U0 (*Append)(U8* dst, U8* fmt, ...);
     Bool (*BeginsWith)(U8* fragment, U8* str);
     Bool (*EndsWith)(U8* fragment, U8* str);
     Bool (*IsNumber)(U8* s);