Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

sim: sh: fix switch-bool warnings

Browse Source 
This code triggers -Werror=switch-bool warnings with <=gcc-5 versions.
Rework it to use if statements instead as it also simplifies a bit.
This commit is contained in:
Mike Frysinger
2021-11-11 19:36:28 -05:00
parent dc5a462160
commit 35f7d33dd9
1 changed files with 31 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
sim/sh/interp.c
View File

@@ -1104,74 +1104,51 @@ div1 (int *R, int iRn2, int iRn1/*, int T*/)
R[iRn1] <<= 1;
R[iRn1] |= (unsigned long) T;
switch (old_q)
if (!old_q)
{
case 0:
switch (M)
if (!M)
{
case 0:
tmp0 = R[iRn1];
R[iRn1] -= R[iRn2];
tmp1 = (R[iRn1] > tmp0);
switch (Q)
{
case 0:
SET_SR_Q (tmp1);
break;
case 1:
SET_SR_Q ((unsigned char) (tmp1 == 0));
break;
}
break;
case 1:
tmp0 = R[iRn1];
R[iRn1] += R[iRn2];
tmp1 = (R[iRn1] < tmp0);
switch (Q)
{
case 0:
SET_SR_Q ((unsigned char) (tmp1 == 0));
break;
case 1:
SET_SR_Q (tmp1);
break;
}
break;
if (!Q)
SET_SR_Q (tmp1);
else
SET_SR_Q ((unsigned char) (tmp1 == 0));
}
break;
case 1:
switch (M)
else
{
case 0:
tmp0 = R[iRn1];
R[iRn1] += R[iRn2];
tmp1 = (R[iRn1] < tmp0);
switch (Q)
{
case 0:
SET_SR_Q (tmp1);
break;
case 1:
SET_SR_Q ((unsigned char) (tmp1 == 0));
break;
}
break;
case 1:
if (!Q)
SET_SR_Q ((unsigned char) (tmp1 == 0));
else
SET_SR_Q (tmp1);
}
}
else
{
if (!M)
{
tmp0 = R[iRn1];
R[iRn1] += R[iRn2];
tmp1 = (R[iRn1] < tmp0);
if (!Q)
SET_SR_Q (tmp1);
else
SET_SR_Q ((unsigned char) (tmp1 == 0));
}
else
{
tmp0 = R[iRn1];
R[iRn1] -= R[iRn2];
tmp1 = (R[iRn1] > tmp0);
switch (Q)
{
case 0:
SET_SR_Q ((unsigned char) (tmp1 == 0));
break;
case 1:
SET_SR_Q (tmp1);
break;
}
break;
if (!Q)
SET_SR_Q ((unsigned char) (tmp1 == 0));
else
SET_SR_Q (tmp1);
}
break;
}
/*T = (Q == M);*/
SET_SR_T (Q == M);