[mupen64plus-video-rice] 66/191: Replace movsxl with more portable mnemonic movslq

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-video-rice.

commit fd590aa15b1302c4c8d82126409f209d02d5b835
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Jul 24 10:54:34 2011 +0200

    Replace movsxl with more portable mnemonic movslq
---
 debian/changelog                     |  2 ++
 debian/patches/portable_movsxl.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 836b7a1..c86aa5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ mupen64plus-video-rice (1.99.4-3) UNRELEASED; urgency=low
       needed
     - Add divide_by_zero.patch, Fix random crash due to divide-by-zero error
     - Add undefined_functions.patch, Add header for undefined min/max/memcpy
+    - Add portable_movsxl.patch, Replace movsxl with more portable mnemonic
+      movslq
   * Depend on pkg-config in debian/control for new Makefile
 
  -- Sven Eckelmann <sven at narfation.org>  Sat, 23 Jul 2011 16:42:59 +0200
diff --git a/debian/patches/portable_movsxl.patch b/debian/patches/portable_movsxl.patch
new file mode 100644
index 0000000..2a39388
--- /dev/null
+++ b/debian/patches/portable_movsxl.patch
@@ -0,0 +1,34 @@
+Description: Replace movsxl with more portable mnemonic movslq
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-video-rice/changeset/e22b417ae26e
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/FrameBuffer.cpp b/src/FrameBuffer.cpp
+index 9d4cff06664e22e61561cbbe8753ac175863c7a3..103025c856b1cbd8364671d27e14e9e4507ca103 100644
+--- a/src/FrameBuffer.cpp
++++ b/src/FrameBuffer.cpp
+@@ -653,9 +653,9 @@ l1:             mov esi, [ecx+ebx]
+             }
+ #elif defined(__GNUC__) && defined(__x86_64__) && !defined(NO_ASM)
+         asm volatile(" xorl          %k2,      %k2           \n"
+-                     " movsxl        %k4,      %q4           \n"
++                     " movslq        %k4,      %q4           \n"
+                      "0:                                     \n"
+-                     " movsxl         %3,    %%rbx           \n"
++                     " movslq         %3,    %%rbx           \n"
+                      " sub            $4,    %%rbx           \n"
+                      "1:                                     \n"
+                      " movl (%0,%%rbx,1),    %%eax           \n"
+diff --git a/src/RenderBase.cpp b/src/RenderBase.cpp
+index 51f2ff692989575e711b1e8a5742b6eee9a779d5..ef1d8c03435fafc2b54180ebaa3094f6c4c36a78 100644
+--- a/src/RenderBase.cpp
++++ b/src/RenderBase.cpp
+@@ -384,7 +384,7 @@ __declspec( naked ) void  __fastcall SSEVec3TransformDKR(XVECTOR4 &pOut, const X
+ void SSEVec3Transform(int i)
+ {
+   asm volatile(" shl               $4,      %0   \n"
+-               " movsxl           %k0,     %q0   \n"
++               " movslq           %k0,     %q0   \n"
+                " movaps      (%1,%q0),  %%xmm1   \n"
+                " movaps         0(%2),  %%xmm4   \n"
+                " movaps        16(%2),  %%xmm5   \n"
diff --git a/debian/patches/series b/debian/patches/series
index 14700a3..94c535a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ highres_memcorruption.patch
 png_truecolor_conversation.patch
 divide_by_zero.patch
 undefined_functions.patch
+portable_movsxl.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-rice.git