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

Merge branch 'master' into GLSL-master

Browse Source 
this fix debug build
This commit is contained in:
degasus
2013-03-07 17:05:32 +01:00
parent 800a58f01c 279e3c7e14
commit 12e84f918a
14 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/Src/ChunkFile.h
View File

@ -246,9 +246,9 @@ private:
break;
case MODE_VERIFY:
_dbg_assert_msg_(COMMON, (x == *ptr),
_dbg_assert_msg_(COMMON, (x == **ptr),
"Savestate verification failure: %d (0x%X) (at %p) != %d (0x%X) (at %p).\n",
x, x, &x, *ptr, *ptr, &*ptr);
x, x, &x, **ptr, **ptr, *ptr);
break;
default:

2
Source/Core/Common/Src/x64FPURoundMode.cpp
View File

@ -84,7 +84,7 @@ namespace FPURoundMode
};
unsigned short _mode;
asm ("fstcw %0" : : "m" (_mode));
_mode = (_mode & ~table[4]) | table[mode];
_mode = (_mode & ~table[3]) | table[mode];
asm ("fldcw %0" : : "m" (_mode));
#endif
#else