[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 06/15] target-i386: Move user-mode exception acti
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v3 06/15] target-i386: Move user-mode exception actions out of user-exec.c |
Date: |
Mon, 13 Jun 2016 18:05:26 +0100 |
From: Peter Maydell <address@hidden>
The exception_action() function in user-exec.c is just a call to
cpu_loop_exit() for every target CPU except i386. Since this
function is only called if the target's handle_mmu_fault() hook has
indicated an MMU fault, and that hook is only called from the
handle_cpu_signal() code path, we can simply move the x86-specific
setup into that hook, which allows us to remove the TARGET_I386
ifdef from user-exec.c.
Of the actions that were done by the call to raise_interrupt_err():
* cpu_svm_check_intercept_param() is a no-op in user mode
* check_exception() is a no-op since double faults are impossible
for user-mode
* assignments to cs->exception_index and env->error_code are no-ops
* assigning to env->exception_next_eip is unnecessary because it
is not used unless env->exception_is_int is true
* cpu_loop_exit_restore() is equivalent to cpu_loop_exit() since
pc is 0
which leaves just setting env_>exception_is_int as the action that
needs to be added to x86_cpu_handle_mmu_fault().
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Sergey Fedorov <address@hidden>
Acked-by: Eduardo Habkost <address@hidden>
Acked-by: Riku Voipio <address@hidden>
Message-id: address@hidden
---
target-i386/helper.c | 2 ++
user-exec.c | 16 +---------------
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 889fdab..1c250b8 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -701,6 +701,8 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr,
env->error_code = (is_write << PG_ERROR_W_BIT);
env->error_code |= PG_ERROR_U_MASK;
cs->exception_index = EXCP0E_PAGE;
+ env->exception_is_int = 0;
+ env->exception_next_eip = -1;
return 1;
}
diff --git a/user-exec.c b/user-exec.c
index b9e7bec..50e95a6 100644
--- a/user-exec.c
+++ b/user-exec.c
@@ -40,18 +40,6 @@
//#define DEBUG_SIGNAL
-static void exception_action(CPUState *cpu)
-{
-#if defined(TARGET_I386)
- X86CPU *x86_cpu = X86_CPU(cpu);
- CPUX86State *env1 = &x86_cpu->env;
-
- raise_exception_err(env1, cpu->exception_index, env1->error_code);
-#else
- cpu_loop_exit(cpu);
-#endif
-}
-
/* exit the current TB from a signal handler. The host registers are
restored in a state compatible with the CPU emulator
*/
@@ -120,10 +108,8 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned
long address,
/* now we have a real cpu fault */
cpu_restore_state(cpu, pc);
- /* we restore the process signal mask as the sigreturn should
- do it (XXX: use sigsetjmp) */
sigprocmask(SIG_SETMASK, old_set, NULL);
- exception_action(cpu);
+ cpu_loop_exit(cpu);
/* never comes here */
return 1;
--
2.5.5
- [Qemu-devel] [PATCH v3 00/15] mirror: follow AioContext change gracefully, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 01/15] translate-all.c: Don't pass puc, locked to tb_invalidate_phys_page(), Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 02/15] user-exec: Push resume-from-signal code out to handle_cpu_signal(), Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 03/15] cpu-exec: Rename cpu_resume_from_signal() to cpu_loop_exit_noexc(), Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 04/15] user-exec: Don't reextract sigmask from usercontext pointer, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 05/15] target-i386: Add comment about do_interrupt_user() next_eip argument, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 06/15] target-i386: Move user-mode exception actions out of user-exec.c,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v3 08/15] ui: fix regression in printing VNC host/port on startup, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 07/15] vnc: drop unused depth arg for set_pixel_format, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 09/15] gtk: fix vte version check, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 10/15] ui/console-gl: Add support for big endian display surfaces, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 12/15] blockjob: move iostatus reset out of block_job_enter(), Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 11/15] console: ignore ui_info updates which don't actually update something, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 13/15] blockjob: add pause points, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 14/15] blockjob: add AioContext attach/detach callbacks, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 15/15] mirror: follow AioContext change gracefully, Stefan Hajnoczi, 2016/06/13