This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus.
commit 347f9a06206015a70c8f38f0d22dcc278ac6554f Author: Sven Eckelmann <[email protected]> Date: Sat Sep 26 23:43:42 2009 +0200 Correctly set floating point control word In interpreter mode small assembler snippeds are used to set the floating point control word to emulate the MIPS coprocessor behaviour. The makefile variable isn't propagated to the c preprocessor and thus we need to check otherwise if target architecture is x86 or compatible. --- debian/changelog | 1 + debian/patches/interpreter_x86_fldcw.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 24 insertions(+) diff --git a/debian/changelog b/debian/changelog index e042f37..51ada1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ mupen64plus (1.5+dfsg1-5) UNRELEASED; urgency=low buffers to fix segfault during stop of emulation - Add rice_nodebug.patch, Don't enable excessive debug functionality in rice_video + - Add interpreter_x86_fldcw.patch, Correctly set floating point control word -- Sven Eckelmann <[email protected]> Fri, 11 Sep 2009 00:37:19 +0200 diff --git a/debian/patches/interpreter_x86_fldcw.patch b/debian/patches/interpreter_x86_fldcw.patch new file mode 100644 index 0000000..e4ca4fa --- /dev/null +++ b/debian/patches/interpreter_x86_fldcw.patch @@ -0,0 +1,22 @@ +Description: Correctly set floating point control word + In interpreter mode small assembler snippeds are used to set the floating point + control word to emulate the MIPS coprocessor behaviour. The makefile variable + isn't propagated to the c preprocessor and thus we need to check otherwise if + target architecture is x86 or compatible. +Bug: http://code.google.com/p/mupen64plus/issues/detail?id=272 +Author: Sven Eckelmann <[email protected]> + +--- +diff --git a/r4300/macros.h b/r4300/macros.h +index 1afcacaf129d339cf980e1f86811f5543ec4c7d7..18fe545de4ba05c36e900e603a81b288e421e382 100644 +--- a/r4300/macros.h ++++ b/r4300/macros.h +@@ -98,7 +98,7 @@ stop=1; \ + #define TagHi reg_cop0[29] + #define ErrorEPC reg_cop0[30] + +-#ifdef X86 ++#if (defined(__i386__) || defined(__x86_64__)) + #define set_rounding() __asm__ __volatile__("fldcw %0" : : "m" (rounding_mode)) + #define set_trunc() __asm__ __volatile__("fldcw %0" : : "m" (trunc_mode)) + #define set_round() __asm__ __volatile__("fldcw %0" : : "m" (round_mode)) diff --git a/debian/patches/series b/debian/patches/series index 680e478..8631f20 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,3 +26,4 @@ noexecstack.patch fix_readpng.patch jttl_fix_romclosed.patch rice_nodebug.patch +interpreter_x86_fldcw.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
