From d4df3c7e07a6a64b9aca8e021bdadefacb607c76 Mon Sep 17 00:00:00 2001 From: Maxim Poliakovski Date: Thu, 25 Jul 2019 04:20:48 +0200 Subject: [PATCH] ppcfpopcodes: replace logical AND with AND where required. --- ppcfpopcodes.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ppcfpopcodes.cpp b/ppcfpopcodes.cpp index 493c582..606a494 100644 --- a/ppcfpopcodes.cpp +++ b/ppcfpopcodes.cpp @@ -1016,14 +1016,14 @@ void ppc_mffsdot(){ void ppc_mtfsf(){ reg_b = (ppc_cur_instruction >> 11) & 31; uint32_t fm_mask = (ppc_cur_instruction >> 17) & 255; - crm += ((fm_mask && 1) == 1)? 0xF0000000 : 0x00000000; - crm += ((fm_mask && 2) == 1)? 0x0F000000 : 0x00000000; - crm += ((fm_mask && 4) == 1)? 0x00F00000 : 0x00000000; - crm += ((fm_mask && 8) == 1)? 0x000F0000 : 0x00000000; - crm += ((fm_mask && 16) == 1)? 0x0000F000 : 0x00000000; - crm += ((fm_mask && 32) == 1)? 0x00000F00 : 0x00000000; - crm += ((fm_mask && 64) == 1)? 0x000000F0 : 0x00000000; - crm += ((fm_mask && 128) == 1)? 0x0000000F : 0x00000000; + crm += ((fm_mask & 1) == 1)? 0xF0000000 : 0x00000000; + crm += ((fm_mask & 2) == 1)? 0x0F000000 : 0x00000000; + crm += ((fm_mask & 4) == 1)? 0x00F00000 : 0x00000000; + crm += ((fm_mask & 8) == 1)? 0x000F0000 : 0x00000000; + crm += ((fm_mask & 16) == 1)? 0x0000F000 : 0x00000000; + crm += ((fm_mask & 32) == 1)? 0x00000F00 : 0x00000000; + crm += ((fm_mask & 64) == 1)? 0x000000F0 : 0x00000000; + crm += ((fm_mask & 128) == 1)? 0x0000000F : 0x00000000; uint32_t quickfprval = (uint32_t)ppc_state.ppc_fpr[reg_b]; ppc_state.ppc_fpscr = (quickfprval & crm) | (quickfprval & ~(crm)); } @@ -1031,14 +1031,14 @@ void ppc_mtfsf(){ void ppc_mtfsfdot(){ reg_b = (ppc_cur_instruction >> 11) & 31; uint32_t fm_mask = (ppc_cur_instruction >> 17) & 255; - crm += ((fm_mask && 1) == 1)? 0xF0000000 : 0x00000000; - crm += ((fm_mask && 2) == 1)? 0x0F000000 : 0x00000000; - crm += ((fm_mask && 4) == 1)? 0x00F00000 : 0x00000000; - crm += ((fm_mask && 8) == 1)? 0x000F0000 : 0x00000000; - crm += ((fm_mask && 16) == 1)? 0x0000F000 : 0x00000000; - crm += ((fm_mask && 32) == 1)? 0x00000F00 : 0x00000000; - crm += ((fm_mask && 64) == 1)? 0x000000F0 : 0x00000000; - crm += ((fm_mask && 128) == 1)? 0x0000000F : 0x00000000; + crm += ((fm_mask & 1) == 1)? 0xF0000000 : 0x00000000; + crm += ((fm_mask & 2) == 1)? 0x0F000000 : 0x00000000; + crm += ((fm_mask & 4) == 1)? 0x00F00000 : 0x00000000; + crm += ((fm_mask & 8) == 1)? 0x000F0000 : 0x00000000; + crm += ((fm_mask & 16) == 1)? 0x0000F000 : 0x00000000; + crm += ((fm_mask & 32) == 1)? 0x00000F00 : 0x00000000; + crm += ((fm_mask & 64) == 1)? 0x000000F0 : 0x00000000; + crm += ((fm_mask & 128) == 1)? 0x0000000F : 0x00000000; uint32_t quickfprval = (uint32_t)ppc_state.ppc_fpr[reg_b]; ppc_state.ppc_fpscr = (quickfprval & crm) | (quickfprval & ~(crm)); }