From patchwork Sun Oct 4 21:49:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Igor V. Kovalenko" X-Patchwork-Id: 34939 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 7FEECB7B86 for ; Mon, 5 Oct 2009 08:50:08 +1100 (EST) Received: from localhost ([127.0.0.1]:44584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MuYxw-0002WS-SU for incoming@patchwork.ozlabs.org; Sun, 04 Oct 2009 17:50:04 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MuYxP-0002UA-QN for qemu-devel@nongnu.org; Sun, 04 Oct 2009 17:49:31 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MuYxP-0002TZ-2C for qemu-devel@nongnu.org; Sun, 04 Oct 2009 17:49:31 -0400 Received: from [199.232.76.173] (port=44806 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MuYxO-0002T8-SW for qemu-devel@nongnu.org; Sun, 04 Oct 2009 17:49:30 -0400 Received: from fg-out-1718.google.com ([72.14.220.155]:2677) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MuYxO-0007yq-GX for qemu-devel@nongnu.org; Sun, 04 Oct 2009 17:49:30 -0400 Received: by fg-out-1718.google.com with SMTP id d23so814559fga.10 for ; Sun, 04 Oct 2009 14:49:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:subject:to:date :message-id:user-agent:mime-version:content-type :content-transfer-encoding; bh=69U3Ekt2B0RTudW/AVxnEi0iDCCudc61sRQRyGAgPDg=; b=ax2hEYIvpQoZSejg0lAAdUOqGIBVCRaWkq5tCbRlAJbZoouMwmWTOEtPRCLngUn8KE YWsqVgSReQq+YaphFkvTMQgciZz/YDNekDmS4599AK25CRbz4RIwNzWaA/sArcNFU0mp JFdlwwXR0lwLFtHmMQohoRl1hXAce4W3/qD7A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:subject:to:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; b=dloRkWvKbOOF3hLELUAGrCyBqgNxrWD/xd24X0Sq/iNuPtuhiNR+zONle8zzNwkd9W PVs3NSQNCegLI6XvmHfAh8AaNAbS1uLHSpyJDkl8qn+9VE6Vezu1dOPVEFC2JRmrwNL6 t/mz1I44H/9tae4539t5uFxIr3Bzezmr8f6EE= Received: by 10.86.10.36 with SMTP id 36mr4552752fgj.61.1254692968994; Sun, 04 Oct 2009 14:49:28 -0700 (PDT) Received: from skyserv (host-87-255-14-75.bigtelecom.ru [87.255.14.75]) by mx.google.com with ESMTPS id 12sm5797228fgg.28.2009.10.04.14.49.28 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 04 Oct 2009 14:49:28 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=[192.168.1.2]) by skyserv with esmtp (Exim 4.69) (envelope-from ) id 1MuYxL-0002MQ-NK for qemu-devel@nongnu.org; Mon, 05 Oct 2009 01:49:27 +0400 From: Igor V. Kovalenko To: qemu-devel@nongnu.org Date: Mon, 05 Oct 2009 01:49:27 +0400 Message-ID: <20091004214927.9048.1000.stgit@skyserv> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH] sparc64: fix done instruction pc 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 Fix done instruction to resume with pc=tnpc, npc=tnpc+4 Signed-off-by: Igor V. Kovalenko --- target-sparc/op_helper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c index 8992d1c..a1ada8b 100644 --- a/target-sparc/op_helper.c +++ b/target-sparc/op_helper.c @@ -3318,7 +3318,7 @@ void helper_done(void) { trap_state* tsptr = cpu_tsptr(env); - env->pc = tsptr->tpc; + env->pc = tsptr->tnpc; env->npc = tsptr->tnpc + 4; PUT_CCR(env, tsptr->tstate >> 32); env->asi = (tsptr->tstate >> 24) & 0xff;