From patchwork Mon May 3 17:07:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 51514 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 8F9D0B7BEE for ; Tue, 4 May 2010 03:17:45 +1000 (EST) Received: from localhost ([127.0.0.1]:49352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O8zE1-0000g2-Px for incoming@patchwork.ozlabs.org; Mon, 03 May 2010 13:14:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O8z8L-0007dD-8L for qemu-devel@nongnu.org; Mon, 03 May 2010 13:08:41 -0400 Received: from [140.186.70.92] (port=59044 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O8z8K-0007d0-51 for qemu-devel@nongnu.org; Mon, 03 May 2010 13:08:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O8z8J-0000FD-95 for qemu-devel@nongnu.org; Mon, 03 May 2010 13:08:39 -0400 Received: from mail-qy0-f188.google.com ([209.85.221.188]:62982) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O8z8J-0000Bh-6c for qemu-devel@nongnu.org; Mon, 03 May 2010 13:08:39 -0400 Received: by mail-qy0-f188.google.com with SMTP id 26so4137992qyk.19 for ; Mon, 03 May 2010 10:08:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=nJ5j0a6424fknTQObTMFqYNBv9VoLWtBNZXWEuauflE=; b=odaXyFdoyABoQYeCAzhAatNqluN/9JgOPwLHupVh7d+DvqR1pGzehded/nUZ5TT6Wc P1myEZ/8jkZSudtdVigLsdGUeUKx+BS/o5GvGA5LKdU3i61pKeGHDWW0CmwSO/xLWo2H XAurKVWGK1f40+KoVehfpgtK4ZCLEQtswUoEM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=qKmFu1IgLRdaPlkTJG+2EP60t2u4UTi7kv5sC1E9A3KQX0VCzQI/Jj5PxFapfC4THp kiemlmd0U4Vni/Kl/aed8uPGl8SkY79ohIGSP9S3Xm/pXwbK9qB+TSIwrarj8OXF3DjH GNRYzdgi6M5rmn0n0bo0ChfAbQH1W/79+y8Ug= Received: by 10.224.52.75 with SMTP id h11mr3374616qag.370.1272906519079; Mon, 03 May 2010 10:08:39 -0700 (PDT) Received: from localhost.localdomain (are.twiddle.net [75.149.56.221]) by mx.google.com with ESMTPS id 2sm9954190qwi.29.2010.05.03.10.08.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 03 May 2010 10:08:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 3 May 2010 10:07:50 -0700 Message-Id: <1272906475-14480-3-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1272906475-14480-2-git-send-email-rth@twiddle.net> References: <1272906475-14480-1-git-send-email-rth@twiddle.net> <1272906475-14480-2-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 2/7] alpha-linux-user: Fix siginfo.si_addr for SIGSEGV and SIGBUS. 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 --- linux-user/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 18b52c0..e35c124 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2434,7 +2434,7 @@ void cpu_loop (CPUState *env) info.si_signo = TARGET_SIGSEGV; info.si_errno = 0; info.si_code = 0; /* ??? SEGV_MAPERR vs SEGV_ACCERR. */ - info._sifields._sigfault._addr = env->pc; + info._sifields._sigfault._addr = env->ipr[IPR_EXC_ADDR]; queue_signal(env, info.si_signo, &info); break; case EXCP_DTB_MISS_PAL: @@ -2458,7 +2458,7 @@ void cpu_loop (CPUState *env) info.si_signo = TARGET_SIGBUS; info.si_errno = 0; info.si_code = TARGET_BUS_ADRALN; - info._sifields._sigfault._addr = env->pc; + info._sifields._sigfault._addr = env->ipr[IPR_EXC_ADDR]; queue_signal(env, info.si_signo, &info); break; case EXCP_OPCDEC: