mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 17:19:44 -06:00
Add some missing GPL headers, fix building with Platform SDK 6.0, delete unused HTTP code.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@452 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -19,7 +19,11 @@
|
||||
#include <limits>
|
||||
|
||||
#ifdef _WIN32
|
||||
#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
|
||||
#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset
|
||||
#include <intrin.h>
|
||||
#undef _interlockedbittestandset
|
||||
#undef _interlockedbittestandreset
|
||||
#else
|
||||
#include <xmmintrin.h>
|
||||
#endif
|
||||
@ -32,7 +36,7 @@
|
||||
// POSSIBLE APPROACHES:
|
||||
// * Full SW FPU. Urgh.
|
||||
// * Partial SW FPU, emulate just as much as necessary for monkey ball. Feasible but a lot of work.
|
||||
// * HLE hacking. Figure out what all the evil functions really do and fake them.
|
||||
// * HLE hacking. Figure out what all the evil functions really do and fake them. DONE (well, works okay-ish)
|
||||
|
||||
// Interesting places in Super Monkey Ball:
|
||||
// 80036654: fctwixz stuff
|
||||
|
@ -17,7 +17,11 @@
|
||||
|
||||
#include <float.h>
|
||||
#ifdef _WIN32
|
||||
#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
|
||||
#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset
|
||||
#include <intrin.h>
|
||||
#undef _interlockedbittestandset
|
||||
#undef _interlockedbittestandreset
|
||||
#else
|
||||
static const unsigned short FPU_ROUND_NEAR = 0 << 10;
|
||||
static const unsigned short FPU_ROUND_DOWN = 1 << 10;
|
||||
|
@ -65,8 +65,9 @@ namespace Jit64
|
||||
MOV(32, R(ABI_PARAM1), gpr.R(b));
|
||||
if (a)
|
||||
ADD(32, R(ABI_PARAM1), gpr.R(a));
|
||||
SafeLoadRegToEAX(ABI_PARAM1, 8, 0);
|
||||
MOV(32, gpr.R(d), R(EAX));
|
||||
//SafeLoadRegToEAX(ABI_PARAM1, 8, 0);
|
||||
UnsafeLoadRegToReg(ABI_PARAM1, gpr.RX(d), 8, 0, false);
|
||||
//MOV(32, gpr.R(d), R(EAX));
|
||||
gpr.UnlockAll();
|
||||
gpr.UnlockAllX();
|
||||
}
|
||||
|
Reference in New Issue
Block a user