mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-18 17:29:57 -04:00
Keep the crash report's exception filter in place, and write the game's exit code into its log from the launcher.
The last-chance exception filter is set at the start, before the GPU driver and the other DLLs load. A DLL that sets its own filter later takes its place, and a fault in that DLL then ends the game with no FATAL line in the log. Two 0.6.0 logs from an RX 7800 XT end that way on the title screen. Once a second the filter is now put back and the module that replaced it is logged (NX2NAVI_CRASH_FILTER_GUARD, default 1). When the game ends with a nonzero code, the launcher adds that code, in hex with its meaning, to the end of logs\nx2navi.log, so a fail-fast exit that no handler in the process can see still shows in the log a player sends. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -41,7 +41,7 @@ static const char *const known[] = {
|
||||
"BIND_ZL", "BIND_ZR", "BLOCK_VIEWS_3D", "CLOTH_REALTIME", "COLOR_BRIGHTNESS", "COLOR_CONTRAST", "COLOR_GAMMA",
|
||||
"COLOR_PRESET", "COLOR_SATURATION", "CONTACT_DEBUG", "CONTACT_SHADOWS", "CORE_DIAG", "CRIT", "CRIT_OUT",
|
||||
"DESC_TEMPLATE", "DEVICE_PROFILE", "DISCORD_APP_ID", "DISCORD_IMAGE", "DISCORD_RPC", "DLAA", "DLAA_CAM_KEEP", "DLAA_JITTER", "DLAA_MV", "DLAA_MASKDEBUG", "DLAA_MVDEBUG", "DLAA_OBJMV", "DLAA_SURVEY", "DLAA_TIMES", "DLSS", "DLSS_CHAR_MASK", "DLSS_PRESET", "DLSS_REACTIVE", "DUMP", "DUMP_BUF", "DUMP_DIR",
|
||||
"DUMP_LOG", "DUMP_FILE", "DS3", "LOG_CS_BINDS", "LOG_TEX_FLAGS", "LOG_MESH", "MESH", "POOL", "NATIVE_TENSOR", "LOG_RCOND", "LOG_RT_SIZES", "DUMP_WHITE", "DUMP_AFTER", "DUMP_MOVIE", "SUBMIT_FINISH", "ACQUIRE_WAIT", "CS_FALLBACK", "EXEFS", "FEEDBACK", "FIX_C0", "FIX_ZERO", "FLIGHT", "FLIGHT_AT", "FLIGHT_DIR", "FLIGHT_FRAMES",
|
||||
"DUMP_LOG", "DUMP_FILE", "DS3", "LOG_CS_BINDS", "LOG_TEX_FLAGS", "LOG_MESH", "MESH", "POOL", "NATIVE_TENSOR", "LOG_RCOND", "LOG_RT_SIZES", "DUMP_WHITE", "DUMP_AFTER", "DUMP_MOVIE", "SUBMIT_FINISH", "ACQUIRE_WAIT", "CRASH_FILTER_GUARD", "CS_FALLBACK", "EXEFS", "FEEDBACK", "FIX_C0", "FIX_ZERO", "FLIGHT", "FLIGHT_AT", "FLIGHT_DIR", "FLIGHT_FRAMES",
|
||||
"FLIGHT_SPIKE_MS", "FLIGHT_THUMBS", "FLUSH_SPAN", "FLUSH_UPLOAD", "FOLIAGE_SHADOW_CULL", "FOLIAGE_SHADOW_VRS", "FOV", "FOV_PATCH", "FG_HUDLESS_SHOW", "FPS60", "FPS_LIMIT", "FRAMEGEN", "FREEZE_IDLE", "FREE_CORES",
|
||||
"FULLSCREEN", "FXAA", "GAME_ASPECT", "GAME_RES", "GPA", "GPA_EMPTY", "GPA_TWIN", "GPL", "GPL_DRAW_BUILD", "GPU", "GPU_INDEX", "GPU_PASSES", "GPU_NAME", "HDR", "HDR_BLOWOUT", "HDR_CONTRAST",
|
||||
"HDR_EXPOSURE", "HDR_FLARE", "HDR_GAMMA", "HDR_GAME_NITS", "HDR_GRADE", "HDR_HIGHLIGHT_SAT", "HDR_HIGHLIGHTS", "HDR_HUE",
|
||||
|
||||
@@ -498,8 +498,24 @@ static void cpu_placement(void) {
|
||||
plat_process_affinity(on ? one : all);
|
||||
}
|
||||
|
||||
// NX2NAVI_CRASH_FILTER_GUARD (default 1; 0 off): once a second, the crash report's last-chance exception filter is put
|
||||
// back if a DLL loaded after the start (a GPU driver, an overlay) set its own in its place. Without it, a fault in such
|
||||
// a DLL ends the process with no FATAL line in the log. The first eight replacements are logged with the module.
|
||||
static void crash_filter_guard(uint64_t frame) {
|
||||
static int on = -1, logged;
|
||||
if (on < 0) on = rt_knob("CRASH_FILTER_GUARD", "1");
|
||||
if (!on || frame % 60) return;
|
||||
char who[160];
|
||||
if (plat_crash_filter_reassert(who, sizeof who) && logged < 8) {
|
||||
logged++;
|
||||
rt_log("diag: frame %llu: an exception filter from %s had replaced the crash report's; the crash report's is "
|
||||
"back (NX2NAVI_CRASH_FILTER_GUARD)", (unsigned long long)frame, who);
|
||||
}
|
||||
}
|
||||
|
||||
void perf_present(uint64_t frame) {
|
||||
static uint64_t last, sum, max, n, win_start, ab_b;
|
||||
crash_filter_guard(frame);
|
||||
static int64_t win_prev[PERF_CNT_N];
|
||||
prof_render_tid = plat_thread_id();
|
||||
if (rt_trace & RT_TRACE_SCHED) kern_sched_report(frame);
|
||||
|
||||
@@ -1051,6 +1051,7 @@ void plat_mem_fault_hook(int (*fn)(uint64_t addr)) {
|
||||
}
|
||||
|
||||
void plat_crash_context(const char *s) { (void)s; } // the Windows crash notes only
|
||||
int plat_crash_filter_reassert(char *who, size_t n) { (void)who, (void)n; return 0; } // Windows only
|
||||
|
||||
// plat_jmp_save / plat_jmp_go (platform.h): leaf code that does not move rsp before it leaves, as on Windows.
|
||||
_Static_assert(sizeof(PlatJmp) == 72 && __builtin_offsetof(PlatJmp, mxcsr) == 64, "plat_jmp_save layout");
|
||||
|
||||
@@ -271,6 +271,9 @@ void plat_crash_hook(void (*fn)(const PlatCrash *c));
|
||||
// What this thread is doing, named by the crash notes (a stack overflow leaves no room for the full report); NULL
|
||||
// clears it. s must stay valid until it is cleared.
|
||||
void plat_crash_context(const char *s);
|
||||
// Puts the crash hook's last-chance exception filter back in place. 1 when a DLL loaded later had set its own in its
|
||||
// place (who: that filter's module and offset), 0 when it was still there. Windows only; 0 elsewhere.
|
||||
int plat_crash_filter_reassert(char *who, size_t n);
|
||||
int plat_mem_read(uint64_t addr, void *out, size_t n); // copies n bytes, 0 instead of faulting on unmapped memory
|
||||
int plat_mem_readable(uint64_t addr, uint64_t n); // every page of [addr, addr + n) can be read; no fault
|
||||
void *plat_aligned_alloc(size_t size, size_t align); // free with plat_aligned_free; NULL on failure
|
||||
|
||||
@@ -1007,6 +1007,21 @@ void plat_crash_hook(void (*fn)(const PlatCrash *c)) {
|
||||
_set_invalid_parameter_handler(invalid_parameter);
|
||||
}
|
||||
|
||||
// The last-chance filter is set once, at the start, before the GPU driver, the window and audio libraries and the
|
||||
// movie decoder load. A DLL that sets its own filter later takes the place of crash_filter, and a fault outside this
|
||||
// executable then ends the process with no line in the log. This puts crash_filter back; when another filter had
|
||||
// taken its place, `who` gets the module and offset of that filter and the call returns 1.
|
||||
int plat_crash_filter_reassert(char *who, size_t n) {
|
||||
LPTOP_LEVEL_EXCEPTION_FILTER prev = SetUnhandledExceptionFilter(crash_filter);
|
||||
if (prev == crash_filter) return 0;
|
||||
void *base = NULL;
|
||||
if (prev) RtlPcToFileHeader((void *)prev, &base);
|
||||
if (!prev) snprintf(who, n, "no filter (removed)");
|
||||
else if (!base) snprintf(who, n, "%p, outside every module", (void *)prev);
|
||||
else snprintf(who, n, "%s+%#llx", image_name(base), (unsigned long long)((uintptr_t)prev - (uintptr_t)base));
|
||||
return 1;
|
||||
}
|
||||
|
||||
// A fresh process gets a fresh layout: Windows places DLLs, heaps and thread stacks at random addresses. The parent
|
||||
// waits and exits with the child's code.
|
||||
void plat_reexec(void) {
|
||||
|
||||
Reference in New Issue
Block a user