Commit 7634d658 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/tcg: move wrap_address() to internal.h 



We want to use it in another file.

Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170920153016.3858-3-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 6b257354

target/s390x/internal.h

+14 −0
Original line number Diff line number Diff line
@@ -162,6 +162,20 @@ static inline uint8_t get_per_atmid(CPUS390XState *env) 
           ((env->psw.mask & PSW_ASC_ACCREG) ?    (1 << 2) : 0);

}



static inline uint64_t wrap_address(CPUS390XState *env, uint64_t a)

{

    if (!(env->psw.mask & PSW_MASK_64)) {

        if (!(env->psw.mask & PSW_MASK_32)) {

            /* 24-Bit mode */

            a &= 0x00ffffff;

        } else {

            /* 31-Bit mode */

            a &= 0x7fffffff;

        }

    }

    return a;

}



/* CC optimization */



/* Instead of computing the condition codes after each x86 instruction,

target/s390x/mem_helper.c

+0 −14
Original line number Diff line number Diff line
@@ -122,20 +122,6 @@ static inline void cpu_stsize_data_ra(CPUS390XState *env, uint64_t addr, 
    }

}



static inline uint64_t wrap_address(CPUS390XState *env, uint64_t a)

{

    if (!(env->psw.mask & PSW_MASK_64)) {

        if (!(env->psw.mask & PSW_MASK_32)) {

            /* 24-Bit mode */

            a &= 0x00ffffff;

        } else {

            /* 31-Bit mode */

            a &= 0x7fffffff;

        }

    }

    return a;

}



static void fast_memset(CPUS390XState *env, uint64_t dest, uint8_t byte,

                        uint32_t l, uintptr_t ra)

{