[mupen64plus-rsp-hle] 63/167: Add parentheses around arithmetic in operand of ‘^’

[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-rsp-hle.

commit 9a0b5971f5a7080d17bc352a4165cb7054aa60d8
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Jul 24 10:16:23 2011 +0200

    Add parentheses around arithmetic in operand of ‘^’
---
 debian/changelog                    |  2 +
 debian/patches/endianness_xor.patch | 95 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 98 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e360a15..29f97ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ mupen64plus-rsp-hle (1.99.4-3) UNRELEASED; urgency=low
     - Add rewrite_makefile.patch, Rewrite Makefile to fix flags and linking
     - Add big_endian_conflict.patch, Don't use _BIG_ENDIAN to check for
       endianness
+    - Add endianness_xor.patch, Add parentheses around arithmetic in operand
+      of ‘^’ related to endian conversation
 
  -- Sven Eckelmann <sven at narfation.org>  Sat, 23 Jul 2011 16:42:47 +0200
 
diff --git a/debian/patches/endianness_xor.patch b/debian/patches/endianness_xor.patch
new file mode 100644
index 0000000..c9c0248
--- /dev/null
+++ b/debian/patches/endianness_xor.patch
@@ -0,0 +1,95 @@
+Description: Add parentheses around arithmetic in operand of ‘^’
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-rsp-hle/changeset/f084f76c4780
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/ucode1.cpp b/src/ucode1.cpp
+index 3843143e795a653a9fbf1bcf5dfb1b63df24ba7c..7d0c40fd4ea8daa90669f4b82f20ecedb47e6f06 100644
+--- a/src/ucode1.cpp
++++ b/src/ucode1.cpp
+@@ -825,17 +825,17 @@ static void LOADADPCM (void) { // Loads an ADPCM table - Works 100% Now 03-13-01
+     //assert ((inst1&0xffff) <= 0x80);
+     u16 *table = (u16 *)(rsp.RDRAM+v0);
+     for (u32 x = 0; x < ((inst1&0xffff)>>0x4); x++) {
+-        adpcmtable[0x0+(x<<3)^S] = table[0];
+-        adpcmtable[0x1+(x<<3)^S] = table[1];
++        adpcmtable[(0x0+(x<<3))^S] = table[0];
++        adpcmtable[(0x1+(x<<3))^S] = table[1];
+ 
+-        adpcmtable[0x2+(x<<3)^S] = table[2];
+-        adpcmtable[0x3+(x<<3)^S] = table[3];
++        adpcmtable[(0x2+(x<<3))^S] = table[2];
++        adpcmtable[(0x3+(x<<3))^S] = table[3];
+ 
+-        adpcmtable[0x4+(x<<3)^S] = table[4];
+-        adpcmtable[0x5+(x<<3)^S] = table[5];
++        adpcmtable[(0x4+(x<<3))^S] = table[4];
++        adpcmtable[(0x5+(x<<3))^S] = table[5];
+ 
+-        adpcmtable[0x6+(x<<3)^S] = table[6];
+-        adpcmtable[0x7+(x<<3)^S] = table[7];
++        adpcmtable[(0x6+(x<<3))^S] = table[6];
++        adpcmtable[(0x7+(x<<3))^S] = table[7];
+         table += 8;
+     }
+ }
+diff --git a/src/ucode2.cpp b/src/ucode2.cpp
+index b1688477a6b70ef267b4fabbec5591d8f3078ce3..858ee38cb568947abf01ae15b6ebaa5a6be3e9a9 100644
+--- a/src/ucode2.cpp
++++ b/src/ucode2.cpp
+@@ -56,17 +56,17 @@ static void LOADADPCM2 (void) { // Loads an ADPCM table - Works 100% Now 03-13-0
+     u16 *table = (u16 *)(rsp.RDRAM+v0); // Zelda2 Specific...
+ 
+     for (u32 x = 0; x < ((inst1&0xffff)>>0x4); x++) {
+-        adpcmtable[0x0+(x<<3)^S] = table[0];
+-        adpcmtable[0x1+(x<<3)^S] = table[1];
++        adpcmtable[(0x0+(x<<3))^S] = table[0];
++        adpcmtable[(0x1+(x<<3))^S] = table[1];
+ 
+-        adpcmtable[0x2+(x<<3)^S] = table[2];
+-        adpcmtable[0x3+(x<<3)^S] = table[3];
++        adpcmtable[(0x2+(x<<3))^S] = table[2];
++        adpcmtable[(0x3+(x<<3))^S] = table[3];
+ 
+-        adpcmtable[0x4+(x<<3)^S] = table[4];
+-        adpcmtable[0x5+(x<<3)^S] = table[5];
++        adpcmtable[(0x4+(x<<3))^S] = table[4];
++        adpcmtable[(0x5+(x<<3))^S] = table[5];
+ 
+-        adpcmtable[0x6+(x<<3)^S] = table[6];
+-        adpcmtable[0x7+(x<<3)^S] = table[7];
++        adpcmtable[(0x6+(x<<3))^S] = table[6];
++        adpcmtable[(0x7+(x<<3))^S] = table[7];
+         table += 8;
+     }
+ }
+diff --git a/src/ucode3.cpp b/src/ucode3.cpp
+index c0a36a0bbb4153f417f77bbe45f170ca72d8d30c..75c1e3e6e1e845bcff0b0cb00b08ed37d74eb346 100644
+--- a/src/ucode3.cpp
++++ b/src/ucode3.cpp
+@@ -534,17 +534,17 @@ static void LOADADPCM3 (void) { // Loads an ADPCM table - Works 100% Now 03-13-0
+     //assert ((inst1&0xffff) <= 0x80);
+     u16 *table = (u16 *)(rsp.RDRAM+v0);
+     for (u32 x = 0; x < ((inst1&0xffff)>>0x4); x++) {
+-        adpcmtable[0x0+(x<<3)^S] = table[0];
+-        adpcmtable[0x1+(x<<3)^S] = table[1];
++        adpcmtable[(0x0+(x<<3))^S] = table[0];
++        adpcmtable[(0x1+(x<<3))^S] = table[1];
+ 
+-        adpcmtable[0x2+(x<<3)^S] = table[2];
+-        adpcmtable[0x3+(x<<3)^S] = table[3];
++        adpcmtable[(0x2+(x<<3))^S] = table[2];
++        adpcmtable[(0x3+(x<<3))^S] = table[3];
+ 
+-        adpcmtable[0x4+(x<<3)^S] = table[4];
+-        adpcmtable[0x5+(x<<3)^S] = table[5];
++        adpcmtable[(0x4+(x<<3))^S] = table[4];
++        adpcmtable[(0x5+(x<<3))^S] = table[5];
+ 
+-        adpcmtable[0x6+(x<<3)^S] = table[6];
+-        adpcmtable[0x7+(x<<3)^S] = table[7];
++        adpcmtable[(0x6+(x<<3))^S] = table[6];
++        adpcmtable[(0x7+(x<<3))^S] = table[7];
+         table += 8;
+     }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 724b713..f7ea7a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 rewrite_makefile.patch
 big_endian_conflict.patch
+endianness_xor.patch

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