From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 02/38] linux-user/i386: Split out gen_signal
Date: Mon, 16 Mar 2020 17:15:14 +0100 [thread overview]
Message-ID: <20200316161550.336150-3-laurent@vivier.eu> (raw)
In-Reply-To: <20200316161550.336150-1-laurent@vivier.eu>
From: Richard Henderson <richard.henderson@linaro.org>
This is a bit tidier than open-coding the 5 lines necessary
to initialize the target_siginfo_t. In addition, this zeros
the remaining bytes of the target_siginfo_t, rather than
passing in garbage.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200213032223.14643-3-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/i386/cpu_loop.c | 93 ++++++++++++++------------------------
1 file changed, 33 insertions(+), 60 deletions(-)
diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c
index 024b6f4d588c..e217cca5ee1e 100644
--- a/linux-user/i386/cpu_loop.c
+++ b/linux-user/i386/cpu_loop.c
@@ -81,13 +81,23 @@ static void set_idt(int n, unsigned int dpl)
}
#endif
+static void gen_signal(CPUX86State *env, int sig, int code, abi_ptr addr)
+{
+ target_siginfo_t info = {
+ .si_signo = sig,
+ .si_code = code,
+ ._sifields._sigfault._addr = addr
+ };
+
+ queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+}
+
void cpu_loop(CPUX86State *env)
{
CPUState *cs = env_cpu(env);
int trapnr;
abi_ulong pc;
abi_ulong ret;
- target_siginfo_t info;
for(;;) {
cpu_exec_start(cs);
@@ -134,70 +144,45 @@ void cpu_loop(CPUX86State *env)
#endif
case EXCP0B_NOSEG:
case EXCP0C_STACK:
- info.si_signo = TARGET_SIGBUS;
- info.si_errno = 0;
- info.si_code = TARGET_SI_KERNEL;
- info._sifields._sigfault._addr = 0;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ gen_signal(env, TARGET_SIGBUS, TARGET_SI_KERNEL, 0);
break;
case EXCP0D_GPF:
/* XXX: potential problem if ABI32 */
#ifndef TARGET_X86_64
if (env->eflags & VM_MASK) {
handle_vm86_fault(env);
- } else
-#endif
- {
- info.si_signo = TARGET_SIGSEGV;
- info.si_errno = 0;
- info.si_code = TARGET_SI_KERNEL;
- info._sifields._sigfault._addr = 0;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ break;
}
+#endif
+ gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0);
break;
case EXCP0E_PAGE:
- info.si_signo = TARGET_SIGSEGV;
- info.si_errno = 0;
- if (!(env->error_code & 1))
- info.si_code = TARGET_SEGV_MAPERR;
- else
- info.si_code = TARGET_SEGV_ACCERR;
- info._sifields._sigfault._addr = env->cr[2];
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ gen_signal(env, TARGET_SIGSEGV,
+ (env->error_code & 1 ?
+ TARGET_SEGV_ACCERR : TARGET_SEGV_MAPERR),
+ env->cr[2]);
break;
case EXCP00_DIVZ:
#ifndef TARGET_X86_64
if (env->eflags & VM_MASK) {
handle_vm86_trap(env, trapnr);
- } else
-#endif
- {
- /* division by zero */
- info.si_signo = TARGET_SIGFPE;
- info.si_errno = 0;
- info.si_code = TARGET_FPE_INTDIV;
- info._sifields._sigfault._addr = env->eip;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ break;
}
+#endif
+ gen_signal(env, TARGET_SIGFPE, TARGET_FPE_INTDIV, env->eip);
break;
case EXCP01_DB:
case EXCP03_INT3:
#ifndef TARGET_X86_64
if (env->eflags & VM_MASK) {
handle_vm86_trap(env, trapnr);
- } else
+ break;
+ }
#endif
- {
- info.si_signo = TARGET_SIGTRAP;
- info.si_errno = 0;
- if (trapnr == EXCP01_DB) {
- info.si_code = TARGET_TRAP_BRKPT;
- info._sifields._sigfault._addr = env->eip;
- } else {
- info.si_code = TARGET_SI_KERNEL;
- info._sifields._sigfault._addr = 0;
- }
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ if (trapnr == EXCP01_DB) {
+ gen_signal(env, TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->eip);
+ } else {
+ gen_signal(env, TARGET_SIGTRAP, TARGET_SI_KERNEL, 0);
}
break;
case EXCP04_INTO:
@@ -205,31 +190,19 @@ void cpu_loop(CPUX86State *env)
#ifndef TARGET_X86_64
if (env->eflags & VM_MASK) {
handle_vm86_trap(env, trapnr);
- } else
-#endif
- {
- info.si_signo = TARGET_SIGSEGV;
- info.si_errno = 0;
- info.si_code = TARGET_SI_KERNEL;
- info._sifields._sigfault._addr = 0;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ break;
}
+#endif
+ gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0);
break;
case EXCP06_ILLOP:
- info.si_signo = TARGET_SIGILL;
- info.si_errno = 0;
- info.si_code = TARGET_ILL_ILLOPN;
- info._sifields._sigfault._addr = env->eip;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ gen_signal(env, TARGET_SIGILL, TARGET_ILL_ILLOPN, env->eip);
break;
case EXCP_INTERRUPT:
/* just indicate that signals should be handled asap */
break;
case EXCP_DEBUG:
- info.si_signo = TARGET_SIGTRAP;
- info.si_errno = 0;
- info.si_code = TARGET_TRAP_BRKPT;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ gen_signal(env, TARGET_SIGTRAP, TARGET_TRAP_BRKPT, 0);
break;
case EXCP_ATOMIC:
cpu_exec_step_atomic(cs);
--
2.24.1
next prev parent reply other threads:[~2020-03-16 17:59 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 16:15 [PULL 00/38] Linux user for 5.0 patches Laurent Vivier
2020-03-16 16:15 ` [PULL 01/38] target/i386: Renumber EXCP_SYSCALL Laurent Vivier
2020-03-16 16:15 ` Laurent Vivier [this message]
2020-03-16 16:15 ` [PULL 03/38] linux-user/i386: Emulate x86_64 vsyscalls Laurent Vivier
2020-03-16 16:15 ` [PULL 04/38] linux-user: Add x86_64 vsyscall page to /proc/self/maps Laurent Vivier
2020-03-16 16:15 ` [PULL 05/38] linux-user: Flush out implementation of gettimeofday Laurent Vivier
2020-03-16 16:15 ` [PULL 06/38] linux-user: Add AT_EXECFN auxval Laurent Vivier
2020-03-16 16:15 ` [PULL 07/38] linux-user: do prlimit selectively Laurent Vivier
2020-03-16 16:15 ` [PULL 08/38] linux-user: fix socket() strace Laurent Vivier
2020-03-16 16:15 ` [PULL 09/38] linux-user: Update TASK_UNMAPPED_BASE for aarch64 Laurent Vivier
2020-03-16 16:15 ` [PULL 10/38] linux-user: Protect more syscalls Laurent Vivier
2020-03-16 16:15 ` [PULL 11/38] linux-user/syscall: Add support for clock_gettime64/clock_settime64 Laurent Vivier
2020-03-16 16:15 ` [PULL 12/38] linux-user: Support futex_time64 Laurent Vivier
2020-03-17 16:09 ` Laurent Vivier
2020-03-16 16:15 ` [PULL 13/38] linux-user/riscv: Update the syscall_nr's to the 5.5 kernel Laurent Vivier
2020-03-16 16:15 ` [PULL 14/38] linux-user: introduce parameters to generate syscall_nr.h Laurent Vivier
2020-03-16 16:15 ` [PULL 15/38] linux-user, alpha: add syscall table generation support Laurent Vivier
2020-03-16 16:15 ` [PULL 16/38] linux-user, hppa: " Laurent Vivier
2020-03-16 16:15 ` [PULL 17/38] linux-user, m68k: " Laurent Vivier
2020-03-16 16:15 ` [PULL 18/38] linux-user, xtensa: " Laurent Vivier
2020-03-16 16:15 ` [PULL 19/38] linux-user, sh4: " Laurent Vivier
2020-03-16 16:15 ` [PULL 20/38] linux-user, microblaze: " Laurent Vivier
2020-03-16 16:15 ` [PULL 21/38] linux-user, arm: " Laurent Vivier
2020-03-16 16:15 ` [PULL 22/38] linux-user, ppc: " Laurent Vivier
2020-03-16 16:15 ` [PULL 23/38] linux-user, s390x: remove syscall definitions for !TARGET_S390X Laurent Vivier
2020-03-16 16:15 ` [PULL 24/38] linux-user, s390x: add syscall table generation support Laurent Vivier
2020-03-16 16:15 ` [PULL 25/38] linux-user, sparc, sparc64: " Laurent Vivier
2020-03-16 16:15 ` [PULL 26/38] linux-user, x86_64, i386: cleanup TARGET_NR_arch_prctl Laurent Vivier
2020-03-16 16:15 ` [PULL 27/38] linux-user, i386: add syscall table generation support Laurent Vivier
2020-03-16 16:15 ` [PULL 28/38] linux-user, x86_64: " Laurent Vivier
2020-03-16 16:15 ` [PULL 29/38] linux-user, mips: " Laurent Vivier
2020-03-16 16:15 ` [PULL 30/38] linux-user, mips64: " Laurent Vivier
2020-03-16 16:15 ` [PULL 31/38] linux-user, scripts: add a script to update syscall.tbl Laurent Vivier
2020-03-16 16:15 ` [PULL 32/38] linux-user: update syscall.tbl from linux 0bf999f9c5e7 Laurent Vivier
2020-03-16 16:15 ` [PULL 33/38] linux-user,mips: move content of mips_syscall_args Laurent Vivier
2020-03-16 16:15 ` [PULL 34/38] linux-user,mips: update syscall-args-o32.c.inc Laurent Vivier
2020-03-16 16:15 ` [PULL 35/38] scripts: add a script to generate syscall_nr.h Laurent Vivier
2020-03-16 16:15 ` [PULL 36/38] linux-user, aarch64: sync syscall numbers with kernel v5.5 Laurent Vivier
2020-03-16 16:15 ` [PULL 37/38] linux-user, nios2: " Laurent Vivier
2020-03-16 16:15 ` [PULL 38/38] linux-user, openrisc: " Laurent Vivier
2020-03-16 19:17 ` [PULL 00/38] Linux user for 5.0 patches Peter Maydell
2020-03-17 7:49 ` Laurent Vivier
2020-03-16 21:59 ` no-reply
2020-03-16 23:43 ` no-reply
2020-03-17 1:09 ` no-reply
2020-03-17 2:01 ` no-reply
2020-03-17 2:13 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200316161550.336150-3-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=alex.bennee@linaro.org \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=riku.voipio@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).