From patchwork Thu May 10 00:14:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 158160 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2174EB6FA4 for ; Thu, 10 May 2012 13:10:50 +1000 (EST) Received: from localhost ([::1]:50551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH4w-0005Tq-Rt for incoming@patchwork.ozlabs.org; Wed, 09 May 2012 20:17:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2X-0001lb-RP for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSH2U-0005iG-IP for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:29 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35631 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2U-0005hL-0k for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:26 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id EC8F0970AD; Thu, 10 May 2012 02:15:24 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 10 May 2012 02:14:38 +0200 Message-Id: <1336608892-30501-61-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1336608892-30501-1-git-send-email-afaerber@suse.de> References: <1336608892-30501-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Subject: [Qemu-devel] [PATCH next v2 60/74] target-mips: Use cpu_reset() in do_interrupt() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Andreas Färber --- target-mips/helper.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/target-mips/helper.c b/target-mips/helper.c index ddf9cb7..4208bb2 100644 --- a/target-mips/helper.c +++ b/target-mips/helper.c @@ -399,6 +399,7 @@ static void set_hflags_for_handler (CPUMIPSState *env) void do_interrupt (CPUMIPSState *env) { #if !defined(CONFIG_USER_ONLY) + MIPSCPU *cpu = mips_env_get_cpu(env); target_ulong offset; int cause = -1; const char *name; @@ -452,7 +453,7 @@ void do_interrupt (CPUMIPSState *env) set_hflags_for_handler(env); break; case EXCP_RESET: - cpu_state_reset(env); + cpu_reset(CPU(cpu)); break; case EXCP_SRESET: env->CP0_Status |= (1 << CP0St_SR);