From 7f40dddcd699a001c0af27c0db3de2356a227f63 Mon Sep 17 00:00:00 2001 From: nakeee Date: Thu, 9 Jul 2009 12:54:35 +0000 Subject: [PATCH] DSPLLE comment cleanup git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3726 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DSPCore/Src/DSPHWInterface.cpp | 18 +++++++++--------- Source/Core/DSPCore/Src/DSPIntCCUtil.cpp | 2 +- .../Plugins/Plugin_DSP_LLE/Src/DSPSymbols.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Source/Core/DSPCore/Src/DSPHWInterface.cpp b/Source/Core/DSPCore/Src/DSPHWInterface.cpp index bd7f2b0cbd..57bbdde515 100644 --- a/Source/Core/DSPCore/Src/DSPHWInterface.cpp +++ b/Source/Core/DSPCore/Src/DSPHWInterface.cpp @@ -159,7 +159,7 @@ void gdsp_ifx_write(u16 addr, u16 val) break; case 0xd3: // ZeldaUnk (accelerator WRITE) - INFO_LOG(DSPLLE, "Write To ZeldaUnk pc=%04x (%04x)\n", g_dsp.pc, val); + INFO_LOG(DSPLLE, "Write To ZeldaUnk pc=%04x (%04x)", g_dsp.pc, val); dsp_write_aram_d3(val); break; @@ -244,18 +244,18 @@ void gdsp_idma_in(u16 dsp_addr, u32 addr, u32 size) } WriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false); - INFO_LOG(DSPLLE, "*** Copy new UCode from 0x%08x to 0x%04x (crc: %8x)\n", addr, dsp_addr, g_dsp.iram_crc); + INFO_LOG(DSPLLE, "*** Copy new UCode from 0x%08x to 0x%04x (crc: %8x)", addr, dsp_addr, g_dsp.iram_crc); g_dsp.iram_crc = DSPHost_CodeLoaded(g_dsp.cpu_ram + (addr & 0x0fffffff), size); DSPAnalyzer::Analyze(); // This calls the reset functions, but it get some games stuck // uncomment it to help with debugging - // DSPCore_SetException(EXP_RESET); + DSPCore_SetException(EXP_RESET); } void gdsp_idma_out(u16 dsp_addr, u32 addr, u32 size) { - ERROR_LOG(DSPLLE, "*** idma_out IRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)\n", dsp_addr / 2, addr, size); + ERROR_LOG(DSPLLE, "*** idma_out IRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)", dsp_addr / 2, addr, size); } @@ -264,7 +264,7 @@ void gdsp_ddma_in(u16 dsp_addr, u32 addr, u32 size) { if ((addr & 0x7FFFFFFF) > 0x01FFFFFF) { - ERROR_LOG(DSPLLE, "*** ddma_in read from invalid addr (0x%08x)\n", addr); + ERROR_LOG(DSPLLE, "*** ddma_in read from invalid addr (0x%08x)", addr); return; } @@ -275,7 +275,7 @@ void gdsp_ddma_in(u16 dsp_addr, u32 addr, u32 size) *(u16*)&dst[dsp_addr + i] = Common::swap16(*(const u16*)&g_dsp.cpu_ram[(addr + i) & 0x7FFFFFFF]); } - INFO_LOG(DSPLLE, "*** ddma_in RAM (0x%08x) -> DRAM_DSP (0x%04x) : size (0x%08x)\n", addr, dsp_addr / 2, size); + INFO_LOG(DSPLLE, "*** ddma_in RAM (0x%08x) -> DRAM_DSP (0x%04x) : size (0x%08x)", addr, dsp_addr / 2, size); } @@ -283,7 +283,7 @@ void gdsp_ddma_out(u16 dsp_addr, u32 addr, u32 size) { if ((addr & 0x7FFFFFFF) > 0x01FFFFFF) { - ERROR_LOG(DSPLLE, "*** gdsp_ddma_out to invalid addr (0x%08x)\n", addr); + ERROR_LOG(DSPLLE, "*** gdsp_ddma_out to invalid addr (0x%08x)", addr); return; } @@ -294,7 +294,7 @@ void gdsp_ddma_out(u16 dsp_addr, u32 addr, u32 size) *(u16*)&g_dsp.cpu_ram[(addr + i) & 0x7FFFFFFF] = Common::swap16(*(const u16*)&src[dsp_addr + i]); } - INFO_LOG(DSPLLE, "*** ddma_out DRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)\n", dsp_addr / 2, addr, size); + INFO_LOG(DSPLLE, "*** ddma_out DRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)", dsp_addr / 2, addr, size); } void gdsp_do_dma() @@ -311,7 +311,7 @@ void gdsp_do_dma() if ((ctl > 3) || (len > 0x4000)) { - ERROR_LOG(DSPLLE, "DMA ERROR pc: %04x ctl: %04x addr: %08x da: %04x size: %04x\n", g_dsp.pc, ctl, addr, dsp_addr, len); + ERROR_LOG(DSPLLE, "DMA ERROR pc: %04x ctl: %04x addr: %08x da: %04x size: %04x", g_dsp.pc, ctl, addr, dsp_addr, len); exit(0); } diff --git a/Source/Core/DSPCore/Src/DSPIntCCUtil.cpp b/Source/Core/DSPCore/Src/DSPIntCCUtil.cpp index f880d7b92d..94ccb905ee 100644 --- a/Source/Core/DSPCore/Src/DSPIntCCUtil.cpp +++ b/Source/Core/DSPCore/Src/DSPIntCCUtil.cpp @@ -134,7 +134,7 @@ bool CheckCondition(u8 _Condition) case 0xf: // Empty - always true. return true; default: - ERROR_LOG(DSPLLE, "Unknown condition check: 0x%04x\n", _Condition & 0xf); + ERROR_LOG(DSPLLE, "Unknown condition check: 0x%04x", _Condition & 0xf); return false; } } diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/DSPSymbols.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/DSPSymbols.cpp index 4e72b54d34..2b583f4f68 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/DSPSymbols.cpp +++ b/Source/Plugins/Plugin_DSP_LLE/Src/DSPSymbols.cpp @@ -221,7 +221,7 @@ bool ReadAnnotatedAssembly(const char *filename) // Sanity check if (hex > last_addr + 3 || hex < last_addr - 3) { static int errors = 0; - ERROR_LOG(DSPLLE, "Got Insane Hex Digit %04x (%04x) from %s", hex, last_addr, line); + ERROR_INFO(DSPLLE, "Got Insane Hex Digit %04x (%04x) from %s", hex, last_addr, line); errors++; if (errors > 10) {