diff options
| author | hrydgard <hrydgard@gmail.com> | 2009-07-18 17:53:15 +0000 |
|---|---|---|
| committer | hrydgard <hrydgard@gmail.com> | 2009-07-18 17:53:15 +0000 |
| commit | 9b0bed1e7fe647cd712e70cf10d6273ec213ed32 (patch) | |
| tree | 26ad7c3b1027f034c255442874fd179951b322e6 /Source | |
| parent | 89c55c32eceffda360922bc37df0f3a7eb20de0f (diff) | |
fix a build error and some warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3835 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DSPCore/Src/DSPIntUtil.h | 6 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/Source/Core/DSPCore/Src/DSPIntUtil.h b/Source/Core/DSPCore/Src/DSPIntUtil.h index 0d87136afe..96e24389fe 100644 --- a/Source/Core/DSPCore/Src/DSPIntUtil.h +++ b/Source/Core/DSPCore/Src/DSPIntUtil.h @@ -96,7 +96,7 @@ inline void dsp_increase_addr_reg(int reg, s16 value) // --- reg // --------------------------------------------------------------------------------------- -inline u16 dsp_op_read_reg(u8 reg) +inline u16 dsp_op_read_reg(int reg) { switch (reg & 0x1f) { case DSP_REG_ST0: @@ -109,7 +109,7 @@ inline u16 dsp_op_read_reg(u8 reg) } } -inline void dsp_op_write_reg(u8 reg, u16 val) +inline void dsp_op_write_reg(int reg, u16 val) { switch (reg & 0x1f) { // 8-bit sign extended registers. Should look at prod.h too... @@ -133,7 +133,7 @@ inline void dsp_op_write_reg(u8 reg, u16 val) } } -inline void dsp_conditional_extend_accum(u8 reg) +inline void dsp_conditional_extend_accum(int reg) { switch (reg) { diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp index 1fa85d1ba1..07efc94b68 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp @@ -338,11 +338,6 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize) MixAddVoice(PB, templbuffer, temprbuffer, _iSize, false); WriteBackPB(blockAddr, PB); - #if defined(HAVE_WX) && HAVE_WX - #if defined(_DEBUG) || defined(DEBUGFAST) - if(m_DebuggerFrame) m_DebuggerFrame->gLastBlock = blockAddr + p*2 + 2; // save last block location - #endif - #endif blockAddr = (PB.next_pb_hi << 16) | PB.next_pb_lo; if (!blockAddr) { // Guess we're out of blocks |