mirror of
https://git.triforceproject.com/triforce/source
synced 2026-11-22 17:19:58 -04:00
The 0.6 crashes after warps and area changes fixed (no write-back into memory the capture leaves out), invisible objects fixed (occlusion gate), DLSS frame generation flicker fixed, achievements, the renderer built with a play profile, faster translated game code, helper threads judged on settled scenes, memory, shader preparation, audio effects, launcher, controls and Linux fixes.
113 lines
6.5 KiB
Python
113 lines
6.5 KiB
Python
"""a64-kit's guest model (rt/a64.h, rt/a64_rt.c) with a 64-bit guest window, written next to the lifted code.
|
|
|
|
a64-kit maps all guest memory below 4 GB (`A64_MEM + (uint32_t)addr`): its own loader picks every address. MKW
|
|
does not fit: a 39-bit address space, ~9.5 GiB of planned memory on the 12 GB layout, 2x 5.7 GiB sparse GPU
|
|
regions. With A64_ADDR64 (defined by the generated header) an access is `A64_MEM + addr` over a reservation of the
|
|
whole 39-bit space (Eden's fastmem arena, or our own), and lookups of code addresses refuse anything above 4 GB
|
|
instead of truncating it (code always lies below: Eden loads it at 0x80000000).
|
|
|
|
It also adds the interrupt flag and A64_POLL that nx2/poll.py's loop-header polls use.
|
|
|
|
The changes are text substitutions on the vendored files, each required to match exactly once, so a refreshed
|
|
a64-kit that moved these lines fails here loudly instead of silently keeping the 32-bit window.
|
|
"""
|
|
import os
|
|
|
|
import kit
|
|
|
|
POLL_DECL = r"""
|
|
/* (nx2/poll.py) loop back-edge interrupt polls: A64_POLLING builds clear c->poll and call a64_poll_cur, the backend's,
|
|
when it is set. The call is handed nothing on purpose: the context parameter is noescape (A64_NOESC) and never
|
|
captured, so a call with no pointer argument cannot touch *c, and the compiler keeps guest registers in host registers
|
|
across the loop. (a64_poll(c), the old form, made every loop body reload and store them: a call that takes c may change
|
|
any of it.) The poll sits before the backward goto, after the body's stores: at the loop header, a call C cannot mark
|
|
as returning (LLVM's willreturn) left the stores after it not guaranteed to execute, and nothing was promoted.
|
|
a64_poll_cur finds the thread's context itself (host/mkw_glue.c, hos_ctx). A64_POLL_CTX keeps the old form for the
|
|
emulator-hosted DLL (nx2/rt/eden_shim.c), whose host's poll takes the context. */
|
|
void a64_poll(Ctx *A64_NOESC c);
|
|
void a64_poll_cur(void);
|
|
#if defined(A64_POLLING) && defined(A64_POLL_CTX)
|
|
#define A64_POLL(c) do { if (__builtin_expect(__atomic_load_n(&(c)->poll, __ATOMIC_RELAXED) != 0, 0)) a64_poll(c); } while (0)
|
|
#elif defined(A64_POLLING)
|
|
#define A64_POLL(c) do { if (__builtin_expect(__atomic_load_n(&(c)->poll, __ATOMIC_RELAXED) != 0, 0)) { \
|
|
__atomic_store_n(&(c)->poll, 0, __ATOMIC_RELAXED); a64_poll_cur(); } } while (0)
|
|
#else
|
|
#define A64_POLL(c) ((void)0)
|
|
#endif"""
|
|
|
|
# (Triforce, 11-22, the performance audit's LIFT-47, after Source B's) what a DMB of the load or the store kind is in code
|
|
# lifted with A64_DMB_LIGHT=1 (nx2/insn.py dmb_light). x86-64 orders loads with loads, loads with later stores and stores
|
|
# with stores itself; the empty asm with a "memory" clobber keeps the compiler from moving or merging guest accesses across
|
|
# it (a C11 fence alone would not order the plain accesses), and no instruction is emitted. Any other host: the full fence.
|
|
DMB_LDST = r"""
|
|
#if defined(__x86_64__)
|
|
#define A64_DMB_LDST() __asm__ __volatile__("" ::: "memory")
|
|
#else
|
|
#define A64_DMB_LDST() recomp_barrier()
|
|
#endif"""
|
|
|
|
ADDR64 = r"""#ifndef A64_ADDR64
|
|
#define A64_ADDR64 1 /* (nx2/rtgen.py: 64-bit guest window) */
|
|
#endif
|
|
#if A64_ADDR64
|
|
#define A64_PTR(a) (A64_MEM + (uint64_t)(a))
|
|
#define A64_DIRTY_PAGES (1ull << 27) /* (nx2/rtgen.py) A64_WRITE_TRACK: a mark per 4 KB page of the 512 GB window */
|
|
#else
|
|
#define A64_DIRTY_PAGES (1ull << 20)
|
|
#define A64_PTR(a) (A64_MEM + (uint32_t)(a))
|
|
#endif"""
|
|
|
|
RET_MISMATCH = ("void a64_ret_mismatch(Ctx *A64_NOESC c, uint64_t pc); "
|
|
"/* RET to something other than the caller (debug builds) */")
|
|
THREAD = " void *thread; /* the OS layer's thread object */\n} GuestContext;"
|
|
LOOKUP = " uint32_t a = (uint32_t)addr, lo = 0, hi = a64_fn_count;"
|
|
# (the soft write watch's table at the window's size, the address masked into it: a stray pointer marks a wrong
|
|
# page, never memory past the table)
|
|
MARK_NATIVE = r"""extern uint8_t a64_dirty[1u << 20];
|
|
/* (Tried 2026-10-21: reading a mark first and writing it only when clear, against cache lines moving between cores:
|
|
game threads +1.1 ms a frame, the code 18 MB bigger. Not kept.) */
|
|
#define A64_MARK(a, n) (__atomic_store_n(&a64_dirty[(uint32_t)(a) >> 12], 1, __ATOMIC_RELEASE), \
|
|
__atomic_store_n(&a64_dirty[(uint32_t)((a) + (n) - 1) >> 12], 1, __ATOMIC_RELEASE))"""
|
|
MARK_NATIVE_64 = r"""extern uint8_t a64_dirty[A64_DIRTY_PAGES];
|
|
/* (Tried 2026-10-21: reading a mark first and writing it only when clear, against cache lines moving between cores:
|
|
game threads +1.1 ms a frame, the code 18 MB bigger. Not kept.) */
|
|
#define A64_DIRTY_AT(a) (((uint64_t)(a) >> 12) & (A64_DIRTY_PAGES - 1))
|
|
#ifdef A64_MARK_ONE /* (triforce, build.py RX_MARK_ONE=1: the first byte's page alone. The collection takes a mark as "this page
|
|
and the next", host/rx_backend.c collect_in: a store of up to 4 KB reaches no further) */
|
|
#define A64_MARK(a, n) (__atomic_store_n(&a64_dirty[A64_DIRTY_AT(a)], 1, __ATOMIC_RELEASE))
|
|
#else
|
|
#define A64_MARK(a, n) (__atomic_store_n(&a64_dirty[A64_DIRTY_AT(a)], 1, __ATOMIC_RELEASE), \
|
|
__atomic_store_n(&a64_dirty[A64_DIRTY_AT((a) + (n) - 1)], 1, __ATOMIC_RELEASE))
|
|
#endif"""
|
|
|
|
SUBST = {
|
|
"a64.h": [
|
|
(THREAD, THREAD.replace("\n} GuestContext;", "\n uint32_t poll; "
|
|
"/* (nx2/rtgen.py) interrupt request: A64_POLL clears it and calls a64_poll_cur when set */\n} GuestContext;")),
|
|
(RET_MISMATCH, RET_MISMATCH + POLL_DECL + DMB_LDST),
|
|
("#define A64_PTR(a) (A64_MEM + (uint32_t)(a))", ADDR64),
|
|
(MARK_NATIVE, MARK_NATIVE_64),
|
|
],
|
|
"a64_rt.c": [
|
|
(LOOKUP, "#if A64_ADDR64\n if (addr >> 32) return NULL; /* (code lies below 4 GB: never a truncated match) */\n"
|
|
"#endif\n" + LOOKUP),
|
|
("uint8_t a64_dirty[1u << 20];", "uint8_t a64_dirty[A64_DIRTY_PAGES];"),
|
|
],
|
|
}
|
|
|
|
|
|
def write(out_dir):
|
|
os.makedirs(out_dir, exist_ok=True)
|
|
for name, subs in SUBST.items():
|
|
text = open(os.path.join(kit.KIT, "rt", name), encoding="utf-8").read()
|
|
for old, new in subs:
|
|
n = text.count(old)
|
|
if n != 1:
|
|
raise SystemExit("rtgen: %r found %d times in a64-kit rt/%s (expected once): update nx2/rtgen.py"
|
|
% (old[:60], n, name))
|
|
text = text.replace(old, new)
|
|
head = "/* Generated by mkw-recomp nx2/rtgen.py from a64-kit rt/%s (64-bit guest window). Do not edit. */\n" % name
|
|
with open(os.path.join(out_dir, name), "w", newline="\n", encoding="utf-8") as f:
|
|
f.write(head + text)
|
|
return out_dir
|