ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core/hw/sh4/dyna/shil.cpp: Fix '&&' within '||' warning 

Here's the original compiler warning:
../../core/hw/sh4/dyna/shil.cpp:700:24: warning: '&&' within '||'
      [-Wlogical-op-parentheses]
  ...if (op->rd.is_reg() && op->rd._reg==reg_sr_T ||  op->op==shop_ifb)
         ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~ ~~
../../core/hw/sh4/dyna/shil.cpp:700:24: note: place parentheses around the '&&'
      expression to silence this warning
  ...if (op->rd.is_reg() && op->rd._reg==reg_sr_T ||  op->op==shop_ifb)
                         ^
         (                                       )
../../core/hw/sh4/dyna/shil.cpp:843:25: warning: '&&' within '||'
      [-Wlogical-op-parentheses]
                        if (op->rs1.is_reg() && op->rs1._reg==reg_sr_T
                            ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~
../../core/hw/sh4/dyna/shil.cpp:843:25: note: place parentheses around the '&&'
      expression to silence this warning
                        if (op->rs1.is_reg() && op->rs1._reg==reg_sr_T
                                             ^
                            (                                         )
../../core/hw/sh4/dyna/shil.cpp:844:25: warning: '&&' within '||'
      [-Wlogical-op-parentheses]
                                || op->rs2.is_reg() &&
op->rs2._reg==reg_sr_T
                                ~~ ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~
../../core/hw/sh4/dyna/shil.cpp:844:25: note: place parentheses around the '&&'
      expression to silence this warning
                                || op->rs2.is_reg() && op->rs2._reg==reg_sr_T
                                                    ^
                                   (                                         )
../../core/hw/sh4/dyna/shil.cpp:845:25: warning: '&&' within '||'
      [-Wlogical-op-parentheses]
                                || op->rs3.is_reg() && op->rs3._reg==reg_sr_T
                                ~~ ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~
../../core/hw/sh4/dyna/shil.cpp:845:25: note: place parentheses around the '&&'
      expression to silence this warning
                                || op->rs3.is_reg() && op->rs3._reg==reg_sr_T
                                                    ^
                                   (                                         )
This commit is contained in:
Jan Holthuis 2015-08-03 16:58:15 +02:00
parent 1d0ef81a43
commit 5ab3d7b59b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/hw/sh4/dyna/shil.cpp
View File

@ -697,7 +697,7 @@ void dejcond(RuntimeBlockInfo* blk)
if (found)
{
if (op->rd.is_reg() && op->rd._reg==reg_sr_T || op->op==shop_ifb)
if ((op->rd.is_reg() && op->rd._reg==reg_sr_T) || op->op==shop_ifb)
{
found=false;
}
@ -840,9 +840,9 @@ void srt_waw(RuntimeBlockInfo* blk)
if (found)
{
if (op->rs1.is_reg() && op->rs1._reg==reg_sr_T
|| op->rs2.is_reg() && op->rs2._reg==reg_sr_T
|| op->rs3.is_reg() && op->rs3._reg==reg_sr_T
if ((op->rs1.is_reg() && op->rs1._reg==reg_sr_T)
|| (op->rs2.is_reg() && op->rs2._reg==reg_sr_T)
|| (op->rs3.is_reg() && op->rs3._reg==reg_sr_T)
|| op->op==shop_ifb)
{
found=false;