Commit 1e36aee6 authored by Richard Henderson's avatar Richard Henderson Committed by David Hildenbrand
Browse files

target/s390x: Use tcg_s390_program_interrupt in TCG helpers 



Replace all uses of s390_program_interrupt within files
that are marked CONFIG_TCG.  These are necessarily tcg-only.

This lets each of these users benefit from the QEMU_NORETURN
attribute on tcg_s390_program_interrupt.

Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20191001171614.8405-5-richard.henderson@linaro.org>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
parent 77b703f8

target/s390x/cc_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "qemu/osdep.h"

#include "cpu.h"

#include "internal.h"

#include "tcg_s390x.h"

#include "exec/exec-all.h"

#include "exec/helper-proto.h"

#include "qemu/host-utils.h"
@@ -588,8 +589,7 @@ void HELPER(sacf)(CPUS390XState *env, uint64_t a1) 
        break;

    default:

        HELPER_LOG("unknown sacf mode: %" PRIx64 "\n", a1);

        s390_program_interrupt(env, PGM_SPECIFICATION, GETPC());

        break;

        tcg_s390_program_interrupt(env, PGM_SPECIFICATION, GETPC());

    }

}

#endif

target/s390x/crypto_helper.c

+3 −4
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "qemu/osdep.h"

#include "qemu/main-loop.h"

#include "internal.h"

#include "tcg_s390x.h"

#include "exec/helper-proto.h"

#include "exec/exec-all.h"

#include "exec/cpu_ldst.h"
@@ -34,16 +35,14 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3, 
    case S390_FEAT_TYPE_PCKMO:

    case S390_FEAT_TYPE_PCC:

        if (mod) {

            s390_program_interrupt(env, PGM_SPECIFICATION, ra);

            return 0;

            tcg_s390_program_interrupt(env, PGM_SPECIFICATION, ra);

        }

        break;

    }



    s390_get_feat_block(type, subfunc);

    if (!test_be_bit(fc, subfunc)) {

        s390_program_interrupt(env, PGM_SPECIFICATION, ra);

        return 0;

        tcg_s390_program_interrupt(env, PGM_SPECIFICATION, ra);

    }



    switch (fc) {

target/s390x/excp_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ void s390x_cpu_do_unaligned_access(CPUState *cs, vaddr addr, 
    S390CPU *cpu = S390_CPU(cs);

    CPUS390XState *env = &cpu->env;



    s390_program_interrupt(env, PGM_SPECIFICATION, retaddr);

    tcg_s390_program_interrupt(env, PGM_SPECIFICATION, retaddr);

}



#endif /* CONFIG_USER_ONLY */

target/s390x/fpu_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ void HELPER(sfpc)(CPUS390XState *env, uint64_t fpc) 
{

    if (fpc_to_rnd[fpc & 0x7] == -1 || fpc & 0x03030088u ||

        (!s390_has_feat(S390_FEAT_FLOATING_POINT_EXT) && fpc & 0x4)) {

        s390_program_interrupt(env, PGM_SPECIFICATION, GETPC());

        tcg_s390_program_interrupt(env, PGM_SPECIFICATION, GETPC());

    }



    /* Install everything in the main FPC.  */
@@ -843,7 +843,7 @@ void HELPER(sfas)(CPUS390XState *env, uint64_t fpc) 


    if (fpc_to_rnd[fpc & 0x7] == -1 || fpc & 0x03030088u ||

        (!s390_has_feat(S390_FEAT_FLOATING_POINT_EXT) && fpc & 0x4)) {

        s390_program_interrupt(env, PGM_SPECIFICATION, GETPC());

        tcg_s390_program_interrupt(env, PGM_SPECIFICATION, GETPC());

    }



    /*
@@ -880,7 +880,7 @@ void HELPER(sfas)(CPUS390XState *env, uint64_t fpc) 
void HELPER(srnm)(CPUS390XState *env, uint64_t rnd)

{

    if (rnd > 0x7 || fpc_to_rnd[rnd & 0x7] == -1) {

        s390_program_interrupt(env, PGM_SPECIFICATION, GETPC());

        tcg_s390_program_interrupt(env, PGM_SPECIFICATION, GETPC());

    }



    env->fpc = deposit32(env->fpc, 0, 3, rnd);

target/s390x/int_helper.c

+8 −7
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "qemu/osdep.h"

#include "cpu.h"

#include "internal.h"

#include "tcg_s390x.h"

#include "exec/exec-all.h"

#include "qemu/host-utils.h"

#include "exec/helper-proto.h"
@@ -39,7 +40,7 @@ int64_t HELPER(divs32)(CPUS390XState *env, int64_t a, int64_t b64) 
    int64_t q;



    if (b == 0) {

        s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

        tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

    }



    ret = q = a / b;
@@ -47,7 +48,7 @@ int64_t HELPER(divs32)(CPUS390XState *env, int64_t a, int64_t b64) 


    /* Catch non-representable quotient.  */

    if (ret != q) {

        s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

        tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

    }



    return ret;
@@ -60,7 +61,7 @@ uint64_t HELPER(divu32)(CPUS390XState *env, uint64_t a, uint64_t b64) 
    uint64_t q;



    if (b == 0) {

        s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

        tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

    }



    ret = q = a / b;
@@ -68,7 +69,7 @@ uint64_t HELPER(divu32)(CPUS390XState *env, uint64_t a, uint64_t b64) 


    /* Catch non-representable quotient.  */

    if (ret != q) {

        s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

        tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

    }



    return ret;
@@ -79,7 +80,7 @@ int64_t HELPER(divs64)(CPUS390XState *env, int64_t a, int64_t b) 
{

    /* Catch divide by zero, and non-representable quotient (MIN / -1).  */

    if (b == 0 || (b == -1 && a == (1ll << 63))) {

        s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

        tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

    }

    env->retxl = a % b;

    return a / b;
@@ -92,7 +93,7 @@ uint64_t HELPER(divu64)(CPUS390XState *env, uint64_t ah, uint64_t al, 
    uint64_t ret;

    /* Signal divide by zero.  */

    if (b == 0) {

        s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

        tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

    }

    if (ah == 0) {

        /* 64 -> 64/64 case */
@@ -106,7 +107,7 @@ uint64_t HELPER(divu64)(CPUS390XState *env, uint64_t ah, uint64_t al, 
        env->retxl = a % b;

        ret = q;

        if (ret != q) {

            s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

            tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());

        }

#else

        /* 32-bit hosts would need special wrapper functionality - just abort if