mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-17 20:09:57 -04:00
Port Ocarina of Time (Switch 2) to the recomp host
The NVN2 front end and the SM86 to Maxwell shader lowering (tools/xlate/AmpereLowering.cs, mesh and task stages, bindless texture pools, BRX jump tables, the NVN2 compute c0 layout) with four translator patches (0017-0020) bring the opening of the game to 58-60 fps on the Vulkan renderer. This round fixes the haze: SM86 IPA is lowered as a plain Maxwell IPA.PASS (texture coordinates were corrected for perspective twice); LDSM, TXD, both F2IP byte forms, HMMA, MOVM and HFMA2.RELU are lowered and spill mode has eight uniform register groups; conditional rendering keeps the newest counter report per address and treats a report as pending until its value is in guest memory, so occlusion tests and the depth clears around the depth copy behave; and the upscaler stand-in decodes the post pass's sRGB picture before writing the linear target. Tensor-core programs keep the stand-in unless NX2NAVI_NATIVE_TENSOR=1, because their lowering does not match the hardware yet. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
// nx2navi.exe entry: reserves the guest address space, parses the command line and runs one mode.
|
||||
// nx2navi.exe entry: reserves the guest address space, parses the command line and runs one mode.
|
||||
//
|
||||
// nx2navi.exe [--exefs DIR] [--romfs DIR] [--profile DIR] <mode>
|
||||
// --selftest layout, dispatch table and host-function registry; needs no game files
|
||||
@@ -163,7 +163,17 @@ void rt_brk(Cpu *c, uint32_t imm, uint64_t pc) {
|
||||
}
|
||||
|
||||
void rt_udf(Cpu *c, uint64_t pc) {
|
||||
char at[128], lr[128];
|
||||
char at[128], lr[128], d[128];
|
||||
rt_logf("udf at %s (lr %s)\n", ldr_describe(pc, at, sizeof at), ldr_describe(c->x[30], lr, sizeof lr));
|
||||
for (int i = 0; i < 31; i++) rt_logf(" x%-2d %016llx%s", i, (unsigned long long)c->x[i], i % 4 == 3 ? "\n" : "");
|
||||
rt_logf(" sp %016llx\n pc %016llx\n", (unsigned long long)c->sp, (unsigned long long)c->pc);
|
||||
uint64_t fp = c->x[29];
|
||||
for (int n = 0; n < 32 && fp && !(fp & 7) && plat_mem_readable(fp, 16); n++) {
|
||||
uint64_t next = LD64(fp), link = LD64(fp + 8);
|
||||
rt_logf(" guest frame %2d: %s\n", n, ldr_describe(link, d, sizeof d));
|
||||
if (next <= fp || next - fp > (64u << 20)) break;
|
||||
fp = next;
|
||||
}
|
||||
rt_fatal("undefined instruction at %s (lr %s)", ldr_describe(pc, at, sizeof at),
|
||||
ldr_describe(c->x[30], lr, sizeof lr));
|
||||
}
|
||||
@@ -244,7 +254,7 @@ static void crash_handler(const PlatCrash *x) {
|
||||
rt_logf(" sp %016llx\n pc %016llx lr %s\n", (unsigned long long)c->sp, (unsigned long long)c->pc,
|
||||
ldr_describe(c->x[30], d, sizeof d));
|
||||
uint64_t fp = c->x[29];
|
||||
for (int n = 0; n < 32 && fp && !(fp & 7) && readable(fp, 16); n++) {
|
||||
for (int n = 0; n < 32 && fp && !(fp & 7) && plat_mem_readable(fp, 16); n++) {
|
||||
uint64_t next = LD64(fp), lr = LD64(fp + 8);
|
||||
rt_logf(" guest frame %2d: %s\n", n, ldr_describe(lr, d, sizeof d));
|
||||
if (next <= fp || next - fp > (64u << 20)) break;
|
||||
|
||||
Reference in New Issue
Block a user