Commit 92f2b4e7 authored by Aurelien Jarno's avatar Aurelien Jarno Committed by Alexander Graf
Browse files

target-s390x: fix CONVERT TO BINARY (CVD, CVDY) 



current_number being shift left by more than 32 bits, we can't use a
simple int. Similarly use an int64_t type for the input binary value,
to not get the -2^31 case wrong. Finally don't initialize shift to 4,
it's already done in the for loop.

Signed-off-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent c9c19b49

target-s390x/int_helper.c

+4 −5
Original line number Diff line number Diff line
@@ -121,11 +121,12 @@ uint64_t HELPER(clz)(uint64_t v) 
    return clz64(v);

}



uint64_t HELPER(cvd)(int32_t bin)

uint64_t HELPER(cvd)(int32_t reg)

{

    /* positive 0 */

    uint64_t dec = 0x0c;

    int shift = 4;

    int64_t bin = reg;

    int shift;



    if (bin < 0) {

        bin = -bin;
@@ -133,9 +134,7 @@ uint64_t HELPER(cvd)(int32_t bin) 
    }



    for (shift = 4; (shift < 64) && bin; shift += 4) {

        int current_number = bin % 10;



        dec |= (current_number) << shift;

        dec |= (bin % 10) << shift;

        bin /= 10;

    }