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.
28 lines
912 B
Plaintext
28 lines
912 B
Plaintext
// Phase 1 step 1.2 (PLAN-FFI.md): parser coverage for `#jni_call`
|
|
// and `#jni_static_call`. Same `#<intrinsic>(ReturnT)(args...)`
|
|
// shape as `#objc_call`; lands green on the existing parse rule
|
|
// (Phase 1.1 added all three).
|
|
//
|
|
// `inline if false` suppresses sema/codegen — the lowering arrives
|
|
// in Phase 1.15+; this file pins the parse surface only.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
main :: () -> s32 {
|
|
inline if false {
|
|
env : *void = null;
|
|
#jni_env(env) {
|
|
// Instance method: target, name, sig, args...
|
|
#jni_call(*void)(null, "getWindow", "()Landroid/view/Window;");
|
|
|
|
// Static method: class, name, sig, args...
|
|
#jni_static_call(s32)(null, "max", "(II)I", 3, 7);
|
|
|
|
// Returning a Java primitive (jboolean → sx bool).
|
|
#jni_call(bool)(null, "isShown", "()Z");
|
|
}
|
|
}
|
|
print("parse-only ok\n");
|
|
0;
|
|
}
|