From patchwork Fri Mar 12 14:58:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 47867 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 944B8B7D77 for ; Wed, 17 Mar 2010 03:19:17 +1100 (EST) Received: from localhost ([127.0.0.1]:40234 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NrZUA-0001Lh-Ns for incoming@patchwork.ozlabs.org; Tue, 16 Mar 2010 12:19:14 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NrZ4T-00080W-O0 for qemu-devel@nongnu.org; Tue, 16 Mar 2010 11:52:41 -0400 Received: from [199.232.76.173] (port=44827 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NrZ4S-0007zv-SB for qemu-devel@nongnu.org; Tue, 16 Mar 2010 11:52:40 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NrZ4R-0007LD-JQ for qemu-devel@nongnu.org; Tue, 16 Mar 2010 11:52:40 -0400 Received: from are.twiddle.net ([75.149.56.221]:34604) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NrZ4I-0007KQ-G5 for qemu-devel@nongnu.org; Tue, 16 Mar 2010 11:52:39 -0400 Received: by are.twiddle.net (Postfix, from userid 5000) id B5150B08; Tue, 16 Mar 2010 08:52:18 -0700 (PDT) Message-Id: <14f1f6f787a15f6d6a5c3ce7f49a2e682aa339e7.1268754659.git.rth@twiddle.net> In-Reply-To: References: From: Richard Henderson Date: Fri, 12 Mar 2010 15:58:08 +0100 To: qemu-devel@nongnu.org X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 4/4] tcg-hppa: Compute is_write in cpu_signal_handler. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Richard Henderson Acked-by: Stuart Brady --- 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