Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nriij-0000jc-7a for qemu-devel@nongnu.org; Tue, 16 Mar 2010 22:10:53 -0400 Received: from [199.232.76.173] (port=60125 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nriii-0000jT-CE for qemu-devel@nongnu.org; Tue, 16 Mar 2010 22:10:52 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nriig-0004HS-S0 for qemu-devel@nongnu.org; Tue, 16 Mar 2010 22:10:52 -0400 Received: from b.painless.aaisp.net.uk ([81.187.30.52]:57459) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Nriig-0004HM-FO for qemu-devel@nongnu.org; Tue, 16 Mar 2010 22:10:50 -0400 Received: from zubnet.me.uk ([81.187.243.246] helo=circe) by b.painless.aaisp.net.uk with esmtp (Exim 4.69) (envelope-from ) id 1Nriif-00085k-41 for qemu-devel@nongnu.org; Wed, 17 Mar 2010 02:10:49 +0000 Date: Wed, 17 Mar 2010 02:10:43 +0000 From: Stuart Brady Subject: Re: [Qemu-devel] [PATCH 4/4] tcg-hppa: Compute is_write in cpu_signal_handler. Message-ID: <20100317021043.GD23195@zubnet.me.uk> References: <14f1f6f787a15f6d6a5c3ce7f49a2e682aa339e7.1268754659.git.rth@twiddle.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <14f1f6f787a15f6d6a5c3ce7f49a2e682aa339e7.1268754659.git.rth@twiddle.net> List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org On Fri, Mar 12, 2010 at 03:58:08PM +0100, Richard Henderson wrote: > Signed-off-by: Richard Henderson Acked-by: Stuart Brady Argh. It just seems mind bogglingly silly that is_write doesn't seem to be included in the siginfo on archs where doing so would make sense... It's at least something I'd have hoped libc could take care of in the case where the hardware doesn't indicate whether the fault was due to a read or a write... (Right up there with the use of our own caching flushing code instead of calls to mprotect(), etc. and the rather dubious use of qemu-lock.h...) > --- > 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 > >