From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDV3t-0003nP-1v for qemu-devel@nongnu.org; Fri, 10 Jul 2015 05:57:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZDV3q-0007cN-Aa for qemu-devel@nongnu.org; Fri, 10 Jul 2015 05:57:41 -0400 Received: from mail.ispras.ru ([83.149.199.45]:43769) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDV3q-0007c8-2p for qemu-devel@nongnu.org; Fri, 10 Jul 2015 05:57:38 -0400 From: Pavel Dovgalyuk Date: Fri, 10 Jul 2015 12:57:41 +0300 Message-ID: <20150710095741.13280.58656.stgit@PASHA-ISP> In-Reply-To: <20150710095643.13280.88767.stgit@PASHA-ISP> References: <20150710095643.13280.88767.stgit@PASHA-ISP> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v7 10/11] target-i386: exception handling for other helper functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: rth7680@gmail.com, agraf@suse.de, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, leon.alrae@imgtec.com, aurelien@aurel32.net This patch fixes exception handling for other helper functions. Signed-off-by: Pavel Dovgalyuk --- 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 0765073..8c8e53b 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()); } } }