piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix a build error and some warnings.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3835 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2009-07-18 17:53:15 +00:00
parent 89c55c32ec
commit 9b0bed1e7f
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DSPCore/Src/DSPIntUtil.h
View File

@ -96,7 +96,7 @@ inline void dsp_increase_addr_reg(int reg, s16 value)
// --- reg // --- reg
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
inline u16 dsp_op_read_reg(u8 reg) inline u16 dsp_op_read_reg(int reg)
{ {
switch (reg & 0x1f) { switch (reg & 0x1f) {
case DSP_REG_ST0: 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) { switch (reg & 0x1f) {
// 8-bit sign extended registers. Should look at prod.h too... // 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) switch (reg)
{ {

5
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
View File

@ -338,11 +338,6 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize)
MixAddVoice(PB, templbuffer, temprbuffer, _iSize, false); MixAddVoice(PB, templbuffer, temprbuffer, _iSize, false);
WriteBackPB(blockAddr, PB); 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; blockAddr = (PB.next_pb_hi << 16) | PB.next_pb_lo;
if (!blockAddr) { if (!blockAddr) {
// Guess we're out of blocks // Guess we're out of blocks