[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 28/32] iret arch specific accelerator
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 28/32] iret arch specific accelerator |
Date: |
Thu, 23 Oct 2008 12:19:12 -0200 |
let arch-specific accelerator hook into the end of interrupt
return.
Signed-off-by: Glauber Costa <address@hidden>
---
kqemu.c | 10 ++++++++++
target-i386/accel86.h | 8 ++++++++
target-i386/op_helper.c | 9 ++-------
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/kqemu.c b/kqemu.c
index cab6354..0bea20e 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -1186,9 +1186,19 @@ static int kqemu_set_msr(int msr, target_ulong val)
return -1;
}
+static void kqemu_interrupt_return(CPUState *env)
+{
+ if (kqemu_kernel_flags_ok(env)) {
+ CC_OP = CC_OP_EFLAGS;
+ env->exception_index = -1;
+ cpu_loop_exit();
+ }
+}
+
QEMUAccel86 kqemu_accel86 = {
.get_msr = kqemu_get_msr,
.set_msr = kqemu_set_msr,
+ .interrupt_return = kqemu_interrupt_return,
};
QEMUAccel kqemu_accel = {
diff --git a/target-i386/accel86.h b/target-i386/accel86.h
index 142d63e..c3201f5 100644
--- a/target-i386/accel86.h
+++ b/target-i386/accel86.h
@@ -6,6 +6,7 @@
typedef struct QEMUAccel86 {
int (*get_msr)(int msr, uint64_t *value);
int (*set_msr)(int msr, uint64_t value);
+ void (*interrupt_return)(CPUState *env);
} QEMUAccel86;
#define accel86_call_func ((QEMUAccel86 *)(current_accel->arch))
@@ -24,5 +25,12 @@ static inline int accel_set_msr(int msr, uint64_t value)
return accel86_call_func->set_msr(msr, value);
}
+static inline void accel_interrupt_return(CPUState *env)
+{
+ if (!current_accel->arch)
+ return;
+ accel86_call_func->interrupt_return(env);
+}
+
#endif
diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c
index fe8ddf8..61ba6fc 100644
--- a/target-i386/op_helper.c
+++ b/target-i386/op_helper.c
@@ -2918,13 +2918,8 @@ void helper_iret_protected(int shift, int next_eip)
helper_ret_protected(shift, 1, 0);
}
env->hflags2 &= ~HF2_NMI_MASK;
-#ifdef USE_KQEMU
- if (kqemu_is_ok(env)) {
- CC_OP = CC_OP_EFLAGS;
- env->exception_index = -1;
- cpu_loop_exit();
- }
-#endif
+
+ accel_interrupt_return(env);
}
void helper_lret_protected(int shift, int addend)
--
1.5.5.1
- Re: [Qemu-devel] [PATCH 20/32] accel_trace_io, (continued)
- [Qemu-devel] [PATCH 31/32] remove kqemu_is_ok tests., Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 30/32] lcall/lret arch specific accel hooks, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 25/32] provide accel hook for cpu_exec, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 32/32] clean up kqemu code, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 29/32] sysret/sysexit arch specific accelerator, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 28/32] iret arch specific accelerator,
Glauber Costa <=
- [Qemu-devel] [PATCH 19/32] add hook to cpu_register_physical_memory, Glauber Costa, 2008/10/23
- [Qemu-devel] Re: [PATCH 0/32] New shot at accelerators, Jan Kiszka, 2008/10/23
- [Qemu-devel] Re: [PATCH 0/32] New shot at accelerators, Anthony Liguori, 2008/10/23