From 756d32df078daf0ffbf6286bbd1f2a28bc95fc61 Mon Sep 17 00:00:00 2001
From: dingusdev <52434309+dingusdev@users.noreply.github.com>
Date: Fri, 7 Jan 2022 20:40:07 -0700
Subject: [PATCH] Further condition reg opcode patches

---
 cpu/ppc/ppcopcodes.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/cpu/ppc/ppcopcodes.cpp b/cpu/ppc/ppcopcodes.cpp
index 678977b..6e2c7e5 100644
--- a/cpu/ppc/ppcopcodes.cpp
+++ b/cpu/ppc/ppcopcodes.cpp
@@ -1244,7 +1244,8 @@ void dppc_interpreter::ppc_mcrf() {
 
 void dppc_interpreter::ppc_crand() {
     ppc_grab_regsdab();
-    if ((ppc_state.cr & (0x80000000UL >> reg_a)) && (ppc_state.cr & (0x80000000UL >> reg_b))) {
+    uint8_t ir = (ppc_state.cr >> (31 - reg_a)) & (ppc_state.cr >> (31 - reg_b));
+    if (ir & 1) {
         ppc_state.cr |= (0x80000000UL >> reg_d);
     } else {
         ppc_state.cr &= ~(0x80000000UL >> reg_d);
@@ -1253,7 +1254,8 @@ void dppc_interpreter::ppc_crand() {
 
 void dppc_interpreter::ppc_crandc() {
     ppc_grab_regsdab();
-    if ((ppc_state.cr & (0x80000000UL >> reg_a)) && !(ppc_state.cr & (0x80000000UL >> reg_b))) {
+    uint8_t ir = (ppc_state.cr >> (31 - reg_a)) & ~(ppc_state.cr >> (31 - reg_b));
+    if (ir & 1) {
         ppc_state.cr |= (0x80000000UL >> reg_d);
     } else {
         ppc_state.cr &= ~(0x80000000UL >> reg_d);
@@ -1261,7 +1263,8 @@ void dppc_interpreter::ppc_crandc() {
 }
 void dppc_interpreter::ppc_creqv() {
     ppc_grab_regsdab();
-    if (!((ppc_state.cr & (0x80000000UL >> reg_a)) ^ (ppc_state.cr & (0x80000000UL >> reg_b)))) {
+    uint8_t ir = ~((ppc_state.cr & (31 - reg_a)) ^ (ppc_state.cr & (31 - reg_b)));
+    if (ir & 1) {
         ppc_state.cr |= (0x80000000UL >> reg_d);
     } else {
         ppc_state.cr &= ~(0x80000000UL >> reg_d);
@@ -1269,7 +1272,8 @@ void dppc_interpreter::ppc_creqv() {
 }
 void dppc_interpreter::ppc_crnand() {
     ppc_grab_regsdab();
-    if (!((ppc_state.cr & (0x80000000UL >> reg_a)) && (ppc_state.cr & (0x80000000UL >> reg_b)))) {
+    uint8_t ir = ~((ppc_state.cr >> (31 - reg_a)) & (ppc_state.cr >> (31 - reg_b)));
+    if (ir & 1) {
         ppc_state.cr |= (0x80000000UL >> reg_d);
     } else {
         ppc_state.cr &= ~(0x80000000UL >> reg_d);
@@ -1277,7 +1281,8 @@ void dppc_interpreter::ppc_crnand() {
 }
 void dppc_interpreter::ppc_crnor() {
     ppc_grab_regsdab();
-    if (!((ppc_state.cr & (0x80000000UL >> reg_a)) || (ppc_state.cr & (0x80000000UL >> reg_b)))) {
+    uint8_t ir = ~((ppc_state.cr >> (31 - reg_a)) | (ppc_state.cr >> (31 - reg_b)));
+    if (ir & 1) {
         ppc_state.cr |= (0x80000000UL >> reg_d);
     } else {
         ppc_state.cr &= ~(0x80000000UL >> reg_d);
@@ -1286,7 +1291,8 @@ void dppc_interpreter::ppc_crnor() {
 
 void dppc_interpreter::ppc_cror() {
     ppc_grab_regsdab();
-    if ((ppc_state.cr & (0x80000000UL >> reg_a)) || (ppc_state.cr & (0x80000000UL >> reg_b))) {
+    uint8_t ir = (ppc_state.cr >> (31 - reg_a)) || (ppc_state.cr >> (31 - reg_b));
+    if (ir & 1) {
         ppc_state.cr |= (0x80000000UL >> reg_d);
     } else {
         ppc_state.cr &= ~(0x80000000UL >> reg_d);
@@ -1294,7 +1300,8 @@ void dppc_interpreter::ppc_cror() {
 }
 void dppc_interpreter::ppc_crorc() {
     ppc_grab_regsdab();
-    if ((ppc_state.cr & (0x80000000UL >> reg_a)) || !(ppc_state.cr & (0x80000000UL >> reg_b))) {
+    uint8_t ir = (ppc_state.cr >> (31 - reg_a)) || ~(ppc_state.cr >> (31 - reg_b));
+    if (ir & 1) {
         ppc_state.cr |= (0x80000000UL >> reg_d);
     } else {
         ppc_state.cr &= ~(0x80000000UL >> reg_d);