6a3260ff65
`#jni_call` collapses to a single surface — env is *always* implicit:
either picked up from the lexically-enclosing `#jni_env(env) { ... }`
block's Ref (cheap, register-resident, no TL touch) or from the
runtime's thread-local slot via `sx_jni_env_tl_get()` (one fn call
per dispatch). The explicit-env shape is gone — chess and the
existing tests migrate cleanly by wrapping their helper-fn bodies
in `#jni_env(env) { ... }`.
The TL slot lives outside the user's IR module so the LLVM ORC JIT
can load object files cleanly without `orc_rt` for TLS support:
library/vendors/sx_jni_runtime/sx_jni_env_tl.c:
static _Thread_local void *sx_jni_env_tl_slot;
void *sx_jni_env_tl_get(void) { return sx_jni_env_tl_slot; }
void sx_jni_env_tl_set(void *env) { sx_jni_env_tl_slot = env; }
Linkage:
- sx-the-compiler links the .c file via build.zig so the JIT
process-symbol generator resolves `sx_jni_env_tl_get`/`_set`.
- AOT targets get the same .c file auto-linked via the lowering
pass: when lower touches the TL externs, it sets
`needs_jni_env_tl_runtime`, and `Compilation.lowerToIR` appends a
synthetic `CImportInfo` to `lowering_extra_c_sources` that
`collectCImportSources` merges with user-written ones.
Lowering-side changes:
- `getJniEnvTlFids` lazily declares the two externs (parallel
to `getSelRegisterNameFid`) and flips `needs_jni_env_tl_runtime`.
- `#jni_env(env) { body }` emits save→set→body→restore via three
`call` ops to the externs; the inner body sees env via the
lexical-direct stack.
- `lowerJniCall` resolves env from `jni_env_stack` (top) or the TL
fallback. The explicit-env branch is gone.
- `jni_env_stack_base` tracks per-fn lexical scope so lazy-lowering
a callee doesn't accidentally see the caller's Ref (Refs are only
valid inside one fn's instruction stream).
Test migration (mechanical):
- ffi-jni-call-{01..09}: each helper fn wraps `#jni_call(...)`
bodies in `#jni_env(env) { ... }`. Returning values pass through
the block as an expression — `#jni_env` now also lowers in
expression position.
Verified:
- zig build test + tests/run_examples.sh: 130/130 green.
- tests/cross_compile.sh: 3/3 green.
- Chess APK rebuilt + reinstalled on Pixel. Board renders with
status-bar clearance + info panel intact; no crashes in logcat.
Safe-insets dispatch through `#jni_env` + lexical-direct now
fully exercised end-to-end on real hardware.
52 lines
1.8 KiB
Plaintext
52 lines
1.8 KiB
Plaintext
// Phase 1 step 1.15 (PLAN-FFI.md): `#jni_call(void)` codegen.
|
|
//
|
|
// `#jni_call(T)(env, target, "method_name", "(Sig)RetSig", args...)`
|
|
// dispatches a JNI instance-method call. The lowering hand-emits the
|
|
// vtable indirection:
|
|
//
|
|
// ifs = *env // JNINativeInterface*
|
|
// cls = ifs->GetObjectClass(env, target)
|
|
// mid = ifs->GetMethodID(env, cls, name, sig)
|
|
// ifs->Call<Type>Method(env, target, mid, args...)
|
|
//
|
|
// Phase 1.17 introduces method-ID caching via static slots populated
|
|
// at module-init; this step keeps the per-call-site lookup.
|
|
//
|
|
// Host can't dlopen libjvm via the JIT, so the JNI body is gated
|
|
// behind `inline if OS == .android`. The macOS test path strips the
|
|
// body and prints "skipped"; the cross_compile.sh Android target
|
|
// verifies that the gated body actually compiles + links against
|
|
// libjvm in the Android sysroot.
|
|
|
|
#import "modules/std.sx";
|
|
#import "modules/compiler.sx";
|
|
|
|
main :: () -> s32 {
|
|
inline if OS == .android {
|
|
// Real Android entry passes env + target via android_main /
|
|
// ANativeActivity (modules/platform/android.sx). For the cross-
|
|
// compile-only test we just need the lowering to emit valid
|
|
// IR; runtime correctness is exercised by the chess
|
|
// sx_android_query_safe_insets path once Phase 1D for
|
|
// sx_android_jni.c lands.
|
|
env : *void = null;
|
|
target : *void = null;
|
|
#jni_env(env) {
|
|
#jni_call(void)(target, "noop", "()V");
|
|
}
|
|
}
|
|
inline if OS != .android {
|
|
print("skipped (not android)\n");
|
|
}
|
|
0;
|
|
}
|
|
|
|
// Android target requires `android_main` as the NDK entry — kept as
|
|
// a 3-line trampoline so this example can pass through
|
|
// `--target android` builds in `tests/cross_compile.sh`.
|
|
android_main :: (app: *void) {
|
|
inline if OS == .android {
|
|
main();
|
|
}
|
|
}
|