Merge branch 'master' into wii-network

CMakeLists.txt

@@ -554,6 +554,7 @@ option(UNITTESTS "Build unitests" OFF)
 ########################################
 # Start compiling our code
 #
+add_definitions(-std=c++0x)
 add_subdirectory(Source)
 
 

Data/User/GameConfig/G3LE8P.ini

@@ -0,0 +1,15 @@
+# G3LE8P - Super Monkey Ball Adventures (TM)
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GP8EAF.ini

@@ -0,0 +1,15 @@
+# GP8EAF - Pac-Man World 3
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/JAEE01.ini

@@ -0,0 +1,9 @@
+# JAEE01 - Donkey Kong Country
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+[Gecko]

Data/User/GameConfig/JBKP01.ini

@@ -0,0 +1,15 @@
+# JBKP01 - 
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/R8XE52.ini

@@ -0,0 +1,15 @@
+# R8XE52 - Jurassic: The Hunted
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/R9IE01.ini

@@ -0,0 +1,15 @@
+# R9IE01 - PIKMIN1 for Wii
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/RBME5G.ini

@@ -0,0 +1,15 @@
+# RBME5G - Bust-a-Move BASH!
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/RGHE52.ini

@@ -0,0 +1,16 @@
+# RGHE52 - Sample Game Name
+[Core] Values set here will override the main dolphin settings.
+FastDiscSpeed = 0
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/RLBEWR.ini

@@ -0,0 +1,15 @@
+# RLBEWR - LEGO Batman
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/RS8J8N.ini

@@ -0,0 +1,15 @@
+# RS8J8N - SHANGHAI
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/SDFE4Q.ini

@@ -0,0 +1,15 @@
+# SDFE4Q - Disney Sing It: Family Hits
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/SS3EWR.ini

@@ -0,0 +1,15 @@
+# SS3EWR - Elmo's A to Zoo Adventure
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/STEETR.ini

@@ -0,0 +1,15 @@
+# STEETR - Tetris Party Deluxe
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/WBME01.ini

@@ -0,0 +1,15 @@
+# WBME01 - My Pokémon Ranch
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/WPPJJF.ini

@@ -0,0 +1,15 @@
+# WPPJJF - JM‰OÔóÝóWii
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Languages/po/en.po

@@ -4588,7 +4588,7 @@ msgid ""
 "The safer you adjust this, the less likely the emulator will be missing any "
 "texture updates from RAM.\n"
 "\n"
-"If unsure, use the second-fastest value from the right."
+"If unsure, use the rightmost value."
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447

Source/Core/Common/Src/ABI.cpp

@@ -189,7 +189,7 @@ unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize) {
 #ifdef __GNUC__
 		(frameSize + 15) & -16;
 #else
-		frameSize;
+		(frameSize + 3) & -4;
 #endif
 	return alignedSize;
 }
@@ -200,16 +200,15 @@ void XEmitter::ABI_AlignStack(unsigned int frameSize) {
 // Linux requires the stack to be 16-byte aligned before calls that put SSE
 // vectors on the stack, but since we do not keep track of which calls do that,
 // it is effectively every call as well.
-// Windows binaries compiled with MSVC do not have such a restriction, but I
+// Windows binaries compiled with MSVC do not have such a restriction*, but I
 // expect that GCC on Windows acts the same as GCC on Linux in this respect.
 // It would be nice if someone could verify this.
-#ifdef __GNUC__
+// *However, the MSVC optimizing compiler assumes a 4-byte-aligned stack at times.
 	unsigned int fillSize =
 		ABI_GetAlignedFrameSize(frameSize) - (frameSize + 4);
 	if (fillSize != 0) {
 		SUB(32, R(ESP), Imm8(fillSize));
 	}
-#endif
 }
 
 void XEmitter::ABI_RestoreStack(unsigned int frameSize) {

Source/Core/Common/Src/Common.h

@@ -139,14 +139,18 @@ private:
 // wxWidgets does not have a true dummy macro for this.
 #define _trans(a) a
 
-#if defined __APPLE__ && defined __i386__
-#define _M_SSE 0x300
-#elif defined __APPLE__ && defined __x86_64__
-#define _M_SSE 0x301
-#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
-#define _M_SSE 0x301
+#if defined __GNUC__
+# if defined __SSE4_2__
+#  define _M_SSE 0x402
+# elif defined __SSE4_1__
+#  define _M_SSE 0x401
+# elif defined __SSSE3__
+#  define _M_SSE 0x301
+# elif defined __SSE3__
+#  define _M_SSE 0x300
+# endif
 #elif (_MSC_VER >= 1500) || __INTEL_COMPILER // Visual Studio 2008
-#define _M_SSE 0x402
+# define _M_SSE 0x402
 #endif
 
 // Host communication.