Commit 4054cdec authored by Pavel Dovgalyuk's avatar Pavel Dovgalyuk Committed by Richard Henderson
Browse files

target-i386: exception handling for other helper functions 



This patch fixes exception handling for other helper functions.

Signed-off-by: default avatarPavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent 100ec099

target-i386/cc_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ void helper_sti_vm(CPUX86State *env) 
{

    env->eflags |= VIF_MASK;

    if (env->eflags & VIP_MASK) {

        raise_exception(env, EXCP0D_GPF);

        raise_exception_ra(env, EXCP0D_GPF, GETPC());

    }

}

#endif

target-i386/misc_helper.c

+4 −4
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ void helper_rdtsc(CPUX86State *env) 
    uint64_t val;



    if ((env->cr[4] & CR4_TSD_MASK) && ((env->hflags & HF_CPL_MASK) != 0)) {

        raise_exception(env, EXCP0D_GPF);

        raise_exception_ra(env, EXCP0D_GPF, GETPC());

    }

    cpu_svm_check_intercept_param(env, SVM_EXIT_RDTSC, 0);
@@ -238,7 +238,7 @@ void helper_rdtscp(CPUX86State *env) 
void helper_rdpmc(CPUX86State *env)

{

    if ((env->cr[4] & CR4_PCE_MASK) && ((env->hflags & HF_CPL_MASK) != 0)) {

        raise_exception(env, EXCP0D_GPF);

        raise_exception_ra(env, EXCP0D_GPF, GETPC());

    }

    cpu_svm_check_intercept_param(env, SVM_EXIT_RDPMC, 0);
@@ -589,7 +589,7 @@ void helper_hlt(CPUX86State *env, int next_eip_addend) 
void helper_monitor(CPUX86State *env, target_ulong ptr)

{

    if ((uint32_t)env->regs[R_ECX] != 0) {

        raise_exception(env, EXCP0D_GPF);

        raise_exception_ra(env, EXCP0D_GPF, GETPC());

    }

    /* XXX: store address? */

    cpu_svm_check_intercept_param(env, SVM_EXIT_MONITOR, 0);
@@ -601,7 +601,7 @@ void helper_mwait(CPUX86State *env, int next_eip_addend) 
    X86CPU *cpu;



    if ((uint32_t)env->regs[R_ECX] != 0) {

        raise_exception(env, EXCP0D_GPF);

        raise_exception_ra(env, EXCP0D_GPF, GETPC());

    }

    cpu_svm_check_intercept_param(env, SVM_EXIT_MWAIT, 0);

    env->eip += next_eip_addend;

target-i386/ops_sse.h

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ void glue(helper_maskmov, SUFFIX)(CPUX86State *env, Reg *d, Reg *s, 


    for (i = 0; i < (8 << SHIFT); i++) {

        if (s->B(i) & 0x80) {

            cpu_stb_data(env, a0 + i, d->B(i));

            cpu_stb_data_ra(env, a0 + i, d->B(i), GETPC());

        }

    }

}