[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 08/11] target-i386: exception handling for memory
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v7 08/11] target-i386: exception handling for memory helpers |
Date: |
Fri, 10 Jul 2015 12:57:30 +0300 |
User-agent: |
StGit/0.16 |
This patch fixes exception handling for memory helpers
and removes obsolete PC update from translate.c.
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Aurelien Jarno <address@hidden>
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
target-i386/mem_helper.c | 39 ++++++++++++++++++---------------------
target-i386/translate.c | 3 ---
2 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/target-i386/mem_helper.c b/target-i386/mem_helper.c
index 1aec8a5..95b1f53 100644
--- a/target-i386/mem_helper.c
+++ b/target-i386/mem_helper.c
@@ -41,13 +41,14 @@ void helper_cmpxchg8b(CPUX86State *env, target_ulong a0)
int eflags;
eflags = cpu_cc_compute_all(env, CC_OP);
- d = cpu_ldq_data(env, a0);
+ d = cpu_ldq_data_ra(env, a0, GETPC());
if (d == (((uint64_t)env->regs[R_EDX] << 32) |
(uint32_t)env->regs[R_EAX])) {
- cpu_stq_data(env, a0, ((uint64_t)env->regs[R_ECX] << 32) |
(uint32_t)env->regs[R_EBX]);
+ cpu_stq_data_ra(env, a0, ((uint64_t)env->regs[R_ECX] << 32)
+ | (uint32_t)env->regs[R_EBX], GETPC());
eflags |= CC_Z;
} else {
/* always do the store */
- cpu_stq_data(env, a0, d);
+ cpu_stq_data_ra(env, a0, d, GETPC());
env->regs[R_EDX] = (uint32_t)(d >> 32);
env->regs[R_EAX] = (uint32_t)d;
eflags &= ~CC_Z;
@@ -62,19 +63,19 @@ void helper_cmpxchg16b(CPUX86State *env, target_ulong a0)
int eflags;
if ((a0 & 0xf) != 0) {
- raise_exception(env, EXCP0D_GPF);
+ raise_exception_ra(env, EXCP0D_GPF, GETPC());
}
eflags = cpu_cc_compute_all(env, CC_OP);
- d0 = cpu_ldq_data(env, a0);
- d1 = cpu_ldq_data(env, a0 + 8);
+ d0 = cpu_ldq_data_ra(env, a0, GETPC());
+ d1 = cpu_ldq_data_ra(env, a0 + 8, GETPC());
if (d0 == env->regs[R_EAX] && d1 == env->regs[R_EDX]) {
- cpu_stq_data(env, a0, env->regs[R_EBX]);
- cpu_stq_data(env, a0 + 8, env->regs[R_ECX]);
+ cpu_stq_data_ra(env, a0, env->regs[R_EBX], GETPC());
+ cpu_stq_data_ra(env, a0 + 8, env->regs[R_ECX], GETPC());
eflags |= CC_Z;
} else {
/* always do the store */
- cpu_stq_data(env, a0, d0);
- cpu_stq_data(env, a0 + 8, d1);
+ cpu_stq_data_ra(env, a0, d0, GETPC());
+ cpu_stq_data_ra(env, a0 + 8, d1, GETPC());
env->regs[R_EDX] = d1;
env->regs[R_EAX] = d0;
eflags &= ~CC_Z;
@@ -87,11 +88,11 @@ void helper_boundw(CPUX86State *env, target_ulong a0, int v)
{
int low, high;
- low = cpu_ldsw_data(env, a0);
- high = cpu_ldsw_data(env, a0 + 2);
+ low = cpu_ldsw_data_ra(env, a0, GETPC());
+ high = cpu_ldsw_data_ra(env, a0 + 2, GETPC());
v = (int16_t)v;
if (v < low || v > high) {
- raise_exception(env, EXCP05_BOUND);
+ raise_exception_ra(env, EXCP05_BOUND, GETPC());
}
}
@@ -99,10 +100,10 @@ void helper_boundl(CPUX86State *env, target_ulong a0, int
v)
{
int low, high;
- low = cpu_ldl_data(env, a0);
- high = cpu_ldl_data(env, a0 + 4);
+ low = cpu_ldl_data_ra(env, a0, GETPC());
+ high = cpu_ldl_data_ra(env, a0 + 4, GETPC());
if (v < low || v > high) {
- raise_exception(env, EXCP05_BOUND);
+ raise_exception_ra(env, EXCP05_BOUND, GETPC());
}
}
@@ -122,11 +123,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, int
is_write, int mmu_idx,
X86CPU *cpu = X86_CPU(cs);
CPUX86State *env = &cpu->env;
- if (retaddr) {
- /* now we have a real cpu fault */
- cpu_restore_state(cs, retaddr);
- }
- raise_exception_err(env, cs->exception_index, env->error_code);
+ raise_exception_err_ra(env, cs->exception_index, env->error_code,
retaddr);
}
}
#endif
diff --git a/target-i386/translate.c b/target-i386/translate.c
index c405ddd..15ec6d3 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -5204,7 +5204,6 @@ static target_ulong disas_insn(CPUX86State *env,
DisasContext *s,
if (dflag == MO_64) {
if (!(s->cpuid_ext_features & CPUID_EXT_CX16))
goto illegal_op;
- gen_jmp_im(pc_start - s->cs_base);
gen_update_cc_op(s);
gen_lea_modrm(env, s, modrm);
gen_helper_cmpxchg16b(cpu_env, cpu_A0);
@@ -5213,7 +5212,6 @@ static target_ulong disas_insn(CPUX86State *env,
DisasContext *s,
{
if (!(s->cpuid_features & CPUID_CX8))
goto illegal_op;
- gen_jmp_im(pc_start - s->cs_base);
gen_update_cc_op(s);
gen_lea_modrm(env, s, modrm);
gen_helper_cmpxchg8b(cpu_env, cpu_A0);
@@ -6952,7 +6950,6 @@ static target_ulong disas_insn(CPUX86State *env,
DisasContext *s,
goto illegal_op;
gen_op_mov_v_reg(ot, cpu_T[0], reg);
gen_lea_modrm(env, s, modrm);
- gen_jmp_im(pc_start - s->cs_base);
tcg_gen_trunc_tl_i32(cpu_tmp2_i32, cpu_T[0]);
if (ot == MO_16) {
gen_helper_boundw(cpu_env, cpu_A0, cpu_tmp2_i32);
- [Qemu-devel] [PATCH v7 00/11] Fix exceptions handling for MIPS, PowerPC, and i386, Pavel Dovgalyuk, 2015/07/10
- [Qemu-devel] [PATCH v7 01/11] softmmu: add helper function to pass through retaddr, Pavel Dovgalyuk, 2015/07/10
- [Qemu-devel] [PATCH v7 02/11] softmmu: remove now unused functions, Pavel Dovgalyuk, 2015/07/10
- [Qemu-devel] [PATCH v7 03/11] cpu-exec: introduce loop exit with restore function, Pavel Dovgalyuk, 2015/07/10
- [Qemu-devel] [PATCH v7 05/11] target-i386: introduce new raise_exception functions, Pavel Dovgalyuk, 2015/07/10
- [Qemu-devel] [PATCH v7 04/11] target-mips: improve exception handling, Pavel Dovgalyuk, 2015/07/10
- [Qemu-devel] [PATCH v7 06/11] target-i386: exception handling for FPU instructions, Pavel Dovgalyuk, 2015/07/10
- [Qemu-devel] [PATCH v7 07/11] target-i386: exception handling for div instructions, Pavel Dovgalyuk, 2015/07/10
- [Qemu-devel] [PATCH v7 08/11] target-i386: exception handling for memory helpers,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v7 10/11] target-i386: exception handling for other helper functions, Pavel Dovgalyuk, 2015/07/10
- [Qemu-devel] [PATCH v7 09/11] target-i386: exception handling for seg_helper functions, Pavel Dovgalyuk, 2015/07/10
- [Qemu-devel] [PATCH v7 11/11] target-ppc: exceptions handling in icount mode, Pavel Dovgalyuk, 2015/07/10