[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/6] target-i386: exception handling for other helper
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 6/6] target-i386: exception handling for other helper functions |
Date: |
Tue, 15 Sep 2015 12:40:34 -0700 |
From: Pavel Dovgalyuk <address@hidden>
This patch fixes exception handling for other helper functions.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target-i386/cc_helper.c | 2 +-
target-i386/misc_helper.c | 8 ++++----
target-i386/ops_sse.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/target-i386/cc_helper.c b/target-i386/cc_helper.c
index ecbf0ec..d5b7c7b 100644
--- a/target-i386/cc_helper.c
+++ b/target-i386/cc_helper.c
@@ -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
diff --git a/target-i386/misc_helper.c b/target-i386/misc_helper.c
index 52c5d65..6bfc7dd 100644
--- a/target-i386/misc_helper.c
+++ b/target-i386/misc_helper.c
@@ -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;
diff --git a/target-i386/ops_sse.h b/target-i386/ops_sse.h
index bee134b..7aa693a 100644
--- a/target-i386/ops_sse.h
+++ b/target-i386/ops_sse.h
@@ -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());
}
}
}
--
2.1.0
- [Qemu-devel] [PULL 0/6] target-i386 exception improvments, Richard Henderson, 2015/09/15
- [Qemu-devel] [PULL 1/6] target-i386: introduce new raise_exception functions, Richard Henderson, 2015/09/15
- [Qemu-devel] [PULL 3/6] target-i386: exception handling for div instructions, Richard Henderson, 2015/09/15
- [Qemu-devel] [PULL 4/6] target-i386: exception handling for memory helpers, Richard Henderson, 2015/09/15
- [Qemu-devel] [PULL 6/6] target-i386: exception handling for other helper functions,
Richard Henderson <=
- [Qemu-devel] [PULL 2/6] target-i386: exception handling for FPU instructions, Richard Henderson, 2015/09/15
- [Qemu-devel] [PULL 5/6] target-i386: exception handling for seg_helper functions, Richard Henderson, 2015/09/15
- Re: [Qemu-devel] [PULL 0/6] target-i386 exception improvments, Peter Maydell, 2015/09/16