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

target/s390x: move psw_key_valid() to mem_helper.c 



Only used in that file.

Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
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: <20170818114353.13455-12-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 12e1e8f1

target/s390x/cpu.h

+0 −11
Original line number Diff line number Diff line
@@ -366,17 +366,6 @@ void s390x_cpu_debug_excp_handler(CPUState *cs); 
#define MMU_SECONDARY_IDX       1

#define MMU_HOME_IDX            2



static inline bool psw_key_valid(CPUS390XState *env, uint8_t psw_key)

{

    uint16_t pkm = env->cregs[3] >> 16;



    if (env->psw.mask & PSW_MASK_PSTATE) {

        /* PSW key has range 0..15, it is valid if the bit is 1 in the PKM */

        return pkm & (0x80 >> psw_key);

    }

    return true;

}



static inline int cpu_mmu_index(CPUS390XState *env, bool ifetch)

{

    switch (env->psw.mask & PSW_MASK_ASC) {

target/s390x/mem_helper.c

+11 −0
Original line number Diff line number Diff line
@@ -56,6 +56,17 @@ void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type, 
#define HELPER_LOG(x...)

#endif



static inline bool psw_key_valid(CPUS390XState *env, uint8_t psw_key)

{

    uint16_t pkm = env->cregs[3] >> 16;



    if (env->psw.mask & PSW_MASK_PSTATE) {

        /* PSW key has range 0..15, it is valid if the bit is 1 in the PKM */

        return pkm & (0x80 >> psw_key);

    }

    return true;

}



/* Reduce the length so that addr + len doesn't cross a page boundary.  */

static inline uint32_t adj_len_to_page(uint32_t len, uint64_t addr)

{