target/s390x: Fix determination of overflow condition code
cover target/s390x: Fix determination of overflow condition code
These two patches were suggested by Bruno Haible in the QEMU issue tracker, but as far as I can see, were never sent to the mailing list for discussion. Since they definitely fix the behavior of the example programs provided in the issue tracker, I'd like to suggest them now for inclusion.
Thomas Huth (2):
target/s390x: Fix determination of overflow condition code after
addition
target/s390x: Fix determination of overflow condition code after
subtraction
target/s390x/tcg/cc_helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
2.27.0
PATCH 1/2 target/s390x: Fix determination of overflow condition code after addition
This program currently prints different results when run with TCG instead of running on real s390x hardware:
#include <stdio.h>
int overflow_32 (int x, int y)
{
int sum;
return ! __builtin_add_overflow (x, y, &sum);
}
int overflow_64 (long long x, long long y)
{
long sum;
return ! __builtin_add_overflow (x, y, &sum);
}
int a1 = -2147483648;
int b1 = -2147483648;
long long a2 = -9223372036854775808L;
long long b2 = -9223372036854775808L;
int main ()
{
{
int a = a1;
int b = b1;
printf ("a = 0x%x, b = 0x%x\n", a, b);
printf ("no_overflow = %d\n", overflow_32 (a, b));
}
{
long long a = a2;
long long b = b2;
printf ("a = 0x%llx, b = 0x%llx\n", a, b);
printf ("no_overflow = %d\n", overflow_64 (a, b)); }
}
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/616
--- target/s390x/tcg/cc_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/s390x/tcg/cc_helper.c +2 -2
@@ -136,7 +136,7 @@ static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result)static uint32_t cc_calc_add_64 (int64_t a1,int64_t a2,int64_t ar) { -if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >0 )) { +if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >=0 )) {return 3 ;/* overflow */ }else {if (ar <0 ) {
@@ -196,7 +196,7 @@ static uint32_t cc_calc_comp_64(int64_t dst)static uint32_t cc_calc_add_32 (int32_t a1,int32_t a2,int32_t ar) { -if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >0 )) { +if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >=0 )) {return 3 ;/* overflow */ }else {if (ar <0 ) {
Signature · 1 line
2.27.0
Re: [PATCH 1/2] target/s390x: Fix determination of overflow condition code after addition
Quoted 50 lines · Thomas Huth
This program currently prints different results when run with TCG instead of running on real s390x hardware:
#include <
stdio.h>int
overflow_32(int x, int y){ int sum; return ! __builtin_add_overflow (x, y, &sum);}
int
overflow_64(long long x, long long y){ long sum; return ! __builtin_add_overflow (x, y, &sum);}
int a1 = -2147483648;
int b1 = -2147483648;
long long a2 = -9223372036854775808L;
long long b2 = -9223372036854775808L;int main ()
{ { int a = a1; int b = b1; printf ("a = 0x%x, b = 0x%x\n", a, b); printf ("no_overflow = %d\n", overflow_32 (a, b)); } { long long a = a2; long long b = b2; printf ("a = 0x%llx, b = 0x%llx\n", a, b); printf ("no_overflow = %d\n", overflow_64 (a, b)); }}
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/616
Suggested-by Bruno Haible <[email protected]>Signed-off-by Thomas Huth <[email protected]>--- target/s390x/tcg/cc_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)target/s390x/tcg/cc_helper.c +0
-0
target/s390x/tcg/cc_helper.c static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result) · line 139
Quoted 5 lines
target/s390x/tcg/cc_helper.c +1
-1@@ -136,7 +136,7 @@ static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result)static uint32_t cc_calc_add_64 (int64_t a1,int64_t a2,int64_t ar) { -if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >0 )) { +if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >=0 )) {
Intuitively, I'd have checked for any overflow/underflow by comparing with one of the input variables:
a) Both numbers are positive
Adding to positive numbers has to result in something that's bigger than the input parameters.
"a1 > 0 && a2 > 0 && ar < a1"
b) Both numbers are negative
Adding to negative numbers has to result in something that's smaller than the input parameters.
"a1 < 0 && a2 < 0 && ar > a1"
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH 1/2] target/s390x: Fix determination of overflow condition code after addition
Quoted 61 lines · David Hildenbrand
Quoted 50 lines · Thomas Huth
This program currently prints different results when run with TCG instead of running on real s390x hardware:
#include <stdio.h> int overflow_32 (int x, int y) { int sum; return ! __builtin_add_overflow (x, y, &sum); } int overflow_64 (long long x, long long y) { long sum; return ! __builtin_add_overflow (x, y, &sum); } int a1 = -2147483648; int b1 = -2147483648; long long a2 = -9223372036854775808L; long long b2 = -9223372036854775808L; int main () { { int a = a1; int b = b1; printf ("a = 0x%x, b = 0x%x\n", a, b); printf ("no_overflow = %d\n", overflow_32 (a, b)); } { long long a = a2; long long b = b2; printf ("a = 0x%llx, b = 0x%llx\n", a, b); printf ("no_overflow = %d\n", overflow_64 (a, b)); } }Resolves: https://gitlab.com/qemu-project/qemu/-/issues/616
Suggested-by Bruno Haible <[email protected]>Signed-off-by Thomas Huth <[email protected]>--- target/s390x/tcg/cc_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)target/s390x/tcg/cc_helper.c +0
-0target/s390x/tcg/cc_helper.c static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result) · line 139
Quoted 5 lines
target/s390x/tcg/cc_helper.c +1
-1@@ -136,7 +136,7 @@ static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result)static uint32_t cc_calc_add_64 (int64_t a1,int64_t a2,int64_t ar) { -if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >0 )) { +if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >=0 )) {Intuitively, I'd have checked for any overflow/underflow by comparing with one of the input variables:
Quoted 6 lines
a) Both numbers are positive
Adding to positive numbers has to result in something that's bigger than the input parameters.
"a1 > 0 && a2 > 0 && ar < a1"
I think it doesn't really matter whether we compare ar with a1 or 0 here. If an overflow happens, what's the biggest number that we can get? AFAICT it's with a1 = 0x7fffffffffffffff and a2 = 0x7fffffffffffffff. You then get:
0x7fffffffffffffff + 0x7fffffffffffffff = 0xFFFFFFFFFFFFFFFE
and that's still < 0 if treated as a signed value. I don't see a way where ar could be in the range between 0 and a1.
(OTOH, checking for ar < a1 instead of ar < 0 wouldn't hurt either, I guess).
Quoted 6 lines
b) Both numbers are negative
Adding to negative numbers has to result in something that's smaller than the input parameters.
"a1 < 0 && a2 < 0 && ar > a1"
What about if the uppermost bit gets lost in 64-bit mode:
0x8000000000000000 + 0x8000000000000000 = 0x0000000000000000
ar > a1 does not work here anymore, does it?
Thomas
Re: [PATCH 1/2] target/s390x: Fix determination of overflow condition code after addition
Quoted 85 lines · Thomas Huth
Quoted 61 lines · David Hildenbrand
Quoted 50 lines · Thomas Huth
This program currently prints different results when run with TCG instead of running on real s390x hardware:
#include <stdio.h> int overflow_32 (int x, int y) { int sum; return ! __builtin_add_overflow (x, y, &sum); } int overflow_64 (long long x, long long y) { long sum; return ! __builtin_add_overflow (x, y, &sum); } int a1 = -2147483648; int b1 = -2147483648; long long a2 = -9223372036854775808L; long long b2 = -9223372036854775808L; int main () { { int a = a1; int b = b1; printf ("a = 0x%x, b = 0x%x\n", a, b); printf ("no_overflow = %d\n", overflow_32 (a, b)); } { long long a = a2; long long b = b2; printf ("a = 0x%llx, b = 0x%llx\n", a, b); printf ("no_overflow = %d\n", overflow_64 (a, b)); } }Resolves: https://gitlab.com/qemu-project/qemu/-/issues/616
Suggested-by Bruno Haible <[email protected]>Signed-off-by Thomas Huth <[email protected]>--- target/s390x/tcg/cc_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)target/s390x/tcg/cc_helper.c +0
-0target/s390x/tcg/cc_helper.c static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result) · line 139
Quoted 5 lines
target/s390x/tcg/cc_helper.c +1
-1@@ -136,7 +136,7 @@ static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result)static uint32_t cc_calc_add_64 (int64_t a1,int64_t a2,int64_t ar) { -if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >0 )) { +if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >=0 )) {Intuitively, I'd have checked for any overflow/underflow by comparing with one of the input variables:
Quoted 6 lines
a) Both numbers are positive
Adding to positive numbers has to result in something that's bigger than the input parameters.
"a1 > 0 && a2 > 0 && ar < a1"
I think it doesn't really matter whether we compare ar with a1 or 0 here. If an overflow happens, what's the biggest number that we can get? AFAICT it's with a1 =
0x7fffffffffffffffand a2 =0x7fffffffffffffff. You then get:
0x7fffffffffffffff+0x7fffffffffffffff=0xFFFFFFFFFFFFFFFEand that's still < 0 if treated as a signed value. I don't see a way where ar could be in the range between 0 and a1.
(OTOH, checking for ar < a1 instead of ar < 0 wouldn't hurt either, I guess).
Quoted 5 lines
b) Both numbers are negative
Adding to negative numbers has to result in something that's smaller than the input parameters.
Quoted 7 lines
Quoted 1 line
"a1 < 0 && a2 < 0 && ar > a1"
What about if the uppermost bit gets lost in 64-bit mode:
0x8000000000000000+0x8000000000000000=0x0000000000000000ar > a1 does not work here anymore, does it?
0 > -9223372036854775808, no?
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH 1/2] target/s390x: Fix determination of overflow condition code after addition
Quoted 88 lines · David Hildenbrand
Quoted 87 lines · Thomas Huth
Quoted 61 lines · David Hildenbrand
Quoted 50 lines · Thomas Huth
This program currently prints different results when run with TCG instead of running on real s390x hardware:
#include <stdio.h> int overflow_32 (int x, int y) { int sum; return ! __builtin_add_overflow (x, y, &sum); } int overflow_64 (long long x, long long y) { long sum; return ! __builtin_add_overflow (x, y, &sum); } int a1 = -2147483648; int b1 = -2147483648; long long a2 = -9223372036854775808L; long long b2 = -9223372036854775808L; int main () { { int a = a1; int b = b1; printf ("a = 0x%x, b = 0x%x\n", a, b); printf ("no_overflow = %d\n", overflow_32 (a, b)); } { long long a = a2; long long b = b2; printf ("a = 0x%llx, b = 0x%llx\n", a, b); printf ("no_overflow = %d\n", overflow_64 (a, b)); } }Resolves: https://gitlab.com/qemu-project/qemu/-/issues/616
Suggested-by Bruno Haible <[email protected]>Signed-off-by Thomas Huth <[email protected]>--- target/s390x/tcg/cc_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)target/s390x/tcg/cc_helper.c +0
-0target/s390x/tcg/cc_helper.c static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result) · line 139
Quoted 5 lines
target/s390x/tcg/cc_helper.c +1
-1@@ -136,7 +136,7 @@ static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result)static uint32_t cc_calc_add_64 (int64_t a1,int64_t a2,int64_t ar) { -if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >0 )) { +if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >=0 )) {Intuitively, I'd have checked for any overflow/underflow by comparing with one of the input variables:
Quoted 6 lines
a) Both numbers are positive
Adding to positive numbers has to result in something that's bigger than the input parameters.
"a1 > 0 && a2 > 0 && ar < a1"
I think it doesn't really matter whether we compare ar with a1 or 0 here. If an overflow happens, what's the biggest number that we can get? AFAICT it's with a1 =
0x7fffffffffffffffand a2 =0x7fffffffffffffff. You then get:0x7fffffffffffffff + 0x7fffffffffffffff = 0xFFFFFFFFFFFFFFFEand that's still < 0 if treated as a signed value. I don't see a way where ar could be in the range between 0 and a1.
(OTOH, checking for ar < a1 instead of ar < 0 wouldn't hurt either, I guess).
Quoted 6 lines
b) Both numbers are negative
Adding to negative numbers has to result in something that's smaller than the input parameters.
"a1 < 0 && a2 < 0 && ar > a1"
Quoted 8 lines
Quoted 5 lines
What about if the uppermost bit gets lost in 64-bit mode:
0x8000000000000000 + 0x8000000000000000 = 0x0000000000000000ar > a1 does not work here anymore, does it?
0 > -9223372036854775808, no?
current coffe level < correct coffee level
... sorry, never mind, you're right of course.
Anyway, 0 is the lowest number we can get for an underflow, so comparing with >= 0 should be fine (but comparing with a1 wouldn't hurt either).
Thomas
Re: [PATCH 1/2] target/s390x: Fix determination of overflow condition code after addition
Quoted 96 lines · Thomas Huth
Quoted 95 lines · David Hildenbrand
Quoted 92 lines · Thomas Huth
Quoted 61 lines · David Hildenbrand
Quoted 50 lines · Thomas Huth
This program currently prints different results when run with TCG instead of running on real s390x hardware:
#include <stdio.h> int overflow_32 (int x, int y) { int sum; return ! __builtin_add_overflow (x, y, &sum); } int overflow_64 (long long x, long long y) { long sum; return ! __builtin_add_overflow (x, y, &sum); } int a1 = -2147483648; int b1 = -2147483648; long long a2 = -9223372036854775808L; long long b2 = -9223372036854775808L; int main () { { int a = a1; int b = b1; printf ("a = 0x%x, b = 0x%x\n", a, b); printf ("no_overflow = %d\n", overflow_32 (a, b)); } { long long a = a2; long long b = b2; printf ("a = 0x%llx, b = 0x%llx\n", a, b); printf ("no_overflow = %d\n", overflow_64 (a, b)); } }Resolves: https://gitlab.com/qemu-project/qemu/-/issues/616
Suggested-by Bruno Haible <[email protected]>Signed-off-by Thomas Huth <[email protected]>--- target/s390x/tcg/cc_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)target/s390x/tcg/cc_helper.c +0
-0target/s390x/tcg/cc_helper.c static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result) · line 139
Quoted 5 lines
target/s390x/tcg/cc_helper.c +1
-1@@ -136,7 +136,7 @@ static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result)static uint32_t cc_calc_add_64 (int64_t a1,int64_t a2,int64_t ar) { -if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >0 )) { +if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >=0 )) {Intuitively, I'd have checked for any overflow/underflow by comparing with one of the input variables:
Quoted 6 lines
a) Both numbers are positive
Adding to positive numbers has to result in something that's bigger than the input parameters.
"a1 > 0 && a2 > 0 && ar < a1"
I think it doesn't really matter whether we compare ar with a1 or 0 here. If an overflow happens, what's the biggest number that we can get? AFAICT it's with a1 =
0x7fffffffffffffffand a2 =0x7fffffffffffffff. You then get:0x7fffffffffffffff + 0x7fffffffffffffff = 0xFFFFFFFFFFFFFFFEand that's still < 0 if treated as a signed value. I don't see a way where ar could be in the range between 0 and a1.
(OTOH, checking for ar < a1 instead of ar < 0 wouldn't hurt either, I guess).
Quoted 6 lines
b) Both numbers are negative
Adding to negative numbers has to result in something that's smaller than the input parameters.
"a1 < 0 && a2 < 0 && ar > a1"
What about if the uppermost bit gets lost in 64-bit mode:
0x8000000000000000 + 0x8000000000000000 = 0x0000000000000000ar > a1 does not work here anymore, does it?
Quoted 8 lines
Quoted 1 line
0 > -9223372036854775808, no?
current coffe level < correct coffee level
... sorry, never mind, you're right of course.
Anyway, 0 is the lowest number we can get for an underflow, so comparing with >= 0 should be fine (but comparing with a1 wouldn't hurt either).
At least for me it takes more brainpower to understand that than comparing against one of both parameters as we usually do, e.g., for unsigned values in
include/qemu/range.h:range_init()
if (lob + size < lob) {
return -ERANGE;
}Having that said, I haven't checked all corner cases in your example but I assume it's fine.
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH 1/2] target/s390x: Fix determination of overflow condition code after addition
Quoted 101 lines · David Hildenbrand
Quoted 100 lines · Thomas Huth
Quoted 88 lines · David Hildenbrand
Quoted 87 lines · Thomas Huth
Quoted 61 lines · David Hildenbrand
Quoted 50 lines · Thomas Huth
This program currently prints different results when run with TCG instead of running on real s390x hardware:
#include <stdio.h> int overflow_32 (int x, int y) { int sum; return ! __builtin_add_overflow (x, y, &sum); } int overflow_64 (long long x, long long y) { long sum; return ! __builtin_add_overflow (x, y, &sum); } int a1 = -2147483648; int b1 = -2147483648; long long a2 = -9223372036854775808L; long long b2 = -9223372036854775808L; int main () { { int a = a1; int b = b1; printf ("a = 0x%x, b = 0x%x\n", a, b); printf ("no_overflow = %d\n", overflow_32 (a, b)); } { long long a = a2; long long b = b2; printf ("a = 0x%llx, b = 0x%llx\n", a, b); printf ("no_overflow = %d\n", overflow_64 (a, b)); } }Resolves: https://gitlab.com/qemu-project/qemu/-/issues/616
Suggested-by Bruno Haible <[email protected]>Signed-off-by Thomas Huth <[email protected]>--- target/s390x/tcg/cc_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)target/s390x/tcg/cc_helper.c +0
-0target/s390x/tcg/cc_helper.c static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result) · line 139
Quoted 5 lines
target/s390x/tcg/cc_helper.c +1
-1@@ -136,7 +136,7 @@ static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result)static uint32_t cc_calc_add_64 (int64_t a1,int64_t a2,int64_t ar) { -if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >0 )) { +if ((a1 >0 && a2 >0 && ar <0 ) || (a1 <0 && a2 <0 && ar >=0 )) {Intuitively, I'd have checked for any overflow/underflow by comparing with one of the input variables:
Quoted 6 lines
a) Both numbers are positive
Adding to positive numbers has to result in something that's bigger than the input parameters.
"a1 > 0 && a2 > 0 && ar < a1"
I think it doesn't really matter whether we compare ar with a1 or 0 here. If an overflow happens, what's the biggest number that we can get? AFAICT it's with a1 =
0x7fffffffffffffffand a2 =0x7fffffffffffffff. You then get:0x7fffffffffffffff + 0x7fffffffffffffff = 0xFFFFFFFFFFFFFFFEand that's still < 0 if treated as a signed value. I don't see a way where ar could be in the range between 0 and a1.
(OTOH, checking for ar < a1 instead of ar < 0 wouldn't hurt either, I guess).
Quoted 6 lines
b) Both numbers are negative
Adding to negative numbers has to result in something that's smaller than the input parameters.
"a1 < 0 && a2 < 0 && ar > a1"
Quoted 8 lines
Quoted 5 lines
What about if the uppermost bit gets lost in 64-bit mode:
0x8000000000000000 + 0x8000000000000000 = 0x0000000000000000ar > a1 does not work here anymore, does it?
0 > -9223372036854775808, no?
current coffe level < correct coffee level
Quoted 8 lines
Quoted 4 lines
... sorry, never mind, you're right of course.
Anyway, 0 is the lowest number we can get for an underflow, so comparing with >= 0 should be fine (but comparing with a1 wouldn't hurt either).
At least for me it takes more brainpower to understand that than comparing against one of both parameters as we usually do, e.g., for unsigned values
Maybe we should simply switch the code to use __builtin_add_overflow and __builtin_sub_overflow and let the compiler figure out the details...
Thomas
Re: [PATCH 1/2] target/s390x: Fix determination of overflow condition code after addition
Quoted 105 lines · Thomas Huth
Quoted 104 lines · David Hildenbrand
Quoted 103 lines · Thomas Huth
Quoted 89 lines · David Hildenbrand
Quoted 88 lines · Thomas Huth
Quoted 62 lines · David Hildenbrand
Quoted 50 lines · Thomas Huth
This program currently prints different results when run with TCG instead of running on real s390x hardware:
#include <
stdio.h>int
overflow_32(int x, int y)
{
int sum;
return !__builtin_add_overflow(x, y, &sum); }int
overflow_64(long long x, long long y) {
long sum;
return !__builtin_add_overflow(x, y, &sum); }int a1 = -2147483648;
int b1 = -2147483648;
long long a2 = -9223372036854775808L;
long long b2 = -9223372036854775808L;int main ()
{
{
int a = a1;
int b = b1;
printf ("a = 0x%x, b = 0x%x\n", a, b); printf ("no_overflow= %d\n",overflow_32(a, b)); }
{
long long a = a2;
long long b = b2;
printf ("a = 0x%llx, b = 0x%llx\n", a, b); printf ("no_overflow= %d\n",overflow_64(a, b)); }
}Resolves: https://gitlab.com/qemu-project/qemu/-/issues/616
Suggested-by Bruno Haible <[email protected]>Signed-off-by Thomas Huth <[email protected]>---
target/s390x/tcg/cc_helper.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)target/s390x/tcg/cc_helper.c +0
-0target/s390x/tcg/cc_helper.c static uint32_t cc_calc_subu(uint64_t borrow_out, · line 140
Quoted 6 lines
target/s390x/tcg/cc_helper.c +1
-1@@ -136,7 +136,7 @@ static uint32_t cc_calc_subu(uint64_t borrow_out, uint64_t result) static uint32_t cc_calc_add_64(int64_t a1, int64_t a2, int64_t ar) { - if ((a1 > 0 && a2 > 0 && ar < 0) || (a1 < 0 && a2 < 0 && ar > 0)) { + if ((a1 > 0 && a2 > 0 && ar < 0) || (a1 < 0 && a2 < 0 && ar >=0 )) {Intuitively, I'd have checked for any overflow/underflow by comparing with one of the input variables:
Quoted 6 lines
a) Both numbers are positive
Adding to positive numbers has to result in something that's bigger than the input parameters.
"a1 > 0 && a2 > 0 && ar < a1"
I think it doesn't really matter whether we compare ar with a1 or 0 here. If an overflow happens, what's the biggest number that we can get? AFAICT it's with a1 =
0x7fffffffffffffffand a2 =0x7fffffffffffffff. You then get:
0x7fffffffffffffff+0x7fffffffffffffff=0xFFFFFFFFFFFFFFFEand that's still < 0 if treated as a signed value. I don't see a way where ar could be in the range between 0 and a1.
(OTOH, checking for ar < a1 instead of ar < 0 wouldn't hurt either, I guess).
Quoted 6 lines
b) Both numbers are negative
Adding to negative numbers has to result in something that's smaller than the input parameters.
"a1 < 0 && a2 < 0 && ar > a1"
Quoted 8 lines
Quoted 5 lines
What about if the uppermost bit gets lost in 64-bit mode:
0x8000000000000000+0x8000000000000000=0x0000000000000000ar > a1 does not work here anymore, does it?
0 > -9223372036854775808, no?
current coffe level < correct coffee level
... sorry, never mind, you're right of course.
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines
Anyway, 0 is the lowest number we can get for an underflow, so comparing with >= 0 should be fine (but comparing with a1 wouldn't hurt either).
At least for me it takes more brainpower to understand that than comparing against one of both parameters as we usually do, e.g., for unsigned values
Maybe we should simply switch the code to use
__builtin_add_overflowand__builtin_sub_overflowand let the compiler figure out the details...
Never mind again, that doesn't work in this context either ... /me finally goes fetching another coffee...
Thomas
Re: [PATCH 1/2] target/s390x: Fix determination of overflow condition code after addition
In reply to David HildenbrandQuoted 14 lines · David Hildenbrand
Review
Quoted 4 lines
static uint32_t cc_calc_add_64(int64_t a1, int64_t a2, int64_t ar) {(quoted diff) +1
-1- if ((a1 > 0 && a2 > 0 && ar < 0) || (a1 < 0 && a2 < 0 && ar > 0)) { + if ((a1 > 0 && a2 > 0 && ar < 0) || (a1 < 0 && a2 < 0 && ar >= 0)) {Intuitively, I'd have checked for any overflow/underflow by comparing with one of the input variables:
a) Both numbers are positive
Adding to positive numbers has to result in something that's bigger than the input parameters.
Quoted 8 lines
"a1 > 0 && a2 > 0 && ar < a1"
b) Both numbers are negative
Adding to negative numbers has to result in something that's smaller than the input parameters.
"a1 < 0 && a2 < 0 && ar > a1"
If we're not going to just fix the >= typo, I'd suggest using the much more compact bitwise method:
((ar ^ a1) & ~(a1 ^ a2)) < 0
See sadd64_overflow in qemu/host-utils.h.
r~
Re: [PATCH 1/2] target/s390x: Fix determination of overflow condition code after addition
Quoted 22 lines · Richard Henderson
Quoted 21 lines · David Hildenbrand
Quoted 4 lines
static
uint32_tcc_calc_add_64(int64_t a1, int64_t a2, int64_t ar){- if ((a1 > 0 && a2 > 0 && ar < 0) || (a1 < 0 && a2 < 0 && ar > 0)) { + if ((a1 > 0 && a2 > 0 && ar < 0) || (a1 < 0 && a2 < 0 && ar >= 0)) {Intuitively, I'd have checked for any overflow/underflow by comparing with one of the input variables:
a) Both numbers are positive
Adding to positive numbers has to result in something that's bigger than the input parameters.
"a1 > 0 && a2 > 0 && ar < a1"
b) Both numbers are negative
Adding to negative numbers has to result in something that's smaller than the input parameters.
Quoted 8 lines
Quoted 1 line
"a1 < 0 && a2 < 0 && ar > a1"
If we're not going to just fix the >= typo, I'd suggest using the much more compact bitwise method:
((ar ^ a1) & ~(a1 ^ a2)) < 0
See
sadd64_overflowinqemu/host-utils.h.
Thanks, sounds like a good idea. Anyway, I'd like to go with Bruno's patch for 7.0 and do the optimization in the 7.1 cycle instead.
Thomas
PATCH 2/2 target/s390x: Fix determination of overflow condition code after subtraction
In reply to Thomas HuthReported by Paul Eggert in
https://lists.gnu.org/archive/html/bug-gnulib/2021-09/msg00050.html
This program currently prints different results when run with TCG instead of running on real s390x hardware:
#include <stdio.h>
int overflow_32 (int x, int y)
{
int sum;
return __builtin_sub_overflow (x, y, &sum);
}
int overflow_64 (long long x, long long y)
{
long sum;
return __builtin_sub_overflow (x, y, &sum);
}
int a1 = 0;
int b1 = -2147483648;
long long a2 = 0L;
long long b2 = -9223372036854775808L;
int main ()
{
{
int a = a1;
int b = b1;
printf ("a = 0x%x, b = 0x%x\n", a, b);
printf ("no_overflow = %d\n", ! overflow_32 (a, b));
}
{
long long a = a2;
long long b = b2;
printf ("a = 0x%llx, b = 0x%llx\n", a, b);
printf ("no_overflow = %d\n", ! overflow_64 (a, b)); }
}
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/618
--- target/s390x/tcg/cc_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/s390x/tcg/cc_helper.c +2 -2
@@ -151,7 +151,7 @@ static uint32_t cc_calc_add_64(int64_t a1, int64_t a2, int64_t ar)static uint32_t cc_calc_sub_64 (int64_t a1,int64_t a2,int64_t ar) { -if ((a1 >0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) { +if ((a1 >=0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) {return 3 ;/* overflow */ }else {if (ar <0 ) {
@@ -211,7 +211,7 @@ static uint32_t cc_calc_add_32(int32_t a1, int32_t a2, int32_t ar)static uint32_t cc_calc_sub_32 (int32_t a1,int32_t a2,int32_t ar) { -if ((a1 >0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) { +if ((a1 >=0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) {return 3 ;/* overflow */ }else {if (ar <0 ) {
Signature · 1 line
2.27.0
Re: [PATCH 2/2] target/s390x: Fix determination of overflow condition code after subtraction
Quoted 62 lines · Thomas Huth
Reported by Paul Eggert in
https://lists.gnu.org/archive/html/bug-gnulib/2021-09/msg00050.htmlThis program currently prints different results when run with TCG instead of running on real s390x hardware:
#include <
stdio.h>int
overflow_32(int x, int y){ int sum; return __builtin_sub_overflow (x, y, &sum);}
int
overflow_64(long long x, long long y){ long sum; return __builtin_sub_overflow (x, y, &sum);}
int a1 = 0;
int b1 = -2147483648;
long long a2 = 0L;
long long b2 = -9223372036854775808L;int main ()
{ { int a = a1; int b = b1; printf ("a = 0x%x, b = 0x%x\n", a, b); printf ("no_overflow = %d\n", ! overflow_32 (a, b)); } { long long a = a2; long long b = b2; printf ("a = 0x%llx, b = 0x%llx\n", a, b); printf ("no_overflow = %d\n", ! overflow_64 (a, b)); }}
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/618
Suggested-by Bruno Haible <[email protected]>Signed-off-by Thomas Huth <[email protected]>--- target/s390x/tcg/cc_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)target/s390x/tcg/cc_helper.c +1
-1@@ -151,7 +151,7 @@ static uint32_t cc_calc_add_64(int64_t a1, int64_t a2, int64_t ar)static uint32_t cc_calc_sub_64 (int64_t a1,int64_t a2,int64_t ar) { -if ((a1 >0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) { +if ((a1 >=0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) {return 3 ;/* overflow */ }else {if (ar <0 ) {
target/s390x/tcg/cc_helper.c static uint32_t cc_calc_add_32(int32_t a1, int32_t a2, int32_t ar) · line 217
Quoted 8 lines
target/s390x/tcg/cc_helper.c +1
-1@@ -211,7 +211,7 @@ static uint32_t cc_calc_add_32(int32_t a1, int32_t a2, int32_t ar)static uint32_t cc_calc_sub_32 (int32_t a1,int32_t a2,int32_t ar) { -if ((a1 >0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) { +if ((a1 >=0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) {return 3 ;/* overflow */ }else {if (ar <0 ) {
Again, intuitively I'd check for
a) Subtracting a negative number from a positive one -> Adding two positive numbers should result in the result being bigger than the first parameter.
a1 > 0 && a2 < 0 && ar < a1
a) Subtracting a positive number from a negative one -> Adding two negative numbers should result in something that's smaller than the first parameter
a1 < 0 && a2 > 0 && ar > a1
But maybe I am missing something :)
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH 2/2] target/s390x: Fix determination of overflow condition code after subtraction
Quoted 31 lines · David Hildenbrand
Quoted 14 lines
target/s390x/tcg/cc_helper.c +1
-1@@ -151,7 +151,7 @@ static uint32_t cc_calc_add_64(int64_t a1, int64_t a2, int64_t ar)static uint32_t cc_calc_sub_64 (int64_t a1,int64_t a2,int64_t ar) { -if ((a1 >0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) { +if ((a1 >=0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) {return 3 ;/* overflow */ }else {if (ar <0 ) {target/s390x/tcg/cc_helper.c static uint32_t cc_calc_add_32(int32_t a1, int32_t a2, int32_t ar) · line 217
Quoted 8 lines
target/s390x/tcg/cc_helper.c +1
-1@@ -211,7 +211,7 @@ static uint32_t cc_calc_add_32(int32_t a1, int32_t a2, int32_t ar)static uint32_t cc_calc_sub_32 (int32_t a1,int32_t a2,int32_t ar) { -if ((a1 >0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) { +if ((a1 >=0 && a2 <0 && ar <0 ) || (a1 <0 && a2 >0 && ar >0 )) {return 3 ;/* overflow */ }else {if (ar <0 ) {Again, intuitively I'd check for
a) Subtracting a negative number from a positive one -> Adding two positive numbers should result in the result being bigger than the first parameter.
a1 > 0 && a2 < 0 && ar < a1
Quoted 8 lines
a) Subtracting a positive number from a negative one -> Adding two negative numbers should result in something that's smaller than the first parameter
a1 < 0 && a2 > 0 && ar > a1
But maybe I am missing something :)
Again, see ssub64_overflow in qemu/host-utils.h.
r~