ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compile on windows 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1308 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-11-26 21:27:01 +00:00
parent 0bad9e9385
commit e8b0757ee7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Plugins/Plugin_DSP_LLE/Src/gdsp_interpreter.cpp
View File

@ -132,9 +132,9 @@ void gdsp_init()
void gdsp_reset() void gdsp_reset()
{ {
// _assert_msg_(0, "gdsp_reset()"); // _assert_msg_(0, "gdsp_reset()");
_assert_msg_(!g_dsp.exception_in_progress_hack, "assert while exception"); _assert_msg_(MASTER_LOG, !g_dsp.exception_in_progress_hack, "assert while exception");
g_dsp.pc = DSP_RESET_VECTOR; g_dsp.pc = DSP_RESET_VECTOR;
g_dsp.exception_in_progress_hack = false; g_dsp.exception_in_progress_hack = false;
} }
@ -294,7 +294,7 @@ void gdsp_step()
{ {
if (gdsp_exceptions & (1<<i)) if (gdsp_exceptions & (1<<i))
{ {
_assert_msg_(!g_dsp.exception_in_progress_hack, "assert while exception"); _assert_msg_(MASTER_LOG, !g_dsp.exception_in_progress_hack, "assert while exception");
dsp_reg_store_stack(DSP_STACK_C, g_dsp.pc); dsp_reg_store_stack(DSP_STACK_C, g_dsp.pc);
dsp_reg_store_stack(DSP_STACK_D, g_dsp.r[R_SR]); dsp_reg_store_stack(DSP_STACK_D, g_dsp.r[R_SR]);

6
Source/Plugins/Plugin_DSP_LLE/Src/gdsp_opcodes.cpp
View File

@ -199,9 +199,9 @@ bool CheckCondition(uint8 _Condition)
void dsp_op_unknown(uint16 opc) void dsp_op_unknown(uint16 opc)
{ {
_assert_msg_(!g_dsp.exception_in_progress_hack, "assert while exception"); _assert_msg_(MASTER_LOG, !g_dsp.exception_in_progress_hack, "assert while exception");
ErrorLog("dsp_op_unknown somewhere"); ErrorLog("dsp_op_unknown somewhere");
g_dsp.pc = g_dsp.err_pc; g_dsp.pc = g_dsp.err_pc;
} }