From mboxrd@z Thu Jan 1 00:00:00 1970 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) 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 Date: Mon, 05 Oct 2009 01:49:27 +0400 Message-ID: <20091004214927.9048.1000.stgit@skyserv> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] sparc64: fix done instruction pc List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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;