mirror of
https://github.com/RetroPortingToolKit/psxrecomp
synced 2026-10-27 10:38:46 -04:00
Matthew Stanley
479c51934a
TX_DATA writes now route through the SIO0 shifter under SIO_MODEL_CYCLE_PACED. Pad and card share the single-byte shifter and TX buffer; bus owner is tagged on the first byte of each SELECT cycle. sio_advance() is driven from psx_advance_cycles() so the shifter and ACK pipeline progress on the guest CPU clock without touching the legacy IRQ countdown. The SELECT-deassert and TX_EN 1->0 paths now restore TX_RDY|TX_EMPTY when they kill an in-flight shifter. Without this, sio_stat retained the TX-clear bits set by SHIFT_START and the next handler busy-waited forever on TX_RDY=0 inside the exception, deadlocking the BIOS. Watchdog dump captured the deadlock at chain handler 0x445C with stat=0x0000 across 4 seconds of PC samples. Diagnostics added (passive/gated): - starvation_ring records SIO MMIO events + periodic PC samples, watchdog dumps to JSONL on TCP-poll starvation - starvation_walk.py queries the dump (last/last_change/why_idle) Validation: shell-only sanity stable; one CROSS press no longer hangs; mc_read_done climbs from 0 -> 30+ with mc_aborts=0. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
109 lines
3.8 KiB
C
109 lines
3.8 KiB
C
/*
|
|
* starvation_ring.h — Always-on diagnostic ring for capturing SIO/MMIO
|
|
* state immediately before a TCP-starvation hang.
|
|
*
|
|
* Phase 1.0e-e2 debug aid. Scope: diagnostic-only. Records every SIO MMIO
|
|
* event (TX_DATA write, RX read, STAT read, CTRL write) plus a snapshot
|
|
* of all SIO bus state at that moment. Watchdog monitors host wall-clock
|
|
* since last debug_server_poll; if it exceeds a threshold, the ring is
|
|
* flushed to disk and the process aborts cleanly so the dump survives.
|
|
*
|
|
* NOT for permanent use. Disabled by setting STARVATION_RING_ENABLED=0.
|
|
*/
|
|
#ifndef PSXRECOMP_V4_STARVATION_RING_H
|
|
#define PSXRECOMP_V4_STARVATION_RING_H
|
|
|
|
#include <stdint.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifndef STARVATION_RING_ENABLED
|
|
#define STARVATION_RING_ENABLED 1
|
|
#endif
|
|
|
|
#define STARVATION_RING_CAP (1 << 14) /* 16K entries */
|
|
|
|
typedef enum {
|
|
SR_EVT_NONE = 0,
|
|
SR_EVT_TX_DATA_WRITE = 1,
|
|
SR_EVT_RX_DATA_READ = 2,
|
|
SR_EVT_STAT_READ = 3,
|
|
SR_EVT_CTRL_WRITE = 4,
|
|
SR_EVT_MODE_WRITE = 5,
|
|
SR_EVT_BAUD_WRITE = 6,
|
|
SR_EVT_SHIFT_START = 7,
|
|
SR_EVT_BUFFER_LOAD = 8,
|
|
SR_EVT_TX_DROPPED = 9,
|
|
SR_EVT_SHIFT_DONE = 10,
|
|
SR_EVT_ACK_FIRE = 11,
|
|
SR_EVT_SELECT_ASSERT = 12,
|
|
SR_EVT_SELECT_DEASS = 13,
|
|
SR_EVT_RESET = 14,
|
|
SR_EVT_PC_SAMPLE = 15, /* periodic PC sample, no MMIO event */
|
|
} StarvationEventKind;
|
|
|
|
typedef struct {
|
|
uint64_t seq; /* monotonic sequence */
|
|
uint64_t psx_cycle_count; /* guest cycle clock at event */
|
|
uint64_t host_us; /* host monotonic time in microseconds */
|
|
uint32_t current_func; /* g_debug_current_func_addr */
|
|
uint32_t last_store_pc; /* g_debug_last_store_pc */
|
|
uint16_t sio_ctrl;
|
|
uint16_t sio_stat;
|
|
uint8_t tx_data; /* on TX_DATA writes; else 0 */
|
|
uint8_t rx_data; /* on RX_DATA reads; else 0 */
|
|
uint8_t kind; /* StarvationEventKind */
|
|
uint8_t in_exception;
|
|
uint8_t shift_active;
|
|
uint8_t tx_buffered;
|
|
uint8_t pending_ack;
|
|
uint8_t bus_owner; /* SioBusOwner */
|
|
uint8_t active_device; /* DEV_NONE/PAD/MEMCARD */
|
|
uint8_t mc_state;
|
|
uint8_t pad_state;
|
|
uint8_t selected_slot;
|
|
uint8_t g_sio_timing_active;
|
|
uint8_t tx_rdy_visible; /* (sio_stat & 1) at event time */
|
|
uint8_t tx_em_visible; /* (sio_stat & 4) at event time */
|
|
uint8_t pad8;
|
|
uint16_t pad16;
|
|
int shift_remaining; /* cycles left on shifter */
|
|
int ack_remaining; /* cycles left on ack */
|
|
uint32_t bus_byte_index;
|
|
uint32_t i_stat;
|
|
uint32_t i_mask;
|
|
} StarvationEntry;
|
|
|
|
void starvation_ring_record(uint8_t kind, uint8_t tx, uint8_t rx,
|
|
uint16_t ctrl, uint16_t stat,
|
|
int shift_active, int shift_remaining,
|
|
int tx_buffered, int pending_ack,
|
|
int ack_remaining,
|
|
uint8_t bus_owner, uint32_t bus_byte_index,
|
|
uint8_t active_device, uint8_t mc_state,
|
|
uint8_t pad_state, uint8_t selected_slot,
|
|
int g_sio_timing_active);
|
|
|
|
/* Watchdog: call from debug_server_poll() to refresh the heartbeat.
|
|
* If too much wall-time passes without a refresh AND the BIOS is
|
|
* actively running (post-boot), the ring is dumped and the process
|
|
* aborts. */
|
|
void starvation_watchdog_heartbeat(void);
|
|
|
|
/* Run watchdog check from a hot path (e.g. psx_advance_cycles). */
|
|
void starvation_watchdog_check(void);
|
|
|
|
/* Manual dump-to-file (for testing / TCP probe). Filename can be NULL. */
|
|
void starvation_ring_dump(const char *path);
|
|
|
|
/* Periodic PC sample. Caller responsible for throttling. */
|
|
void starvation_ring_pc_sample(void);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* PSXRECOMP_V4_STARVATION_RING_H */
|