From e5ee7213676eb1a00654971dff74e9b744b0ca8d Mon Sep 17 00:00:00 2001 From: Raphael Amorim Date: Fri, 5 Jun 2026 10:36:56 +0200 Subject: [PATCH] remove dead code --- bus.jam | 7 ------- main.jam | 9 ++++----- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/bus.jam b/bus.jam index 80698a8..994b3ee 100644 --- a/bus.jam +++ b/bus.jam @@ -401,10 +401,3 @@ pub fn busWrite8(bus: Bus, cop0: *mut[] u32, addr: u32, val: u32) { } } -// Direct buffer accessors. -pub fn busRamPtr(bus: Bus) *mut[] u8 { return bus.ram.ptr; } -pub fn busBiosPtr(bus: Bus) *mut[] u8 { return bus.bios.ptr; } -pub fn busVramPtr(bus: Bus) *mut[] u8 { return bus.vram.ptr; } -pub fn busDmaPtr(bus: Bus) *mut[] u32 { return bus.dma.ptr; } -pub fn busIrqPtr(bus: Bus) *mut[] u32 { return bus.irq.ptr; } -pub fn busGtePtr(bus: Bus) *mut[] u32 { return bus.gte.ptr; } diff --git a/main.jam b/main.jam index b29ab07..8777a46 100644 --- a/main.jam +++ b/main.jam @@ -11,8 +11,7 @@ const { Bus, allocBus, busRead32, busRead16, busRead8, - busWrite32, busWrite16, busWrite8, - busRamPtr, busBiosPtr, busVramPtr + busWrite32, busWrite16, busWrite8 } = import("bus"); // Force device modules into main.jam's codegen context. const { Gpu } = import("gpu"); @@ -193,7 +192,7 @@ fn loadExe(path: []u8, bus: Bus, regs: *mut[] u32, c: mut Cpu) { var bp: *mut[] u8 = body.ptr; f.read(bp[0..fileSz]); const dst: u32 = ramDest & 0x001FFFFF; - var ram: *mut[] u8 = busRamPtr(bus); + var ram: *mut[] u8 = bus.ram.ptr; var i: u32 = 0; while (i < fileSz) { ram[dst + i] = body[i]; @@ -224,7 +223,7 @@ fn loadExe(path: []u8, bus: Bus, regs: *mut[] u32, c: mut Cpu) { fn loadBios(path: []u8, bus: Bus) u64 { match (File.open(path)) { Some(f) { - var biosPtr: *mut[] u8 = busBiosPtr(bus); + var biosPtr: *mut[] u8 = bus.bios.ptr; var bios: []u8 = biosPtr[0..0x80000]; const got: u64 = f.read(bios); f.close(); @@ -663,7 +662,7 @@ fn main() { // Audio: runOneFrame pushed the per-frame sample batch into the // ring; SDL's callback (psone_audio_cb) drains it at the host's // 44.1 kHz pull rate. - var vram: *mut[] u8 = busVramPtr(bus); + var vram: *mut[] u8 = bus.vram.ptr; // Read the current display origin out of the GPU state buffer // (g[63] disp_x, g[64] disp_y - set by GP1 0x05). The BIOS // moves these around during double-buffered animation. -- 2.51.2