mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-i386: exception handling for other helper functions

Browse Source 
This patch fixes exception handling for other helper functions.

Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Pavel Dovgalyuk 2015-07-10 12:57:41 +03:00 committed by Richard Henderson
parent 100ec09919
commit 4054cdec04
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-i386/cc_helper.c
View File

@ -378,7 +378,7 @@ void helper_sti_vm(CPUX86State *env)
{ {
env->eflags |= VIF_MASK; env->eflags |= VIF_MASK;
if (env->eflags & VIP_MASK) { if (env->eflags & VIP_MASK) {
raise_exception(env, EXCP0D_GPF); raise_exception_ra(env, EXCP0D_GPF, GETPC());
} }
} }
#endif #endif

8
target-i386/misc_helper.c
View File

@ -220,7 +220,7 @@ void helper_rdtsc(CPUX86State *env)
uint64_t val; uint64_t val;
if ((env->cr[4] & CR4_TSD_MASK) && ((env->hflags & HF_CPL_MASK) != 0)) { 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); cpu_svm_check_intercept_param(env, SVM_EXIT_RDTSC, 0);
@ -238,7 +238,7 @@ void helper_rdtscp(CPUX86State *env)
void helper_rdpmc(CPUX86State *env) void helper_rdpmc(CPUX86State *env)
{ {
if ((env->cr[4] & CR4_PCE_MASK) && ((env->hflags & HF_CPL_MASK) != 0)) { 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); 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) void helper_monitor(CPUX86State *env, target_ulong ptr)
{ {
if ((uint32_t)env->regs[R_ECX] != 0) { if ((uint32_t)env->regs[R_ECX] != 0) {
raise_exception(env, EXCP0D_GPF); raise_exception_ra(env, EXCP0D_GPF, GETPC());
} }
/* XXX: store address? */ /* XXX: store address? */
cpu_svm_check_intercept_param(env, SVM_EXIT_MONITOR, 0); 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; X86CPU *cpu;
if ((uint32_t)env->regs[R_ECX] != 0) { 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); cpu_svm_check_intercept_param(env, SVM_EXIT_MWAIT, 0);
env->eip += next_eip_addend; env->eip += next_eip_addend;

2
target-i386/ops_sse.h
View File

@ -483,7 +483,7 @@ void glue(helper_maskmov, SUFFIX)(CPUX86State *env, Reg *d, Reg *s,
for (i = 0; i < (8 << SHIFT); i++) { for (i = 0; i < (8 << SHIFT); i++) {
if (s->B(i) & 0x80) { 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());
} }
} }
} }