From 7a3af9b2c4710d9e481e867ef0447a3dd19e271e Mon Sep 17 00:00:00 2001
From: "Dr. Chat" <arkolbed@gmail.com>
Date: Mon, 15 May 2017 11:07:19 -0500
Subject: [PATCH] PPC: Fix vsl[b/h/w] and vsr[b/h/w] with variable shift
 amounts.

---
 src/xenia/cpu/backend/x64/x64_sequences.cc | 30 +++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/xenia/cpu/backend/x64/x64_sequences.cc b/src/xenia/cpu/backend/x64/x64_sequences.cc
index cd0891e0b..d19cc93d7 100644
--- a/src/xenia/cpu/backend/x64/x64_sequences.cc
+++ b/src/xenia/cpu/backend/x64/x64_sequences.cc
@@ -5538,8 +5538,9 @@ struct VECTOR_SHL_V128
       // See if the shift is equal first for a shortcut.
       e.vpshuflw(e.xmm0, i.src2, 0b00000000);
       e.vpshufd(e.xmm0, e.xmm0, 0b00000000);
-      e.vptest(e.xmm0, i.src2);
-      e.jnc(emu);
+      e.vpxor(e.xmm1, e.xmm0, i.src2);
+      e.vptest(e.xmm1, e.xmm1);
+      e.jnz(emu);
 
       // Equal. Shift using vpsllw.
       e.mov(e.rax, 0xF);
@@ -5615,8 +5616,9 @@ struct VECTOR_SHL_V128
       // Only bother with this check if shift amt isn't constant.
       if (!i.src2.is_constant) {
         e.vpshufd(e.xmm0, i.src2, 0b00000000);
-        e.vptest(e.xmm0, i.src2);
-        e.jnc(emu);
+        e.vpxor(e.xmm1, e.xmm0, i.src2);
+        e.vptest(e.xmm1, e.xmm1);
+        e.jnz(emu);
 
         // Equal. Shift using vpsrad.
         e.mov(e.rax, 0x1F);
@@ -5722,8 +5724,9 @@ struct VECTOR_SHR_V128
     if (!i.src2.is_constant) {
       e.vpshuflw(e.xmm0, i.src2, 0b00000000);
       e.vpshufd(e.xmm0, e.xmm0, 0b00000000);
-      e.vptest(e.xmm0, i.src2);
-      e.jnc(emu);
+      e.vpxor(e.xmm1, e.xmm0, i.src2);
+      e.vptest(e.xmm1, e.xmm1);
+      e.jnz(emu);
 
       // Equal. Shift using vpsrlw.
       e.mov(e.rax, 0xF);
@@ -5799,8 +5802,9 @@ struct VECTOR_SHR_V128
       // Only bother with this check if shift amt isn't constant.
       if (!i.src2.is_constant) {
         e.vpshufd(e.xmm0, i.src2, 0b00000000);
-        e.vptest(e.xmm0, i.src2);
-        e.jnc(emu);
+        e.vpxor(e.xmm1, e.xmm0, i.src2);
+        e.vptest(e.xmm1, e.xmm1);
+        e.jnz(emu);
 
         // Equal. Shift using vpsrld.
         e.mov(e.rax, 0x1F);
@@ -5893,8 +5897,9 @@ struct VECTOR_SHA_V128
     if (!i.src2.is_constant) {
       e.vpshuflw(e.xmm0, i.src2, 0b00000000);
       e.vpshufd(e.xmm0, e.xmm0, 0b00000000);
-      e.vptest(e.xmm0, i.src2);
-      e.jnc(emu);
+      e.vpxor(e.xmm1, e.xmm0, i.src2);
+      e.vptest(e.xmm1, e.xmm1);
+      e.jnz(emu);
 
       // Equal. Shift using vpsraw.
       e.mov(e.rax, 0xF);
@@ -5965,8 +5970,9 @@ struct VECTOR_SHA_V128
       // Only bother with this check if shift amt isn't constant.
       if (!i.src2.is_constant) {
         e.vpshufd(e.xmm0, i.src2, 0b00000000);
-        e.vptest(e.xmm0, i.src2);
-        e.jnc(emu);
+        e.vpxor(e.xmm1, e.xmm0, i.src2);
+        e.vptest(e.xmm1, e.xmm1);
+        e.jnz(emu);
 
         // Equal. Shift using vpsrad.
         e.mov(e.rax, 0x1F);