Skip to content

Commit

Permalink
user-exec.c: Set is_write correctly in the ARM cpu_signal_handler()
Browse files Browse the repository at this point in the history
In the ARM implementation of cpu_signal_handler(), set is_write
correctly using the FSR value which the kernel passes us in the
error_code field of uc_mcontext. Since the WnR bit of the FSR was
only introduced in ARMv6, this means that v5 cores will continue
to behave as before this patch, but they are not really supported
as hosts for linux-user mode anyway since they do not have the
modern behaviour for unaligned accesses.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1370352705-27590-1-git-send-email-peter.maydell@linaro.org
  • Loading branch information
pm215 authored and Riku Voipio committed Jul 5, 2013
1 parent 1acae9f commit 023b0ae
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions user-exec.c
Expand Up @@ -20,6 +20,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "tcg.h"
#include "qemu/bitops.h"

#undef EAX
#undef ECX
Expand Down Expand Up @@ -441,8 +442,11 @@ int cpu_signal_handler(int host_signum, void *pinfo,
#else
pc = uc->uc_mcontext.arm_pc;
#endif
/* XXX: compute is_write */
is_write = 0;

/* error_code is the FSR value, in which bit 11 is WnR (assuming a v6 or
* later processor; on v5 we will always report this as a read).
*/
is_write = extract32(uc->uc_mcontext.error_code, 11, 1);
return handle_cpu_signal(pc, (unsigned long)info->si_addr,
is_write,
&uc->uc_sigmask, puc);
Expand Down

0 comments on commit 023b0ae

Please sign in to comment.