Merge branch 'opa334:2.x' into 2.x

Author: wumbomumbo

.github/workflows/main.yml

@@ -25,8 +25,13 @@ concurrency:
 
 jobs:
   build:
-    runs-on: macos-15
+    runs-on: macos-latest
     steps:
+      - name: Xcode Setup
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+
       - name: Checkout
         uses: actions/checkout@main
         with:

BaseBin/libjailbreak/Makefile

@@ -2,7 +2,7 @@ TARGET = libjailbreak.dylib
 
 CC = clang
 
-CFLAGS = -framework Foundation -framework CoreServices -framework Security -framework IOKit -framework IOSurface -I../.include -I../_external/modules/litehook/src -isysroot $(shell xcrun --sdk iphoneos --show-sdk-path) -arch arm64 -arch arm64e -miphoneos-version-min=15.0 -fobjc-arc -dynamiclib -install_name @loader_path/$(TARGET) -I$(shell brew --prefix)/opt/libarchive/include -g
+CFLAGS = -framework Foundation -framework CoreServices -framework Security -framework IOKit -framework IOSurface -I../.include -I../_external/modules/litehook/src -isysroot $(shell xcrun --sdk iphoneos --show-sdk-path) -arch arm64 -arch arm64e -miphoneos-version-min=15.0 -fobjc-arc -dynamiclib -install_name @loader_path/$(TARGET) -I$(shell brew --prefix)/opt/libarchive/include -g -O2
 LDFLAGS = -larchive -lbsm -L../.build -lchoma
 
 sign: $(TARGET)

BaseBin/libjailbreak/src/kcall_arm64.c

@@ -9,7 +9,7 @@
 // I don't like this as it breaks executing multiple threads at the same time
 // But as we don't even really do/support that currently anyways, it doesn't matter
 uint64_t getUserReturnThreadContext(void);
-extern uint64_t gUserReturnDidHappen;
+extern volatile uint64_t gUserReturnDidHappen;
 
 #ifndef __arm64e__
 

BaseBin/libjailbreak/src/translation.c

@@ -17,9 +17,9 @@ struct tt_level arm_tt_level[4];
 
 // Address translation physical <-> virtual
 
+#define PTOV_TABLE_SIZE 8
 uint64_t phystokv(uint64_t pa)
 {
-	const uint64_t PTOV_TABLE_SIZE = 8;
 	struct ptov_table_entry {
 		uint64_t pa;
 		uint64_t va;

BaseBin/libjailbreak/src/util.c

@@ -862,23 +862,23 @@ static void* worker_thread(void *arg)
 }
 
 // A thread to alternately spin and sleep.
+#define ACTIVITY_WORKER_COUNT 10
 static void* activity_thread(void *arg)
 {
 	volatile uint64_t *runCount = arg;
 	struct mach_timebase_info tb;
 	mach_timebase_info(&tb);
 	const unsigned milliseconds = 40;
-	const unsigned worker_count = 10;
 	while (*runCount != 0) {
 		// Spin for one period on multiple threads.
 		uint64_t start = mach_absolute_time();
 		uint64_t end = start + milliseconds * 1000 * 1000 * tb.denom / tb.numer;
-		pthread_t worker[worker_count];
-		for (unsigned i = 0; i < worker_count; i++) {
+		pthread_t worker[ACTIVITY_WORKER_COUNT];
+		for (unsigned i = 0; i < ACTIVITY_WORKER_COUNT; i++) {
 			pthread_create(&worker[i], NULL, worker_thread, &end);
 		}
 		worker_thread(&end);
-		for (unsigned i = 0; i < worker_count; i++) {
+		for (unsigned i = 0; i < ACTIVITY_WORKER_COUNT; i++) {
 			pthread_join(worker[i], NULL);
 		}
 		// Sleep for one period.