Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NrYxE-0005ad-Jq for qemu-devel@nongnu.org; Tue, 16 Mar 2010 11:45:12 -0400 Received: from [199.232.76.173] (port=41187 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NrYxE-0005aI-1t for qemu-devel@nongnu.org; Tue, 16 Mar 2010 11:45:12 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NrYxD-00073O-2x for qemu-devel@nongnu.org; Tue, 16 Mar 2010 11:45:11 -0400 Received: from are.twiddle.net ([75.149.56.221]:41149) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NrYxB-00072t-Kl for qemu-devel@nongnu.org; Tue, 16 Mar 2010 11:45:09 -0400 From: Richard Henderson Date: Fri, 12 Mar 2010 15:58:08 +0100 Message-Id: <20100316154506.509E5B08@are.twiddle.net> Subject: [Qemu-devel] [PATCH 4/4] tcg-hppa: Compute is_write in cpu_signal_handler. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org --- cpu-exec.c | 38 +++++++++++++++++++++++++++++++------- 1 files changed, 31 insertions(+), 7 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index bcfcda2..14204f4 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -1193,15 +1193,39 @@ int cpu_signal_handler(int host_signum, void *pinfo, { struct siginfo *info = pinfo; struct ucontext *uc = puc; - unsigned long pc; - int is_write; + unsigned long pc = uc->uc_mcontext.sc_iaoq[0]; + uint32_t insn = *(uint32_t *)pc; + int is_write = 0; + + /* XXX: need kernel patch to get write flag faster. */ + switch (insn >> 26) { + case 0x1a: /* STW */ + case 0x19: /* STH */ + case 0x18: /* STB */ + case 0x1b: /* STWM */ + is_write = 1; + break; + + case 0x09: /* CSTWX, FSTWX, FSTWS */ + case 0x0b: /* CSTDX, FSTDX, FSTDS */ + /* Distinguish from coprocessor load ... */ + is_write = (insn >> 9) & 1; + break; + + case 0x03: + switch ((insn >> 6) & 15) { + case 0xa: /* STWS */ + case 0x9: /* STHS */ + case 0x8: /* STBS */ + case 0xe: /* STWAS */ + case 0xc: /* STBYS */ + is_write = 1; + } + break; + } - pc = uc->uc_mcontext.sc_iaoq[0]; - /* FIXME: compute is_write */ - is_write = 0; return handle_cpu_signal(pc, (unsigned long)info->si_addr, - is_write, - &uc->uc_sigmask, puc); + is_write, &uc->uc_sigmask, puc); } #else -- 1.6.6.1