diff --git a/pcsx2/R3000AInterpreter.cpp b/pcsx2/R3000AInterpreter.cpp index 08ae864180..2b89109218 100644 --- a/pcsx2/R3000AInterpreter.cpp +++ b/pcsx2/R3000AInterpreter.cpp @@ -196,7 +196,6 @@ const char* intrname[]={ void zeroEx() { -#ifdef PCSX2_DEVBUILD u32 pc; u32 code; const char *lib; @@ -243,16 +242,21 @@ void zeroEx() psxRegs.pc = psxRegs.GPR.n.ra; } - if (!strncmp(lib, "loadcore", 8) && code == 6) { - DevCon.WriteLn( Color_Gray, "loadcore RegisterLibraryEntries (%x): %8.8s", psxRegs.pc, iopVirtMemR(psxRegs.GPR.n.a0+12)); - } + { + // these three can be pretty spammy at times, and so we might want to attach a + // log source toggle to them. - if (!strncmp(lib, "intrman", 7) && code == 4) { - DevCon.WriteLn( Color_Gray, "intrman RegisterIntrHandler (%x): intr %s, handler %x", psxRegs.pc, intrname[psxRegs.GPR.n.a0], psxRegs.GPR.n.a2); - } + if (!strncmp(lib, "loadcore", 8) && code == 6) { + DbgCon.WriteLn( Color_Gray, "loadcore RegisterLibraryEntries (%x): %8.8s", psxRegs.pc, iopVirtMemR(psxRegs.GPR.n.a0+12)); + } - if (!strncmp(lib, "sifcmd", 6) && code == 17) { - DevCon.WriteLn( Color_Gray, "sifcmd sceSifRegisterRpc (%x): rpc_id %x", psxRegs.pc, psxRegs.GPR.n.a1); + if (!strncmp(lib, "intrman", 7) && code == 4) { + DbgCon.WriteLn( Color_Gray, "intrman RegisterIntrHandler (%x): intr %s, handler %x", psxRegs.pc, intrname[psxRegs.GPR.n.a0], psxRegs.GPR.n.a2); + } + + if (!strncmp(lib, "sifcmd", 6) && code == 17) { + DbgCon.WriteLn( Color_Gray, "sifcmd sceSifRegisterRpc (%x): rpc_id %x", psxRegs.pc, psxRegs.GPR.n.a1); + } } if (!strncmp(lib, "sysclib", 8)) diff --git a/pcsx2/ps2/Iop/IopHwWrite.cpp b/pcsx2/ps2/Iop/IopHwWrite.cpp index 704803c449..4e917d1389 100644 --- a/pcsx2/ps2/Iop/IopHwWrite.cpp +++ b/pcsx2/ps2/Iop/IopHwWrite.cpp @@ -92,7 +92,7 @@ void __fastcall iopHwWrite8_Page1( u32 addr, mem8_t val ) DevCon.Warning( "HwWrite8 to Counter32 [ignored], addr 0x%08x = 0x%02x", addr, psxHu8(addr) ); psxHu8( addr ) = val; } - else if( masked_addr >= pgmsk(HW_USB_START) && masked_addr < pgmsk(HW_USB_END) ) + else if( (masked_addr >= pgmsk(HW_USB_START)) && (masked_addr < pgmsk(HW_USB_END)) ) { USBwrite8( addr, val ); } diff --git a/pcsx2/x86/iR3000A.cpp b/pcsx2/x86/iR3000A.cpp index c2a7ae5195..7f6ec7bd4b 100644 --- a/pcsx2/x86/iR3000A.cpp +++ b/pcsx2/x86/iR3000A.cpp @@ -662,7 +662,7 @@ void psxRecompileCodeConst1(R3000AFNPTR constcode, R3000AFNPTR_INFO noconstcode) if ( ! _Rt_ ) { if( (psxRegs.code>>26) == 9 ) { //ADDIU, call bios - if( IsDebugBuild ) + if( IsDevBuild ) { MOV32ItoM( (uptr)&psxRegs.code, psxRegs.code ); MOV32ItoM( (uptr)&psxRegs.pc, psxpc );