From 4f6fab781b875f56a849ff6d13f400a79830d31e Mon Sep 17 00:00:00 2001 From: arcum42 Date: Thu, 12 Nov 2009 14:52:29 +0000 Subject: [PATCH] Expand the color list a bit, muck with the Linux color console code, and change a few ifs to a case statement. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2192 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/include/Utilities/Console.h | 15 +- common/src/Utilities/Console.cpp | 94 ++++++------ pcsx2/HwWrite.cpp | 228 ++++++++++++++--------------- pcsx2/gui/ConsoleLogger.cpp | 13 +- pcsx2/x86/ix86-32/iR5900-32.cpp | 34 +++-- 5 files changed, 200 insertions(+), 184 deletions(-) diff --git a/common/include/Utilities/Console.h b/common/include/Utilities/Console.h index a780ac5f65..563d5cc781 100644 --- a/common/include/Utilities/Console.h +++ b/common/include/Utilities/Console.h @@ -1,6 +1,6 @@ /* PCSX2 - PS2 Emulator for PCs * Copyright (C) 2002-2009 PCSX2 Dev Team - * + * * PCSX2 is free software: you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -36,13 +36,20 @@ enum ConsoleColors // Strong text *may* result in mis-aligned text in the console, depending on the // font and the platform, so use these with caution. - Color_StrongBlack, Color_StrongRed, // intended for errors Color_StrongGreen, // intended for infrequent state information Color_StrongBlue, // intended for block headings + Color_StrongMagenta, Color_StrongOrange, // intended for warnings - + Color_StrongGray, + + Color_StrongCyan, + Color_StrongYellow, + Color_StrongWhite, + + Color_Default, + ConsoleColors_Count }; @@ -76,7 +83,7 @@ struct IConsoleWriter // ---------------------------------------------------------------------------- // Public members; call these to print stuff to console! // - // All functions always return false. Return value is provided only so that we can easily + // All functions always return false. Return value is provided only so that we can easily // disable logs at compile time using the "0&&action" macro trick. bool Write( ConsoleColors color, const char* fmt, ... ) const; diff --git a/common/src/Utilities/Console.cpp b/common/src/Utilities/Console.cpp index d3075f578f..7478febf23 100644 --- a/common/src/Utilities/Console.cpp +++ b/common/src/Utilities/Console.cpp @@ -76,26 +76,45 @@ const IConsoleWriter ConsoleWriter_Null = // -------------------------------------------------------------------------------------- #ifdef __LINUX__ -static const wxChar* tbl_color_codes[] = +static __forceinline const wxChar* GetLinuxConsoleColor(ConsoleColors color) { - L"\033[30m" // black - , L"\033[31m" // red - , L"\033[32m" // green - , L"\033[33m" // yellow - , L"\033[34m" // blue - , L"\033[35m" // magenta - , L"\033[36m" // cyan - , L"\033[37m" // white! - , L"\033[30m\033[1m" // strong black - , L"\033[31m\033[1m" // strong red - , L"\033[32m\033[1m" // strong green - , L"\033[33m\033[1m" // strong yellow - , L"\033[34m\033[1m" // strong blue - , L"\033[35m\033[1m" // strong magenta - , L"\033[36m\033[1m" // strong cyan - , L"\033[37m\033[1m" // strong white! - , L"\033[0m" // Back to default. -}; + switch(color) + { + case Color_Black: return L"\033[30m"; + case Color_StrongBlack: return L"\033[30m\033[1m"; + + case Color_Red: return L"\033[31m"; + case Color_StrongRed: return L"\033[31m\033[1m"; + + case Color_Green: return L"\033[32m"; + case Color_StrongGreen: return L"\033[32m\033[1m"; + + case Color_Yellow: return L"\033[33m"; + case Color_StrongYellow: return L"\033[33m\033[1m"; + + case Color_Blue: return L"\033[34m"; + case Color_StrongBlue: return L"\033[34m\033[1m"; + + // No orange, so use magenta. + case Color_Orange: + case Color_Magenta: return L"\033[35m"; + case Color_StrongOrange: + case Color_StrongMagenta: return L"\033[35m\033[1m"; + + case Color_Cyan: return L"\033[36m"; + case Color_StrongCyan: return L"\033[36m\033[1m"; + + // Use 'white' instead of grey. + case Color_Gray: + case Color_White: return L"\033[37m"; + case Color_StrongGray: + case Color_StrongWhite: return L"\033[37m\033[1m"; + + // On some other value being passed, clear any formatting. + case Color_Default: + default: return L"\033[0m"; + } +} #endif // One possible default write action at startup and shutdown is to use the stdout. @@ -115,32 +134,20 @@ static void __concall ConsoleStdio_Newline() wxPrintf( L"\n" ); } -static void __concall ConsoleStdio_SetColor( ConsoleColors color ) +static void __concall ConsoleStdio_ClearColor() { #ifdef __LINUX__ - wxPrintf(tbl_color_codes[16]); - switch (color) - { - case Color_Black: wxPrintf(tbl_color_codes[0]); break; - case Color_Green: wxPrintf(tbl_color_codes[2]); break; - case Color_Red: wxPrintf(tbl_color_codes[1]); break; - case Color_Blue: wxPrintf(tbl_color_codes[4]); break; - case Color_Magenta: wxPrintf(tbl_color_codes[5]); break; - case Color_Orange: wxPrintf(tbl_color_codes[5]); break; // No orange, so use magenta. - case Color_Gray: wxPrintf(tbl_color_codes[7]); break; // Use white instead of grey. - case Color_Cyan: wxPrintf(tbl_color_codes[6]); break; - case Color_Yellow: wxPrintf(tbl_color_codes[3]); break; - case Color_White: wxPrintf(tbl_color_codes[7]); break; - case Color_StrongBlack: wxPrintf(tbl_color_codes[8]); break; - case Color_StrongRed: wxPrintf(tbl_color_codes[9]); break; - case Color_StrongGreen: wxPrintf(tbl_color_codes[10]); break; - case Color_StrongBlue: wxPrintf(tbl_color_codes[12]); break; - case Color_StrongOrange: wxPrintf(tbl_color_codes[13]); break; // strong magenta. - default: wxPrintf(tbl_color_codes[16]); break; - } + wxPrintf(L"\033[0m"); #endif } +static void __concall ConsoleStdio_SetColor( ConsoleColors color ) +{ +#ifdef __LINUX__ + ConsoleStdio_ClearColor(); + wxPrintf(GetLinuxConsoleColor(color)); +#endif +} static void __concall ConsoleStdio_SetTitle( const wxString& title ) { @@ -149,13 +156,6 @@ static void __concall ConsoleStdio_SetTitle( const wxString& title ) #endif } -static void __concall ConsoleStdio_ClearColor() -{ -#ifdef __LINUX__ - wxPrintf(tbl_color_codes[16]); -#endif -} - const IConsoleWriter ConsoleWriter_Stdio = { ConsoleStdio_DoWrite, // Writes without newlines go to buffer to avoid error log spam. diff --git a/pcsx2/HwWrite.cpp b/pcsx2/HwWrite.cpp index d19913c555..17bda439f4 100644 --- a/pcsx2/HwWrite.cpp +++ b/pcsx2/HwWrite.cpp @@ -1,6 +1,6 @@ /* PCSX2 - PS2 Emulator for PCs * Copyright (C) 2002-2009 PCSX2 Dev Team - * + * * PCSX2 is free software: you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -42,7 +42,7 @@ static __forceinline void DmaExec8( void (*func)(), u32 mem, u8 value ) u32 qwcRegister = (mem | 0x20) & ~0x1; //Need to remove the lower bit else we end up clearing TADR //It's invalid for the hardware to write a DMA while it is active, not without Suspending the DMAC - if ((value & 0x1) && ((psHu8(mem) & 0x1) == 0x1) && dmacRegs->ctrl.DMAE) + if ((value & 0x1) && ((psHu8(mem) & 0x1) == 0x1) && dmacRegs->ctrl.DMAE) { DMA_LOG( "DMAExec8 Attempt to run DMA while one is already active mem = %x", mem ); } @@ -50,8 +50,8 @@ static __forceinline void DmaExec8( void (*func)(), u32 mem, u8 value ) // Upper 16bits of QWC should not be written since QWC is 16bits in size. if ((psHu32(qwcRegister) >> 16) != 0) { - DMA_LOG("DMA QWC (%x) upper 16bits set to %x\n", qwcRegister, psHu32(qwcRegister) >> 16); - psHu32(qwcRegister) = 0; + DMA_LOG("DMA QWC (%x) upper 16bits set to %x\n", qwcRegister, psHu32(qwcRegister) >> 16); + psHu32(qwcRegister) = 0; } psHu8(mem) = (u8)value; @@ -67,7 +67,7 @@ static __forceinline void DmaExec16( void (*func)(), u32 mem, u16 value ) u32 qwcRegister = mem | 0x20; //It's invalid for the hardware to write a DMA while it is active, not without Suspending the DMAC - if ((value & 0x100) && ((psHu32(mem) & 0x100) == 0x100) && dmacRegs->ctrl.DMAE) + if ((value & 0x100) && ((psHu32(mem) & 0x100) == 0x100) && dmacRegs->ctrl.DMAE) { DMA_LOG( "DMAExec16 Attempt to run DMA while one is already active mem = %x", mem); } @@ -75,11 +75,11 @@ static __forceinline void DmaExec16( void (*func)(), u32 mem, u16 value ) // Upper 16bits of QWC should not be written since QWC is 16bits in size. if ((psHu32(qwcRegister) >> 16) != 0) { - DMA_LOG("DMA QWC (%x) upper 16bits set to %x\n", + DMA_LOG("DMA QWC (%x) upper 16bits set to %x\n", qwcRegister, - psHu32(qwcRegister) >> 16); - psHu32(qwcRegister) = 0; - } + psHu32(qwcRegister) >> 16); + psHu32(qwcRegister) = 0; + } psHu16(mem) = (u16)value; if ((psHu16(mem) & 0x100) && dmacRegs->ctrl.DMAE) @@ -94,10 +94,10 @@ static void DmaExec( void (*func)(), u32 mem, u32 value ) u32 qwcRegister = mem | 0x20; //It's invalid for the hardware to write a DMA while it is active, not without Suspending the DMAC - if ((value & 0x100) && ((psHu32(mem) & 0x100) == 0x100) && dmacRegs->ctrl.DMAE) + if ((value & 0x100) && ((psHu32(mem) & 0x100) == 0x100) && dmacRegs->ctrl.DMAE) { DMA_LOG( "DMAExec32 Attempt to run DMA while one is already active mem = %x", mem ); - + // Returning here breaks every single Gust game written. :( // Not returning here breaks Fatal Frame. Gamefix time. if (CHECK_DMAEXECHACK) return; @@ -106,10 +106,10 @@ static void DmaExec( void (*func)(), u32 mem, u32 value ) // Upper 16bits of QWC should not be written since QWC is 16bits in size. if ((psHu32(qwcRegister) >> 16) != 0) { - DMA_LOG("DMA QWC (%x) upper 16bits set to %x\n", + DMA_LOG("DMA QWC (%x) upper 16bits set to %x\n", qwcRegister, - psHu32(qwcRegister) >> 16); - psHu32(qwcRegister) = 0; + psHu32(qwcRegister) >> 16); + psHu32(qwcRegister) = 0; } /* Keep the old tag if in chain mode and hw doesn't set it*/ @@ -130,19 +130,19 @@ char sio_buffer[1024]; int sio_count; u16 QueuedDMA = 0; -void hwWrite8(u32 mem, u8 value) +void hwWrite8(u32 mem, u8 value) { if ((mem >= VIF0_STAT) && (mem < VIF0_FIFO)) { u32 bytemod = mem & 0x3; u32 bitpos = 8 * bytemod; u32 newval = psHu8(mem) & (255UL << bitpos); - + if (mem < VIF1_STAT) vif0Write32( mem & ~0x3, newval | (value<ctrl.DMAE) + if ((value & 0x1) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("8 bit VIF0 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x1; @@ -208,7 +208,7 @@ void hwWrite8(u32 mem, u8 value) case D1_CHCR + 1: // dma1 - vif1 DMA_LOG("VIF1dma EXECUTE, value=0x%x", value); - if ((value & 0x1) && !dmacRegs->ctrl.DMAE) + if ((value & 0x1) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("8 bit VIF1 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x2; @@ -219,7 +219,7 @@ void hwWrite8(u32 mem, u8 value) case D2_CHCR + 1: // dma2 - gif DMA_LOG("GSdma EXECUTE, value=0x%x", value); - if ((value & 0x1) && !dmacRegs->ctrl.DMAE) + if ((value & 0x1) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("8 bit GIF DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x4; @@ -229,7 +229,7 @@ void hwWrite8(u32 mem, u8 value) case D3_CHCR + 1: // dma3 - fromIPU DMA_LOG("IPU0dma EXECUTE, value=0x%x", value); - if ((value & 0x1) && !dmacRegs->ctrl.DMAE) + if ((value & 0x1) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("8 bit IPU0 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x8; @@ -239,7 +239,7 @@ void hwWrite8(u32 mem, u8 value) case D4_CHCR + 1: // dma4 - toIPU DMA_LOG("IPU1dma EXECUTE, value=0x%x", value); - if ((value & 0x1) && !dmacRegs->ctrl.DMAE) + if ((value & 0x1) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("8 bit IPU1 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x10; @@ -250,7 +250,7 @@ void hwWrite8(u32 mem, u8 value) case D5_CHCR + 1: // dma5 - sif0 DMA_LOG("SIF0dma EXECUTE, value=0x%x", value); // if (value == 0) psxSu32(0x30) = 0x40000; - if ((value & 0x1) && !dmacRegs->ctrl.DMAE) + if ((value & 0x1) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("8 bit SIF0 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x20; @@ -260,7 +260,7 @@ void hwWrite8(u32 mem, u8 value) case D6_CHCR + 1: // dma6 - sif1 DMA_LOG("SIF1dma EXECUTE, value=0x%x", value); - if ((value & 0x1) && !dmacRegs->ctrl.DMAE) + if ((value & 0x1) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("8 bit SIF1 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x40; @@ -270,7 +270,7 @@ void hwWrite8(u32 mem, u8 value) case D7_CHCR + 1: // dma7 - sif2 DMA_LOG("SIF2dma EXECUTE, value=0x%x", value); - if ((value & 0x1) && !dmacRegs->ctrl.DMAE) + if ((value & 0x1) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("8 bit SIF2 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x80; @@ -280,7 +280,7 @@ void hwWrite8(u32 mem, u8 value) case D8_CHCR + 1: // dma8 - fromSPR DMA_LOG("fromSPRdma8 EXECUTE, value=0x%x", value); - if ((value & 0x1) && !dmacRegs->ctrl.DMAE) + if ((value & 0x1) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("8 bit SPR0 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x100; @@ -290,7 +290,7 @@ void hwWrite8(u32 mem, u8 value) case SPR1_CHCR + 1: // dma9 - toSPR DMA_LOG("toSPRdma8 EXECUTE, value=0x%x", value); - if ((value & 0x1) && !dmacRegs->ctrl.DMAE) + if ((value & 0x1) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("8 bit SPR1 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x200; @@ -310,27 +310,27 @@ void hwWrite8(u32 mem, u8 value) case SBUS_F210: psHu8(mem) = value; break; - + case SBUS_F220: psHu8(mem) = value; break; - + case SBUS_F230: psHu8(mem) = value; break; - + case SBUS_F240: if (!(value & 0x100)) psHu32(mem) &= ~0x100; break; - + case SBUS_F250: psHu8(mem) = value; break; - + case SBUS_F260: psHu8(mem) = value; break; - + default: pxAssert( (mem & 0xff0f) != 0xf200 ); @@ -339,7 +339,7 @@ void hwWrite8(u32 mem, u8 value) case 0x1000f410: case MCH_RICM: break; - + default: psHu8(mem) = value; } @@ -375,7 +375,7 @@ __forceinline void hwWrite16(u32 mem, u16 value) case D0_CHCR: // dma0 - vif0 DMA_LOG("VIF0dma %lx", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("16 bit VIF0 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x1; @@ -385,7 +385,7 @@ __forceinline void hwWrite16(u32 mem, u16 value) case D1_CHCR: // dma1 - vif1 - chcr DMA_LOG("VIF1dma CHCR %lx", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("16 bit VIF1 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x2; @@ -399,27 +399,27 @@ __forceinline void hwWrite16(u32 mem, u16 value) HW_LOG("VIF1dma Madr %lx", value); psHu16(mem) = value;//dma1 madr break; - + case D1_QWC: // dma1 - vif1 - qwc HW_LOG("VIF1dma QWC %lx", value); psHu16(mem) = value;//dma1 qwc break; - + case D1_TADR: // dma1 - vif1 - tadr HW_LOG("VIF1dma TADR %lx", value); psHu16(mem) = value;//dma1 tadr break; - + case D1_ASR0: // dma1 - vif1 - asr0 HW_LOG("VIF1dma ASR0 %lx", value); psHu16(mem) = value;//dma1 asr0 break; - + case D1_ASR1: // dma1 - vif1 - asr1 HW_LOG("VIF1dma ASR1 %lx", value); psHu16(mem) = value;//dma1 asr1 break; - + case D1_SADR: // dma1 - vif1 - sadr HW_LOG("VIF1dma SADR %lx", value); psHu16(mem) = value;//dma1 sadr @@ -429,7 +429,7 @@ __forceinline void hwWrite16(u32 mem, u16 value) case D2_CHCR: // dma2 - gif DMA_LOG("0x%8.8x hwWrite32: GSdma %lx", cpuRegs.cycle, value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("16 bit GIF DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x4; @@ -442,27 +442,27 @@ __forceinline void hwWrite16(u32 mem, u16 value) psHu16(mem) = value;//dma2 madr HW_LOG("Hardware write DMA2_MADR 32bit at %x with value %x",mem,value); break; - + case D2_QWC: psHu16(mem) = value;//dma2 qwc HW_LOG("Hardware write DMA2_QWC 32bit at %x with value %x",mem,value); break; - + case D2_TADR: psHu16(mem) = value;//dma2 taddr HW_LOG("Hardware write DMA2_TADDR 32bit at %x with value %x",mem,value); break; - + case D2_ASR0: psHu16(mem) = value;//dma2 asr0 HW_LOG("Hardware write DMA2_ASR0 32bit at %x with value %x",mem,value); break; - + case D2_ASR1: psHu16(mem) = value;//dma2 asr1 HW_LOG("Hardware write DMA2_ASR1 32bit at %x with value %x",mem,value); break; - + case D2_SADR: psHu16(mem) = value;//dma2 saddr HW_LOG("Hardware write DMA2_SADDR 32bit at %x with value %x",mem,value); @@ -471,7 +471,7 @@ __forceinline void hwWrite16(u32 mem, u16 value) case D3_CHCR: // dma3 - fromIPU DMA_LOG("IPU0dma %lx", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("16 bit IPU0 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x8; @@ -484,17 +484,17 @@ __forceinline void hwWrite16(u32 mem, u16 value) psHu16(mem) = value;//dma2 madr HW_LOG("Hardware write IPU0DMA_MADR 32bit at %x with value %x",mem,value); break; - + case D3_QWC: psHu16(mem) = value;//dma2 madr HW_LOG("Hardware write IPU0DMA_QWC 32bit at %x with value %x",mem,value); break; - + case D3_TADR: psHu16(mem) = value;//dma2 tadr HW_LOG("Hardware write IPU0DMA_TADR 32bit at %x with value %x",mem,value); break; - + case D3_SADR: psHu16(mem) = value;//dma2 saddr HW_LOG("Hardware write IPU0DMA_SADDR 32bit at %x with value %x",mem,value); @@ -503,7 +503,7 @@ __forceinline void hwWrite16(u32 mem, u16 value) case D4_CHCR: // dma4 - toIPU DMA_LOG("IPU1dma %lx", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("16 bit IPU1 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x10; @@ -516,17 +516,17 @@ __forceinline void hwWrite16(u32 mem, u16 value) psHu16(mem) = value;//dma2 madr HW_LOG("Hardware write IPU1DMA_MADR 32bit at %x with value %x",mem,value); break; - + case D4_QWC: psHu16(mem) = value;//dma2 madr HW_LOG("Hardware write IPU1DMA_QWC 32bit at %x with value %x",mem,value); break; - + case D4_TADR: psHu16(mem) = value;//dma2 tadr HW_LOG("Hardware write IPU1DMA_TADR 32bit at %x with value %x",mem,value); break; - + case D4_SADR: psHu16(mem) = value;//dma2 saddr HW_LOG("Hardware write IPU1DMA_SADDR 32bit at %x with value %x",mem,value); @@ -535,7 +535,7 @@ __forceinline void hwWrite16(u32 mem, u16 value) case D5_CHCR: // dma5 - sif0 DMA_LOG("SIF0dma %lx", value); // if (value == 0) psxSu32(0x30) = 0x40000; - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("16 bit SIF0 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x20; @@ -546,28 +546,28 @@ __forceinline void hwWrite16(u32 mem, u16 value) case D5_CHCR + 2: //? break; - + case D6_CHCR: // dma6 - sif1 DMA_LOG("SIF1dma %lx", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("16 bit SIF1 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x40; } DmaExec16(dmaSIF1, mem, value); break; - + // Given the other values here, perhaps something like this is in order? /*case 0x1000C402: // D6_CHCR + 2 //? break;*/ - + #ifdef PCSX2_DEVBUILD case D6_MADR: // dma6 - sif1 - madr HW_LOG("SIF1dma MADR = %lx", value); psHu16(mem) = value; break; - + case D6_QWC: // dma6 - sif1 - qwc HW_LOG("SIF1dma QWC = %lx", value); psHu16(mem) = value; @@ -581,21 +581,21 @@ __forceinline void hwWrite16(u32 mem, u16 value) case D7_CHCR: // dma7 - sif2 DMA_LOG("SIF2dma %lx", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("16 bit SIF2 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x80; } DmaExec16(dmaSIF2, mem, value); break; - + case D7_CHCR + 2: //? break; - + case D8_CHCR: // dma8 - fromSPR DMA_LOG("fromSPRdma %lx", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("16 bit SPR0 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x100; @@ -605,19 +605,19 @@ __forceinline void hwWrite16(u32 mem, u16 value) case SPR1_CHCR: // dma9 - toSPR DMA_LOG("toSPRdma %lx", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("16 bit SPR1 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x200; } DmaExec16(dmaSPR1, mem, value); break; - + case DMAC_ENABLEW + 2: psHu16(DMAC_ENABLEW + 2) = value; psHu16(DMAC_ENABLER + 2) = value; break; - + case SIO_ISR: case SIO_ISR + 2: case 0x1000f410: @@ -629,7 +629,7 @@ __forceinline void hwWrite16(u32 mem, u16 value) case SBUS_F200: psHu16(mem) = value; break; - + case SBUS_F210: psHu16(mem) = value; break; @@ -637,22 +637,22 @@ __forceinline void hwWrite16(u32 mem, u16 value) case SBUS_F220: psHu16(mem) |= value; break; - + case SBUS_F230: psHu16(mem) &= ~value; break; - + case SBUS_F240: if (!(value & 0x100)) psHu16(mem) &= ~0x100; else psHu16(mem) |= 0x100; break; - + case SBUS_F250: psHu16(mem) = value; break; - + case SBUS_F260: psHu16(mem) = 0; break; @@ -713,9 +713,9 @@ void __fastcall hwWrite32_page_03( u32 mem, u32 value ) if (mem >= VIF0_STAT) { if(mem < VIF1_STAT) - vif0Write32(mem, value); + vif0Write32(mem, value); else - vif1Write32(mem, value); + vif1Write32(mem, value); return; } @@ -723,13 +723,13 @@ void __fastcall hwWrite32_page_03( u32 mem, u32 value ) { case GIF_CTRL: psHu32(mem) = value & 0x8; - + if (value & 0x1) gsGIFReset(); else if ( value & 8 ) gifRegs->stat.PSE = 1; else - gifRegs->stat.PSE = 0; + gifRegs->stat.PSE = 0; break; case GIF_MODE: @@ -763,7 +763,7 @@ void __fastcall hwWrite32_page_0B( u32 mem, u32 value ) { case D3_CHCR: // dma3 - fromIPU DMA_LOG("IPU0dma EXECUTE, value=0x%x\n", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("32 bit IPU0 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x8; @@ -780,7 +780,7 @@ void __fastcall hwWrite32_page_0B( u32 mem, u32 value ) case D4_CHCR: // dma4 - toIPU DMA_LOG("IPU1dma EXECUTE, value=0x%x\n", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("32 bit IPU1 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x10; @@ -819,9 +819,9 @@ void __fastcall hwWrite32_page_0E( u32 mem, u32 value ) case DMAC_CTRL: { u32 oldvalue = psHu32(mem); - + HW_LOG("DMAC_CTRL Write 32bit %x", value); - + psHu32(mem) = value; //Check for DMAS that were started while the DMAC was disabled if (((oldvalue & 0x1) == 0) && ((value & 0x1) == 1)) @@ -830,7 +830,7 @@ void __fastcall hwWrite32_page_0E( u32 mem, u32 value ) } break; } - + case DMAC_STAT: HW_LOG("DMAC_STAT Write 32bit %x", value); @@ -842,7 +842,7 @@ void __fastcall hwWrite32_page_0E( u32 mem, u32 value ) cpuTestDMACInts(); break; - + default: psHu32(mem) = value; break; @@ -860,7 +860,7 @@ void __fastcall hwWrite32_page_0F( u32 mem, u32 value ) { case HELPSWITCH(INTC_STAT): HW_LOG("INTC_STAT Write 32bit %x", value); - psHu32(INTC_STAT) &= ~value; + psHu32(INTC_STAT) &= ~value; //cpuTestINTCInts(); break; @@ -870,7 +870,7 @@ void __fastcall hwWrite32_page_0F( u32 mem, u32 value ) cpuTestINTCInts(); break; - //------------------------------------------------------------------ + //------------------------------------------------------------------ case HELPSWITCH(MCH_RICM)://MCH_RICM: x:4|SA:12|x:5|SDEV:1|SOP:4|SBC:1|SDEV:5 if ((((value >> 16) & 0xFFF) == 0x21) && (((value >> 6) & 0xF) == 1) && (((psHu32(0xf440) >> 7) & 1) == 0))//INIT & SRP=0 rdram_sdevid = 0; // if SIO repeater is cleared, reset sdevid @@ -880,22 +880,22 @@ void __fastcall hwWrite32_page_0F( u32 mem, u32 value ) case HELPSWITCH(SBUS_F200): psHu32(mem) = value; break; - + case HELPSWITCH(SBUS_F220): psHu32(mem) |= value; break; - + case HELPSWITCH(SBUS_F230): psHu32(mem) &= ~value; break; - + case HELPSWITCH(SBUS_F240): if(!(value & 0x100)) psHu32(mem) &= ~0x100; else psHu32(mem) |= 0x100; break; - + case HELPSWITCH(SBUS_F260): psHu32(mem) = 0; break; @@ -930,31 +930,31 @@ void __fastcall hwWrite32_generic( u32 mem, u32 value ) { case D0_CHCR: // dma0 - vif0 DMA_LOG("VIF0dma EXECUTE, value=0x%x", value); - - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("32 bit VIF0 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x1; } - + DmaExec(dmaVIF0, mem, value); return; //------------------------------------------------------------------ case D1_CHCR: // dma1 - vif1 - chcr DMA_LOG("VIF1dma EXECUTE, value=0x%x", value); - - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("32 bit VIF1 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x2; } - - if (value & 0x100) + + if (value & 0x100) { vif1.done = false; //This must be done here! some games (ala Crash of the Titans) pause the dma to start MFIFO } else cpuRegs.interrupt &= ~(1<<10) | ~(1<<1); //Tekken tag seems to stop vif and start it again in normal, so we will cancel the mfifo loop - + DmaExec(dmaVIF1, mem, value); return; @@ -968,7 +968,7 @@ void __fastcall hwWrite32_generic( u32 mem, u32 value ) //------------------------------------------------------------------ case D2_CHCR: // dma2 - gif DMA_LOG("GIFdma EXECUTE, value=0x%x", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("32 bit GIF DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x4; @@ -987,7 +987,7 @@ void __fastcall hwWrite32_generic( u32 mem, u32 value ) case D5_CHCR: // dma5 - sif0 DMA_LOG("SIF0dma EXECUTE, value=0x%x", value); //if (value == 0) psxSu32(0x30) = 0x40000; - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("32 bit SIF0 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x20; @@ -997,7 +997,7 @@ void __fastcall hwWrite32_generic( u32 mem, u32 value ) //------------------------------------------------------------------ case D6_CHCR: // dma6 - sif1 DMA_LOG("SIF1dma EXECUTE, value=0x%x", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("32 bit SIF1 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x40; @@ -1012,7 +1012,7 @@ void __fastcall hwWrite32_generic( u32 mem, u32 value ) //------------------------------------------------------------------ case D7_CHCR: // dma7 - sif2 DMA_LOG("SIF2dma EXECUTE, value=0x%x", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("32 bit SIF2 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x80; @@ -1022,7 +1022,7 @@ void __fastcall hwWrite32_generic( u32 mem, u32 value ) //------------------------------------------------------------------ case D8_CHCR: // dma8 - fromSPR DMA_LOG("SPR0dma EXECUTE (fromSPR), value=0x%x", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("32 bit SPR0 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x100; @@ -1032,7 +1032,7 @@ void __fastcall hwWrite32_generic( u32 mem, u32 value ) //------------------------------------------------------------------ case SPR1_CHCR: // dma9 - toSPR DMA_LOG("SPR1dma EXECUTE (toSPR), value=0x%x", value); - if ((value & 0x100) && !dmacRegs->ctrl.DMAE) + if ((value & 0x100) && !dmacRegs->ctrl.DMAE) { DevCon.Warning("32 bit SPR1 DMA Start while DMAC Disabled\n"); QueuedDMA |= 0x200; @@ -1075,9 +1075,9 @@ void __fastcall hwWrite64_page_03( u32 mem, const mem64_t* srcval ) if (mem >= VIF0_STAT) { if (mem < VIF1_STAT) - vif0Write32(mem, value); + vif0Write32(mem, value); else - vif1Write32(mem, value); + vif1Write32(mem, value); return; } @@ -1101,7 +1101,7 @@ void __fastcall hwWrite64_page_03( u32 mem, const mem64_t* srcval ) { // set/clear bits 0 and 2 as per the GIF_MODE value. const u32 bitmask = GIF_MODE_M3R | GIF_MODE_IMT; - + Console.WriteLn("GIFMODE64 %x", value); psHu64(GIF_MODE) = value; @@ -1127,16 +1127,16 @@ void __fastcall hwWrite64_page_0E( u32 mem, const mem64_t* srcval ) { u32 oldvalue = psHu32(mem); psHu64(mem) = value; - + HW_LOG("DMAC_CTRL Write 64bit %x", value); - + if (((oldvalue & 0x1) == 0) && ((value & 0x1) == 1)) { if (QueuedDMA != 0) StartQueuedDMA(); } break; } - + case DMAC_STAT: HW_LOG("DMAC_STAT Write 64bit %x", value); @@ -1148,7 +1148,7 @@ void __fastcall hwWrite64_page_0E( u32 mem, const mem64_t* srcval ) cpuTestDMACInts(); break; - + default: psHu64(mem) = value; break; @@ -1168,7 +1168,7 @@ void __fastcall hwWrite64_generic( u32 mem, const mem64_t* srcval ) case INTC_STAT: HW_LOG("INTC_STAT Write 64bit %x", (u32)value); - psHu32(INTC_STAT) &= ~value; + psHu32(INTC_STAT) &= ~value; //cpuTestINTCInts(); break; @@ -1206,10 +1206,10 @@ void __fastcall hwWrite128_generic(u32 mem, const mem128_t *srcval) { case INTC_STAT: HW_LOG("INTC_STAT Write 64bit %x", (u32)srcval[0]); - psHu32(INTC_STAT) &= ~srcval[0]; + psHu32(INTC_STAT) &= ~srcval[0]; //cpuTestINTCInts(); break; - + case INTC_MASK: HW_LOG("INTC_MASK Write 64bit %x", (u32)srcval[0]); psHu32(INTC_MASK) ^= (u16)srcval[0]; diff --git a/pcsx2/gui/ConsoleLogger.cpp b/pcsx2/gui/ConsoleLogger.cpp index b0705abd3a..ffb9f63731 100644 --- a/pcsx2/gui/ConsoleLogger.cpp +++ b/pcsx2/gui/ConsoleLogger.cpp @@ -117,10 +117,10 @@ void ConsoleTestThread::ExecuteTaskInThread() } // ---------------------------------------------------------------------------- -// pass an uninitialized file object, the function will ask the user for the -// filename and try to open it, returns true on success (file was opened), +// Pass an uninitialized file object. The function will ask the user for the +// filename and try to open it. It returns true on success (file was opened), // false if file couldn't be opened/created and -1 if the file selection -// dialog was canceled +// dialog was canceled. // static bool OpenLogFile(wxFile& file, wxString& filename, wxWindow *parent) { @@ -180,6 +180,7 @@ void ConsoleLogFrame::ColorArray::Create( int fontsize ) const wxFont fixedB( fontsize, wxMODERN, wxNORMAL, wxBOLD ); // Standard R, G, B format: + new (&m_table[Color_Default]) wxTextAttr( wxColor( 0, 0, 0 ), wxNullColour, fixed ); new (&m_table[Color_Black]) wxTextAttr( wxColor( 0, 0, 0 ), wxNullColour, fixed ); new (&m_table[Color_Red]) wxTextAttr( wxColor( 128, 0, 0 ), wxNullColour, fixed ); new (&m_table[Color_Green]) wxTextAttr( wxColor( 0, 128, 0 ), wxNullColour, fixed ); @@ -196,7 +197,13 @@ void ConsoleLogFrame::ColorArray::Create( int fontsize ) new (&m_table[Color_StrongRed]) wxTextAttr( wxColor( 128, 0, 0 ), wxNullColour, fixedB ); new (&m_table[Color_StrongGreen]) wxTextAttr( wxColor( 0, 128, 0 ), wxNullColour, fixedB ); new (&m_table[Color_StrongBlue]) wxTextAttr( wxColor( 0, 0, 128 ), wxNullColour, fixedB ); + new (&m_table[Color_StrongMagenta]) wxTextAttr( wxColor( 160, 0, 160 ), wxNullColour, fixedB ); new (&m_table[Color_StrongOrange]) wxTextAttr( wxColor( 160, 120, 0 ), wxNullColour, fixedB ); + new (&m_table[Color_StrongGray]) wxTextAttr( wxColor( 108, 108, 108 ), wxNullColour, fixedB ); + + new (&m_table[Color_StrongCyan]) wxTextAttr( wxColor( 128, 180, 180 ), wxNullColour, fixedB ); + new (&m_table[Color_StrongYellow]) wxTextAttr( wxColor( 180, 180, 128 ), wxNullColour, fixedB ); + new (&m_table[Color_StrongWhite]) wxTextAttr( wxColor( 160, 160, 160 ), wxNullColour, fixedB ); } void ConsoleLogFrame::ColorArray::Cleanup() diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900-32.cpp index 96ab577b00..8f1fb87091 100644 --- a/pcsx2/x86/ix86-32/iR5900-32.cpp +++ b/pcsx2/x86/ix86-32/iR5900-32.cpp @@ -1559,20 +1559,24 @@ StartRecomp: //const u32 pgsz = std::min(0x1000 - inpage_offs, inpage_sz); const u32 pgsz = inpage_sz; - if(PageType!=-1) - { - if (PageType==0) { + switch (PageType) + { + case -1: + break; + + case 0: mmap_MarkCountedRamPage( inpage_ptr ); manual_page[inpage_ptr >> 12] = 0; - } - else - { + break; + + default: xMOV( ecx, inpage_ptr ); xMOV( edx, pgsz / 4 ); //xMOV( eax, startpc ); // uncomment this to access startpc (as eax) in dyna_block_discard u32 lpc = inpage_ptr; u32 stg = pgsz; + while(stg>0) { xCMP( ptr32[PSM(lpc)], *(u32*)PSM(lpc) ); @@ -1590,21 +1594,21 @@ StartRecomp: // (ideally, perhaps, manual_counter should be reset to 0 every few minutes?) - if (startpc != 0x81fc0 && manual_counter[inpage_ptr >> 12] <= 3) { - + if (startpc != 0x81fc0 && manual_counter[inpage_ptr >> 12] <= 3) + { // Counted blocks add a weighted (by block size) value into manual_page each time they're // run. If the block gets run a lot, it resets and re-protects itself in the hope // that whatever forced it to be manually-checked before was a 1-time deal. // Counted blocks have a secondary threshold check in manual_counter, which forces a block - // to 'uncounted' mode if it's recompiled several time. This protects against excessive + // to 'uncounted' mode if it's recompiled several times. This protects against excessive // recompilation of blocks that reside on the same codepage as data. // fixme? Currently this algo is kinda dumb and results in the forced recompilation of a // lot of blocks before it decides to mark a 'busy' page as uncounted. There might be // be a more clever approach that could streamline this process, by doing a first-pass // test using the vtlb memory protection (without recompilation!) to reprotect a counted - // block. But unless a new also is relatively simple in implementation, it's probably + // block. But unless a new algo is relatively simple in implementation, it's probably // not worth the effort (tests show that we have lots of recompiler memory to spare, and // that the current amount of recompilation is fairly cheap). @@ -1612,16 +1616,15 @@ StartRecomp: xJC( dyna_page_reset ); // note: clearcnt is measured per-page, not per-block! - //DbgCon.WriteLn( "Manual block @ %08X : size=%3d page/offs=%05X/%03X inpgsz=%d clearcnt=%d", + //DbgCon.WriteLn( "Manual block @ %08X : size =%3d page/offs = %05X/%03X inpgsz = %d clearcnt = %d", // startpc, sz, inpage_ptr>>12, inpage_ptr&0xfff, inpage_sz, manual_counter[inpage_ptr >> 12] ); } else { - DbgCon.WriteLn( Color_Gray, "Uncounted Manual block @ 0x%08X : size=%3d page/offs=%05X/%03X inpgsz=%d", + DbgCon.WriteLn( Color_Gray, "Uncounted Manual block @ 0x%08X : size =%3d page/offs = %05X/%03X inpgsz = %d", startpc, sz, inpage_ptr>>12, inpage_ptr&0xfff, pgsz, inpage_sz ); } - - } + break; } // Finally: Generate x86 recompiled code! @@ -1631,8 +1634,7 @@ StartRecomp: } #ifdef PCSX2_DEBUG - if( (dumplog & 1) ) - iDumpBlock(startpc, recPtr); + if (dumplog & 1) iDumpBlock(startpc, recPtr); #endif pxAssert( (pc-startpc)>>2 <= 0xffff );