Commit a7c1fadf authored by Aurelien Jarno's avatar Aurelien Jarno Committed by Richard Henderson
Browse files

target/s390x: mask the SIGP order_code using SIGP_ORDER_MASK 



For that move the definition from kvm.c to cpu.h

Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Message-Id: <20170509082800.10756-2-aurelien@aurel32.net>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent 4dba4d6f

target/s390x/cpu.h

+3 −0
Original line number Diff line number Diff line
@@ -1078,6 +1078,9 @@ struct sysib_322 { 
#define SIGP_MODE_Z_ARCH_TRANS_ALL_PSW 1

#define SIGP_MODE_Z_ARCH_TRANS_CUR_PSW 2



/* SIGP order code mask corresponding to bit positions 56-63 */

#define SIGP_ORDER_MASK 0x000000ff



void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr);

int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc,

                  target_ulong *raddr, int *flags, bool exc);

target/s390x/kvm.c

+0 −2
Original line number Diff line number Diff line
@@ -1764,8 +1764,6 @@ static int sigp_set_architecture(S390CPU *cpu, uint32_t param, 
    return SIGP_CC_ORDER_CODE_ACCEPTED;

}



#define SIGP_ORDER_MASK 0x000000ff



static int handle_sigp(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)

{

    CPUS390XState *env = &cpu->env;

target/s390x/misc_helper.c

+1 −2
Original line number Diff line number Diff line
@@ -517,8 +517,7 @@ uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1, 
    /* Remember: Use "R1 or R1 + 1, whichever is the odd-numbered register"

       as parameter (input). Status (output) is always R1. */



    /* sigp contains the order code in bit positions 56-63, mask it here. */

    switch (order_code & 0xff) {

    switch (order_code & SIGP_ORDER_MASK) {

    case SIGP_SET_ARCH:

        /* switch arch */

        break;