From 357b5839cad218150b6c5d45e65d1a3979b1d631 Mon Sep 17 00:00:00 2001 From: SimoneN64 Date: Sun, 19 Mar 2023 15:21:04 +0100 Subject: [PATCH] Use more correct loggings --- src/backend/Core.cpp | 2 +- src/backend/GameDB.cpp | 1 - src/backend/core/RDP.cpp | 71 ++++++++++++++++----------------- src/backend/core/RSP.cpp | 22 +++++----- src/backend/core/jit/decode.cpp | 2 +- src/backend/core/mmio/PI.cpp | 4 +- 6 files changed, 50 insertions(+), 52 deletions(-) diff --git a/src/backend/Core.cpp b/src/backend/Core.cpp index efa61d31..b2476f6c 100644 --- a/src/backend/Core.cpp +++ b/src/backend/Core.cpp @@ -6,7 +6,7 @@ namespace n64 { Core::Core() { if(SDL_GameControllerAddMappingsFromFile("resources/gamecontrollerdb.txt") < 0) { - Util::print("Failed to load game controller DB\n"); + Util::warn("Failed to load game controller DB\n"); } } diff --git a/src/backend/GameDB.cpp b/src/backend/GameDB.cpp index 4210ae3e..73d4ee6e 100644 --- a/src/backend/GameDB.cpp +++ b/src/backend/GameDB.cpp @@ -18,7 +18,6 @@ void GameDB::match(Mem& mem) { if (matches_region) { mem.saveType = i.saveType; mem.rom.gameNameDB = i.name; - Util::debug("Loaded {}\n", i.name); return; } else { Util::warn("Matched code for %s, but not region! Game supposedly exists in regions [{}] but this image has region {}\n", diff --git a/src/backend/core/RDP.cpp b/src/backend/core/RDP.cpp index 4166e560..73c1132e 100644 --- a/src/backend/core/RDP.cpp +++ b/src/backend/core/RDP.cpp @@ -74,41 +74,41 @@ void RDP::WriteStatus(MI& mi, Registers& regs, RSP& rsp, u32 val) { inline void logCommand(u8 cmd) { switch(cmd) { - case 0x08: Util::print("Fill triangle\n"); break; - case 0x09: Util::print("Fill, zbuf triangle\n"); break; - case 0x0a: Util::print("Texture triangle\n"); break; - case 0x0b: Util::print("Texture, zbuf triangle\n"); break; - case 0x0c: Util::print("Shade triangle\n"); break; - case 0x0d: Util::print("Shade, zbuf triangle\n"); break; - case 0x0e: Util::print("Shade, texture triangle\n"); break; - case 0x0f: Util::print("Shade, texture, zbuf triangle\n"); break; - case 0x24: Util::print("Texture rectangle\n"); break; - case 0x25: Util::print("Texture rectangle flip\n"); break; - case 0x26: Util::print("Sync load\n"); break; - case 0x27: Util::print("Sync pipe\n"); break; - case 0x28: Util::print("Sync tile\n"); break; - case 0x29: Util::print("Sync full\n"); break; - case 0x2a: Util::print("Set key gb\n"); break; - case 0x2b: Util::print("Set key r\n"); break; - case 0x2c: Util::print("Set convert\n"); break; - case 0x2d: Util::print("Set scissor\n"); break; - case 0x2e: Util::print("Set prim depth\n"); break; - case 0x2f: Util::print("Set other modes\n"); break; - case 0x30: Util::print("Load TLUT\n"); break; - case 0x32: Util::print("Set tile size\n"); break; - case 0x33: Util::print("Load block\n"); break; - case 0x34: Util::print("Load tile\n"); break; - case 0x35: Util::print("Set tile\n"); break; - case 0x36: Util::print("Fill rectangle\n"); break; - case 0x37: Util::print("Set fill color\n"); break; - case 0x38: Util::print("Set fog color\n"); break; - case 0x39: Util::print("Set blend color\n"); break; - case 0x3a: Util::print("Set prim color\n"); break; - case 0x3b: Util::print("Set env color\n"); break; - case 0x3c: Util::print("Set combine\n"); break; - case 0x3d: Util::print("Set texture image\n"); break; - case 0x3e: Util::print("Set mask image\n"); break; - case 0x3f: Util::print("Set color image\n"); break; + case 0x08: Util::debug("Fill triangle\n"); break; + case 0x09: Util::debug("Fill, zbuf triangle\n"); break; + case 0x0a: Util::debug("Texture triangle\n"); break; + case 0x0b: Util::debug("Texture, zbuf triangle\n"); break; + case 0x0c: Util::debug("Shade triangle\n"); break; + case 0x0d: Util::debug("Shade, zbuf triangle\n"); break; + case 0x0e: Util::debug("Shade, texture triangle\n"); break; + case 0x0f: Util::debug("Shade, texture, zbuf triangle\n"); break; + case 0x24: Util::debug("Texture rectangle\n"); break; + case 0x25: Util::debug("Texture rectangle flip\n"); break; + case 0x26: Util::debug("Sync load\n"); break; + case 0x27: Util::debug("Sync pipe\n"); break; + case 0x28: Util::debug("Sync tile\n"); break; + case 0x29: Util::debug("Sync full\n"); break; + case 0x2a: Util::debug("Set key gb\n"); break; + case 0x2b: Util::debug("Set key r\n"); break; + case 0x2c: Util::debug("Set convert\n"); break; + case 0x2d: Util::debug("Set scissor\n"); break; + case 0x2e: Util::debug("Set prim depth\n"); break; + case 0x2f: Util::debug("Set other modes\n"); break; + case 0x30: Util::debug("Load TLUT\n"); break; + case 0x32: Util::debug("Set tile size\n"); break; + case 0x33: Util::debug("Load block\n"); break; + case 0x34: Util::debug("Load tile\n"); break; + case 0x35: Util::debug("Set tile\n"); break; + case 0x36: Util::debug("Fill rectangle\n"); break; + case 0x37: Util::debug("Set fill color\n"); break; + case 0x38: Util::debug("Set fog color\n"); break; + case 0x39: Util::debug("Set blend color\n"); break; + case 0x3a: Util::debug("Set prim color\n"); break; + case 0x3b: Util::debug("Set env color\n"); break; + case 0x3c: Util::debug("Set combine\n"); break; + case 0x3d: Util::debug("Set texture image\n"); break; + case 0x3e: Util::debug("Set mask image\n"); break; + case 0x3f: Util::debug("Set color image\n"); break; } } @@ -156,7 +156,6 @@ void RDP::RunCommand(MI& mi, Registers& regs, RSP& rsp) { while (buf_index < word_len) { u8 cmd = (cmd_buf[buf_index] >> 24) & 0x3F; - //logCommand(cmd); int cmd_len = cmd_lens[cmd]; if ((buf_index + cmd_len) * 4 > len + (remaining_cmds * 4)) { diff --git a/src/backend/core/RSP.cpp b/src/backend/core/RSP.cpp index b511e135..8816000b 100644 --- a/src/backend/core/RSP.cpp +++ b/src/backend/core/RSP.cpp @@ -35,34 +35,34 @@ void RSP::Reset() { /* inline void logRSP(const RSP& rsp, const u32 instr) { - Util::print("{:04X} {:08X} ", rsp.oldPC, instr); + Util::debug("{:04X} {:08X} ", rsp.oldPC, instr); for (auto gpr : rsp.gpr) { - Util::print("{:08X} ", gpr); + Util::debug("{:08X} ", gpr); } for (auto vpr : rsp.vpr) { for (int i = 0; i < 8; i++) { - Util::print("{:04X}", vpr.element[i]); + Util::debug("{:04X}", vpr.element[i]); } - Util::print(" "); + Util::debug(" "); } for (int i = 0; i < 8; i++) { - Util::print("{:04X}", rsp.acc.h.element[i]); + Util::debug("{:04X}", rsp.acc.h.element[i]); } - Util::print(" "); + Util::debug(" "); for (int i = 0; i < 8; i++) { - Util::print("{:04X}", rsp.acc.m.element[i]); + Util::debug("{:04X}", rsp.acc.m.element[i]); } - Util::print(" "); + Util::debug(" "); for (int i = 0; i < 8; i++) { - Util::print("{:04X}", rsp.acc.l.element[i]); + Util::debug("{:04X}", rsp.acc.l.element[i]); } - Util::print(" {:04X} {:04X} {:02X}\n", rsp.GetVCC(), rsp.GetVCO(), rsp.GetVCE()); - Util::print("DMEM: {:02X}{:02X}\n", rsp.dmem[0x3c4], rsp.dmem[0x3c5]); + Util::debug(" {:04X} {:04X} {:02X}\n", rsp.GetVCC(), rsp.GetVCO(), rsp.GetVCE()); + Util::debug("DMEM: {:02X}{:02X}\n", rsp.dmem[0x3c4], rsp.dmem[0x3c5]); } */ diff --git a/src/backend/core/jit/decode.cpp b/src/backend/core/jit/decode.cpp index 83eb61f3..f221a804 100644 --- a/src/backend/core/jit/decode.cpp +++ b/src/backend/core/jit/decode.cpp @@ -82,7 +82,7 @@ bool JIT::special(u32 instr) { code.call(rax); res = true; break; - case 0x0C: Util::print("[RECOMPILER] Unhandled syscall instruction {:016X}\n", (u64)regs.pc); /*dumpCode.close();*/ exit(1); + case 0x0C: Util::panic("[RECOMPILER] Unhandled syscall instruction {:016X}\n", (u64)regs.pc); case 0x0D: Util::panic("[RECOMPILER] Unhandled break instruction {:016X}\n", (u64)regs.pc); case 0x0F: break; // SYNC case 0x10: diff --git a/src/backend/core/mmio/PI.cpp b/src/backend/core/mmio/PI.cpp index 11151f4b..916f41ea 100644 --- a/src/backend/core/mmio/PI.cpp +++ b/src/backend/core/mmio/PI.cpp @@ -57,7 +57,7 @@ void PI::Write(Mem& mem, Registers& regs, u32 addr, u32 val) { dramAddr = dram_addr + len; cartAddr = cart_addr + len; InterruptRaise(mi, regs, Interrupt::PI); - //Util::print("PI DMA from RDRAM to CARTRIDGE (size: {} B, {:08X} to {:08X})\n", len, dramAddr, cartAddr); + //Util::debug("PI DMA from RDRAM to CARTRIDGE (size: {} B, {:08X} to {:08X})\n", len, dramAddr, cartAddr); } break; case 0x0460000C: { u32 len = (val & 0x00FFFFFF) + 1; @@ -73,7 +73,7 @@ void PI::Write(Mem& mem, Registers& regs, u32 addr, u32 val) { dramAddr = dram_addr + len; cartAddr = cart_addr + len; InterruptRaise(mi, regs, Interrupt::PI); - //Util::print("PI DMA from CARTRIDGE to RDRAM (size: {} B, {:08X} to {:08X})\n", len, cart_addr, dram_addr); + //Util::debug("PI DMA from CARTRIDGE to RDRAM (size: {} B, {:08X} to {:08X})\n", len, cart_addr, dram_addr); } break; case 0x04600010: if(val & 2) {