Campaign Weeks 3-6 of /Users/agra/.claude/plans/lets-plan-to-move-splendid-pumpkin.md
land in one push: the bundling pipeline that used to live in
src/target.zig (createBundle, embedFramework, extractEntitlements,
buildInfoPlist, codesign) now lives in
library/modules/platform/bundle.sx and runs in the IR interpreter
after target.link() returns.
New language-side surface:
- library/modules/fs.sx — POSIX libc bindings (open/read/write/close,
mkdir/unlink/rmdir, chmod, rename, access, basename/dirname). Variadic
open() lowers to C's varargs via the new args: ..T form. Direct libc
calls bypass *File method dispatch so they work from the post-link
IR interpreter.
- library/modules/process.sx — popen-based run(cmd) returning
ProcessResult{ exit_code, stdout }, plus env() and find_executable().
- library/modules/std.sx — xml_escape(s) and variadic path_join(parts).
- library/modules/compiler.sx — BuildOptions grows
set_post_link_callback / set_post_link_module / binary_path
accessors; bundle_path/bundle_id/codesign_identity/provisioning_profile
setters + accessors; per-target predicates is_macos/is_ios/
is_ios_device/is_ios_simulator + target_triple; framework_count /
framework_at(i) / framework_path_count / framework_path_at(i);
add_asset_dir(src, dest) + asset_dir_count / src_at / dest_at.
Compiler-side wiring:
- src/ir/compiler_hooks.zig — BuildConfig now carries post_link_callback_fn,
post_link_module, binary_path, bundle_*, target_triple,
target_frameworks, target_framework_paths, asset_dirs. Hook registry
exposes every accessor; getters return "" / 0 for unset fields so
bundle.sx can treat absent values uniformly.
- src/ir/host_ffi.zig (new) — dlsym(RTLD_DEFAULT) + arity-switched cdecl
trampolines so #foreign("c") declarations resolve through the host
libc during #run / post-link interpretation.
- src/ir/interp.zig — callForeign dispatch; build_config pointer
injection so accessor hooks see live state during re-entry.
- src/core.zig — keeps the IR module alive past generateCode; exposes
invokeByName / invokeByFuncId so main.zig can re-enter the
interpreter after linking.
- src/main.zig — wires bundle/codesign/provisioning CLI flags +
target_triple + framework lists into BuildConfig; invokes the
post-link callback (by FuncId or by <module>.bundle_main lookup) once
target.link() returns. When --bundle is set but no callback is
registered, auto-falls-back to post_link_module = "platform.bundle"
so the legacy --bundle CLI keeps working for any program that imports
modules/platform/bundle.sx.
Apple .app bundler (library/modules/platform/bundle.sx):
- Single bundle_main entry covers macOS, iOS simulator, iOS device.
Per-target Info.plist switch keys off is_ios()/is_ios_simulator() —
iOS emits UIDeviceFamily / LSRequiresIPhoneOS /
UIApplicationSceneManifest / DTPlatformName (iPhoneOS or
iPhoneSimulator); macOS emits the minimal CFBundle* set.
- iOS-only steps:
- Provisioning embed: fs.read_file + fs.write_file to
<bundle>/embedded.mobileprovision.
- Framework embed: recursive cp -R per -F search path into
<bundle>/Frameworks/<Name>.framework/ (until fs.sx grows list_dir).
- Entitlements extraction: four process.run calls (security cms -D,
plutil -extract Entitlements xml1, plutil -extract
ApplicationIdentifierPrefix.0, plutil -replace application-identifier)
resolving the wildcard <TEAM>.* -> <TEAM>.<bundle_id>.
- Real codesign with --entitlements when present.
- Asset dirs (add_asset_dir): recursive cp -R src/. into <bundle>/dest/.
Missing src is treated as "nothing to do" so projects can register
add_asset_dir("assets", "assets") unconditionally.
Parser:
- parseStmt() now accepts #import \"path\"; and #framework \"Name\"; as
statement-position tokens. Needed for top-level
inline if OS == .android { #import \"modules/platform/android.sx\"; }
blocks (issue-0042 flatten pass surfaces them); chess's
inline-if-with-#import was rejected at parse time before this fix.
Removals from src/target.zig:
- createBundle, embedFramework, extractEntitlements, buildInfoPlist,
codesign (~210 lines). main.zig no longer calls createBundle after
link(); the sx callback is the single entry point.
Tests / regression markers (all run under sx run host JIT):
- examples/115-post-link-callback.sx — callback registration round-trip.
- examples/116-fs-roundtrip.sx — fs.write_file -> fs.read_file -> exists.
- examples/117-process-roundtrip.sx — process.run + env + find_executable.
- examples/118-macos-bundle.sx — macOS .app via bundle_main callback.
- examples/119-interp-cast-ptr-cmp.sx — cast(T) val under interpreter.
- examples/120-interp-variadic-any.sx — variadic ..Any indexing in IR
interpreter.
- examples/121-ios-sim-bundle.sx — iOS-sim cross-compile + .app with
iOS-shaped Info.plist (added to tests/cross_compile.sh as the
ios-sim tuple).
- examples/122-ios-device-bundle.sx — iOS device cross-compile +
full codesign pipeline (provisioning embed + entitlements
extraction + --entitlements codesign). Manually verified end-to-end:
installed via xcrun devicectl device install app + launched
successfully on iPhone 17 Pro.
- examples/123-inline-if-import-in-body.sx — locks in the parser fix.
zig build && zig build test && bash tests/run_examples.sh => 141 passed,
0 failed; bash tests/cross_compile.sh => 7 passed, 0 failed.
309 lines
11 KiB
Plaintext
309 lines
11 KiB
Plaintext
|
|
@context = internal global { { ptr, ptr, ptr }, ptr } zeroinitializer
|
|
@g_should_call = internal global i1 false
|
|
@str = private unnamed_addr constant [10 x i8] c"getWindow\00", align 1
|
|
@str.1 = private unnamed_addr constant [21 x i8] c"()Ljava/lang/Object;\00", align 1
|
|
@SX_JNI_CLS_getWindow____Ljava_lang_Object_ = internal global ptr null
|
|
@SX_JNI_MID_getWindow____Ljava_lang_Object_ = internal global ptr null
|
|
@str.2 = private unnamed_addr constant [4 x i8] c"ok\0A\00", align 1
|
|
@str.3 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1
|
|
|
|
; Function Attrs: nounwind
|
|
declare void @out(ptr) #0
|
|
|
|
declare ptr @malloc(i64)
|
|
|
|
declare ptr @memcpy(ptr, ptr, i64)
|
|
|
|
declare ptr @memset(ptr, i32, i64)
|
|
|
|
declare void @free(ptr)
|
|
|
|
; Function Attrs: nounwind
|
|
declare void @GPA.create(ptr sret({ ptr, ptr, ptr }), ptr) #0
|
|
|
|
; Function Attrs: nounwind
|
|
define internal ptr @GPA.alloc(ptr %0, i64 %1) #0 {
|
|
entry:
|
|
%alloca = alloca ptr, align 8
|
|
store ptr %0, ptr %alloca, align 8
|
|
%allocaN = alloca i64, align 8
|
|
store i64 %1, ptr %allocaN, align 8
|
|
%load = load ptr, ptr %alloca, align 8
|
|
%gep = getelementptr inbounds { i64 }, ptr %load, i32 0, i32 0
|
|
%loadN = load i64, ptr %gep, align 8
|
|
%add = add i64 %loadN, 1
|
|
store i64 %add, ptr %gep, align 8
|
|
%loadN = load i64, ptr %allocaN, align 8
|
|
%malloc = call ptr @malloc(i64 %loadN)
|
|
ret ptr %malloc
|
|
}
|
|
|
|
; Function Attrs: nounwind
|
|
define internal void @GPA.dealloc(ptr %0, ptr %1) #0 {
|
|
entry:
|
|
%alloca = alloca ptr, align 8
|
|
store ptr %0, ptr %alloca, align 8
|
|
%allocaN = alloca ptr, align 8
|
|
store ptr %1, ptr %allocaN, align 8
|
|
%load = load ptr, ptr %alloca, align 8
|
|
%gep = getelementptr inbounds { i64 }, ptr %load, i32 0, i32 0
|
|
%loadN = load i64, ptr %gep, align 8
|
|
%sub = sub i64 %loadN, 1
|
|
store i64 %sub, ptr %gep, align 8
|
|
%loadN = load ptr, ptr %allocaN, align 8
|
|
call void @free(ptr %loadN)
|
|
ret void
|
|
}
|
|
|
|
; Function Attrs: nounwind
|
|
declare void @Arena.add_chunk(ptr, i64) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare void @Arena.create(ptr sret({ ptr, ptr, ptr }), ptr, ptr, i64) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare void @Arena.reset(ptr) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare void @Arena.deinit(ptr) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare ptr @Arena.alloc(ptr, i64) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare void @Arena.dealloc(ptr, ptr) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare void @BufAlloc.create(ptr sret({ ptr, ptr, ptr }), ptr, ptr, i64) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare void @BufAlloc.reset(ptr) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare ptr @BufAlloc.alloc(ptr, i64) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare void @BufAlloc.dealloc(ptr, ptr) #0
|
|
|
|
; Function Attrs: nounwind
|
|
define internal { ptr, i64 } @cstring(i64 %0) #0 {
|
|
entry:
|
|
%alloca = alloca i64, align 8
|
|
store i64 %0, ptr %alloca, align 8
|
|
%load = load i64, ptr %alloca, align 8
|
|
%add = add i64 %load, 1
|
|
%heap = call ptr @malloc(i64 %add)
|
|
%allocaN = alloca ptr, align 8
|
|
store ptr %heap, ptr %allocaN, align 8
|
|
%loadN = load ptr, ptr %allocaN, align 8
|
|
%loadN = load i64, ptr %alloca, align 8
|
|
%addN = add i64 %loadN, 1
|
|
%1 = call ptr @memset(ptr %loadN, i32 0, i64 %addN)
|
|
%allocaN = alloca { ptr, i64 }, align 8
|
|
store { ptr, i64 } undef, ptr %allocaN, align 8
|
|
%loadN = load ptr, ptr %allocaN, align 8
|
|
%gep = getelementptr inbounds { ptr, i64 }, ptr %allocaN, i32 0, i32 0
|
|
%pti = ptrtoint ptr %loadN to i64
|
|
store i64 %pti, ptr %gep, align 8
|
|
%loadN = load i64, ptr %alloca, align 8
|
|
%gepN = getelementptr inbounds { ptr, i64 }, ptr %allocaN, i32 0, i32 1
|
|
store i64 %loadN, ptr %gepN, align 8
|
|
%loadN = load { ptr, i64 }, ptr %allocaN, align 8
|
|
ret { ptr, i64 } %loadN
|
|
}
|
|
|
|
; Function Attrs: nounwind
|
|
declare ptr @int_to_string(i64) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare ptr @bool_to_string(i1) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare ptr @float_to_string(double) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare void @hex_group(ptr, i64, i64) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare ptr @int_to_hex_string(i64) #0
|
|
|
|
; Function Attrs: nounwind
|
|
define internal { ptr, i64 } @concat({ ptr, i64 } %0, { ptr, i64 } %1) #0 {
|
|
entry:
|
|
%alloca = alloca { ptr, i64 }, align 8
|
|
store { ptr, i64 } %0, ptr %alloca, align 8
|
|
%allocaN = alloca { ptr, i64 }, align 8
|
|
store { ptr, i64 } %1, ptr %allocaN, align 8
|
|
%load = load { ptr, i64 }, ptr %alloca, align 8
|
|
%len = extractvalue { ptr, i64 } %load, 1
|
|
%allocaN = alloca i64, align 8
|
|
store i64 %len, ptr %allocaN, align 8
|
|
%loadN = load { ptr, i64 }, ptr %allocaN, align 8
|
|
%lenN = extractvalue { ptr, i64 } %loadN, 1
|
|
%allocaN = alloca i64, align 8
|
|
store i64 %lenN, ptr %allocaN, align 8
|
|
%loadN = load i64, ptr %allocaN, align 8
|
|
%loadN = load i64, ptr %allocaN, align 8
|
|
%add = add i64 %loadN, %loadN
|
|
%call = call { ptr, i64 } @cstring(i64 %add)
|
|
%allocaN = alloca { ptr, i64 }, align 8
|
|
store { ptr, i64 } %call, ptr %allocaN, align 8
|
|
%loadN = load { ptr, i64 }, ptr %allocaN, align 8
|
|
%dptr = extractvalue { ptr, i64 } %loadN, 0
|
|
%loadN = load { ptr, i64 }, ptr %alloca, align 8
|
|
%dptrN = extractvalue { ptr, i64 } %loadN, 0
|
|
%loadN = load i64, ptr %allocaN, align 8
|
|
%2 = call ptr @memcpy(ptr %dptr, ptr %dptrN, i64 %loadN)
|
|
%loadN = load i64, ptr %allocaN, align 8
|
|
%loadN = load { ptr, i64 }, ptr %allocaN, align 8
|
|
%igp.data = extractvalue { ptr, i64 } %loadN, 0
|
|
%igp.ptr = getelementptr i8, ptr %igp.data, i64 %loadN
|
|
%loadN = load { ptr, i64 }, ptr %allocaN, align 8
|
|
%dptrN = extractvalue { ptr, i64 } %loadN, 0
|
|
%loadN = load i64, ptr %allocaN, align 8
|
|
%3 = call ptr @memcpy(ptr %igp.ptr, ptr %dptrN, i64 %loadN)
|
|
%loadN = load { ptr, i64 }, ptr %allocaN, align 8
|
|
ret { ptr, i64 } %loadN
|
|
}
|
|
|
|
; Function Attrs: nounwind
|
|
define internal { ptr, i64 } @substr({ ptr, i64 } %0, i64 %1, i64 %2) #0 {
|
|
entry:
|
|
%alloca = alloca { ptr, i64 }, align 8
|
|
store { ptr, i64 } %0, ptr %alloca, align 8
|
|
%allocaN = alloca i64, align 8
|
|
store i64 %1, ptr %allocaN, align 8
|
|
%allocaN = alloca i64, align 8
|
|
store i64 %2, ptr %allocaN, align 8
|
|
%load = load i64, ptr %allocaN, align 8
|
|
%call = call { ptr, i64 } @cstring(i64 %load)
|
|
%allocaN = alloca { ptr, i64 }, align 8
|
|
store { ptr, i64 } %call, ptr %allocaN, align 8
|
|
%loadN = load { ptr, i64 }, ptr %allocaN, align 8
|
|
%dptr = extractvalue { ptr, i64 } %loadN, 0
|
|
%loadN = load i64, ptr %allocaN, align 8
|
|
%loadN = load { ptr, i64 }, ptr %alloca, align 8
|
|
%igp.data = extractvalue { ptr, i64 } %loadN, 0
|
|
%igp.ptr = getelementptr i8, ptr %igp.data, i64 %loadN
|
|
%loadN = load i64, ptr %allocaN, align 8
|
|
%3 = call ptr @memcpy(ptr %dptr, ptr %igp.ptr, i64 %loadN)
|
|
%loadN = load { ptr, i64 }, ptr %allocaN, align 8
|
|
ret { ptr, i64 } %loadN
|
|
}
|
|
|
|
; Function Attrs: nounwind
|
|
declare ptr @xml_escape(ptr) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare ptr @path_join(ptr) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare ptr @any_to_string([2 x i64]) #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare ptr @build_format(ptr) #0
|
|
|
|
; Function Attrs: nounwind
|
|
define internal void @unused_jni(ptr %0, ptr %1) #0 {
|
|
entry:
|
|
%alloca = alloca ptr, align 8
|
|
store ptr %0, ptr %alloca, align 8
|
|
%allocaN = alloca ptr, align 8
|
|
store ptr %1, ptr %allocaN, align 8
|
|
%load = load ptr, ptr %alloca, align 8
|
|
%call = call ptr @sx_jni_env_tl_get()
|
|
call void @sx_jni_env_tl_set(ptr %load)
|
|
%loadN = load ptr, ptr %allocaN, align 8
|
|
%jni.ifs = load ptr, ptr %load, align 8
|
|
%jni.cached.mid = load ptr, ptr @SX_JNI_MID_getWindow____Ljava_lang_Object_, align 8
|
|
%jni.is.cached = icmp ne ptr %jni.cached.mid, null
|
|
br i1 %jni.is.cached, label %jni.cont, label %jni.miss
|
|
|
|
jni.miss: ; preds = %entry
|
|
%2 = getelementptr inbounds ptr, ptr %jni.ifs, i32 31
|
|
%jni.GetObjectClass = load ptr, ptr %2, align 8
|
|
%jni.cls = call ptr %jni.GetObjectClass(ptr %load, ptr %loadN)
|
|
%3 = getelementptr inbounds ptr, ptr %jni.ifs, i32 21
|
|
%jni.NewGlobalRef = load ptr, ptr %3, align 8
|
|
%jni.global.cls = call ptr %jni.NewGlobalRef(ptr %load, ptr %jni.cls)
|
|
store ptr %jni.global.cls, ptr @SX_JNI_CLS_getWindow____Ljava_lang_Object_, align 8
|
|
%4 = getelementptr inbounds ptr, ptr %jni.ifs, i32 33
|
|
%jni.GetMethodID = load ptr, ptr %4, align 8
|
|
%jni.fresh.mid = call ptr %jni.GetMethodID(ptr %load, ptr %jni.global.cls, ptr @str, ptr @str.1)
|
|
store ptr %jni.fresh.mid, ptr @SX_JNI_MID_getWindow____Ljava_lang_Object_, align 8
|
|
br label %jni.cont
|
|
|
|
jni.cont: ; preds = %jni.miss, %entry
|
|
%jni.mid = phi ptr [ %jni.cached.mid, %entry ], [ %jni.fresh.mid, %jni.miss ]
|
|
%5 = getelementptr inbounds ptr, ptr %jni.ifs, i32 34
|
|
%jni.callfn = load ptr, ptr %5, align 8
|
|
%jni.ret = call ptr %jni.callfn(ptr %load, ptr %loadN, ptr %jni.mid)
|
|
%allocaN = alloca ptr, align 8
|
|
store ptr %jni.ret, ptr %allocaN, align 8
|
|
call void @sx_jni_env_tl_set(ptr %call)
|
|
ret void
|
|
}
|
|
|
|
; Function Attrs: nounwind
|
|
define i32 @main() #0 {
|
|
entry:
|
|
%alloca = alloca { i64 }, align 8
|
|
store { i64 } zeroinitializer, ptr %alloca, align 8
|
|
%si = insertvalue { ptr, ptr, ptr } undef, ptr %alloca, 0
|
|
%siN = insertvalue { ptr, ptr, ptr } %si, ptr @__thunk_GPA_Allocator_alloc, 1
|
|
%siN = insertvalue { ptr, ptr, ptr } %siN, ptr @__thunk_GPA_Allocator_dealloc, 2
|
|
%siN = insertvalue { { ptr, ptr, ptr }, ptr } undef, { ptr, ptr, ptr } %siN, 0
|
|
%siN = insertvalue { { ptr, ptr, ptr }, ptr } %siN, ptr null, 1
|
|
store { { ptr, ptr, ptr }, ptr } %siN, ptr @context, align 8
|
|
%gload = load i1, ptr @g_should_call, align 1
|
|
br i1 %gload, label %if.then.0, label %if.merge.1
|
|
|
|
if.then.0: ; preds = %entry
|
|
call void @unused_jni(ptr null, ptr null)
|
|
br label %if.merge.1
|
|
|
|
if.merge.1: ; preds = %if.then.0, %entry
|
|
%allocaN = alloca { ptr, i64 }, align 8
|
|
%gep = getelementptr inbounds { ptr, i64 }, ptr %allocaN, i32 0, i32 0
|
|
store ptr null, ptr %gep, align 8
|
|
%gepN = getelementptr inbounds { ptr, i64 }, ptr %allocaN, i32 0, i32 1
|
|
store i64 0, ptr %gepN, align 8
|
|
%allocaN = alloca { ptr, i64 }, align 8
|
|
store { ptr, i64 } { ptr @str.2, i64 3 }, ptr %allocaN, align 8
|
|
%allocaN = alloca { ptr, i64 }, align 8
|
|
store { ptr, i64 } { ptr @str.3, i64 0 }, ptr %allocaN, align 8
|
|
%load = load { ptr, i64 }, ptr %allocaN, align 8
|
|
%loadN = load { ptr, i64 }, ptr %allocaN, align 8
|
|
%call = call { ptr, i64 } @substr({ ptr, i64 } %loadN, i64 0, i64 3)
|
|
%callN = call { ptr, i64 } @concat({ ptr, i64 } %load, { ptr, i64 } %call)
|
|
store { ptr, i64 } %callN, ptr %allocaN, align 8
|
|
%loadN = load { ptr, i64 }, ptr %allocaN, align 8
|
|
%str.ptr = extractvalue { ptr, i64 } %loadN, 0
|
|
%str.len = extractvalue { ptr, i64 } %loadN, 1
|
|
%0 = call i64 @write(i32 1, ptr %str.ptr, i64 %str.len)
|
|
ret i32 0
|
|
}
|
|
|
|
; Function Attrs: nounwind
|
|
define internal ptr @__thunk_GPA_Allocator_alloc(ptr %0, i64 %1) #0 {
|
|
entry:
|
|
%call = call ptr @GPA.alloc(ptr %0, i64 %1)
|
|
ret ptr %call
|
|
}
|
|
|
|
; Function Attrs: nounwind
|
|
define internal void @__thunk_GPA_Allocator_dealloc(ptr %0, ptr %1) #0 {
|
|
entry:
|
|
call void @GPA.dealloc(ptr %0, ptr %1)
|
|
ret void
|
|
}
|
|
|
|
; Function Attrs: nounwind
|
|
declare ptr @sx_jni_env_tl_get() #0
|
|
|
|
; Function Attrs: nounwind
|
|
declare void @sx_jni_env_tl_set(ptr) #0
|
|
|
|
declare i64 @write(i32, ptr, i64)
|